[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui/dialogs ViewOptionsDialog.java,1.1,1.2 AboutDialog.java,1.3,1.4

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

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

Modified Files:
	ViewOptionsDialog.java AboutDialog.java 
Log Message:
komplette umstruckturierung der Anzeige optionen

Index: ViewOptionsDialog.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ViewOptionsDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewOptionsDialog.java	28 Sep 2005 15:53:04 -0000	1.1
--- ViewOptionsDialog.java	29 Sep 2005 14:48:19 -0000	1.2
***************
*** 4,19 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
- import java.io.IOException;
  
- import javax.swing.ImageIcon;
  import javax.swing.JButton;
  import javax.swing.JDialog;
- import javax.swing.JEditorPane;
- import javax.swing.JLabel;
  import javax.swing.JPanel;
  import javax.swing.JTextField;
  
  import net.sf.magicmap.client.gui.utils.GUIUtils;
  import net.sf.magicmap.client.gui.utils.RelativePanelBuilder;
  
  import com.Ostermiller.util.Browser;
--- 4,19 ----
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  
  import javax.swing.JButton;
+ import javax.swing.JCheckBox;
  import javax.swing.JDialog;
  import javax.swing.JPanel;
  import javax.swing.JTextField;
  
+ import net.sf.magicmap.client.controller.Controller;
+ import net.sf.magicmap.client.gui.MainGUI;
  import net.sf.magicmap.client.gui.utils.GUIUtils;
  import net.sf.magicmap.client.gui.utils.RelativePanelBuilder;
+ import net.sf.magicmap.client.views.MapView;
  
  import com.Ostermiller.util.Browser;
***************
*** 21,26 ****
  
  public class ViewOptionsDialog extends JDialog implements ActionListener{
! 	private JPanel               mainPanel;
! 	  private JTextField           text;
  	  
  	  public static void showDialog(Frame owner){
--- 21,31 ----
  
  public class ViewOptionsDialog extends JDialog implements ActionListener{
! 	private JPanel  mainPanel;
! 	private MapView mapView;
! 	private JCheckBox showAccessPoints;
! 	private JCheckBox showLocations;
! 	private JCheckBox showClients;
! 	private JCheckBox showEdgesBetweenLocations;
! 	private JCheckBox showEdges;
  	  
  	  public static void showDialog(Frame owner){
***************
*** 33,38 ****
  
  	  private ViewOptionsDialog(Frame owner) {
! 	    super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about")));
! 	    setSize(406, 430);
  	    this.setResizable(false);
  
--- 38,43 ----
  
  	  private ViewOptionsDialog(Frame owner) {
! 	    super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("viewoptions")));
! 	    setSize(256, 260);
  	    this.setResizable(false);
  
***************
*** 40,43 ****
--- 45,49 ----
  	    RelativePanelBuilder builder = new RelativePanelBuilder(layout);
  
+ 		mapView = Controller.getInstance().getMapView();
  
  	    // OK / Abbrechen
***************
*** 49,52 ****
--- 55,85 ----
  	    builder.setRightRightDistance("okcancel", null, -10);
  	    builder.setBottomBottomDistance("okcancel", null, -10);
+ 	    
+ 	    showAccessPoints = builder.addCheckBox(GUIUtils.i18n("showaccesspoints",false),"showaccesspoints",mapView.isShowAccessPoints());
+ 	    builder.setTop("showaccesspoints",20);
+ 	    builder.setLeft("showaccesspoints",20);
+ 	    builder.setWidth("showaccesspoints",this.getWidth()-40);
+ 	    
+ 	    showLocations = builder.addCheckBox(GUIUtils.i18n("showlocations",false),"showlocations",mapView.isShowLocations());
+ 	    builder.setTopBottomDistance("showlocations","showaccesspoints",10);
+ 	    builder.setLeftLeftDistance("showlocations","showaccesspoints",0);
+ 	    builder.setRightRightDistance("showlocations","showaccesspoints",0);
+ 	    
+ 	    showClients = builder.addCheckBox(GUIUtils.i18n("showclients",false),"showclients",mapView.isShowClients());
+ 	    builder.setTopBottomDistance("showclients","showlocations",10);
+ 	    builder.setLeftLeftDistance("showclients","showaccesspoints",0);
+ 	    builder.setRightRightDistance("showclients","showaccesspoints",0);
+ 	    
+ 	    showEdgesBetweenLocations = builder.addCheckBox(GUIUtils.i18n("showedgesbetweenlocations",false),"showedgesbetweenlocations",mapView.isShowEdgesBetweenLocations());
+ 	    builder.setTopBottomDistance("showedgesbetweenlocations","showclients",10);
+ 	    builder.setLeftLeftDistance("showedgesbetweenlocations","showaccesspoints",0);
+ 	    builder.setRightRightDistance("showedgesbetweenlocations","showaccesspoints",0);
+ 	    
+ 	    showEdges = builder.addCheckBox(GUIUtils.i18n("showedges",false),"showedges",mapView.isShowEdges());
+ 	    builder.setTopBottomDistance("showedges","showedgesbetweenlocations",10);
+ 	    builder.setLeftLeftDistance("showedges","showaccesspoints",0);
+ 	    builder.setRightRightDistance("showedges","showaccesspoints",0);
+ 	    showEdges.setActionCommand("SHOWEDGES");
+ 	    showEdges.addActionListener(this);
  	   	    
  	    mainPanel = builder.getPanel();
***************
*** 59,64 ****
  	  public void actionPerformed(ActionEvent e){
  	    if ("OK".equals(e.getActionCommand())){
! 	    	this.setVisible(false);
  	    }
  	  }
  }
--- 92,109 ----
  	  public void actionPerformed(ActionEvent e){
  	    if ("OK".equals(e.getActionCommand())){
! 
! 	    	   mapView.setShowAccessPoints(showAccessPoints.isSelected());
! 	    	   mapView.setShowClients(showClients.isSelected());
! 	    	   mapView.setShowEdges(showEdges.isSelected());
! 	    	   mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected());
! 	    	   mapView.setShowLocations(showLocations.isSelected());
! 	    	MainGUI.getInstance().setUserDefinedView();
! 	    	this.setVisible(false);    	
! 	    } else if ("CANCEL".equals(e.getActionCommand())){
! 	        this.setVisible(false);
! 	    } else if ("SHOWEDGES".equals(e.getActionCommand()) && !showEdges.isSelected()){
! 	    	showEdgesBetweenLocations.setSelected(false);
  	    }
+ 	    
  	  }
  }

Index: AboutDialog.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutDialog.java	28 Sep 2005 13:33:35 -0000	1.3
--- AboutDialog.java	29 Sep 2005 14:48:19 -0000	1.4
***************
*** 30,34 ****
  		AboutDialog d = new AboutDialog(owner);
  	    GUIUtils.locateOnScreen(d);
- 	    Browser.init();
  	    d.setModal(true);
  	    d.setVisible(true);
--- 30,33 ----