Skip to content

Commit

Permalink
#5537: Remove redundant controls
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Sep 17, 2022
1 parent 0ebad12 commit fb00152
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 153 deletions.
122 changes: 0 additions & 122 deletions install/ui/entityclasschooser.fbp
View file
Expand Up @@ -188,128 +188,6 @@
<property name="permission">none</property>
<property name="rows">2</property>
<property name="vgap">6</property>
<object class="sizeritem" expanded="0">
<property name="border">0</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Defined in:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">EntityClassChooserDefFileNameLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">6</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">-</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">EntityClassChooserDefFileName</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">2</property>
<property name="flag">wxTOP</property>
Expand Down
18 changes: 0 additions & 18 deletions install/ui/entityclasschooser.xrc
View file
Expand Up @@ -31,24 +31,6 @@
<hgap>6</hgap>
<growablecols>1</growablecols>
<growablerows></growablerows>
<object class="sizeritem">
<option>0</option>
<flag></flag>
<border>0</border>
<object class="wxStaticText" name="EntityClassChooserDefFileNameLabel">
<label>Defined in:</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag></flag>
<border>6</border>
<object class="wxStaticText" name="EntityClassChooserDefFileName">
<label>-</label>
<wrap>-1</wrap>
</object>
</object>
<object class="sizeritem">
<option>0</option>
<flag>wxTOP</flag>
Expand Down
16 changes: 5 additions & 11 deletions libs/wxutil/EntityClassChooser.cpp
View file
Expand Up @@ -224,10 +224,9 @@ EntityClassChooser::EntityClassChooser(Purpose purpose) :
);

// Setup the tree view and invoke threaded loader to get the entity classes
setupTreeView();
setupSelector();
loadEntityClasses();

makeLabelBold(this, "EntityClassChooserDefFileNameLabel");
makeLabelBold(this, "EntityClassChooserUsageLabel");

wxSplitterWindow* splitter = findNamedObject<wxSplitterWindow>(this, "EntityClassChooserSplitter");
Expand Down Expand Up @@ -326,7 +325,7 @@ int EntityClassChooser::ShowModal()
return returnCode;
}

void EntityClassChooser::setupTreeView()
void EntityClassChooser::setupSelector()
{
auto parent = findNamedObject<wxPanel>(this, "EntityClassChooserLeftPane");

Expand All @@ -348,29 +347,25 @@ void EntityClassChooser::_onItemActivated( wxDataViewEvent& ev )
}
}

// Update the usage information
void EntityClassChooser::updateUsageInfo(const std::string& eclass)
void EntityClassChooser::updateUsageInfo(const std::string& declName)
{
// Lookup the IEntityClass instance
auto e = GlobalEntityClassManager().findOrInsert(eclass, true);
auto eclass = GlobalEntityClassManager().findOrInsert(declName, true);

// Set the usage panel to the IEntityClass' usage information string
auto* usageText = findNamedObject<wxTextCtrl>(this, "EntityClassChooserUsageText");
usageText->SetValue(e ? eclass::getUsage(e) : "");
usageText->SetValue(eclass ? eclass::getUsage(eclass) : "");
}

void EntityClassChooser::updateSelection()
{
auto selectedEclass = _selector->GetSelectedDeclName();

auto* defFileName = findNamedObject<wxStaticText>(this, "EntityClassChooserDefFileName");

if (selectedEclass.empty())
{
// Nothing selected
_modelPreview->setModel("");
_modelPreview->setSkin("");
defFileName->SetLabel("-");

findNamedObject<wxButton>(this, "EntityClassChooserAddButton")->Enable(false);
return;
Expand All @@ -392,7 +387,6 @@ void EntityClassChooser::updateSelection()
{
_modelPreview->setModel(eclass->getAttributeValue("model"));
_modelPreview->setSkin(eclass->getAttributeValue("skin"));
defFileName->SetLabel(eclass->getDeclFilePath());
}
}

Expand Down
3 changes: 1 addition & 2 deletions libs/wxutil/EntityClassChooser.h
View file
Expand Up @@ -56,8 +56,7 @@ class EntityClassChooser final :

void loadEntityClasses();

// Widget construction helpers
void setupTreeView();
void setupSelector();

// Update the usage panel with information from the provided entityclass
void updateUsageInfo(const std::string& eclass);
Expand Down

0 comments on commit fb00152

Please sign in to comment.