提交: 8 - FolderMenu (svn)

OmegaT のメニューバーにフォルダーツリー参照用のメニューを追加します。

Commit MetaInfo

• 修訂: 8 (tree)
• 時間: 2013-08-16 22:36:16
• 作者: yu-tang

Log Message

allow to open folder with enter key.

Change Summary

• modified: trunk/src/org/omegat/plugin/foldermenu/MenuManager.java
• modified: trunk/src/org/omegat/plugin/foldermenu/FolderMenu.java
• modified: trunk/src/org/omegat/plugin/foldermenu/VersionInfo.java
• modified: trunk/src/org/omegat/plugin/foldermenu/Submenu.java

差異

--- trunk/src/org/omegat/plugin/foldermenu/MenuManager.java	(revision 7)
+++ trunk/src/org/omegat/plugin/foldermenu/MenuManager.java	(revision 8)
@@ -32,14 +32,15 @@
 public class MenuManager {
 
     private JMenu root;
-    private JMenu projectRoot;
+    private JMenu currentProject;
 
     public MenuManager() {
         root = getRootMenu(L10n.getFoldersMenuLabel());  // Folders menu
+        root.addMenuKeyListener(Submenu.getMenuKeyListener()); // for opening folder with enter key
         
         // ProjectRoot
         try {
-            projectRoot = Submenu.create(L10n.getProjectRootMenuLabel(), root);
+            currentProject = Submenu.create(L10n.getProjectRootMenuLabel(), root);
         } catch (IOException ex) {
             Log.log(ex);
             return;
@@ -61,7 +62,7 @@
     public void createProjectItems() {
         File rootDir = new File(Core.getProject().getProjectProperties().getProjectRoot());
         try {
-            Submenu.associate(projectRoot, rootDir);
+            Submenu.associate(currentProject, rootDir);
         } catch (IOException ex) {
             Log.log(ex);
         }
@@ -68,8 +69,7 @@
     }
 
     public void removeAllProjectItems() {
-        //projectRoot.removeChildren();
-        Submenu.removeChildren(projectRoot);
+        Submenu.removeChildren(currentProject);
     }
     
     private JMenu getRootMenu(String labelString) {

--- trunk/src/org/omegat/plugin/foldermenu/FolderMenu.java	(revision 7)
+++ trunk/src/org/omegat/plugin/foldermenu/FolderMenu.java	(revision 8)
@@ -27,7 +27,7 @@
 /**
  * easy access to project folders from menu
  *
- * TODO アイテムを含むフォルダーをキーボード操作で開けるように
+ * TODO refactoring Submenu module
  *
  * @author Yu Tang
  */
@@ -47,9 +47,7 @@
     }
 
     @Override
-    public void onApplicationShutdown() {
-        //
-    }
+    public void onApplicationShutdown() { /* do nothing */ }
 
     @Override
     public void onProjectChanged(PROJECT_CHANGE_TYPE eventType) {

--- trunk/src/org/omegat/plugin/foldermenu/VersionInfo.java	(revision 7)
+++ trunk/src/org/omegat/plugin/foldermenu/VersionInfo.java	(revision 8)
@@ -26,7 +26,7 @@
     
     private static final String APP_NAME = "FolderMenu";
     private static final String APP_VERSION = "0.2";
-    private static final String APP_BUILD = "20130815";
+    private static final String APP_BUILD = "20130816";
     private static final String APP_AUTHOR = "Yu-Tang";
     
     public static void main(String[] args) {

--- trunk/src/org/omegat/plugin/foldermenu/Submenu.java	(revision 7)
+++ trunk/src/org/omegat/plugin/foldermenu/Submenu.java	(revision 8)
@@ -19,6 +19,7 @@
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.File;
@@ -29,7 +30,11 @@
 import javax.swing.Icon;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+import javax.swing.MenuElement;
+import javax.swing.MenuSelectionManager;
 import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuKeyEvent;
+import javax.swing.event.MenuKeyListener;
 import javax.swing.event.MenuListener;
 import javax.swing.filechooser.FileSystemView;
 import org.omegat.core.Core;
@@ -49,12 +54,13 @@
         fs = FileSystemView.getFileSystemView();
         ff = new FileFilter() {
 
-                   @Override
-                   public boolean accept(File file) {
-                       return !file.getName().startsWith(".") && !file.isHidden();
-                   }
+            @Override
+            public boolean accept(File file) {
+                return !file.getName().startsWith(".") && !file.isHidden();
+            }
 
-               };
+        };
+
         al = new ActionListener() {
 
             @Override
@@ -63,6 +69,33 @@
             }
             
         };
+
+        mkl = new MenuKeyListener() {
+
+            @Override
+            public void menuKeyTyped(MenuKeyEvent e) { /* do nothing */ }
+
+            @Override
+            public void menuKeyPressed(MenuKeyEvent e) {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    MenuSelectionManager manager = e.getMenuSelectionManager();
+                    MenuElement[] selectedPath = manager.getSelectedPath();
+                    MenuElement selection = selectedPath[selectedPath.length-1];
+                    if (selection instanceof JMenu) {
+                        JMenu menu = (JMenu) selection;
+                        if (menu.isEnabled()) {
+                            manager.clearSelectedPath();
+                            open(menu.getActionCommand());
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void menuKeyReleased(MenuKeyEvent e) { /* do nothing */ }
+
+        };
+
         mol = new MouseListener() {
 
             @Override
@@ -74,16 +107,16 @@
             }
 
             @Override
-            public void mousePressed(MouseEvent e) { /* ignore */ }
+            public void mousePressed(MouseEvent e) { /* do nothing */ }
 
             @Override
-            public void mouseReleased(MouseEvent e) { /* ignore */ }
+            public void mouseReleased(MouseEvent e) { /* do nothing */ }
 
             @Override
-            public void mouseEntered(MouseEvent e) { /* ignore */ }
+            public void mouseEntered(MouseEvent e) { /* do nothing */ }
 
             @Override
-            public void mouseExited(MouseEvent e) { /* ignore */ }
+            public void mouseExited(MouseEvent e) { /* do nothing */ }
             
         };
         
@@ -110,7 +143,7 @@
             }
 
             @Override
-            public void menuCanceled(MenuEvent e) { /* ignore */ }
+            public void menuCanceled(MenuEvent e) { /* do nothing */ }
             
         };
         
@@ -174,6 +207,10 @@
     public static ActionListener getActionListener() {
         return al;
     }
+            
+    public static MenuKeyListener getMenuKeyListener() {
+        return mkl;
+    }
     
     public static MouseListener getMouseListener() {
         return mol;
@@ -236,34 +273,34 @@
     }
     
     private static JMenu createMenu(File folder) throws IOException {
-        JMenu m = new JMenu(folder.getName());
-        m.setIcon(Submenu.getIcon(folder));
-        m.setActionCommand(folder.getCanonicalPath());
-        m.addMenuListener(getMenuListener());
-        m.addMouseListener(getMouseListener());
-        m.setEnabled(true);
-        return m;
+        return createMenu(folder, null);
     }
     
-    private static JMenu createMenu(String label) {
-        JMenu m = new JMenu();
-        Mnemonics.setLocalizedText(m, label);
-        m.addMenuListener(getMenuListener());
-        m.addMouseListener(getMouseListener());
-        return m;
+    private static JMenu createMenu(String label) throws IOException {
+        return createMenu(null, label);
     }
     
     private static JMenu createMenu(File folder, String label) throws IOException {
-        JMenu m = new JMenu();
-        Mnemonics.setLocalizedText(m, label);
-        m.setIcon(Submenu.getIcon(folder));
-        m.setActionCommand(folder.getCanonicalPath());
+        JMenu m;
+        if (label == null) {
+            m = new JMenu(folder.getName());
+        } else {
+            m = new JMenu();
+            Mnemonics.setLocalizedText(m, label);
+        }
+        
         m.addMenuListener(getMenuListener());
         m.addMouseListener(getMouseListener());
-        m.setEnabled(true);
+        
+        if (folder != null) {
+            m.setIcon(getIcon(folder));
+            m.setActionCommand(folder.getCanonicalPath());
+            m.setEnabled(true);           
+        }
+
         return m;
     }
-    
+
     private static void prepare(File folder, JMenu menu, File[] filteredListFiles) throws IOException {
         if (menu.getItemCount() > 0) {
             // submenus are already created
@@ -289,9 +326,10 @@
     }
     
     private static final FileSystemView fs;
-    private static final FileFilter ff;
-    private static final ActionListener al;
-    private static final MouseListener mol;
-    private static final MenuListener mel;
-    private static final Comparator comp;
+    private static final FileFilter      ff;
+    private static final ActionListener  al;
+    private static final MenuKeyListener mkl;
+    private static final MouseListener   mol;
+    private static final MenuListener    mel;
+    private static final Comparator      comp;
 }