QOL fixes (#222)

* qol fixes

* ctrl_mask -> ctrl_down_mask

* reverted deobfuscation change

2 files changed, 35 insertions, 21 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 185e83c..f3bf69a 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -8,7 +8,6 @@ import cuchaz.enigma.gui.dialog.SearchDialog;
 import cuchaz.enigma.gui.stats.StatsMember;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.utils.I18n;
-import cuchaz.enigma.utils.Utils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -40,6 +39,9 @@ public class MenuBar extends JMenuBar {
         public MenuBar(Gui gui) {
                 this.gui = gui;
 
+                /*
+                 * File menu
+                 */
                 {
                         JMenu menu = new JMenu(I18n.translate("menu.file"));
                         this.add(menu);
@@ -48,9 +50,14 @@ public class MenuBar extends JMenuBar {
                                 menu.add(item);
                                 item.addActionListener(event -> {
                                         this.gui.jarFileChooser.setVisible(true);
-                                        Path path = Paths.get(this.gui.jarFileChooser.getDirectory()).resolve(this.gui.jarFileChooser.getFile());
-                                        if (Files.exists(path)) {
-                                                gui.getController().openJar(path);
+                                        String file = this.gui.jarFileChooser.getFile();
+                                        // checks if the file name is not empty
+                                        if (file != null) {
+                                                Path path = Paths.get(this.gui.jarFileChooser.getDirectory()).resolve(file);
+                                                // checks if the file name corresponds to an existing file
+                                                if (Files.exists(path)) {
+                                                        gui.getController().openJar(path);
+                                                }
                                         }
                                 });
                         }
@@ -189,6 +196,7 @@ public class MenuBar extends JMenuBar {
 
                                         pane.add(button);
                     frame.pack();
+                    frame.setLocationRelativeTo(this.gui.getFrame());
                     frame.setVisible(true);
                 });
 
@@ -202,6 +210,9 @@ public class MenuBar extends JMenuBar {
                         }
                 }
 
+                /*
+                 * Decompiler menu
+                 */
                 {
                         JMenu menu = new JMenu(I18n.translate("menu.decompiler"));
                         add(menu);
@@ -222,6 +233,9 @@ public class MenuBar extends JMenuBar {
                         }
                 }
 
+                /*
+                 * View menu
+                 */
                 {
                         JMenu menu = new JMenu(I18n.translate("menu.view"));
                         this.add(menu);
@@ -250,16 +264,12 @@ public class MenuBar extends JMenuBar {
                                                 pane.add(text);
                                                 
                                                 JButton okButton = new JButton(I18n.translate("menu.view.languages.ok"));
-                                                okButton.setAlignmentX(JButton.CENTER_ALIGNMENT);
-                                                okButton.setHorizontalAlignment(JButton.CENTER);
                                                 pane.add(okButton);
                                                 okButton.addActionListener(arg0 -> frame.dispose());
                                                 
-                                                frame.setSize(350, 110);
-                                                frame.setResizable(false);
+                                                frame.pack();
                                                 frame.setLocationRelativeTo(this.gui.getFrame());
                                                 frame.setVisible(true);
-                                                frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
                                         });
                                 }
 
@@ -274,6 +284,10 @@ public class MenuBar extends JMenuBar {
 
                         }
                 }
+                
+                /*
+                 * Help menu
+                 */
                 {
                         JMenu menu = new JMenu(I18n.translate("menu.help"));
                         this.add(menu);
diff --git a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
index 94da1d2..b92041c 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
@@ -24,7 +24,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.rename"));
                         menu.addActionListener(event -> gui.startRename());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.renameMenu = menu;
@@ -32,7 +32,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.javadoc"));
                         menu.addActionListener(event -> gui.startDocChange());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.editJavadocMenu = menu;
@@ -40,7 +40,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.inheritance"));
                         menu.addActionListener(event -> gui.showInheritance());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_I, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.showInheritanceMenu = menu;
@@ -48,7 +48,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.implementations"));
                         menu.addActionListener(event -> gui.showImplementations());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.showImplementationsMenu = menu;
@@ -56,7 +56,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.calls"));
                         menu.addActionListener(event -> gui.showCalls(true));
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.showCallsMenu = menu;
@@ -64,7 +64,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.calls.specific"));
                         menu.addActionListener(event -> gui.showCalls(false));
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.SHIFT_DOWN_MASK));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK + InputEvent.SHIFT_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.showCallsSpecificMenu = menu;
@@ -72,7 +72,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.declaration"));
                         menu.addActionListener(event -> gui.getController().navigateTo(gui.cursorReference.entry));
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.openEntryMenu = menu;
@@ -80,7 +80,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.back"));
                         menu.addActionListener(event -> gui.getController().openPreviousReference());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.openPreviousMenu = menu;
@@ -88,7 +88,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.forward"));
                         menu.addActionListener(event -> gui.getController().openNextReference());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.openNextMenu = menu;
@@ -96,7 +96,7 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.mark_deobfuscated"));
                         menu.addActionListener(event -> gui.toggleMapping());
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, 0));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));
                         menu.setEnabled(false);
                         this.add(menu);
                         this.toggleMappingMenu = menu;
@@ -107,13 +107,13 @@ public class PopupMenuBar extends JPopupMenu {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.zoom.in"));
                         menu.addActionListener(event -> gui.editor.offsetEditorZoom(2));
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_MASK));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_DOWN_MASK));
                         this.add(menu);
                 }
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.zoom.out"));
                         menu.addActionListener(event -> gui.editor.offsetEditorZoom(-2));
-                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK));
+                        menu.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_DOWN_MASK));
                         this.add(menu);
                 }
                 {