Merge pull request #32 from Ogefest/feature/textarea-search-bar

Feature/textarea search bar
Ogefest · Apr 26, 2021 · 6bea0ca · 6bea0ca
2 parents 94b3479 + 375a71a
commit 6bea0ca
Show file tree

Hide file tree

Showing 12 changed files with 261 additions and 514 deletions.
diff --git a/src/main/java/notepack/NoteTabContentCallback.java b/src/main/java/notepack/NoteTabContentCallback.java
diff --git a/src/main/java/notepack/NoteTabContentController.java b/src/main/java/notepack/NoteTabContentController.java
diff --git a/src/main/java/notepack/SearchFormCallback.java b/src/main/java/notepack/SearchFormCallback.java
diff --git a/src/main/java/notepack/SearchFormController.java b/src/main/java/notepack/SearchFormController.java
diff --git a/src/main/java/notepack/app/task/InitializeShortcuts.java b/src/main/java/notepack/app/task/InitializeShortcuts.java
@@ -45,12 +45,19 @@ public void guiWork(TaskUtil taskUtil, App app) {
         notes.getScene().getAccelerators().put(kcSearchReplaceString, () -> {
             Tab t = taskUtil.getNotesContainer().getSelectionModel().getSelectedItem();
             if (t.getUserData() instanceof TextAreaController) {
-                ((TextAreaController) t.getUserData()).showSearchReplaceForm();
+                ((TextAreaController) t.getUserData()).showSearchForm();
             }
             if (t.getUserData() instanceof TodoPaneBackgroundController) {
                 ((TodoPaneBackgroundController) t.getUserData()).toggleSearchInput();
             }
         });
+        KeyCombination kcSearchString = new KeyCodeCombination(KeyCode.R, KeyCombination.CONTROL_DOWN);
+        notes.getScene().getAccelerators().put(kcSearchString, () -> {
+            Tab t = taskUtil.getNotesContainer().getSelectionModel().getSelectedItem();
+            if (t.getUserData() instanceof TextAreaController) {
+                ((TextAreaController) t.getUserData()).showReplaceForm();
+            }
+        });
 
         KeyCombination kcOpenNotes = new KeyCodeCombination(KeyCode.N, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN);
         parentStage.getScene().getAccelerators().put(kcOpenNotes, () -> taskUtil.showNotesPane());