Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Improve the toolbar customization UI

revert-0c36e162
Ian McInerney 10 months ago
parent
85810510f4
commit
18e5a16040
5 changed files with 391 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 381
      common/dialogs/panel_toolbar_customization.cpp
  2. 12
      common/dialogs/panel_toolbar_customization.fbp
  3. 22
      common/dialogs/panel_toolbar_customization_base.cpp
  4. 10
      common/dialogs/panel_toolbar_customization_base.h
  5. 11
      include/dialogs/panel_toolbar_customization.h

381
common/dialogs/panel_toolbar_customization.cpp
View File

@ -44,30 +44,58 @@ enum
class TOOLBAR_TREE_ITEM_DATA : public wxTreeItemData
{
public:
TOOLBAR_TREE_ITEM_DATA()
{ }
TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE aType ) :
wxTreeItemData(),
m_name( "" ),
m_action( nullptr ),
m_type( aType )
{}
{ }
TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE aType, int aSize ) :
m_type( aType ),
m_size( aSize )
{
wxASSERT( aType == TOOLBAR_ITEM_TYPE::SPACER );
}
TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE aType, wxString aName ) :
m_type( aType ),
m_name( aName )
{
wxASSERT( aType == TOOLBAR_ITEM_TYPE::CONTROL
|| aType == TOOLBAR_ITEM_TYPE::GROUP );
}
TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE aType, TOOL_ACTION* aAction ) :
m_type( aType ),
m_action( aAction )
{
wxASSERT( aType == TOOLBAR_ITEM_TYPE::TOOL );
}
void SetAction( TOOL_ACTION* aAction ) { m_action = aAction; }
TOOL_ACTION* GetAction() const { return m_action; }
void SetName( std::string aName ) { m_name = aName; }
std::string GetName() const { return m_name; }
void SetName( wxString& aName ) { m_name = aName; }
const wxString& GetName() const { return m_name; }
void SetToolbarItem( TOOLBAR_ITEM& aItem ) { m_item = aItem; }
TOOLBAR_ITEM GetToolbarItem() const { return m_item; }
void SetSize( int aSize ) { m_size = aSize; }
int GetSize() const { return m_size; }
TOOLBAR_ITEM_TYPE GetType() const { return m_type; }
private:
std::string m_name;
// Item type
TOOLBAR_ITEM_TYPE m_type;
// Tool properties
TOOL_ACTION* m_action;
TOOLBAR_ITEM m_item;
TOOLBAR_ITEM_TYPE m_type;
// Spacer properties
int m_size;
// Group/control properties
wxString m_name;
};
@ -109,6 +137,10 @@ PANEL_TOOLBAR_CUSTOMIZATION::PANEL_TOOLBAR_CUSTOMIZATION( wxWindow* aParent, APP
// This is the button only press for the browse button instead of the menu
m_insertButton->Bind( wxEVT_BUTTON, &PANEL_TOOLBAR_CUSTOMIZATION::onSeparatorPress, this );
// TODO (ISM): Enable moving up/down and draging
m_btnToolMoveDown->Enable( false );
m_btnToolMoveUp->Enable( false );
}
@ -152,6 +184,81 @@ bool PANEL_TOOLBAR_CUSTOMIZATION::TransferDataFromWindow()
}
void PANEL_TOOLBAR_CUSTOMIZATION::parseToolbarTree( TOOLBAR_CONFIGURATION& aToolbar )
{
wxTreeItemId mainId;
wxTreeItemId rootId = m_toolbarTree->GetRootItem();
wxTreeItemIdValue mainCookie;
mainId = m_toolbarTree->GetFirstChild( rootId, mainCookie );
while( mainId.IsOk() )
{
wxTreeItemData* treeData = m_toolbarTree->GetItemData( mainId );
TOOLBAR_TREE_ITEM_DATA* tbData = dynamic_cast<TOOLBAR_TREE_ITEM_DATA*>( treeData );
wxASSERT( tbData );
switch( tbData->GetType() )
{
case TOOLBAR_ITEM_TYPE::SPACER:
aToolbar.AppendSpacer( tbData->GetSize() );
break;
case TOOLBAR_ITEM_TYPE::SEPARATOR:
aToolbar.AppendSeparator();
break;
case TOOLBAR_ITEM_TYPE::CONTROL:
break;
case TOOLBAR_ITEM_TYPE::TOOL:
aToolbar.AppendAction( *( tbData->GetAction() ) );
break;
case TOOLBAR_ITEM_TYPE::GROUP:
TOOLBAR_GROUP_CONFIG grpConfig( tbData->GetName() );
if( m_toolbarTree->ItemHasChildren( mainId ) )
{
wxTreeItemIdValue childCookie;
wxTreeItemId childId = m_toolbarTree->GetFirstChild( mainId, childCookie );
while( childId.IsOk() )
{
wxTreeItemData* childTreeData = m_toolbarTree->GetItemData( childId );
TOOLBAR_TREE_ITEM_DATA* childTbData = dynamic_cast<TOOLBAR_TREE_ITEM_DATA*>( childTreeData );
wxASSERT( childTbData );
switch( childTbData->GetType() )
{
case TOOLBAR_ITEM_TYPE::GROUP:
case TOOLBAR_ITEM_TYPE::SPACER:
case TOOLBAR_ITEM_TYPE::SEPARATOR:
case TOOLBAR_ITEM_TYPE::CONTROL:
wxASSERT_MSG( false, "Invalid entry in a group" );
break;
case TOOLBAR_ITEM_TYPE::TOOL:
grpConfig.AddAction( *( childTbData->GetAction() ) );
break;
}
childId = m_toolbarTree->GetNextChild( mainId, childCookie );
}
}
aToolbar.AppendGroup( grpConfig );
}
mainId = m_toolbarTree->GetNextChild( rootId, mainCookie );
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATION& aToolbar )
{
m_toolbarTree->DeleteAllItems();
@ -167,7 +274,6 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
{
// Add a separator
TOOLBAR_TREE_ITEM_DATA* sepTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::SEPARATOR );
sepTreeItem->SetToolbarItem( item );
m_toolbarTree->AppendItem( root, "Separator", -1, -1, sepTreeItem );
break;
}
@ -176,8 +282,9 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
{
// Add a spacer
TOOLBAR_TREE_ITEM_DATA* spacerTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::SPACER );
spacerTreeItem->SetToolbarItem( item );
m_toolbarTree->AppendItem( root, wxString::Format( "Spacer: %s", item.m_Size ), -1, -1, spacerTreeItem );
spacerTreeItem->SetSize( item.m_Size );
m_toolbarTree->AppendItem( root, wxString::Format( "Spacer: %i", item.m_Size ), -1, -1,
spacerTreeItem );
break;
}
@ -197,9 +304,7 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
}
TOOLBAR_TREE_ITEM_DATA* toolTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::TOOL );
toolTreeItem->SetName( item.m_ActionName );
toolTreeItem->SetAction( toolMap->second );
toolTreeItem->SetToolbarItem( item );
int imgIdx = -1;
auto imgMap = m_actionImageListMap.find( item.m_ActionName );
@ -216,9 +321,10 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
{
// Add a group of items to the toolbar
TOOLBAR_TREE_ITEM_DATA* groupTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::GROUP );
groupTreeItem->SetToolbarItem( item );
groupTreeItem->SetName( item.m_GroupName );
wxTreeItemId groupId = m_toolbarTree->AppendItem( root, item.m_GroupName, -1, -1, groupTreeItem );
wxTreeItemId groupId = m_toolbarTree->AppendItem( root, item.m_GroupName, -1, -1,
groupTreeItem );
// Add the elements below the group
for( auto& groupItem : item.m_GroupItems )
@ -232,7 +338,6 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
}
TOOLBAR_TREE_ITEM_DATA* toolTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::TOOL );
toolTreeItem->SetName( groupItem );
toolTreeItem->SetAction( toolMap->second );
int imgIdx = -1;
@ -250,6 +355,15 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateToolbarTree( const TOOLBAR_CONFIGURATI
}
m_toolbarTree->ExpandAll();
wxTreeItemIdValue temp;
wxTreeItemId firstItem = m_toolbarTree->GetFirstChild( root, temp );
if( firstItem.IsOk() )
{
m_toolbarTree->SelectItem( firstItem );
m_toolbarTree->EnsureVisible( firstItem );
}
}
@ -335,19 +449,121 @@ void PANEL_TOOLBAR_CUSTOMIZATION::populateActions( const std::map<std::string, T
void PANEL_TOOLBAR_CUSTOMIZATION::onGroupPress( wxCommandEvent& aEvent )
{
TOOLBAR_TREE_ITEM_DATA* treeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::GROUP,
_( "Group" ) );
wxTreeItemId newItem;
wxTreeItemId selItem = m_toolbarTree->GetSelection();
if( selItem.IsOk() )
{
// Can't add a group onto a group
wxTreeItemId parent = m_toolbarTree->GetItemParent( selItem );
if( parent.IsOk() )
{
wxTreeItemId secondParent = m_toolbarTree->GetItemParent( parent );
if( secondParent.IsOk() )
{
delete treeItem;
return;
}
}
newItem = m_toolbarTree->InsertItem( m_toolbarTree->GetRootItem(), selItem, treeItem->GetName(),
-1, -1, treeItem );
}
else
{
newItem = m_toolbarTree->AppendItem( m_toolbarTree->GetRootItem(), treeItem->GetName(), -1, -1,
treeItem );
}
if( newItem.IsOk() )
{
m_toolbarTree->SelectItem( newItem );
m_toolbarTree->EnsureVisible( newItem );
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::onSpacerPress( wxCommandEvent& aEvent )
{
TOOLBAR_TREE_ITEM_DATA* treeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::SPACER, 5 );
wxString label = wxString::Format( "Spacer: %i", treeItem->GetSize() );
wxTreeItemId newItem;
wxTreeItemId selItem = m_toolbarTree->GetSelection();
if( selItem.IsOk() )
{
// Insert after the current selection at the same level
wxTreeItemId parent = m_toolbarTree->GetItemParent( selItem );
// Can't insert a spacer in a group yet
if( parent.IsOk() )
{
wxTreeItemId secondParent = m_toolbarTree->GetItemParent( parent );
if( secondParent.IsOk() )
{
delete treeItem;
return;
}
}
newItem = m_toolbarTree->InsertItem( parent, selItem, label, -1, -1, treeItem );
}
else
newItem = m_toolbarTree->AppendItem( m_toolbarTree->GetRootItem(), label, -1, -1, treeItem );
if( newItem.IsOk() )
{
m_toolbarTree->SelectItem( newItem );
m_toolbarTree->EnsureVisible( newItem );
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::onSeparatorPress( wxCommandEvent& aEvent )
{
TOOLBAR_TREE_ITEM_DATA* treeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::SEPARATOR );
wxTreeItemId newItem;
wxTreeItemId selItem = m_toolbarTree->GetSelection();
if( selItem.IsOk() )
{
// Insert after the current selection at the same level
wxTreeItemId parent = m_toolbarTree->GetItemParent( selItem );
// Can't insert a separator in a group yet
if( parent.IsOk() )
{
wxTreeItemId secondParent = m_toolbarTree->GetItemParent( parent );
if( secondParent.IsOk() )
{
delete treeItem;
return;
}
}
newItem = m_toolbarTree->InsertItem( parent, selItem, "Separator", -1, -1, treeItem );
}
else
{
newItem = m_toolbarTree->AppendItem( m_toolbarTree->GetRootItem(), "Separator", -1, -1,
treeItem );
}
if( newItem.IsOk() )
{
m_toolbarTree->SelectItem( newItem );
m_toolbarTree->EnsureVisible( newItem );
}
}
@ -363,26 +579,143 @@ void PANEL_TOOLBAR_CUSTOMIZATION::enableCustomControls( bool enable )
m_toolbarTree->Enable( enable );
m_btnAddTool->Enable( enable );
m_btnToolDelete->Enable( enable );
m_btnToolMoveDown->Enable( enable );
m_btnToolMoveUp->Enable( enable );
// TODO (ISM): Enable moving up/down
//m_btnToolMoveDown->Enable( enable );
//m_btnToolMoveUp->Enable( enable );
m_actionsList->Enable( enable );
m_insertButton->Enable( enable );
}
void PANEL_TOOLBAR_CUSTOMIZATION::OnToolDelete( wxCommandEvent& event )
void PANEL_TOOLBAR_CUSTOMIZATION::onToolDelete( wxCommandEvent& event )
{
wxTreeItemId item = m_toolbarTree->GetSelection();
if( !item.IsOk() )
return;
// The tree control defaults to nothing selected if you delete the item
// at the last place, so we have to manually get the itme immediately before
// the one we will delete, and then select it if nothing is selected.
wxTreeItemId prev = m_toolbarTree->GetPrevSibling( item );
m_toolbarTree->Delete( item );
item = m_toolbarTree->GetSelection();
if( !item.IsOk() && prev.IsOk() )
{
m_toolbarTree->SelectItem( prev );
m_toolbarTree->EnsureVisible( prev );
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::onToolMoveUp( wxCommandEvent& event )
{
}
void PANEL_TOOLBAR_CUSTOMIZATION::onToolMoveDown( wxCommandEvent& event )
{
}
void PANEL_TOOLBAR_CUSTOMIZATION::onBtnAddAction( wxCommandEvent& event )
{
// Get the selected item
long actionIdx = m_actionsList->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
// Nothing is selected, bail out
if( actionIdx < 0 )
return;
// This is needed because GetItemData returns a wxUIntPtr, which is actually size_t...
void* v = ( void* ) m_actionsList->GetItemData( actionIdx );
TOOL_ACTION* action = static_cast<TOOL_ACTION*>( v );
// Build the item to add
TOOLBAR_TREE_ITEM_DATA* toolTreeItem = new TOOLBAR_TREE_ITEM_DATA( TOOLBAR_ITEM_TYPE::TOOL );
toolTreeItem->SetAction( action );
int imgIdx = -1;
auto imgMap = m_actionImageListMap.find( action->GetName() );
if( imgMap != m_actionImageListMap.end() )
imgIdx = imgMap->second;
// Actually add the item
wxString label = action->GetFriendlyName();
wxTreeItemId selItem = m_toolbarTree->GetSelection();
wxTreeItemId newItem;
if( selItem.IsOk() )
{
TOOLBAR_TREE_ITEM_DATA* data =
dynamic_cast<TOOLBAR_TREE_ITEM_DATA*>( m_toolbarTree->GetItemData( selItem ) );
if( data && data->GetType() == TOOLBAR_ITEM_TYPE::GROUP )
{
// Insert into the end of the group
newItem = m_toolbarTree->AppendItem( selItem, label, imgIdx, -1, toolTreeItem );
}
else
{
// Insert after the current selection at the same level
wxTreeItemId parent = m_toolbarTree->GetItemParent( selItem );
newItem = m_toolbarTree->InsertItem( parent, selItem, label, imgIdx, -1, toolTreeItem );
}
}
else
{
// Insert at the root level if there is no selection
newItem = m_toolbarTree->AppendItem( m_toolbarTree->GetRootItem(), label, imgIdx, -1,
toolTreeItem );
}
if( newItem.IsOk() )
{
m_toolbarTree->SelectItem( newItem );
m_toolbarTree->EnsureVisible( newItem );
// Move the action to the next available one, to be nice
if( ++actionIdx < m_actionsList->GetItemCount() )
m_actionsList->SetItemState( actionIdx, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::OnToolMoveUp( wxCommandEvent& event )
void PANEL_TOOLBAR_CUSTOMIZATION::onTreeBeginLabelEdit( wxTreeEvent& event )
{
wxTreeItemId id = event.GetItem();
if( id.IsOk() )
{
wxTreeItemData* treeData = m_toolbarTree->GetItemData( id );
TOOLBAR_TREE_ITEM_DATA* tbData = dynamic_cast<TOOLBAR_TREE_ITEM_DATA*>( treeData );
switch( tbData->GetType() )
{
case TOOLBAR_ITEM_TYPE::TOOL:
case TOOLBAR_ITEM_TYPE::CONTROL:
case TOOLBAR_ITEM_TYPE::SEPARATOR:
// Don't let these be edited
event.Veto();
break;
case TOOLBAR_ITEM_TYPE::GROUP:
case TOOLBAR_ITEM_TYPE::SPACER:
// Do nothing here
break;
}
}
}
void PANEL_TOOLBAR_CUSTOMIZATION::OnToolMoveDown( wxCommandEvent& event )
void PANEL_TOOLBAR_CUSTOMIZATION::onTreeEndLabelEdit( wxTreeEvent& event )
{
}

12
common/dialogs/panel_toolbar_customization.fbp
View File

@ -344,13 +344,15 @@
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT|wxTR_NO_LINES</property>
<property name="style">wxTR_DEFAULT_STYLE|wxTR_EDIT_LABELS|wxTR_HIDE_ROOT|wxTR_NO_LINES</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>
<event name="OnTreeBeginLabelEdit">onTreeBeginLabelEdit</event>
<event name="OnTreeEndLabelEdit">onTreeEndLabelEdit</event>
</object>
</object>
</object>
@ -438,7 +440,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnToolDelete</event>
<event name="OnButtonClick">onToolDelete</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -513,7 +515,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnToolMoveUp</event>
<event name="OnButtonClick">onToolMoveUp</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -588,7 +590,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnToolMoveDown</event>
<event name="OnButtonClick">onToolMoveDown</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -759,7 +761,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnAddTextVar</event>
<event name="OnButtonClick">onBtnAddAction</event>
</object>
</object>
<object class="sizeritem" expanded="false">

22
common/dialogs/panel_toolbar_customization_base.cpp
View File

@ -41,7 +41,7 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* pa
wxBoxSizer* bSizer11;
bSizer11 = new wxBoxSizer( wxVERTICAL );
m_toolbarTree = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT|wxTR_NO_LINES );
m_toolbarTree = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_EDIT_LABELS|wxTR_HIDE_ROOT|wxTR_NO_LINES );
bSizer11->Add( m_toolbarTree, 0, wxALL|wxEXPAND, 5 );
@ -109,10 +109,12 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* pa
// Connect Events
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnUpdateUI ) );
m_customToolbars->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onCustomizeTbCb ), NULL, this );
m_btnToolDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolDelete ), NULL, this );
m_btnToolMoveUp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolMoveUp ), NULL, this );
m_btnToolMoveDown->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolMoveDown ), NULL, this );
m_btnAddTool->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnAddTextVar ), NULL, this );
m_toolbarTree->Connect( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onTreeBeginLabelEdit ), NULL, this );
m_toolbarTree->Connect( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onTreeEndLabelEdit ), NULL, this );
m_btnToolDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolDelete ), NULL, this );
m_btnToolMoveUp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolMoveUp ), NULL, this );
m_btnToolMoveDown->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolMoveDown ), NULL, this );
m_btnAddTool->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onBtnAddAction ), NULL, this );
}
PANEL_TOOLBAR_CUSTOMIZATION_BASE::~PANEL_TOOLBAR_CUSTOMIZATION_BASE()
@ -120,9 +122,11 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::~PANEL_TOOLBAR_CUSTOMIZATION_BASE()
// Disconnect Events
this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnUpdateUI ) );
m_customToolbars->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onCustomizeTbCb ), NULL, this );
m_btnToolDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolDelete ), NULL, this );
m_btnToolMoveUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolMoveUp ), NULL, this );
m_btnToolMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnToolMoveDown ), NULL, this );
m_btnAddTool->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnAddTextVar ), NULL, this );
m_toolbarTree->Disconnect( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onTreeBeginLabelEdit ), NULL, this );
m_toolbarTree->Disconnect( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onTreeEndLabelEdit ), NULL, this );
m_btnToolDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolDelete ), NULL, this );
m_btnToolMoveUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolMoveUp ), NULL, this );
m_btnToolMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onToolMoveDown ), NULL, this );
m_btnAddTool->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::onBtnAddAction ), NULL, this );
}

