Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI text - Campaign Properties Dialogue #4635

Merged
merged 21 commits into from
Jan 17, 2024
Merged

UI text - Campaign Properties Dialogue #4635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4b68d1c
Typo/spelling mistake
bubblobill Jan 2, 2024
181f957
copy/paste leftovers removed
bubblobill Jan 2, 2024
6fb4ceb
another typo
bubblobill Jan 2, 2024
dd8953e
New sight/light help-text. Added context comments.
bubblobill Jan 2, 2024
f4c321a
Replaced VBL and MBL abbreviations with VB, MB, or longhand text
bubblobill Jan 2, 2024
9ea1aa5
Resolved conflicts arising from #4616
bubblobill Jan 7, 2024
d197b51
Resolved conflicts arising from #4608
bubblobill Jan 7, 2024
2b762ed
Merge branch 'develop' into UI_Text
bubblobill Jan 7, 2024
81f5826
Merge branch 'RPTools:develop' into UI_Text
bubblobill Jan 11, 2024
c04345a
Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
dependabot[bot] Jan 6, 2024
614f29a
Bump com.google.protobuf:protobuf-java-util from 3.25.1 to 3.25.2
dependabot[bot] Jan 11, 2024
8b28bd8
Bump com.google.protobuf:protoc from 3.25.1 to 3.25.2
dependabot[bot] Jan 11, 2024
4ceb177
Update to Gradle 8.5
kwvanderlinde Jan 11, 2024
4329b5c
Add a method for unioning multiple areas more quickly
kwvanderlinde Jan 11, 2024
3c40c54
Speed up FogUtil.exposeLastPath() by improving area unions
kwvanderlinde Jan 11, 2024
b079549
Updated createMap to handle `lib://` assets via AssetResolver
ColdAnkles Jan 11, 2024
1275f46
Centralised asset MD5 retrieval in FunctionUtil.getAssetKeyFromString()
ColdAnkles Jan 12, 2024
3a475a9
Added support for image token names
ColdAnkles Jan 12, 2024
3b136d5
Campaign Properties Dialog:
bubblobill Jan 14, 2024
a6479c1
Merge remote-tracking branch 'origin/UI_Text_Campaign_Properties' int…
bubblobill Jan 14, 2024
e823623
Spottled
bubblobill Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 101 additions & 97 deletions ...n/java/net/rptools/maptool/client/ui/campaignproperties/CampaignPropertiesDialogView.form
View file
Open in desktop

Large diffs are not rendered by default.

55 changes: 32 additions & 23 deletions .../net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanelView.form
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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">
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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">
Expand All @@ -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>
4 changes: 2 additions & 2 deletions src/main/resources/net/rptools/maptool/client/ui/forms/campaignPropertiesDialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading
Loading