[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui MainGUI.java,1.7,1.8

[Florian L. <fle...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11202/src/net/sf/magicmap/client/gui

Modified Files:
	MainGUI.java 
Log Message:
view options menu started

Index: MainGUI.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MainGUI.java	27 Sep 2005 15:52:30 -0000	1.7
--- MainGUI.java	28 Sep 2005 15:53:04 -0000	1.8
***************
*** 17,20 ****
--- 17,21 ----
  import javax.swing.ImageIcon;
  import javax.swing.JButton;
+ import javax.swing.JCheckBoxMenuItem;
  import javax.swing.JComponent;
  import javax.swing.JFrame;
***************
*** 31,34 ****
--- 32,36 ----
  import net.sf.magicmap.client.gui.dialogs.NewMapDialog;
  import net.sf.magicmap.client.gui.dialogs.SetProxyDialog;
+ import net.sf.magicmap.client.gui.dialogs.ViewOptionsDialog;
  import net.sf.magicmap.client.gui.utils.GUIBuilder;
  import net.sf.magicmap.client.gui.utils.GUIConstants;
***************
*** 93,96 ****
--- 95,99 ----
    private AbstractAction  exitAction;
    private AbstractAction  aboutAction;
+   private AbstractAction  viewAction;
    MapView                 mapView;
    private MagicAction     invisibleAction;
***************
*** 98,101 ****
--- 101,107 ----
    private MagicAction     showLocations;
    private MagicAction     showClients;
+   private MagicAction     simpleView;
+   private MagicAction     normalView;
+   private MagicAction     expertView;
    MagicAction             showEdgesBetweenLocations;
    MagicAction             showEdges;
***************
*** 120,123 ****
--- 126,130 ----
      this.setJMenuBar(menuBar);
      menuBar.add(buildFileMenu());
+     menuBar.add(buildViewMenu());
      menuBar.add(buildOptionsMenu());
      menuBar.add(buildHelpMenu());
***************
*** 230,233 ****
--- 237,247 ----
        }
      };
+     
+     viewAction = new MagicAction("userdefinedview") {
+ 
+         public void actionPerformed(ActionEvent e){
+             ViewOptionsDialog.showDialog(MainGUI.this);
+         }
+     };
  
      invisibleAction = new MagicAction("invisible", GUIConstants.ICON_INVISIBLE, "invisibletooltip") {
***************
*** 269,278 ****
      showEdges = new MagicAction("showedges") {
  
!       public void actionPerformed(ActionEvent e){
!         mapView.setShowEdges(showEdges.isSelected());
  
!       }
      };
  
      invisibleAction.setEnabled(false);
      disconnectAction.setEnabled(false);
--- 283,321 ----
      showEdges = new MagicAction("showedges") {
  
!         public void actionPerformed(ActionEvent e){
!           mapView.setShowEdges(showEdges.isSelected());
  
!         }
!     };
!       
!     simpleView = new MagicAction("simpleview") {
! 
!         public void actionPerformed(ActionEvent e){
!           ((JCheckBoxMenuItem)e.getSource()).setSelected(true);
!           ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false);
!           ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false);
!         }
!     };
! 
!     normalView = new MagicAction("normalview") {
! 
!         public void actionPerformed(ActionEvent e){
!             ((JCheckBoxMenuItem)e.getSource()).setSelected(true);
!             ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false);
!             ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(2)).setSelected(false);
! 
!         }
      };
+    
+     expertView = new MagicAction("expertview") {
+ 
+        public void actionPerformed(ActionEvent e){
+            ((JCheckBoxMenuItem)e.getSource()).setSelected(true);
+            ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(0)).setSelected(false);
+            ((JCheckBoxMenuItem)((JCheckBoxMenuItem)e.getSource()).getParent().getComponent(1)).setSelected(false);
  
+        }
+     };
+   
      invisibleAction.setEnabled(false);
      disconnectAction.setEnabled(false);
***************
*** 332,349 ****
      return menu;
    }
  
    public JMenu buildOptionsMenu(){
      JMenu menu = GUIBuilder.createMenu("options");
      menu.add(GUIBuilder.createCheckBoxMenuItem(invisibleAction, Controller.getInstance().isInvisible()));
-     menu.addSeparator();
-     menu.add(GUIBuilder.createCheckBoxMenuItem(showAccessPoints, true));
-     menu.add(GUIBuilder.createCheckBoxMenuItem(showClients, true));
-     menu.add(GUIBuilder.createCheckBoxMenuItem(showLocations, true));
-     menu.add(GUIBuilder.createCheckBoxMenuItem(showEdges, true));
-     menu.add(GUIBuilder.createCheckBoxMenuItem(showEdgesBetweenLocations, true));
-     menu.addSeparator();
      menu.add(GUIBuilder.createMenuItem(setProxyAction));
      return menu;
- 
    }
  
--- 375,401 ----
      return menu;
    }
+   
+   public JMenu buildViewMenu(){
+ 	    JMenu menu = GUIBuilder.createMenu("view");
+ /*	    menu.add(GUIBuilder.createCheckBoxMenuItem(showAccessPoints, true));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(showClients, true));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(showLocations, true));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(showEdges, true));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(showEdgesBetweenLocations, true));
+ */
+ 
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(simpleView, false));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(normalView, true));
+ 	    menu.add(GUIBuilder.createCheckBoxMenuItem(expertView, false));
+ 	    menu.addSeparator();
+ 	    menu.add(GUIBuilder.createMenuItem(viewAction));
+ 	    return menu;
+   }
  
    public JMenu buildOptionsMenu(){
      JMenu menu = GUIBuilder.createMenu("options");
      menu.add(GUIBuilder.createCheckBoxMenuItem(invisibleAction, Controller.getInstance().isInvisible()));
      menu.add(GUIBuilder.createMenuItem(setProxyAction));
      return menu;
    }