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

Use "Cmd" instead of "Ctrl" on OSX.

This commit is contained in:
Jeff Young 2021-01-03 14:42:57 +00:00
parent 491fc2c8f2
commit 980a8cfb39
1 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
common/dialogs/panel_mouse_settings.cpp
View File

@ -45,6 +45,8 @@ PANEL_MOUSE_SETTINGS::PANEL_MOUSE_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aPar
if( child->GetWindow() == m_autoPanSpeed ) if( child->GetWindow() == m_autoPanSpeed )
child->SetBorder( 14 ); child->SetBorder( 14 );
} }
m_lblCtrl->SetLabel( _( "Cmd" ) );
#endif #endif
m_checkAutoZoomSpeed->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED, m_checkAutoZoomSpeed->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED,
@ -84,32 +86,18 @@ bool PANEL_MOUSE_SETTINGS::TransferDataFromWindow()
switch( m_choiceMiddleButtonDrag->GetSelection() ) switch( m_choiceMiddleButtonDrag->GetSelection() )
{ {
case 0: case 0: drag_middle = static_cast<int>( MOUSE_DRAG_ACTION::PAN ); break;
drag_middle = static_cast<int>( MOUSE_DRAG_ACTION::PAN ); case 1: drag_middle = static_cast<int>( MOUSE_DRAG_ACTION::ZOOM ); break;
break; case 2: break;
default: break;
case 1:
drag_middle = static_cast<int>( MOUSE_DRAG_ACTION::ZOOM );
break;
default:
case 2:
break;
} }
switch( m_choiceRightButtonDrag->GetSelection() ) switch( m_choiceRightButtonDrag->GetSelection() )
{ {
case 0: case 0: drag_right = static_cast<int>( MOUSE_DRAG_ACTION::PAN ); break;
drag_right = static_cast<int>( MOUSE_DRAG_ACTION::PAN ); case 1: drag_right = static_cast<int>( MOUSE_DRAG_ACTION::ZOOM ); break;
break; case 2: break;
default: break;
case 1:
drag_right = static_cast<int>( MOUSE_DRAG_ACTION::ZOOM );
break;
default:
case 2:
break;
} }
cfg->m_Input.center_on_zoom = m_checkZoomCenter->GetValue(); cfg->m_Input.center_on_zoom = m_checkZoomCenter->GetValue();
@ -158,29 +146,19 @@ void PANEL_MOUSE_SETTINGS::applySettingsToPanel( const COMMON_SETTINGS& aSetting
{ {
switch( aVal ) switch( aVal )
{ {
case MOUSE_DRAG_ACTION::PAN: case MOUSE_DRAG_ACTION::PAN: aChoice->SetSelection( 0 ); break;
aChoice->SetSelection( 0 ); case MOUSE_DRAG_ACTION::ZOOM: aChoice->SetSelection( 1 ); break;
break; case MOUSE_DRAG_ACTION::NONE: aChoice->SetSelection( 2 ); break;
case MOUSE_DRAG_ACTION::SELECT: break;
case MOUSE_DRAG_ACTION::ZOOM: default: break;
aChoice->SetSelection( 1 );
break;
case MOUSE_DRAG_ACTION::NONE:
aChoice->SetSelection( 2 );
break;
case MOUSE_DRAG_ACTION::SELECT:
default:
break;
} }
}; };
set_mouse_buttons( set_mouse_buttons( static_cast<MOUSE_DRAG_ACTION>( aSettings.m_Input.drag_middle ),
static_cast<MOUSE_DRAG_ACTION>( aSettings.m_Input.drag_middle ), m_choiceMiddleButtonDrag ); m_choiceMiddleButtonDrag );
set_mouse_buttons( set_mouse_buttons( static_cast<MOUSE_DRAG_ACTION>( aSettings.m_Input.drag_right ),
static_cast<MOUSE_DRAG_ACTION>( aSettings.m_Input.drag_right ), m_choiceRightButtonDrag ); m_choiceRightButtonDrag );
m_currentScrollMod.zoom = aSettings.m_Input.scroll_modifier_zoom; m_currentScrollMod.zoom = aSettings.m_Input.scroll_modifier_zoom;
m_currentScrollMod.panh = aSettings.m_Input.scroll_modifier_pan_h; m_currentScrollMod.panh = aSettings.m_Input.scroll_modifier_pan_h;
@ -249,30 +227,19 @@ void PANEL_MOUSE_SETTINGS::updateScrollModButtons()
{ {
switch( aModifier ) switch( aModifier )
{ {
case 0: case 0: aNoneBtn->SetValue( true ); break;
aNoneBtn->SetValue( true ); case WXK_CONTROL: aCtrlBtn->SetValue( true ); break;
break; case WXK_SHIFT: aShiftBtn->SetValue( true ); break;
case WXK_ALT: aAltBtn->SetValue( true ); break;
case WXK_CONTROL:
aCtrlBtn->SetValue( true );
break;
case WXK_SHIFT:
aShiftBtn->SetValue( true );
break;
case WXK_ALT:
aAltBtn->SetValue( true );
break;
} }
}; };
set_wheel_buttons( set_wheel_buttons( m_currentScrollMod.zoom, m_rbZoomNone, m_rbZoomCtrl, m_rbZoomShift,
m_currentScrollMod.zoom, m_rbZoomNone, m_rbZoomCtrl, m_rbZoomShift, m_rbZoomAlt ); m_rbZoomAlt );
set_wheel_buttons( set_wheel_buttons( m_currentScrollMod.panh, m_rbPanHNone, m_rbPanHCtrl, m_rbPanHShift,
m_currentScrollMod.panh, m_rbPanHNone, m_rbPanHCtrl, m_rbPanHShift, m_rbPanHAlt ); m_rbPanHAlt );
set_wheel_buttons( set_wheel_buttons( m_currentScrollMod.panv, m_rbPanVNone, m_rbPanVCtrl, m_rbPanVShift,
m_currentScrollMod.panv, m_rbPanVNone, m_rbPanVCtrl, m_rbPanVShift, m_rbPanVAlt ); m_rbPanVAlt );
} }