Added "Test" option to the addons dialog which shows the console, in …

…addition to launching.
SKCraft · Mar 20, 2012 · 052f9be · 052f9be
1 parent f402e37
commit 052f9be
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/com/sk89q/mclauncher/AddonManagerDialog.java b/src/main/java/com/sk89q/mclauncher/AddonManagerDialog.java
@@ -480,7 +480,7 @@ private JPanel buildButtons() {
 
         panel.add(Box.createHorizontalGlue());
 
-        JButton launchBtn = new JButton("Launch");
+        JButton launchBtn = new JButton("Launch...");
         panel.add(launchBtn);
         launchBtn.addActionListener(new ActionListener() {
             @Override
@@ -494,6 +494,21 @@ public void actionPerformed(ActionEvent e) {
 
         panel.add(Box.createHorizontalStrut(3));
 
+        JButton testBtn = new JButton("Test...");
+        panel.add(testBtn);
+        testBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                saveAddonsProfile();
+                Launcher.getInstance().getOptions().save();
+                self.dispose();
+                launcherFrame.setShowConsole(true);
+                launcherFrame.launch();
+            }
+        });
+
+        panel.add(Box.createHorizontalStrut(3));
+
         JButton okBtn = new JButton("Close");
         Dimension pref = okBtn.getPreferredSize();
         okBtn.setPreferredSize(new Dimension(Math.max(pref.width, 80),
@@ -508,7 +523,7 @@ public void actionPerformed(ActionEvent e) {
             }
         });
 
-        UIUtil.equalWidth(launchBtn, okBtn);
+        UIUtil.equalWidth(launchBtn, testBtn, okBtn);
 
         return panel;
     }

diff --git a/src/main/java/com/sk89q/mclauncher/LauncherFrame.java b/src/main/java/com/sk89q/mclauncher/LauncherFrame.java
@@ -246,6 +246,18 @@ public void setAutoConnect(String address) {
         }
     }
 
+    /**
+     * Set whether the console should be shown.
+     * 
+     * @param show true to show the console
+     */
+    public void setShowConsole(boolean show) {
+        if (show) {
+            expandBtn.doClick();
+        }
+        showConsoleCheck.setSelected(show);
+    }
+
     /**
      * Open the options window.
      *