Changeset 1032 for trunk

Timestamp:

04/21/16 12:07:21 (8 years ago)

Author:

davidb

Message:

Change of logic so a given starting frame on the command-lline is treated as the home frame

Location:

trunk/src/org/expeditee

Files:

• actions/Navigation.java (modified) (1 diff)
• gui/Browser.java (modified) (1 diff)

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

@@ -67 +67 @@
          */
         public static void GotoSettings() {
-                String framename = UserSettings.HomeFrame.get();
-                framename = framename.substring(0, framename.length() - 1) + '2';
+                //String framename = UserSettings.HomeFrame.get();
+                //framename = framename.substring(0, framename.length() - 1) + '2';
+
+                String userName = UserSettings.ProfileName.get();
+                String framename = userName + '2';
+                
                 FrameUtils.DisplayFrame(framename);
         }

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

@@ -323 +323 @@
                 if((start = FrameIO.LoadFrame(_startFrame)) != null) {
                         // Make sure HomeFrame gets set
-                        if (UserSettings.HomeFrame.get() == null)
-                                UserSettings.HomeFrame.set(profile.getName());
+                        UserSettings.HomeFrame.set(start.getName());
+                        //if (UserSettings.HomeFrame.get() == null) {
+                                //UserSettings.HomeFrame.set(profile.getName());
+
+                        //}
                         // Make sure the user can get back to the profile frame easily
-                        DisplayIO.addToBack(profile);
+                        //DisplayIO.addToBack(profile);
                         // Go to the start frame
                         DisplayIO.setCurrentFrame(start, true);