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

Formatting.

This commit is contained in:
Jeff Young 2023-04-16 22:49:54 +01:00
parent d18102fff6
commit c6d593a47b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/widgets/widget_hotkey_list.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2016 Chris Pavlina <pavlina.chris@gmail.com> * Copyright (C) 2016 Chris Pavlina <pavlina.chris@gmail.com>
* Copyright (C) 2016-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2016-2023 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -347,9 +347,9 @@ void WIDGET_HOTKEY_LIST::editItem( wxTreeListItem aItem )
if( it != m_reservedHotkeys.end() ) if( it != m_reservedHotkeys.end() )
{ {
wxString msg = wxString::Format( wxString msg = wxString::Format( _( "'%s' is a reserved hotkey in KiCad and cannot "
_( "'%s' is a reserved hotkey in KiCad and cannot be assigned." ), "be assigned." ),
it->second ); it->second );
DisplayErrorMessage( this, msg ); DisplayErrorMessage( this, msg );
return; return;
@ -414,12 +414,14 @@ void WIDGET_HOTKEY_LIST::onMenu( wxCommandEvent& aEvent )
{ {
switch( aEvent.GetId() ) switch( aEvent.GetId() )
{ {
case ID_EDIT_HOTKEY:editItem( m_context_menu_item ); case ID_EDIT_HOTKEY:
editItem( m_context_menu_item );
break; break;
case ID_RESET: case ID_RESET:
case ID_CLEAR: case ID_CLEAR:
case ID_DEFAULT:resetItem( m_context_menu_item, aEvent.GetId()); case ID_DEFAULT:
resetItem( m_context_menu_item, aEvent.GetId());
break; break;
default: default:
@ -494,10 +496,10 @@ WIDGET_HOTKEY_LIST::WIDGET_HOTKEY_LIST( wxWindow* aParent, HOTKEY_STORE& aHotkey
#endif #endif
std::vector<wxString> reserved_keys = std::vector<wxString> reserved_keys =
{ {
wxS( "Ctrl+Tab" ), wxS( "Ctrl+Tab" ),
wxS( "Ctrl+Shift+Tab" ) wxS( "Ctrl+Shift+Tab" )
}; };
for( const wxString& key : reserved_keys ) for( const wxString& key : reserved_keys )
{ {