Changeset 641 for trunk/src/org/expeditee/settings/Settings.java

Timestamp:

12/18/13 14:22:48 (11 years ago)

Author:

jts21

Message:

Generated settings frames now use capitalised setting names, and settings are generated/displayed in the order they were declared in code.
Settings with no value no longer have a ':' after their name (good for some things, however maybe we should be showing somehow that some settings can have a value set after a colon, and others use a frame linked from the setting item, and others just use the properties of the setting item?).
Password setting(s) now use the password widget.
Fixed some problems with settings that try to work without having a value set (SpellChecker, ColorWheels, HomeFrame).

File:

• trunk/src/org/expeditee/settings/Settings.java (modified) (8 diffs)

trunk/src/org/expeditee/settings/Settings.java

@@ -14 +14 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Text;
+import org.expeditee.items.widgets.Password;
 import org.expeditee.reflection.PackageLoader;
 
@@ -36 +37 @@
                 private final HashMap<String, FieldSet> settings = new HashMap<String, FieldSet>();
                 private final List<Field> hasDefault = new LinkedList<Field>();
+                private final List<String> orderedEntries = new LinkedList<String>();
                 private final Method onParsed;
                 
@@ -46 +48 @@
                                         // System.out.println(m.getName().toLowerCase());
                                         settings.put(m.getName().substring(3).toLowerCase(), new FieldSet(null, m));
+                                        if(!orderedEntries.contains(m.getName().substring(3))) {
+                                                orderedEntries.add(m.getName().substring(3));
+                                        }
                                 }
                         }
@@ -64 +69 @@
                                 } else {
                                         settings.put(f.getName().toLowerCase(), new FieldSet(f, fs.method));
+                                }
+                                if(!orderedEntries.contains(f.getName())) {
+                                        orderedEntries.add(f.getName());
                                 }
                         }
@@ -199 +207 @@
         
         public static Text generateSettingsTree() {
-                return generateSettingsTree("settings", DisplayIO.getCurrentFrame().createNewText("settings"));
+                return generateSettingsTree("settings", DisplayIO.getCurrentFrame().createNewText("Settings"));
         }
         
@@ -207 +215 @@
                 
                 int x = 50, y = 100;
-                int dY = UserSettings.ItemTemplate.getPolygon().getBounds().height + 10;
+                int dY = UserSettings.ItemTemplate.getPolygon().getBounds().height + 1;
                 int maxY = UserSettings.InitialHeight - 150;
                 
-                // add subpages
+                // add subpages of the current page
                 for(String k : _pages.keySet()) {
                         if(k.startsWith(page.toLowerCase()) && !k.equals(page)) {
@@ -218 +226 @@
                                 }
                                 System.out.println("Generating " + name);
-                                generateSettingsTree(k, frame.addText(x, y, name, null));
+                                generateSettingsTree(k, frame.addText(x, y, name.substring(0, 1).toUpperCase() + name.substring(1), null));
                                 y += dY;
                                 if(y >= maxY) {
@@ -230 +238 @@
                 y = 100;
                 
-                // add settings for the page
+                // add settings of the current page
                 PageDescriptor pd = _pages.get(page);
                 if(pd != null) {
-                        for(String k : pd.settings.keySet()) {
-                                if(k.startsWith("default")) {
-                                        continue;
-                                }
-                                PageDescriptor.FieldSet fs = pd.settings.get(k);
+                        for(String str : pd.orderedEntries) {
+                                String key = str.toLowerCase();
+                                if(key.startsWith("default")) {
+                                        continue;
+                                }
+                                PageDescriptor.FieldSet fs = pd.settings.get(key);
+                                String name = null;
                                 Object value = "";
+                                name = str.substring(0, 1).toUpperCase() + str.substring(1);
                                 if(fs.method == null && fs.field != null) {
                                 try {
                                         if(pd.hasDefault.contains(fs.field)) {
-                                                value = pd.settings.get("default" + k).field.get(null);
+                                                value = ": " + pd.settings.get("default" + key).field.get(null);
                                         } else {
-                                                value = fs.field.get(null);
+                                                value = ": " + fs.field.get(null);
                                         }
                                 } catch (Exception e) {
                         e.printStackTrace();
                     }
-                                }
-                                frame.addText(x, y, k + ": " + value, null);
+                                } else if(fs.method == null) {
+                                        continue;
+                                }
+                                if(key.equals("pass")) {
+                                        Password pw = new Password(frame.createNewText("@iw: org.expeditee.items.widgets.Password"), null);
+                                        pw.setPassword((String) value);
+                                        pw.setPosition(x, y);
+                                        frame.addAllItems(pw.getItems());
+                                        y += pw.getHeight();
+                                } else {
+                                        frame.addText(x, y, name + value, null);
+                                }
                                 y += dY;
                                 if(y >= maxY) {