Skip to content

Commit

Permalink
Add an icon to the entity class chooser button in the Difficulty editor
Browse files Browse the repository at this point in the history 
Switch the placeholder "..." text in the button for a proper icon. Also add
some tooltips for various controls in the dialog.
  • Loading branch information
Matthew Mott committed May 19, 2020
1 parent 3844546 commit 0581d7f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
Binary file added install/bitmaps/treeView16.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions install/ui/difficultyeditor.fbp
View file
Expand Up @@ -43,7 +43,7 @@
<property name="minimum_size"></property>
<property name="name">DifficultyEditorMainPanel</property>
<property name="pos"></property>
<property name="size">857,238</property>
<property name="size">669,238</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
Expand Down Expand Up @@ -197,7 +197,7 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Add a new item to this difficulty level</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down Expand Up @@ -269,7 +269,7 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Delete the selected item from this difficulty level</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down Expand Up @@ -615,7 +615,7 @@
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Entity class to modify. Enter an exact class name or start typing to autocomplete.</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand All @@ -641,7 +641,7 @@
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="bitmap">Load From Art Provider; darkradiant:treeView16.png; wxART_TOOLBAR</property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
Expand All @@ -663,7 +663,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">...</property>
<property name="label"></property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
Expand All @@ -688,7 +688,7 @@
<property name="style">wxBU_EXACTFIT</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Use the entity class chooser dialog to select an entity class</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down Expand Up @@ -814,7 +814,7 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Spawnarg to modify on the selected entity class</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down Expand Up @@ -948,7 +948,7 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Modification to make to the selected spawnarg</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down Expand Up @@ -1089,7 +1089,7 @@
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="tooltip">Commit the above changes into the list in the left-hand panel</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
Expand Down
13 changes: 10 additions & 3 deletions install/ui/difficultyeditor.xrc
View file
Expand Up @@ -2,7 +2,7 @@
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
<object class="wxPanel" name="DifficultyEditorMainPanel">
<style>wxTAB_TRAVERSAL</style>
<size>857,238</size>
<size>669,238</size>
<object class="wxBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
Expand Down Expand Up @@ -34,6 +34,7 @@
<flag></flag>
<border>5</border>
<object class="wxButton" name="DifficultyEditorAddSettingButton">
<tooltip>Add a new item to this difficulty level</tooltip>
<label>Add</label>
<default>0</default>
<markup>0</markup>
Expand All @@ -45,6 +46,7 @@
<flag>wxLEFT|wxRIGHT</flag>
<border>6</border>
<object class="wxButton" name="DifficultyEditorDeleteSettingButton">
<tooltip>Delete the selected item from this difficulty level</tooltip>
<label>Delete</label>
<default>0</default>
<markup>0</markup>
Expand Down Expand Up @@ -115,6 +117,7 @@
<flag>wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</flag>
<border>6</border>
<object class="wxTextCtrl" name="ClassNameTextBox">
<tooltip>Entity class to modify. Enter an exact class name or start typing to autocomplete.</tooltip>
<value></value>
</object>
</object>
Expand All @@ -124,10 +127,11 @@
<border>6</border>
<object class="wxButton" name="ChooseClassButton">
<style>wxBU_EXACTFIT</style>
<label>...</label>
<tooltip>Use the entity class chooser dialog to select an entity class</tooltip>
<label></label>
<default>0</default>
<markup>0</markup>
<bitmap />
<bitmap stock_id="darkradiant:treeView16.png" stock_client="wxART_TOOLBAR">undefined.png</bitmap>
</object>
</object>
</object>
Expand All @@ -146,6 +150,7 @@
<flag>wxALL|wxEXPAND</flag>
<border>6</border>
<object class="wxTextCtrl" name="DifficultyEditorSpawnarg">
<tooltip>Spawnarg to modify on the selected entity class</tooltip>
<value></value>
</object>
</object>
Expand All @@ -169,6 +174,7 @@
<flag>wxTOP|wxBOTTOM|wxLEFT</flag>
<border>6</border>
<object class="wxTextCtrl" name="DifficultyEditorArgument">
<tooltip>Modification to make to the selected spawnarg</tooltip>
<value></value>
</object>
</object>
Expand All @@ -190,6 +196,7 @@
<flag>wxALL|wxALIGN_RIGHT</flag>
<border>6</border>
<object class="wxButton" name="DifficultyEditorSaveSettingButton">
<tooltip>Commit the above changes into the list in the left-hand panel</tooltip>
<label>Save</label>
<default>0</default>
<markup>0</markup>
Expand Down

0 comments on commit 0581d7f

Please sign in to comment.