Changeset 32093

Timestamp:

2017-12-11T19:02:38+13:00 (6 years ago)

Author:

ak19

Message:

Ctr (or equiv on Mac) +F on GS3 GLI's ConfigFileEditor now focuses on the searchField.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/ConfigFileEditor.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/ConfigFileEditor.java

@@ -62 +62 @@
     
     // https://github.com/bobbylight/RSyntaxTextArea/wiki/Example:-Using-Find-and-Replace
-    private JTextField searchField;
+    final private JTextField searchField;
     private JCheckBox regexCB;
     private JCheckBox matchCaseCB;
@@ -123 +123 @@
     editor = new NumberedJTextArea(Dictionary.get("ConfigFileEditor.Tooltip"));
     editor.getDocument().addDocumentListener(this);
-
+    // if Ctrl (or Mac equiv) + F is pressed in the config file editing area,
+    // then move the focus to the searchField, so the user can start typing the searchTerm
+    editor.addKeyListener(new ConfigFileEditorKeyListener());
+    
     save_button = new GLIButton(Dictionary.get("General.Save"), Dictionary.get("ConfigFileEditor.Save_Tooltip"));
     cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("ConfigFileEditor.Cancel_Tooltip")); // tooltip is the same
@@ -202 +205 @@
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     editor.setCaretPosition(0); // start at top of config XML
+
+    // Following has no effect: not sure why on dialog show, with or without requesting focus,
+    // it takes some time for the editor to get focus and only if user's mouse curser is
+    // hovering over ConfigFileEditor and moves about a bit there.
+    // Give editor focus on dialog show, so that Ctrl-F, to shift focus to searchField, will be
+    // responsive too. Not working until mouse moves about over editor, despite the suggestion
+    // at https://stackoverflow.com/questions/17828264/java-swing-jdialog-default-focus
+    editor.requestFocusInWindow();
     }
 
@@ -342 +353 @@
         }
     }
-    
+
+
+    // if Ctrl (or Mac equiv) + F is pressed in the config file editing area,
+    // then move the focus to the searchField, so the user can start typing the searchTerm
+    private class ConfigFileEditorKeyListener
+    extends KeyAdapter
+    {
+    /** Gives notification of key events on the text field */
+    public void keyPressed(KeyEvent key_event)
+    {
+        // Don't hardcode check for Ctrl key "(e.getModifiers() & KeyEvent.CTRL_MASK) != 0)"
+        // because Mac uses another modifier key, Command-F instead of Ctrl-F.
+        // https://stackoverflow.com/questions/5970765/java-detect-ctrlx-key-combination-on-a-jtree
+        if((key_event.getModifiers() == Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())
+           && key_event.getKeyCode() == KeyEvent.VK_F) {
+
+        // Instead of requestFocus() or the more forceful sounding grabFocus(),
+        // use requestFocusInWindow(), see
+        // https://stackoverflow.com/questions/1425392/how-do-you-set-a-focus-on-textfield-in-swing
+        ConfigFileEditor.this.searchField.requestFocusInWindow();
+        //JOptionPane.showMessageDialog(ConfigFileEditor.this, "Got a key", "Got key " + key_event.getKeyCode(), JOptionPane.INFORMATION_MESSAGE);
+        }
+    }
+    }
 }