Revision: 8517
http://languagetool.svn.sourceforge.net/languagetool/?rev=8517&view=rev
Author: dnaber
Date: 2012-12-08 14:13:55 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
more code cleanup; add separators to the menu; improve order of menu items
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/gui/MainMenuBar.java
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle_en.properties
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/gui/MainMenuBar.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/gui/MainMenuBar.java
2012-12-08 13:47:49 UTC (rev 8516)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/gui/MainMenuBar.java
2012-12-08 14:13:55 UTC (rev 8517)
@@ -39,110 +39,69 @@
class MainMenuBar extends JMenuBar implements ActionListener {
private static final long serialVersionUID = -7160998682243081767L;
+ private static final int NO_KEY_EVENT = -1;
private final ResourceBundle messages;
-
+ private final Main prg;
+
// File:
- private String openText;
- private String checkClipboardText;
- private String dockToTrayText;
- private String addLanguageText;
- private String optionsText;
- private String tagText;
- private String quitText;
+ private final String openText;
+ private final String checkClipboardText;
+ private final String dockToTrayText;
+ private final String addLanguageText;
+ private final String optionsText;
+ private final String tagText;
+ private final String quitText;
// Help:
- private String aboutText;
+ private final String aboutText;
- private final Main prg;
- private JMenu fileMenu;
- private JMenu helpMenu;
-
MainMenuBar(Main prg, ResourceBundle messages) {
this.prg = prg;
this.messages = messages;
- initStrings();
+ final JMenu fileMenu = new JMenu(getLabel("guiMenuFile"));
fileMenu.setMnemonic(getMnemonic("guiMenuFile"));
+ final JMenu helpMenu = new JMenu(getLabel("guiMenuHelp"));
helpMenu.setMnemonic(getMnemonic("guiMenuHelp"));
- // "Open":
- final JMenuItem openItem = new JMenuItem(openText);
- openItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_O));
- openItem.setMnemonic(getMnemonic("guiMenuOpen"));
- openItem.addActionListener(this);
- fileMenu.add(openItem);
- // "Check Text in Clipboard":
- final JMenuItem checkClipboardItem = new JMenuItem(checkClipboardText);
- checkClipboardItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_Y));
- checkClipboardItem.setMnemonic(getMnemonic("guiMenuCheckClipboard"));
- checkClipboardItem.addActionListener(this);
- fileMenu.add(checkClipboardItem);
- // "Hide to System Tray":
- final JMenuItem dockToTrayItem = new JMenuItem(dockToTrayText);
- dockToTrayItem.setMnemonic(getMnemonic("guiMenuHide"));
- dockToTrayItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_D));
- dockToTrayItem.addActionListener(this);
- fileMenu.add(dockToTrayItem);
- // "Add Language":
- final JMenuItem addLanguageItem = new JMenuItem(addLanguageText);
- addLanguageItem.setMnemonic(getMnemonic("guiMenuAddRules"));
- addLanguageItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_A));
- addLanguageItem.addActionListener(this);
- fileMenu.add(addLanguageItem);
- // "Tag Text"
- final JMenuItem tagItem = new JMenuItem(tagText);
- tagItem.addActionListener(this);
- tagItem.setMnemonic(getMnemonic("guiTagText"));
- tagItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_T));
- fileMenu.add(tagItem);
- // "Options":
- final JMenuItem optionsItem = new JMenuItem(optionsText);
- optionsItem.setMnemonic(getMnemonic("guiMenuOptions"));
- optionsItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_S));
- optionsItem.addActionListener(this);
- fileMenu.add(optionsItem);
- // "Quit":
- final JMenuItem quitItem = new JMenuItem(quitText);
- quitItem.setMnemonic(getMnemonic("guiMenuQuit"));
- quitItem.setAccelerator(getCtrlKeyStroke(KeyEvent.VK_Q));
- quitItem.addActionListener(this);
- fileMenu.add(quitItem);
- // "About":
- final JMenuItem helpItem = new JMenuItem(aboutText);
- helpItem.addActionListener(this);
- helpItem.setMnemonic(getMnemonic("guiMenuAbout"));
- helpMenu.add(helpItem);
-
- // add menus:
+
+ openText = addMenuItem("guiMenuOpen", KeyEvent.VK_O, fileMenu);
+ checkClipboardText = addMenuItem("guiMenuCheckClipboard", KeyEvent.VK_Y,
fileMenu);
+ tagText = addMenuItem("guiTagText", KeyEvent.VK_T, fileMenu);
+ addLanguageText = addMenuItem("guiMenuAddRules", NO_KEY_EVENT, fileMenu);
+ optionsText = addMenuItem("guiMenuOptions", KeyEvent.VK_S, fileMenu);
+ fileMenu.addSeparator();
+ dockToTrayText = addMenuItem("guiMenuHide", KeyEvent.VK_D, fileMenu);
+ fileMenu.addSeparator();
+ quitText = addMenuItem("guiMenuQuit", KeyEvent.VK_Q, fileMenu);
add(fileMenu);
+
+ aboutText = addMenuItem("guiMenuAbout", NO_KEY_EVENT, helpMenu);
add(helpMenu);
}
- private void initStrings() {
- fileMenu = new JMenu(getLabel("guiMenuFile"));
- helpMenu = new JMenu(getLabel("guiMenuHelp"));
- // File:
- openText = getLabel("guiMenuOpen");
- checkClipboardText = getLabel("guiMenuCheckClipboard");
- dockToTrayText = getLabel("guiMenuHide");
- addLanguageText = getLabel("guiMenuAddRules");
- tagText = getLabel("guiTagText");
- optionsText = getLabel("guiMenuOptions");
- quitText = getLabel("guiMenuQuit");
- // Help:
- aboutText = getLabel("guiMenuAbout");
- }
-
- private KeyStroke getCtrlKeyStroke(int keyEvent) {
- return KeyStroke.getKeyStroke(keyEvent, InputEvent.CTRL_MASK);
- }
-
private char getMnemonic(String key) {
return StringTools.getMnemonic(messages.getString(key));
}
+ private String addMenuItem(String key, int keyEvent, JMenu menu) {
+ final String label = getLabel(key);
+ final JMenuItem openItem = new JMenuItem(label);
+ openItem.setMnemonic(getMnemonic(key));
+ openItem.addActionListener(this);
+ if (keyEvent != NO_KEY_EVENT) {
+ openItem.setAccelerator(getCtrlKeyStroke(keyEvent));
+ }
+ menu.add(openItem);
+ return label;
+ }
+
private String getLabel(String key) {
return StringTools.getLabel(messages.getString(key));
}
+ private KeyStroke getCtrlKeyStroke(int keyEvent) {
+ return KeyStroke.getKeyStroke(keyEvent, InputEvent.CTRL_MASK);
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
if (e.getActionCommand().equals(openText)) {
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
2012-12-08 13:47:49 UTC (rev 8516)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle.properties
2012-12-08 14:13:55 UTC (rev 8517)
@@ -132,7 +132,7 @@
guiMenuAbout = &About...
-guiMenuAddRules = Load &Rule File
+guiMenuAddRules = Load &Rule File...
guiMenuCheckClipboard = &Check Text in Clipboard
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle_en.properties
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle_en.properties
2012-12-08 13:47:49 UTC (rev 8516)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/MessagesBundle_en.properties
2012-12-08 14:13:55 UTC (rev 8517)
@@ -132,7 +132,7 @@
guiMenuAbout = &About...
-guiMenuAddRules = Load &Rule File
+guiMenuAddRules = Load &Rule File...
guiMenuCheckClipboard = &Check Text in Clipboard
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
