Merge pull request #4635 from bubblobill/UI_Text_Campaign_Properties

UI text - Campaign Properties Dialogue

src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanelView.form

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="net.rptools.maptool.client.ui.campaignproperties.TokenPropertiesManagementPanelView">
-  <grid id="26b35" binding="mainPanel" layout-manager="GridLayoutManager" row-count="6" column-count="8" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="26b35" binding="mainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="8" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="10" y="10" width="1023" height="474"/>
@@ -10,7 +10,7 @@
     <children>
       <scrollpane id="814eb">
         <constraints>
-          <grid row="3" column="3" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="3" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -26,7 +26,7 @@
       </scrollpane>
       <scrollpane id="d849c">
         <constraints>
-          <grid row="2" column="0" row-span="2" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="2" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <horizontalScrollBarPolicy value="31"/>
@@ -42,36 +42,29 @@
           </component>
         </children>
       </scrollpane>
-      <component id="31030" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.label.type"/>
-        </properties>
-      </component>
       <vspacer id="efbc9">
         <constraints>
-          <grid row="3" column="7" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="7" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <hspacer id="1548">
         <constraints>
-          <grid row="1" column="5" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="5" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
       <component id="74fd" class="javax.swing.JComboBox">
         <constraints>
-          <grid row="5" column="4" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="4" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <name value="statSheetComboBox"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.combo.statSheet.tooltip"/>
         </properties>
       </component>
       <grid id="b11e" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="6" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="6" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -84,6 +77,7 @@
               <actionCommand value="AddProperty"/>
               <name value="propertyAddButton"/>
               <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.add"/>
+              <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.addProperty.tooltip"/>
             </properties>
           </component>
           <component id="7a102" class="javax.swing.JButton">
@@ -94,60 +88,65 @@
               <actionCommand value="DeleteProperty"/>
               <name value="propertyDeleteButton"/>
               <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.delete"/>
+              <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.deleteProperty.tooltip"/>
             </properties>
           </component>
         </children>
       </grid>
       <component id="e685d" class="javax.swing.JComboBox" default-binding="true">
         <constraints>
-          <grid row="5" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="6" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <model/>
           <name value="statSheetLocationComboBox"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.combo.statSheetLocation.tooltip"/>
         </properties>
       </component>
       <component id="1be4b" class="javax.swing.JButton">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand value="New"/>
           <name value="typeAddButton"/>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.add"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.add.tooltip"/>
         </properties>
       </component>
       <component id="3287b" class="javax.swing.JButton">
         <constraints>
-          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand value="New"/>
           <name value="typeDeleteButton"/>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.delete"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.delete.tooltip"/>
         </properties>
       </component>
       <component id="c8d97" class="javax.swing.JButton">
         <constraints>
-          <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand value="New"/>
           <name value="typeDefaultButton"/>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.setAsDefault"/>
+          <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.setAsDefault.tooltip"/>
         </properties>
       </component>
       <component id="78855" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="Label.name"/>
         </properties>
       </component>
       <component id="65829" class="javax.swing.JTextField">
         <constraints>
-          <grid row="2" column="4" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="4" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <name value="tokenTypeName"/>
@@ -156,7 +155,7 @@
       </component>
       <component id="c35ca" class="javax.swing.JLabel">
         <constraints>
-          <grid row="5" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.label.statSheet"/>
@@ -165,7 +164,7 @@
       <grid id="8e1f5" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="2" column="6" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="6" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -178,6 +177,7 @@
               <actionCommand value="MovePropertyUp"/>
               <name value="propertyMoveUpButton"/>
               <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.up"/>
+              <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.propertyUpDown.tooltip"/>
             </properties>
           </component>
           <component id="f04b7" class="javax.swing.JButton">
@@ -189,10 +189,19 @@
               <name value="propertyMoveDownButton"/>
               <selected value="false"/>
               <text resource-bundle="net/rptools/maptool/language/i18n" key="Button.down"/>
+              <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.button.propertyUpDown.tooltip"/>
             </properties>
           </component>
         </children>
       </grid>
+      <component id="31030" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="net/rptools/maptool/language/i18n" key="TokenPropertiesPanel.label.type"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

src/main/resources/net/rptools/maptool/client/ui/forms/campaignPropertiesDialog.xml

@@ -3711,7 +3711,7 @@
                                         <at name="actionCommand">GM</at>
                                         <at name="name">tokenStatesOwner</at>
                                         <at name="width">245</at>
-                                        <at name="text">CampaginPropertiesDialog.label.owner</at>
+                                        <at name="text">CampaignPropertiesDialog.label.owner</at>
                                         <at name="selected">true</at>
                                         <at name="height">17</at>
                                        </object>
@@ -6049,7 +6049,7 @@
                                              <at name="actionCommand">GM</at>
                                              <at name="name">tokenBarOwner</at>
                                              <at name="width">245</at>
-                                             <at name="text">CampaginPropertiesDialog.label.owner</at>
+                                             <at name="text">CampaignPropertiesDialog.label.owner</at>
                                              <at name="selected">true</at>
                                              <at name="height">17</at>
                                             </object>