Changeset 26699

Timestamp:

2013-01-11T18:37:02+13:00 (11 years ago)

Author:

davidb

Message:

"View Toolbar" and "View Notes" will become "Hide Toolbar" and "Hide Notes" and vice versa whenever the user clicks on these options.

File:

• other-projects/GlamED/trunk/src/org/honours/gui/HonoursFrameIO.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import java.util.List;
 
+import org.expeditee.actions.Misc;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -17 +18 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.stats.Formatter;
+import org.honours.actions.MiscActions;
 import org.honours.collection.CollectionItem;
+import org.honours.collection.NoteLayer;
 
 public class HonoursFrameIO {
@@ -126 +129 @@
     }
 
+    /**
+     * Toggles display of toolbar on and off.
+     */
     public static void ToggleToolbar() {
+        
+        Text displayText = (Text)Misc.getItemContainingData("OptionViewToolbar",FrameIO.LoadFrame(Interfaces.TOGGLE_TOOLS_OVERLAY));
+                
         if(DISPLAY_TOOLBAR){
-            
-            swapLinks(Interfaces.NAVIGATION_OVERLAY,Interfaces.BLANK_TOOLBAR_OVERLAY);
+            displayText.setText("View Toolbar");
+            swapLinks(Interfaces.BLANK_TOOLBAR_OVERLAY,"overlayToolbar");
             DISPLAY_TOOLBAR = false;
             
         }else{
-            //make it reappear.
-            swapLinks(Interfaces.BLANK_TOOLBAR_OVERLAY,Interfaces.NAVIGATION_OVERLAY);
+            
+            displayText.setText("Hide Toolbar");
+            swapLinks(Interfaces.NAVIGATION_OVERLAY,"overlayToolbar");
             DISPLAY_TOOLBAR = true;
         }
@@ -140 +150 @@
         FrameKeyboardActions.Refresh();
     }
+    
 
     public static void ToggleNotesDisplay(CollectionItem collectItem) {
         
         //get link to the collection item's note frame.
-                String noteFrameLink = collectItem.getNoteLayer().getFrame().getName();
-                
-                if(DISPLAY_NOTES){
-                    
-                    swapLinks(noteFrameLink,Interfaces.BLANK_HIDE_NOTES_OVERLAY);
-                    DISPLAY_NOTES = false;
+        NoteLayer nl = collectItem.getNoteLayer();
+        
+        if(nl == null){
+            MessageBay.errorMessage("No notes to display");
+            
+            //TODO: Create new note layer here?
+            
+            return;
+        }
+        
+        
+        String noteFrameLink = nl.getFrame().getName();
+        System.err.println("*** link (in ToggleNotesDisplay method): " + noteFrameLink);
+        
+        Text displayText = (Text)Misc.getItemContainingData("OptionViewNotes",FrameIO.LoadFrame(Interfaces.NAVIGATION_OVERLAY));
+            
+        if(DISPLAY_NOTES){
+            System.err.println("Notes are NOT visible");
+            displayText.setText("View Notes");
+            //swapLinks(noteFrameLink,Interfaces.BLANK_HIDE_NOTES_OVERLAY);
+            swapLinks(Interfaces.BLANK_HIDE_NOTES_OVERLAY,"overlayNotes");
+            DISPLAY_NOTES = false;
                 
                     
-                }else{
-                    swapLinks(Interfaces.BLANK_HIDE_NOTES_OVERLAY,noteFrameLink);
-                    DISPLAY_NOTES = true;
-                }
-                FrameKeyboardActions.Refresh();
+        }else{
+            System.err.println("Notes are visible");
+            displayText.setText("Hide Notes");
+            //swapLinks(Interfaces.BLANK_HIDE_NOTES_OVERLAY,noteFrameLink);
+            swapLinks(noteFrameLink,"overlayNotes");
+            DISPLAY_NOTES = true;
+        }
+        
+        FrameKeyboardActions.Refresh();
         
     }
@@ -171 +202 @@
      * @param newLink
      */
-    private static void swapLinks(String oldLink,String newLink){
-        
-        Frame curr = DisplayIO.getCurrentFrame();
-        for(Item item : curr.getItems()){
-            
-            if(item instanceof Text){
-                Text t = (Text)item;
-                if(t.getText().equals("@ao:3") || t.getText().equals("@ao:4")){
-                    if(t.hasLink()){
-                        if(t.getLink().equals(oldLink)){
-                            t.setLink(newLink);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
+    private static void swapLinks(String newLink,String data){
+        
+        //TODO: Change this code so that it finds an item containing a data value, i.e. "overlayNotes", "overlayToolbar" or "overlayViewToolbar"
+        //The item whose link we want to change
+        Text overlayLink = (Text)Misc.getItemContainingData(data, DisplayIO.getCurrentFrame());
+        
+        overlayLink.setLink(newLink);
+    }
 }