psmith 2003/09/04 16:45:38
Modified: src/java/org/apache/log4j/chainsaw
ChainsawToolBarAndMenus.java LogUI.java
Log:
Refactored the behemoth View menu. Now the menu
items associated with the current Log panel now sit
under their own top level menu ("Current Tab"), and also
reordered the remainder to be more inline with standard
menu structures.
Changed the Welcome tab menu item to reflect on/off the check box
nature.
Revision Changes Path
1.7 +27 -23
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java
Index: ChainsawToolBarAndMenus.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ChainsawToolBarAndMenus.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChainsawToolBarAndMenus.java 3 Sep 2003 07:35:02 -0000 1.6
+++ ChainsawToolBarAndMenus.java 4 Sep 2003 23:45:38 -0000 1.7
@@ -139,6 +139,7 @@
new JCheckBoxMenuItem();
private final JMenu viewMenu = new JMenu("View");
private final JMenuBar menuBar;
+ private final JCheckBoxMenuItem menuItemClose = new JCheckBoxMenuItem();
private final JRadioButtonMenuItem levelDisplayIcon =
new JRadioButtonMenuItem("Icon");
private final JRadioButtonMenuItem levelDisplayText =
@@ -522,22 +523,22 @@
final Action action =
new AbstractAction() {
public void actionPerformed(ActionEvent e) {
- if (logui.tabbedPane.containsWelcomePanel()) {
+ closeAction.putValue(Action.NAME, "Welcome tab");
logui.removeWelcomePanel();
- closeAction.putValue(Action.NAME, "Show Welcome tab");
- } else {
- logui.addWelcomePanel();
- closeAction.putValue(Action.NAME, "Close Welcome tab");
- }
+ if(menuItemClose.isSelected()){
+ logui.addWelcomePanel();
+ } else {
+
+ }
}
};
action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("F1"));
// action.putValue(Action.ACCELERATOR_KEY,
KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.ALT_MASK));
- action.putValue(Action.SHORT_DESCRIPTION, "Removes the Welcome tab");
+ action.putValue(Action.SHORT_DESCRIPTION, "Toggles the Welcome tab");
action.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C));
- action.putValue(Action.NAME, "Close Welcome tab");
+ action.putValue(Action.NAME, "Welcome tab");
return action;
}
@@ -601,7 +602,6 @@
new JMenuItem(
"Other options available via panel's right mouse button popup menu");
menuItemUseRightMouse.setEnabled(false);
- activeTabMenu.add(menuItemUseRightMouse);
viewMenu.setMnemonic('V');
@@ -613,7 +613,8 @@
new JCheckBoxMenuItem(toggleToolbarAction);
showToolbarCheck.setSelected(true);
- JMenuItem menuItemClose = new JMenuItem(closeAction);
+ menuItemClose.setAction(closeAction);
+
JCheckBoxMenuItem pause = new JCheckBoxMenuItem(pauseAction);
JMenuItem menuPrefs = new JMenuItem(showPreferencesAction);
menuPrefs.setText(
@@ -621,11 +622,7 @@
JMenuItem menuUndock = new JMenuItem(undockAction);
- viewMenu.add(menuUndock);
- viewMenu.add(pause);
-
showTabs = new JMenu("Display tabs");
- viewMenu.add(showTabs);
JCheckBoxMenuItem toggleDetailMenuItem =
new JCheckBoxMenuItem(toggleDetailPaneAction);
@@ -650,16 +647,23 @@
Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_B));
toggleStatusBarCheck.setAction(toggleStatusBarAction);
toggleStatusBarCheck.setSelected(true);
- viewMenu.add(toggleDetailMenuItem);
- viewMenu.add(toggleLogTreeMenuItem);
- viewMenu.add(menuPrefs);
-
- viewMenu.addSeparator();
+
+ activeTabMenu.add(pause);
+ activeTabMenu.add(toggleDetailMenuItem);
+ activeTabMenu.add(toggleLogTreeMenuItem);
+ activeTabMenu.addSeparator();
+ activeTabMenu.add(menuUndock);
+ activeTabMenu.add(menuPrefs);
+
+ activeTabMenu.addSeparator();
+ activeTabMenu.add(new JMenuItem(clearAction));
+ activeTabMenu.addSeparator();
+ activeTabMenu.add(menuItemUseRightMouse);
- viewMenu.add(new JMenuItem(clearAction));
viewMenu.addSeparator();
viewMenu.add(showToolbarCheck);
viewMenu.add(toggleStatusBarCheck);
+ viewMenu.add(toggleShowReceiversCheck);
viewMenu.add(menuItemClose);
viewMenu.addSeparator();
@@ -755,11 +759,11 @@
tabMenu.add(tabsTop);
tabMenu.add(tabsBottom);
+ viewMenu.add(showTabs);
+
viewMenu.add(levelIconMenu);
viewMenu.add(tabMenu);
viewMenu.add(responsiveNess);
- viewMenu.addSeparator();
- viewMenu.add(toggleShowReceiversCheck);
viewMenu.add(lookAndFeelMenu);
JMenu helpMenu = new JMenu("Help");
@@ -1123,7 +1127,7 @@
toggleShowReceiversCheck.setSelected(logui.isReceiverPanelVisible());
logTreePaneButton.setSelected(logui.isLogTreePanelVisible());
showReceiversButton.setSelected(logui.isReceiverPanelVisible());
-
+ menuItemClose.setSelected(logui.tabbedPane.containsWelcomePanel());
/**
* We get the currently selected LogPanel, and if null, deactivate some
* actions
1.20 +3 -0 jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java
Index: LogUI.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LogUI.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LogUI.java 4 Sep 2003 05:45:16 -0000 1.19
+++ LogUI.java 4 Sep 2003 23:45:38 -0000 1.20
@@ -772,8 +772,11 @@
}
void removeWelcomePanel() {
+ if(tabbedPane.containsWelcomePanel()) {
tabbedPane.remove(
tabbedPane.getComponentAt(tabbedPane.indexOfTab("Welcome")));
+
+ }
}
void toggleReceiversPanel() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
