Rearrange menus; bump version

Author: rcx

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>groupId</groupId>
     <artifactId>jda</artifactId>
-    <version>0.0.3.1-SNAPSHOT</version>
+    <version>0.0.3.2-SNAPSHOT</version>
 
     <repositories>
         <repository>

src/main/java/the/bytecode/club/jda/JDA.java

@@ -677,10 +677,14 @@ else if ((e.getKeyCode() == KeyEvent.VK_N) && isCtrlDown(e))
         {
             JDA.resetWorkSpace(true);
         }
-        else if ((e.getKeyCode() == KeyEvent.VK_R) && isCtrlDown(e))
+        else if ((e.getKeyCode() == KeyEvent.VK_R) && isCtrlDown(e) && isShiftDown(e))
         {
             viewer.reloadResources();
         }
+        else if ((e.getKeyCode() == KeyEvent.VK_R) && isCtrlDown(e))
+        {
+            viewer.refreshView();
+        }
         else if ((e.getKeyCode() == KeyEvent.VK_W) && isCtrlDown(e) && isShiftDown(e))
         {
             JDA.closeResources(true);

src/main/java/the/bytecode/club/jda/gui/MainViewerGUI.java

@@ -41,6 +41,7 @@ public class MainViewerGUI extends JFrame implements FileChangeNotifier, IPersis
     public JMenu fileMenu;
     public JMenu windowMenu;
     public JMenu settingsMenu;
+    public JMenu helpMenu;
 
     public boolean isMaximized = false;
     public Point unmaximizedPos;
@@ -176,6 +177,7 @@ private void initializeMenubar()
         viewMenu = new JMenu("View");
         windowMenu = new JMenu("Window");
         settingsMenu = new JMenu("Settings");
+        helpMenu = new JMenu("Help");
         setJMenuBar(menuBar);
 
         setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
@@ -218,12 +220,6 @@ private void initializeMenubar()
         fileMenu.add(mnRecentFiles);
         fileMenu.add(new JSeparator());
 
-        mntmAbout.addActionListener(arg0 -> aboutWindow.setVisible(true));
-        fileMenu.add(mntmAbout);
-
-        mntmIntro.addActionListener(arg0 -> introWindow.setVisible(true));
-        fileMenu.add(mntmIntro);
-
         JMenuItem mntmExit = new JMenuItem("Exit");
         mntmExit.addActionListener(arg0 -> exitPrompt());
 
@@ -263,12 +259,6 @@ private void initializeMenubar()
 
         settingsMenu.add(new JSeparator());
 
-        mntmUpdateCheck.setSelected(Settings.DO_UPDATE_CHECK.getBool());
-        mntmUpdateCheck.addActionListener(e -> Settings.DO_UPDATE_CHECK.set(mntmUpdateCheck.isSelected()));
-        settingsMenu.add(mntmUpdateCheck);
-
-        settingsMenu.add(new JSeparator());
-
         mntmSetOptionalLibrary.addActionListener(e -> setOptionalLibrary());
 
         settingsMenu.add(mntmSetOptionalLibrary);
@@ -308,6 +298,18 @@ private void initializeMenubar()
         settingsMenu.add(bytecodeSettingsMenu);
 
         menuBar.add(settingsMenu);
+
+        mntmAbout.addActionListener(arg0 -> aboutWindow.setVisible(true));
+        helpMenu.add(mntmAbout);
+
+        mntmIntro.addActionListener(arg0 -> introWindow.setVisible(true));
+        helpMenu.add(mntmIntro);
+
+        mntmUpdateCheck.setSelected(Settings.DO_UPDATE_CHECK.getBool());
+        mntmUpdateCheck.addActionListener(e -> Settings.DO_UPDATE_CHECK.set(mntmUpdateCheck.isSelected()));
+        helpMenu.add(mntmUpdateCheck);
+        menuBar.add(helpMenu);
+
         menuBar.add(spinnerMenu);
 
         fontSpinner.setPreferredSize(new Dimension(42, 20));

src/main/resources/intro.html

@@ -26,7 +26,8 @@ <h2>Keyboard Short-cuts:</h2>
 <ul>
     <li>Add (Ctrl + O)</li>
     <li>New Workspace (Ctrl + N)</li>
-    <li>Reload Resources (Ctrl + R)</li>
+    <li>Reload Resources (Ctrl + Shift + R)</li>
+    <li>Refresh View [Redecompile] (Ctrl + R)</li>
     <li>Close All Resources (Ctrl + Shift + W)</li>
     <li>Search Text (Ctrl + F)</li>
     <li>Search For File (Ctrl + F)</li>