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

Pcbnew: use Legacy instead of Default when referring to wxDC canvas.

This commit is contained in:
Simon Wells 2015-12-22 16:25:59 -05:00 committed by Wayne Stambaugh
parent 6721545011
commit 415c72262a
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/basepcbframe.cpp
View File

@ -936,7 +936,7 @@ void PCB_BASE_FRAME::SwitchCanvas( wxCommandEvent& aEvent )
switch( aEvent.GetId() ) switch( aEvent.GetId() )
{ {
case ID_MENU_CANVAS_DEFAULT: case ID_MENU_CANVAS_LEGACY:
break; break;
case ID_MENU_CANVAS_CAIRO: case ID_MENU_CANVAS_CAIRO:

4
pcbnew/hotkeys.cpp
View File

@ -131,8 +131,8 @@ static EDA_HOTKEY HkSwitchHighContrastMode( _HKI( "Toggle High Contrast Mode" ),
static EDA_HOTKEY HkSetGridOrigin( _HKI( "Set Grid Origin" ), HK_SET_GRID_ORIGIN, 'S' ); static EDA_HOTKEY HkSetGridOrigin( _HKI( "Set Grid Origin" ), HK_SET_GRID_ORIGIN, 'S' );
static EDA_HOTKEY HkResetGridOrigin( _HKI( "Reset Grid Origin" ), HK_RESET_GRID_ORIGIN, 'Z' ); static EDA_HOTKEY HkResetGridOrigin( _HKI( "Reset Grid Origin" ), HK_RESET_GRID_ORIGIN, 'Z' );
static EDA_HOTKEY HkCanvasDefault( _HKI( "Switch to Default Canvas" ), static EDA_HOTKEY HkCanvasDefault( _HKI( "Switch to Legacy Canvas" ),
HK_CANVAS_DEFAULT, HK_CANVAS_LEGACY,
#ifdef __WXMAC__ #ifdef __WXMAC__
GR_KB_ALT + GR_KB_ALT +
#endif #endif

2
pcbnew/hotkeys.h
View File

@ -116,7 +116,7 @@ enum hotkey_id_commnand {
HK_CALL_MACROS_9, HK_CALL_MACROS_9,
HK_MACRO_ID_END, HK_MACRO_ID_END,
HK_SWITCH_HIGHCONTRAST_MODE, HK_SWITCH_HIGHCONTRAST_MODE,
HK_CANVAS_DEFAULT, HK_CANVAS_LEGACY,
HK_CANVAS_OPENGL, HK_CANVAS_OPENGL,
HK_CANVAS_CAIRO, HK_CANVAS_CAIRO,
HK_LEFT_CLICK, HK_LEFT_CLICK,

4
pcbnew/hotkeys_board_editor.cpp
View File

@ -586,8 +586,8 @@ bool PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit
evt_type = ID_MENU_CANVAS_OPENGL; evt_type = ID_MENU_CANVAS_OPENGL;
break; break;
case HK_CANVAS_DEFAULT: case HK_CANVAS_LEGACY:
evt_type = ID_MENU_CANVAS_DEFAULT; evt_type = ID_MENU_CANVAS_LEGACY;
break; break;
case HK_ZONE_FILL_OR_REFILL: case HK_ZONE_FILL_OR_REFILL:
evt_type = ID_POPUP_PCB_FILL_ALL_ZONES; evt_type = ID_POPUP_PCB_FILL_ALL_ZONES;

8
pcbnew/menubar_modedit.cpp
View File

@ -240,11 +240,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
// Add canvas selection // Add canvas selection
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
text = AddHotkeyName( _( "&Switch Canvas to Default" ), m_hotkeysDescrList, text = AddHotkeyName( _( "&Switch Canvas to Legacy" ), m_hotkeysDescrList,
HK_CANVAS_DEFAULT ); HK_CANVAS_LEGACY );
AddMenuItem( viewMenu, ID_MENU_CANVAS_DEFAULT, AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY,
text, _( "Switch the canvas implementation to default" ), text, _( "Switch the canvas implementation to legacy" ),
KiBitmap( tools_xpm ) ); KiBitmap( tools_xpm ) );
text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), m_hotkeysDescrList, text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), m_hotkeysDescrList,

8
pcbnew/menubar_pcbframe.cpp
View File

@ -357,11 +357,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
text = AddHotkeyName( _( "&Switch Canvas to Default" ), g_Pcbnew_Editor_Hokeys_Descr, text = AddHotkeyName( _( "&Switch Canvas to Legacy" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_CANVAS_DEFAULT ); HK_CANVAS_LEGACY );
AddMenuItem( viewMenu, ID_MENU_CANVAS_DEFAULT, AddMenuItem( viewMenu, ID_MENU_CANVAS_LEGACY,
text, _( "Switch the canvas implementation to default" ), text, _( "Switch the canvas implementation to Legacy" ),
KiBitmap( tools_xpm ) ); KiBitmap( tools_xpm ) );
text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), g_Pcbnew_Editor_Hokeys_Descr, text = AddHotkeyName( _( "Switch Canvas to Open&GL" ), g_Pcbnew_Editor_Hokeys_Descr,

2
pcbnew/moduleframe.cpp
View File

@ -167,7 +167,7 @@ BEGIN_EVENT_TABLE( FOOTPRINT_EDIT_FRAME, PCB_BASE_FRAME )
EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, FOOTPRINT_EDIT_FRAME::Show3D_Frame ) EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, FOOTPRINT_EDIT_FRAME::Show3D_Frame )
// Switching canvases // Switching canvases
EVT_MENU( ID_MENU_CANVAS_DEFAULT, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_LEGACY, PCB_BASE_FRAME::SwitchCanvas )
EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas )
EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas )

2
pcbnew/pcbframe.cpp
View File

@ -177,7 +177,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, PCB_EDIT_FRAME::Show3D_Frame ) EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, PCB_EDIT_FRAME::Show3D_Frame )
// Switching canvases // Switching canvases
EVT_MENU( ID_MENU_CANVAS_DEFAULT, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_LEGACY, PCB_BASE_FRAME::SwitchCanvas )
EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_CAIRO, PCB_BASE_FRAME::SwitchCanvas )
EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas ) EVT_MENU( ID_MENU_CANVAS_OPENGL, PCB_BASE_FRAME::SwitchCanvas )

2
pcbnew/pcbnew_id.h
View File

@ -290,7 +290,7 @@ enum pcbnew_ids
ID_PCB_GEN_CMP_FILE, ID_PCB_GEN_CMP_FILE,
ID_MENU_PCB_SHOW_3D_FRAME, ID_MENU_PCB_SHOW_3D_FRAME,
ID_MENU_CANVAS_DEFAULT, ID_MENU_CANVAS_LEGACY,
ID_MENU_CANVAS_OPENGL, ID_MENU_CANVAS_OPENGL,
ID_MENU_CANVAS_CAIRO, ID_MENU_CANVAS_CAIRO,
ID_PCB_USER_GRID_SETUP, ID_PCB_USER_GRID_SETUP,