Changeset 26759 for other-projects

Timestamp:

2013-01-20T15:52:18+13:00 (11 years ago)

Author:

davidb

Message:

More work done on removing the functionality of toggling on/off the "View/Hide Toolbar" button.

Location:

other-projects/GlamED/trunk/src/org/honours/gui

Files:

• HonoursFrameIO.java (modified) (2 diffs)
• KeyboardActions.java (modified) (1 diff)

other-projects/GlamED/trunk/src/org/honours/gui/HonoursFrameIO.java

@@ -113 +113 @@
 
     }
-    
-    /**
-     * Toggles on and off the display of the "Toggle 
-     * Toolbar" overlay.
-     */
-    public static void toggleToggler(){
-        if(DISPLAY_TOGGLER){
-            swapLinks(Interfaces.TOGGLE_TOOLS_OVERLAY,Interfaces.BLANK_TOGGLER_OVERLAY);
-            DISPLAY_TOGGLER = false;
-        }else{
-            swapLinks(Interfaces.BLANK_TOGGLER_OVERLAY,Interfaces.TOGGLE_TOOLS_OVERLAY);
-            DISPLAY_TOGGLER = true;
-        }
-        FrameKeyboardActions.Refresh();
-    }
 
     /**
@@ -223 +208 @@
         //The item whose link we want to change
         Text overlayLink = (Text)Misc.getItemContainingData(data, DisplayIO.getCurrentFrame());
-        
-        overlayLink.setLink(newLink);
+        System.err.println(data);
+        
+        if(overlayLink != null)
+            overlayLink.setLink(newLink);
     }
 }

other-projects/GlamED/trunk/src/org/honours/gui/KeyboardActions.java

@@ -39 +39 @@
                 HonoursFrameIO.DISPLAY_TOOLBAR = false;
                 MiscActions.ToggleToolbar();
-                
-                //turn off display of toggle toolbar
-                HonoursFrameIO.DISPLAY_TOGGLER = false;
-                MiscActions.ToggleToggler();
+
                 
             }else{
                 HonoursFrameIO.DISPLAY_TOOLBAR = true;
                 MiscActions.ToggleToolbar();
-                
-                HonoursFrameIO.DISPLAY_TOGGLER = true;
-                MiscActions.ToggleToggler();
-                
             }
         }