Changeset 655 for trunk/src/org/expeditee/actions

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

Location:

trunk/src/org/expeditee/actions

Files:

• Misc.java (modified) (3 diffs)
• Navigation.java (modified) (2 diffs)
• Spelling.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Misc.java

@@ -1160 +1160 @@
                 if(!FreeItems.textOnlyAttachedToCursor()) {
                         text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), 
-                                        NetworkSettings.homePage, null);
+                                        NetworkSettings.HomePage.get(), null);
                         text.setParent(DisplayIO.getCurrentFrame());    // set parent of text source for InteractiveWidget.createWidget()
                         FrameMouseActions.pickup(text);                                 // Attach new text link to cursor
@@ -1372 +1372 @@
          */
         public static void resetHomeFrame() {
-                Frame homeFrame = FrameIO.LoadFrame(UserSettings.HomeFrame);
+                Frame homeFrame = FrameIO.LoadFrame(UserSettings.HomeFrame.get());
                 homeFrame.removeAllItems(homeFrame.getItems());
                 homeFrame.addText(0, 0, "title", null);
-                FrameUtils.CreateDefaultProfile(UserSettings.UserName, homeFrame);
+                FrameUtils.CreateDefaultProfile(UserSettings.UserName.get(), homeFrame);
         }
         
@@ -1398 +1398 @@
                         // If no text with url is passed to action create a new text item
                         if(!FreeItems.textOnlyAttachedToCursor()) {
-                                url = NetworkSettings.homePage;                                 // use home page specified by settings
+                                url = NetworkSettings.HomePage.get();                                   // use home page specified by settings
                                 text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), 
                                                 "Web Browser Session", null);

trunk/src/org/expeditee/actions/Navigation.java

@@ -42 +42 @@
          */
         public static void GotoHome() {
-                FrameUtils.DisplayFrame(UserSettings.HomeFrame);
+                FrameUtils.DisplayFrame(UserSettings.HomeFrame.get());
         }
 
@@ -54 +54 @@
          */
         public static void GotoProfile() {
-                FrameUtils.DisplayFrame(UserSettings.ProfileName + '1');
+                FrameUtils.DisplayFrame(UserSettings.ProfileName.get() + '1');
         }
 

trunk/src/org/expeditee/actions/Spelling.java

@@ -28 +28 @@
                 }
                 if (path == null) {
-                        for (String possiblePath : UserSettings.FrameDirs) {
+                        for (String possiblePath : UserSettings.FrameDirs.get()) {
                                 fullPath = FrameIO
                                                 .getFrameFullPathName(possiblePath, frameName);