- Timestamp:
- 01/07/14 14:14:22 (10 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Misc.java
r655 r658 1534 1534 1535 1535 public static Text settings() { 1536 return Settings.generateSettingsTree(); 1536 Text t = DisplayIO.getCurrentFrame().createNewText("Settings"); 1537 Settings.generateSettingsTree(t); 1538 return t; 1537 1539 } 1538 1540 } -
trunk/src/org/expeditee/gui/FrameUtils.java
r655 r658 1463 1463 1464 1464 xPos += 25; 1465 1466 boolean settingsFound = false;1467 1465 1468 1466 // Start Pages should be the first frame in its own frameset + frameset name should be present in FrameUtils.startPages[]. … … 1483 1481 } 1484 1482 } 1485 1486 // Populate settings frameset1487 if(!settingsFound && framesetName.equals("settings")) {1488 Frame indexFrame = FrameIO.LoadFrame(framesetName + "1");1489 1490 if(indexFrame != null) {1491 settingsFound = true;1492 1493 t = profile.addText(550, 100, "@" + indexFrame.getFramesetName(), null);1494 t.setLink(indexFrame.getName());1495 t.setSize((float) 25.0);1496 t.setFamily("SansSerif");1497 t.setFontStyle("Bold");1498 t.setColor(Color.gray);1499 }1500 }1501 1483 } 1502 1484 } 1503 1485 } 1504 1486 } 1487 1488 FrameIO.SaveFrame(profile); 1489 1490 // Populate settings frameset 1491 Settings.Init(); 1492 t = profile.addText(550, 100, "@Settings", null); 1493 t.setSize((float) 25.0); 1494 t.setFamily("SansSerif"); 1495 t.setFontStyle("Bold"); 1496 t.setColor(Color.gray); 1497 Settings.generateSettingsTree(t); 1505 1498 1506 1499 FrameIO.SaveFrame(profile); -
trunk/src/org/expeditee/settings/Settings.java
r656 r658 62 62 private static HashMap<String, PageDescriptor> _pages = new HashMap<String, PageDescriptor>(); 63 63 64 private static boolean _init = false; 64 65 public static void Init() { 66 if(_init) return; 67 _init = true; 65 68 try { 66 69 for(Class<?> clazz : PackageLoader.getClassesNew(SETTINGS_PACKAGE)) { … … 146 149 } 147 150 148 public static Text generateSettingsTree() {149 return generateSettingsTree("settings", DisplayIO.getCurrentFrame().createNewText("Settings"));151 public static void generateSettingsTree(Text link) { 152 generateSettingsTree("settings", link); 150 153 } 151 154 … … 156 159 * 157 160 */ 158 private static TextgenerateSettingsTree(String page, Text text) {159 Frame frame = FrameIO.Create NewFrame(text);161 private static void generateSettingsTree(String page, Text text) { 162 Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null); 160 163 text.setLink(frame.getName()); 161 164 … … 196 199 String value = ""; 197 200 if(s instanceof GenericSetting && ((GenericSetting) s).isPrimitive()) { 198 System.out.println("VALUE: " + ((GenericSetting) s).get());199 201 if(((GenericSetting) s).get() != null) { 200 202 value = ": " + ((GenericSetting) s).get(); … … 235 237 236 238 FrameIO.SaveFrame(frame); 237 return text;238 239 } 239 240 }
Note:
See TracChangeset
for help on using the changeset viewer.