Changeset 655 for trunk/src/org/expeditee/gui/Browser.java

Timestamp:

01/07/14 10:59:52 (10 years ago)

Author:

jts21

Message:

Switch to using specialised objects for settings so they make more a bit more sense (now each setting is a single object instead of multiple, and setter functions and default values are less hackish)
Also added tooltips (help strings) to settings, will need to add a way of displaying these (maybe add the idea of a tooltip which is a text item which only appears when hovering over another item?)
Converted all settings over to new format, everything seems to be working fine

File:

• trunk/src/org/expeditee/gui/Browser.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -151 +151 @@
         private Browser() {
                 // Use the default values initially so we can load the profile frame
-                setSizes(new Dimension(UserSettings.InitialWidth,
-                                UserSettings.InitialHeight));
+                setSizes(new Dimension(UserSettings.InitialWidth.get(),
+                                UserSettings.InitialHeight.get()));
                 // center the frame on the screen
                 Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
                 double xpos = screen.getWidth() / 2;
                 double ypos = screen.getHeight() / 2;
-                setLocation((int) (xpos - (UserSettings.InitialWidth / 2)),
-                                (int) (ypos - (UserSettings.InitialHeight / 2)));
+                setLocation((int) (xpos - (UserSettings.InitialWidth.get() / 2)),
+                                (int) (ypos - (UserSettings.InitialHeight.get() / 2)));
 
                 addWindowListener(this);
@@ -182 +182 @@
         }
             
-                UserSettings.ProfileName = FrameIO.ConvertToValidFramesetName(System
-                                .getProperty("user.name"));
-                String userName = UserSettings.ProfileName;
-                UserSettings.UserName = UserSettings.ProfileName;
+                // UserSettings.ProfileName.set(FrameIO.ConvertToValidFramesetName(System.getProperty("user.name")));
+                String userName = UserSettings.ProfileName.get();
+                //UserSettings.UserName.set(UserSettings.ProfileName.get());
 
                 Frame profile = loadProfile(userName);
@@ -226 +225 @@
                 // Reset windows to user specified size
                 // Must be done after initialising the content pane above!
-                setSizes(new Dimension(UserSettings.InitialWidth,
-                                UserSettings.InitialHeight));
+                setSizes(new Dimension(UserSettings.InitialWidth.get(),
+                                UserSettings.InitialHeight.get()));
 
                 /*