GUI overhauls - scrolling mode, handle resize better, infinite tooltips.

Also bump to 1.7.0b for impending release.
Dabomstew · Mar 4, 2016 · 46a3776 · 46a3776
1 parent 7e22bea
commit 46a3776
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 80 deletions.
diff --git a/readme.txt b/readme.txt
@@ -1,4 +1,4 @@
-Universal Pokemon Randomizer 1.7.0a
+Universal Pokemon Randomizer 1.7.0b
 by Dabomstew, 2012-16
 
 Homepage: http://pokehacks.dabomstew.com/randomizer/index.php

diff --git a/src/com/dabomstew/pkrandom/Constants.java b/src/com/dabomstew/pkrandom/Constants.java
@@ -6,7 +6,7 @@ public class Constants {
 
     public static final String AUTOUPDATE_URL = "http://pokehacks.dabomstew.com/randomizer/autoupdate/";
     public static final String WEBSITE_URL = "http://pokehacks.dabomstew.com/randomizer/";
-    public static final int UPDATE_VERSION = 1701;
+    public static final int UPDATE_VERSION = 1702;
     public static final String ROOT_PATH = getRootPath();
 
     private static String getRootPath() {

diff --git a/src/com/dabomstew/pkrandom/gui/Bundle.properties b/src/com/dabomstew/pkrandom/gui/Bundle.properties
@@ -211,7 +211,6 @@ RandomizerGUI.codeTweaksBtn.textWithActive=Code Tweaks (%d)
 RandomizerGUI.pokeLimitCB.text=
 RandomizerGUI.pokeLimitBtn.text=Limit Pokemon
 RandomizerGUI.pokeLimitCB.toolTipText=<html>Select this to allow yourself to limit the Pokemon used by the randomization.<br /><b>If this box isn't checked all Pokemon will be allowed!</b>
-RandomizerGUI.updateSettingsButton.text=Update Settings
 RandomizerGUI.toggleAutoUpdatesMenuItem.text=Toggle AutoUpdate
 RandomizerGUI.manualUpdateMenuItem.text=Check for Update Now
 RandomizerGUI.disableAutoUpdate=Disable Auto Update
@@ -268,7 +267,7 @@ RandomizerGUI.tmHmTutorPanel.TabConstraints.tabTitle=TM/HMs & Tutors
 RandomizerGUI.startersInnerPanel.TabConstraints.tabTitle=Starters, Statics & Trades
 RandomizerGUI.trainersInnerPanel.TabConstraints.tabTitle=Trainer Pokemon
 RandomizerGUI.fieldItemsInnerPanel.TabConstraints.tabTitle=Field Items
-RandomizerGUI.versionLabel.text=Randomizer Version 1.7.0a
+RandomizerGUI.versionLabel.text=Randomizer Version 1.7.0b
 RandomizerGUI.websiteLinkLabel.text=<html><a href="http://pokehacks.dabomstew.com/randomizer">http://pokehacks.dabomstew.com/randomizer</a>
 RandomizerGUI.peUnchangedRB.text=Unchanged
 RandomizerGUI.peRandomRB.text=Randomize
@@ -287,6 +286,35 @@ RandomizerGUI.wildsInnerPanel.TabConstraints.tabTitle=Wild Pokemon
 RandomizerGUI.miscTweaksInnerPanel.TabConstraints.tabTitle=Misc Tweaks
 RandomizerGUI.miscTweaksPanel.border.title=Misc. Tweaks
 RandomizerGUI.mtNoneAvailableLabel.text=There are no tweaks available for the currently loaded game.
+RandomizerGUI.gameMascotLabel.text=
+RandomizerGUI.thcFullRB.toolTipText=<html>Select this option to allow every Pokemon to learn every TM/HM.<br />This can be fun to mess around with, but it might make the game too easy.
+RandomizerGUI.thcFullRB.text=Full compatibility
+RandomizerGUI.thcRandomTotalRB.toolTipText=<html>Randomise the TMs and HMs that each Pokemon can learn.<br />Each TM or HM will have a 50% chance of being learnable regardless of type.
+RandomizerGUI.thcRandomTotalRB.text=Random (completely)
+RandomizerGUI.thcRandomTypeRB.toolTipText=<html>Randomise the TMs and HMs that each Pokemon can learn.<br />Each TM or HM will have:<br />A 90% chance of being learnable if the Pokemon has it as (one of) its type(s).<br />A 50% chance of being learnable if the move is Normal and the Pokemon isn't.<br />A 25% chance otherwise.
+RandomizerGUI.thcRandomTypeRB.text=Random (prefer same type)
+RandomizerGUI.thcUnchangedRB.toolTipText=<html>Every Pokemon will be able to learn the same TMs that it could before.<br />Note that this applies even if you change the TM moves, which could lead to some odd combinations.
+RandomizerGUI.thcUnchangedRB.text=Unchanged
+RandomizerGUI.tmHmCompatPanel.border.title=TM/HM Compatibility
+RandomizerGUI.tmFullHMCompatCB.toolTipText=<html>If you select this option, then every Pokemon will learn every HM, regardless of any other options you check.
+RandomizerGUI.tmFullHMCompatCB.text=Full HM Compatibility?
+RandomizerGUI.tmKeepFieldMovesCB.toolTipText=<html>If you select this, TMs that contain field-use moves will be left alone.<br />This includes things like Dig & Teleport, but not healing moves (Softboiled).
+RandomizerGUI.tmKeepFieldMovesCB.text=Keep field move TMs?
+RandomizerGUI.tmLearningSanityCB.toolTipText=<html>If you select this option, then Pokemon will be guaranteed to learn TMs of moves that they learn by levelup.<br />Otherwise, move compatibility will be left alone or decided randomly, depending on your other choices.
+RandomizerGUI.tmLearningSanityCB.text=TM/Levelup Move Sanity?
+RandomizerGUI.tmmRandomRB.toolTipText=<html>Give each TM a new move.<br />HM moves are not affected, nor can they be selected to be put in TMs.<br />Each TM will still be unique.<br />If Metronome Only Mode is selected, all TMs are changed to Metronome and this setting has no effect.
+RandomizerGUI.tmmRandomRB.text=Random
+RandomizerGUI.tmmUnchangedRB.toolTipText=<html>Leave the moves in TMs as they are.<br />If Metronome Only Mode is selected, all TMs are changed to Metronome and this setting has no effect.
+RandomizerGUI.tmmUnchangedRB.text=Unchanged
+RandomizerGUI.tmMovesPanel.border.title=TM Moves
+RandomizerGUI.tmhmsPanel.border.title=TMs & HMs
+RandomizerGUI.toggleScrollPaneMenuItem.text=Toggle ScrollView
+RandomizerGUI.settingsButton.text=Settings
+RandomizerGUI.changeToTabbedPane=Change to Tabbed Display Mode
+RandomizerGUI.changeToScrollPane=Change to Scrolling Display Mode
+RandomizerGUI.displayModeChangeDialog.text=Are you sure you wish to switch display modes?\nIn order to apply this setting, the randomizer will have to close first.\nIf you're in the middle of a randomization, finish it before saying Yes.
+RandomizerGUI.displayModeChangeDialog.title=Alert
+RandomizerGUI.displayModeChanged=Display mode changed.\nThe randomizer will now automatically close.\nWhen you re-open it, your display mode change will be applied.
 GenerationLimitDialog.includePokemonHeader.text=Include Pokemon from:
 GenerationLimitDialog.relatedPokemonHeader.text=... and related Pokemon from:
 GenerationLimitDialog.gen1CB.text=Generation 1
@@ -353,25 +381,4 @@ CodeTweaks.lowerCaseNames.toolTipText=<html>If this is selected, all Pokemon nam
 CodeTweaks.lowerCaseNames.name=Lower Case Pokemon Names
 CodeTweaks.catchingTutorial.toolTipText=<html>Selecting this option will randomize the Pokemon participating in the game's catching tutorial.
 CodeTweaks.catchingTutorial.name=Randomize Catching Tutorial
-RandomizerGUI.gameMascotLabel.text=
-RandomizerGUI.thcFullRB.toolTipText=<html>Select this option to allow every Pokemon to learn every TM/HM.<br />This can be fun to mess around with, but it might make the game too easy.
-RandomizerGUI.thcFullRB.text=Full compatibility
-RandomizerGUI.thcRandomTotalRB.toolTipText=<html>Randomise the TMs and HMs that each Pokemon can learn.<br />Each TM or HM will have a 50% chance of being learnable regardless of type.
-RandomizerGUI.thcRandomTotalRB.text=Random (completely)
-RandomizerGUI.thcRandomTypeRB.toolTipText=<html>Randomise the TMs and HMs that each Pokemon can learn.<br />Each TM or HM will have:<br />A 90% chance of being learnable if the Pokemon has it as (one of) its type(s).<br />A 50% chance of being learnable if the move is Normal and the Pokemon isn't.<br />A 25% chance otherwise.
-RandomizerGUI.thcRandomTypeRB.text=Random (prefer same type)
-RandomizerGUI.thcUnchangedRB.toolTipText=<html>Every Pokemon will be able to learn the same TMs that it could before.<br />Note that this applies even if you change the TM moves, which could lead to some odd combinations.
-RandomizerGUI.thcUnchangedRB.text=Unchanged
-RandomizerGUI.tmHmCompatPanel.border.title=TM/HM Compatibility
-RandomizerGUI.tmFullHMCompatCB.toolTipText=<html>If you select this option, then every Pokemon will learn every HM, regardless of any other options you check.
-RandomizerGUI.tmFullHMCompatCB.text=Full HM Compatibility?
-RandomizerGUI.tmKeepFieldMovesCB.toolTipText=<html>If you select this, TMs that contain field-use moves will be left alone.<br />This includes things like Dig & Teleport, but not healing moves (Softboiled).
-RandomizerGUI.tmKeepFieldMovesCB.text=Keep field move TMs?
-RandomizerGUI.tmLearningSanityCB.toolTipText=<html>If you select this option, then Pokemon will be guaranteed to learn TMs of moves that they learn by levelup.<br />Otherwise, move compatibility will be left alone or decided randomly, depending on your other choices.
-RandomizerGUI.tmLearningSanityCB.text=TM/Levelup Move Sanity?
-RandomizerGUI.tmmRandomRB.toolTipText=<html>Give each TM a new move.<br />HM moves are not affected, nor can they be selected to be put in TMs.<br />Each TM will still be unique.<br />If Metronome Only Mode is selected, all TMs are changed to Metronome and this setting has no effect.
-RandomizerGUI.tmmRandomRB.text=Random
-RandomizerGUI.tmmUnchangedRB.toolTipText=<html>Leave the moves in TMs as they are.<br />If Metronome Only Mode is selected, all TMs are changed to Metronome and this setting has no effect.
-RandomizerGUI.tmmUnchangedRB.text=Unchanged
-RandomizerGUI.tmMovesPanel.border.title=TM Moves
-RandomizerGUI.tmhmsPanel.border.title=TMs & HMs
+
diff --git a/src/com/dabomstew/pkrandom/gui/RandomizerGUI.form b/src/com/dabomstew/pkrandom/gui/RandomizerGUI.form
@@ -91,6 +91,16 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="manualUpdateMenuItemActionPerformed"/>
           </Events>
         </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="toggleScrollPaneMenuItem">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="com/dabomstew/pkrandom/gui/Bundle.properties" key="RandomizerGUI.toggleScrollPaneMenuItem.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="toggleScrollPaneMenuItemActionPerformed"/>
+          </Events>
+        </MenuItem>
       </SubComponents>
     </Container>
     <Component class="javax.swing.ButtonGroup" name="pokeEvolutionsButtonGroup">
@@ -101,7 +111,6 @@
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
       <ResourceString bundle="com/dabomstew/pkrandom/gui/Bundle.properties" key="RandomizerGUI.title" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
     </Property>
-    <Property name="resizable" type="boolean" value="false"/>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
@@ -138,24 +147,21 @@
                       </Group>
                       <EmptySpace min="28" pref="28" max="-2" attributes="0"/>
                       <Component id="gameMascotLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="37" max="-2" attributes="0"/>
+                      <EmptySpace max="32767" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="openROMButton" alignment="1" min="-2" pref="159" max="-2" attributes="0"/>
                           <Component id="saveROMButton" alignment="1" min="-2" pref="159" max="-2" attributes="0"/>
                           <Component id="usePresetsButton" alignment="1" min="-2" pref="159" max="-2" attributes="0"/>
-                          <Component id="updateSettingsButton" alignment="1" min="-2" pref="159" max="-2" attributes="0"/>
+                          <Component id="settingsButton" alignment="1" min="-2" pref="159" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="versionLabel" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="32767" attributes="0"/>
                       <Component id="websiteLinkLabel" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                      <Component id="randomizerOptionsPane" min="-2" pref="759" max="-2" attributes="0"/>
-                  </Group>
+                  <Component id="randomizerOptionsPane" alignment="1" max="32767" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -164,7 +170,7 @@
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="generalOptionsPanel" min="-2" max="-2" attributes="0"/>
                   <Component id="gameMascotLabel" min="-2" max="-2" attributes="0"/>
@@ -175,7 +181,7 @@
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="usePresetsButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                      <Component id="updateSettingsButton" min="-2" max="-2" attributes="0"/>
+                      <Component id="settingsButton" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="romInfoPanel" min="-2" max="-2" attributes="0"/>
@@ -192,8 +198,8 @@
                   <Component id="websiteLinkLabel" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="randomizerOptionsPane" min="-2" pref="457" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
+              <Component id="randomizerOptionsPane" pref="457" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -412,14 +418,14 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="saveQSButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JButton" name="updateSettingsButton">
+    <Component class="javax.swing.JButton" name="settingsButton">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="com/dabomstew/pkrandom/gui/Bundle.properties" key="RandomizerGUI.updateSettingsButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+          <ResourceString bundle="com/dabomstew/pkrandom/gui/Bundle.properties" key="RandomizerGUI.settingsButton.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="updateSettingsButtonActionPerformed"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="settingsButtonActionPerformed"/>
       </Events>
     </Component>
     <Container class="javax.swing.JTabbedPane" name="randomizerOptionsPane">