logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psm...@apache.org
Subject cvs commit: jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw ChainsawToolBarAndMenus.java
Date Tue, 06 May 2003 07:50:37 GMT
psmith      2003/05/06 00:50:37

  Modified:    src/java/org/apache/log4j/chainsaw
                        ChainsawToolBarAndMenus.java
  Log:
  fixed a couple of bugs, reordered some menus, changes for how 
  Welcome Panel is added/removed, general tidy up.
  
  Revision  Changes    Path
  1.10      +6 -24     jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
  
  Index: ChainsawToolBarAndMenus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ChainsawToolBarAndMenus.java	6 May 2003 05:22:58 -0000	1.9
  +++ ChainsawToolBarAndMenus.java	6 May 2003 07:50:37 -0000	1.10
  @@ -105,13 +105,7 @@
   			} else {
   				pauseButton.getModel().setSelected(false);
   			}
  -			if (logPanel.isDetailPaneVisible()) {
  -				detailPaneButton.getModel().setSelected(true);
  -			} else {
  -				detailPaneButton.getModel().setSelected(false);
  -
  -			}
  -
  +      detailPaneButton.getModel().setSelected(logPanel.isDetailPaneVisible());
   		}
   
   	}
  @@ -154,7 +148,7 @@
         }
         
       };
  -    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_F));
  +//    action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_F));
       action.putValue(
         Action.ACCELERATOR_KEY,
         KeyStroke.getKeyStroke("F3"));
  @@ -260,7 +254,7 @@
   	}
   
   	private Action createToggleDetailPaneAction() {
  -		Action action = new AbstractAction("Toggle Detail Pane") {
  +		Action action = new AbstractAction("Show Detail Pane") {
   			boolean enabled = true;
   			public void actionPerformed(ActionEvent evt) {
   				LogUI.LogPanel logPanel = logui.getCurrentLogPanel();
  @@ -286,10 +280,10 @@
       final Action action = new AbstractAction() {
         public void actionPerformed(ActionEvent e) {
           if (logui.tabbedPane.containsWelcomePanel()) {
  -          logui.tabbedPane.removeTabAt(logui.tabbedPane.indexOfTab("Welcome"));
  +          logui.removeWelcomePanel();
             closeAction.putValue(Action.NAME, "Show Welcome tab");
           } else {
  -          logui.tabbedPane.addANewTab("Welcome", new WelcomePanel());
  +          logui.addWelcomePanel();
             closeAction.putValue(Action.NAME, "Close Welcome tab");
           }
         }
  @@ -423,25 +417,13 @@
   			new JCheckBoxMenuItem(lockToolbarAction);
   		lockToolbarCheck.setSelected(true);
   
  -		JMenu toolbarMenu = new JMenu("Toolbar");
  -		
   		JCheckBoxMenuItem showToolbarCheck =
   			new JCheckBoxMenuItem(toggleToolbarAction);
   		showToolbarCheck.setSelected(true);
  -
  -
  -    
       
       JMenuItem menuItemClose = new JMenuItem(closeAction);
  -   		
  -		toolbarMenu.add(showToolbarCheck);
  -		toolbarMenu.add(lockToolbarCheck);
  -		
   		JCheckBoxMenuItem pause = new JCheckBoxMenuItem(pauseAction);
   
  -		
  -		
  -		
   		viewMenu.add(pause);
   		JCheckBoxMenuItem toggleDetailMenuItem = new JCheckBoxMenuItem(toggleDetailPaneAction);
   		toggleDetailMenuItem.setSelected(true);
  @@ -450,7 +432,7 @@
       viewMenu.addSeparator();
       viewMenu.add(new JMenuItem(clearAction));
       viewMenu.addSeparator();
  -    viewMenu.add(toolbarMenu);
  +    viewMenu.add(showToolbarCheck);
       viewMenu.add(menuItemClose);
   		
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-dev-help@jakarta.apache.org


Mime
View raw message