haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only show gestures in List HotKeys (and not in Preferences / HotKeys).

This commit is contained in:
Jeff Young 2019-06-14 15:20:25 +01:00
parent b429dbfb88
commit 3d9690302c
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/dialogs/panel_hotkeys_editor.cpp
View File

@ -140,7 +140,7 @@ void PANEL_HOTKEYS_EDITOR::installButtons( wxSizer* aSizer )
bool PANEL_HOTKEYS_EDITOR::TransferDataToWindow() bool PANEL_HOTKEYS_EDITOR::TransferDataToWindow()
{ {
m_hotkeyStore.Init( m_toolManagers ); m_hotkeyStore.Init( m_toolManagers, m_readOnly );
return m_hotkeyListCtrl->TransferDataToControl(); return m_hotkeyListCtrl->TransferDataToControl();
} }
@ -150,6 +150,9 @@ bool PANEL_HOTKEYS_EDITOR::TransferDataFromWindow()
if( !m_hotkeyListCtrl->TransferDataFromControl() ) if( !m_hotkeyListCtrl->TransferDataFromControl() )
return false; return false;
if( m_readOnly )
return true;
// save the hotkeys // save the hotkeys
for( TOOL_MANAGER* toolMgr : m_toolManagers ) for( TOOL_MANAGER* toolMgr : m_toolManagers )
WriteHotKeyConfig( toolMgr->GetActions() ); WriteHotKeyConfig( toolMgr->GetActions() );

15
common/hotkey_store.cpp
View File

@ -84,7 +84,7 @@ HOTKEY_STORE::HOTKEY_STORE()
} }
void HOTKEY_STORE::Init( std::vector<TOOL_MANAGER*> aToolManagerList ) void HOTKEY_STORE::Init( std::vector<TOOL_MANAGER*> aToolManagerList, bool aIncludeGestures )
{ {
m_toolManagers = std::move( aToolManagerList ); m_toolManagers = std::move( aToolManagerList );
@ -125,12 +125,15 @@ void HOTKEY_STORE::Init( std::vector<TOOL_MANAGER*> aToolManagerList )
currentSection->m_HotKeys.emplace_back( HOTKEY( entry.second ) ); currentSection->m_HotKeys.emplace_back( HOTKEY( entry.second ) );
} }
m_hk_sections.emplace_back( HOTKEY_SECTION() ); if( aIncludeGestures )
currentSection = &m_hk_sections.back(); {
currentSection->m_SectionName = _( "Gestures" ); m_hk_sections.emplace_back( HOTKEY_SECTION() );
currentSection = &m_hk_sections.back();
currentSection->m_SectionName = _( "Gestures" );
for( TOOL_ACTION* gesture : g_gesturePseudoActions ) for( TOOL_ACTION* gesture : g_gesturePseudoActions )
currentSection->m_HotKeys.emplace_back( HOTKEY( gesture ) ); currentSection->m_HotKeys.emplace_back( HOTKEY( gesture ) );
}
} }

2
include/hotkey_store.h
View File

@ -69,7 +69,7 @@ public:
*/ */
HOTKEY_STORE(); HOTKEY_STORE();
void Init( std::vector<TOOL_MANAGER*> aToolManagerList ); void Init( std::vector<TOOL_MANAGER*> aToolManagerList, bool aIncludeGestures );
static wxString GetAppName( TOOL_ACTION* aAction ); static wxString GetAppName( TOOL_ACTION* aAction );
static wxString GetSectionName( TOOL_ACTION* aAction ); static wxString GetSectionName( TOOL_ACTION* aAction );