[Javanetsim-cvs] javaNetSim/guiUI HelpWindow.java, 1.1.1.1, 1.2 MenuBar.java, 1.5, 1.6

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15455/guiUI

Modified Files:
	HelpWindow.java MenuBar.java 
Log Message:


Index: MenuBar.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MenuBar.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MenuBar.java	12 Oct 2006 15:21:24 -0000	1.5
--- MenuBar.java	12 Oct 2006 16:14:14 -0000	1.6
***************
*** 21,28 ****
  	//File menu
  	private JMenu mnuFile = new JMenu("File");
! 	private JMenuItem mnuNew = new JMenuItem("New");	//Create new simulation
  	private JMenuItem mnuOpen = new JMenuItem("Open ...");	//Open a old simulation
! 	private JMenuItem mnuSave = new JMenuItem("Save ...");	//Save a simulation
! 	private JMenuItem mnuSaveAs = new JMenuItem("Save As...");	//Save a simulation
  	private JMenuItem mnuExit = new JMenuItem("Exit");	//Exit appliction
  	//private JMenuItem mnuClose = new JMenuItem("Close"); //Close
--- 21,30 ----
  	//File menu
  	private JMenu mnuFile = new JMenu("File");
! 	private JMenuItem mnuNew = new JMenuItem("New");        //Create new simulation
!     
!         
  	private JMenuItem mnuOpen = new JMenuItem("Open ...");	//Open a old simulation
!         private JMenuItem mnuSave = new JMenuItem("Save ...");	//Save a simulation
!         private JMenuItem mnuSaveAs = new JMenuItem("Save As...");	//Save a simulation
  	private JMenuItem mnuExit = new JMenuItem("Exit");	//Exit appliction
  	//private JMenuItem mnuClose = new JMenuItem("Close"); //Close
***************
*** 68,72 ****
  	private JMenu mnuHelp = new JMenu("Help");
  	private JMenuItem mnuAbout = new JMenuItem("About..."); 
! 	//private JMenuItem mnuHelpPane = new JMenuItem("Help...");
  	
  	
--- 70,74 ----
  	private JMenu mnuHelp = new JMenu("Help");
  	private JMenuItem mnuAbout = new JMenuItem("About..."); 
! 	private JMenuItem mnuHelpPane = new JMenuItem("ReadMe/ChangeLog");
  	
  	
***************
*** 87,91 ****
  	
  	private void buildMenu(){
! 		//Add items to file menu
  		mnuFile.add(mnuNew);
  		mnuFile.add(mnuOpen);
--- 89,115 ----
  	
  	private void buildMenu(){
! 
!                 mnuNew.setAccelerator(KeyStroke.getKeyStroke("ctrl N"));
!                 mnuOpen.setAccelerator(KeyStroke.getKeyStroke("ctrl O"));
!                 mnuSave.setAccelerator(KeyStroke.getKeyStroke("ctrl S"));
!                 mnuPC.setAccelerator(KeyStroke.getKeyStroke("ctrl P"));
!                 mnuRouter.setAccelerator(KeyStroke.getKeyStroke("ctrl R"));
!                 mnuHub.setAccelerator(KeyStroke.getKeyStroke("ctrl H"));
! 	
!                 mnuClearConsole.setAccelerator(KeyStroke.getKeyStroke("F3"));
!                 mnuClearNodeInformation.setAccelerator(KeyStroke.getKeyStroke("F4"));
!                 
!                 mnuMsgLinkLayer.setAccelerator(KeyStroke.getKeyStroke("F9"));
!                 mnuMsgNetwork.setAccelerator(KeyStroke.getKeyStroke("F10"));
!                 mnuMsgTransport.setAccelerator(KeyStroke.getKeyStroke("F11"));
!                 mnuMsgApplication.setAccelerator(KeyStroke.getKeyStroke("F12"));
!                 
!                 mnuHelpPane.setAccelerator(KeyStroke.getKeyStroke("F1"));
!                 mnuExit.setAccelerator(KeyStroke.getKeyStroke("ctrl + Q"));
!                     
!                 mnuLayers.setAccelerator(KeyStroke.getKeyStroke("F7"));
!                 mnuPackets.setAccelerator(KeyStroke.getKeyStroke("F8"));
!                 
!                 //Add items to file menu
  		mnuFile.add(mnuNew);
  		mnuFile.add(mnuOpen);
***************
*** 125,130 ****
  		
  		//Add items to help 
! 		mnuHelp.add(mnuAbout);
! 		//mnuHelp.add(mnuHelpPane);
  		
  		// Set up Mnemonics for menu bar.
--- 149,155 ----
  		
  		//Add items to help 
! 		mnuHelp.add(mnuHelpPane);
!                 mnuHelp.add(mnuAbout);
! 		
  		
  		// Set up Mnemonics for menu bar.
***************
*** 351,359 ****
  		});
  		*/
! 		/*mnuHelpPane.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
  				controller.showHelpPane();
  			}
! 		});*/
  		
  		
--- 376,384 ----
  		});
  		*/
! 		mnuHelpPane.addActionListener(new ActionListener(){
  			public void actionPerformed(ActionEvent e){
  				controller.showHelpPane();
  			}
! 		});
  		
  		

Index: HelpWindow.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/HelpWindow.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HelpWindow.java	8 Nov 2005 04:04:28 -0000	1.1.1.1
--- HelpWindow.java	12 Oct 2006 16:14:14 -0000	1.2
***************
*** 52,61 ****
  	{
  		ClassLoader cl = this.getClass().getClassLoader();
! 		this.setTitle("jFirewallSim Help");
  		initComponents();
! 		String file="HtmlHelp/toc.html";
  		JScrollPane scrPane = new JScrollPane(jEditorPane1);
! 		this.setBounds(200,200, 400, 550);
! 		scrPane.setPreferredSize(new Dimension(450, 110));
  		this.getContentPane().add(scrPane, BorderLayout.CENTER);
  		jEditorPane1.setEditable(false);
--- 52,61 ----
  	{
  		ClassLoader cl = this.getClass().getClassLoader();
! 		this.setTitle("javaNetSim ReadMe/ChangeLog");
  		initComponents();
! 		String file="README.txt";
  		JScrollPane scrPane = new JScrollPane(jEditorPane1);
! 		this.setBounds(50,50, 880, 640);
! 		scrPane.setPreferredSize(new Dimension(450, 400));
  		this.getContentPane().add(scrPane, BorderLayout.CENTER);
  		jEditorPane1.setEditable(false);