summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/elements
diff options
context:
space:
mode:
authorGravatar 2xsaiko2020-04-29 18:24:29 +0200
committerGravatar GitHub2020-04-29 12:24:29 -0400
commit0eff06096bc4852f2580f20a0c5bf970ecf66987 (patch)
treefc6c996c66abde850aa8598a24da134c37d1d531 /src/main/java/cuchaz/enigma/gui/elements
parentThis doesn't need to be scaled, potentially fixes circular class loading cras... (diff)
downloadenigma-fork-0eff06096bc4852f2580f20a0c5bf970ecf66987.tar.gz
enigma-fork-0eff06096bc4852f2580f20a0c5bf970ecf66987.tar.xz
enigma-fork-0eff06096bc4852f2580f20a0c5bf970ecf66987.zip
Rewrite search dialog (#233)
* Fix searching * Make buttons use localization * Fix rename field opening when pressing shift+space * Tweak search algorithm * Add a bit of documentation * Remove duplicate example line * Use max() when building the inner map instead of overwriting the old value * Keep search dialog state * Formatting * Fix cursor key selection not scrolling to selected item * Don't set font size * Rename close0 to exit * Fix wrong scrolling when selecting search dialog entry
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/elements')
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/MenuBar.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index fd521ab..8098178 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -29,6 +29,16 @@ import cuchaz.enigma.translation.mapping.serde.MappingFormat;
29import cuchaz.enigma.utils.I18n; 29import cuchaz.enigma.utils.I18n;
30import cuchaz.enigma.utils.Pair; 30import cuchaz.enigma.utils.Pair;
31 31
32import javax.swing.*;
33
34import cuchaz.enigma.config.Config;
35import cuchaz.enigma.config.Themes;
36import cuchaz.enigma.gui.Gui;
37import cuchaz.enigma.gui.dialog.AboutDialog;
38import cuchaz.enigma.gui.stats.StatsMember;
39import cuchaz.enigma.translation.mapping.serde.MappingFormat;
40import cuchaz.enigma.utils.I18n;
41
32public class MenuBar extends JMenuBar { 42public class MenuBar extends JMenuBar {
33 43
34 public final JMenuItem closeJarMenu; 44 public final JMenuItem closeJarMenu;
@@ -325,7 +335,7 @@ public class MenuBar extends JMenuBar {
325 menu.add(search); 335 menu.add(search);
326 search.addActionListener(event -> { 336 search.addActionListener(event -> {
327 if (this.gui.getController().project != null) { 337 if (this.gui.getController().project != null) {
328 new SearchDialog(this.gui).show(); 338 this.gui.getSearchDialog().show();
329 } 339 }
330 }); 340 });
331 341