10
common/dialogs/panel_toolbar_customization_base.h
View File

@ -56,10 +56,12 @@ class PANEL_TOOLBAR_CUSTOMIZATION_BASE : public RESETTABLE_PANEL
// Virtual event handlers, override them in your derived class
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
virtual void onCustomizeTbCb( wxCommandEvent& event ) { event.Skip(); }
virtual void OnToolDelete( wxCommandEvent& event ) { event.Skip(); }
virtual void OnToolMoveUp( wxCommandEvent& event ) { event.Skip(); }
virtual void OnToolMoveDown( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAddTextVar( wxCommandEvent& event ) { event.Skip(); }
virtual void onTreeBeginLabelEdit( wxTreeEvent& event ) { event.Skip(); }
virtual void onTreeEndLabelEdit( wxTreeEvent& event ) { event.Skip(); }
virtual void onToolDelete( wxCommandEvent& event ) { event.Skip(); }
virtual void onToolMoveUp( wxCommandEvent& event ) { event.Skip(); }
virtual void onToolMoveDown( wxCommandEvent& event ) { event.Skip(); }
virtual void onBtnAddAction( wxCommandEvent& event ) { event.Skip(); }
public:

11
include/dialogs/panel_toolbar_customization.h
View File

@ -51,6 +51,8 @@ public:
bool TransferDataToWindow() override;
protected:
void parseToolbarTree( TOOLBAR_CONFIGURATION& aToolbar );
void populateToolbarTree( const TOOLBAR_CONFIGURATION& aToolbar );
void populateActions( const std::map<std::string, TOOL_ACTION*>& aTools,
@ -64,9 +66,12 @@ protected:
// From the base class
void onCustomizeTbCb( wxCommandEvent& event ) override;
void OnToolDelete( wxCommandEvent& event ) override;
void OnToolMoveUp( wxCommandEvent& event ) override;
void OnToolMoveDown( wxCommandEvent& event ) override;
void onToolDelete( wxCommandEvent& event ) override;
void onToolMoveUp( wxCommandEvent& event ) override;
void onToolMoveDown( wxCommandEvent& event ) override;
void onBtnAddAction( wxCommandEvent& event ) override;
void onTreeBeginLabelEdit( wxTreeEvent& event ) override;
void onTreeEndLabelEdit( wxTreeEvent& event ) override;
protected:
wxImageList* m_actionImageList;

Write Preview
Loading…
Cancel
Save