summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/elements
diff options
context:
space:
mode:
authorGravatar Modmuss502019-02-19 19:00:31 +0000
committerGravatar Gegy2019-02-19 21:00:31 +0200
commitaf43eb7a98c0c2dc017b37bba72721c46ecc4afe (patch)
treea460092562d98a176541503d2344a570c0c2e3a2 /src/main/java/cuchaz/enigma/gui/elements
parentTrack loaded mapping path when opening mappings and not just when saving (diff)
downloadenigma-fork-af43eb7a98c0c2dc017b37bba72721c46ecc4afe.tar.gz
enigma-fork-af43eb7a98c0c2dc017b37bba72721c46ecc4afe.tar.xz
enigma-fork-af43eb7a98c0c2dc017b37bba72721c46ecc4afe.zip
Added Basic Search (#102)
* 3am code for a basic search box, needs some cleanup * Cleanup the code a bit * Add missing header * Fix indentation, + unneeded check
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/elements')
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/MenuBar.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index dfbfa65..14ad53d 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -4,6 +4,7 @@ import cuchaz.enigma.config.Config;
4import cuchaz.enigma.config.Themes; 4import cuchaz.enigma.config.Themes;
5import cuchaz.enigma.gui.Gui; 5import cuchaz.enigma.gui.Gui;
6import cuchaz.enigma.gui.dialog.AboutDialog; 6import cuchaz.enigma.gui.dialog.AboutDialog;
7import cuchaz.enigma.gui.dialog.SearchDialog;
7import cuchaz.enigma.throwables.MappingParseException; 8import cuchaz.enigma.throwables.MappingParseException;
8import cuchaz.enigma.translation.mapping.serde.MappingFormat; 9import cuchaz.enigma.translation.mapping.serde.MappingFormat;
9 10
@@ -205,6 +206,12 @@ public class MenuBar extends JMenuBar {
205 themes.add(theme); 206 themes.add(theme);
206 theme.addActionListener(event -> Themes.setLookAndFeel(gui, lookAndFeel)); 207 theme.addActionListener(event -> Themes.setLookAndFeel(gui, lookAndFeel));
207 } 208 }
209
210 JMenuItem search = new JMenuItem("Search");
211 search.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.SHIFT_MASK));
212 menu.add(search);
213 search.addActionListener(event -> new SearchDialog(this.gui).show());
214
208 } 215 }
209 } 216 }
210 { 217 {