From e3fbd46a7935a0aa5dc8e9c80dd352d830753006 Mon Sep 17 00:00:00 2001 From: lajos kamocsay Date: Sun, 15 Apr 2012 12:33:35 +0200 Subject: [PATCH] Commit patch fixing an issue in pan with middle mouse button (from lajos kamocsay) Other minor fixes. --- common/drawframe.cpp | 12 +- .../dialogs/dialog_eeschema_options_base.cpp | 6 +- .../dialogs/dialog_eeschema_options_base.fbp | 6 +- eeschema/pinedit.cpp | 2 +- include/common.h | 6 +- include/convert_to_biu.h | 8 + .../dialogs/dialog_display_options_base.fbp | 2134 ++++++++--------- ...ialog_general_options_BoardEditor_base.cpp | 4 +- ...ialog_general_options_BoardEditor_base.fbp | 4 +- 9 files changed, 1095 insertions(+), 1087 deletions(-) diff --git a/common/drawframe.cpp b/common/drawframe.cpp index 0f9efa3095..14ca16430d 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -575,7 +575,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition ) else virtualSize.x = logicalClientRect.width; } - else if( logicalClientRect.width < drawingRect.width ) + else { if( drawingCenterX > clientCenterX ) virtualSize.x = drawingRect.width + @@ -586,10 +586,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition ) else virtualSize.x = drawingRect.width; } - else - { - virtualSize.x = drawingRect.width; - } } if( drawingRect.GetTop() < logicalClientRect.GetTop() && drawingRect.GetBottom() > logicalClientRect.GetBottom() ) @@ -610,7 +606,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition ) else virtualSize.y = logicalClientRect.height; } - else if( logicalClientRect.height < drawingRect.height ) + else { if( drawingCenterY > clientCenterY ) virtualSize.y = drawingRect.height + @@ -621,10 +617,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPosition ) else virtualSize.y = drawingRect.height; } - else - { - virtualSize.y = drawingRect.height; - } } } diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index 025fd1a605..40ab44fa00 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -145,9 +145,13 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx bSizer2->Add( m_checkShowHiddenPins, 0, wxALL|wxEXPAND, 3 ); m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkEnableMiddleButtonPan->SetToolTip( _("Use middle mouse button dragging to pan") ); + bSizer2->Add( m_checkEnableMiddleButtonPan, 0, wxALL, 3 ); - m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited by current toolbar panning"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("Middle mouse button panning limited"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") ); + bSizer2->Add( m_checkMiddleButtonPanLimited, 0, wxALL, 3 ); m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Enable automatic &panning"), wxDefaultPosition, wxDefaultSize, 0 ); diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index ca9fb73e2f..0c037e12aa 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -2533,7 +2533,7 @@ 0 - + Use middle mouse button dragging to pan wxFILTER_NONE wxDefaultValidator @@ -2600,7 +2600,7 @@ 0 0 wxID_ANY - Middle mouse button panning limited by current toolbar panning + Middle mouse button panning limited 0 @@ -2621,7 +2621,7 @@ 0 - + Middle mouse button panning limited by current scrollbar size wxFILTER_NONE wxDefaultValidator diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index e7da98dd30..b7b3a845b9 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -91,7 +91,7 @@ void LIB_EDIT_FRAME::OnEditPin( wxCommandEvent& event ) dlg.SetPadNameTextSize( ReturnStringFromValue( g_UserUnit, pin->GetNumberTextSize() ) ); dlg.SetPadNameTextSizeUnits( units ); - dlg.SetLength( ReturnStringFromValue( g_UserUnit, pin->GetLength(), m_internalUnits ) ); + dlg.SetLength( ReturnStringFromValue( g_UserUnit, pin->GetLength() ) ); dlg.SetLengthUnits( units ); dlg.SetAddToAllParts( pin->GetUnit() == 0 ); dlg.SetAddToAllBodyStyles( pin->GetConvert() == 0 ); diff --git a/include/common.h b/include/common.h index 5952c13635..0d5b4032e4 100644 --- a/include/common.h +++ b/include/common.h @@ -220,9 +220,13 @@ public: /** * Function GetWxOrientation. - * @return int - ws' style printing orientation. + * @return ws' style printing orientation (wxPORTRAIT or wxLANDSCAPE). */ +#if wxCHECK_VERSION( 2, 9, 0 ) + wxPrintOrientation GetWxOrientation() const { return IsPortrait() ? wxPORTRAIT : wxLANDSCAPE; } +#else int GetWxOrientation() const { return IsPortrait() ? wxPORTRAIT : wxLANDSCAPE; } +#endif /** * Function GetPaperId diff --git a/include/convert_to_biu.h b/include/convert_to_biu.h index 2867c9abbe..c6c537c6e7 100644 --- a/include/convert_to_biu.h +++ b/include/convert_to_biu.h @@ -14,6 +14,7 @@ * depending on compil option */ +#if defined(PCBNEW) || defined(CVPCB) /// Convert mils to PCBNEW internal units (iu). inline int Mils2iu( int mils ) { @@ -36,4 +37,11 @@ inline int DMils2iu( int dmils ) #endif } +#elif defined(EESCHEMA) +inline int Mils2iu( int mils ) +{ + return mils; +} +#endif + #endif // #define CONVERT_TO_BIU_H diff --git a/pcbnew/dialogs/dialog_display_options_base.fbp b/pcbnew/dialogs/dialog_display_options_base.fbp index 50d1007ad5..b0b2cb40bb 100644 --- a/pcbnew/dialogs/dialog_display_options_base.fbp +++ b/pcbnew/dialogs/dialog_display_options_base.fbp @@ -1,1067 +1,1067 @@ - - - - - - C++ - 1 - source_name - 0 - UTF-8 - connect - dialog_display_options_base - 1000 - none - 1 - DialogDisplayOptions_base - - . - - 1 - 1 - 1 - 0 - - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_DISPLAY_OPTIONS_BASE - - 731,291 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Display options - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Tracks and vias: - - sLeftBoxSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - "Sketch" "Filled" - - 1 - 1 - - - 0 - wxID_DISPLAY_TRACK - Tracks: - 1 - - - m_OptDisplayTracks - protected - - 1 - - wxRA_SPECIFY_COLS - - Select how tracks are displayed - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Sketch" "Filled" - - 1 - 1 - - - 0 - ID_VIAS_SHAPES - Via Shapes: - 1 - - - m_OptDisplayVias - protected - - 1 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Never" "Defined holes" "Always" - - 1 - 1 - - - 0 - ID_VIAS_HOLES - Show Via Holes: - 1 - - - m_OptDisplayViaHole - protected - - 1 - - wxRA_SPECIFY_COLS - - Show (or not) via holes. If Defined Holes is selected, only the non default size holes are shown - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Routing help: - - sbMiddleLeftSizer - wxVERTICAL - none - - - 5 - wxALL - 0 - - - "Do not show" "On pads" "On tracks" "On pads and tracks" - - 1 - 1 - - - 0 - wxID_ANY - Show Net Names: - 1 - - - m_ShowNetNamesOption - protected - - 3 - - wxRA_SPECIFY_COLS - - Show or not net names on pads and/or tracks - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Never" "New track" "New track with via area" "New and edited tracks with via area" "Always" - - 1 - 1 - - - 0 - ID_SHOW_CLEARANCE - Show Tracks Clearance: - 1 - - - m_OptDisplayTracksClearance - protected - - 3 - - wxRA_SPECIFY_COLS - - Show( or not) tracks clearance area. If New track is selected, track clearance area is shown only when creating the track. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Footprints: - - sMiddleRightSizer - wxHORIZONTAL - none - - - 5 - - 0 - - - bLModuleSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - - "Line" "Filled" "Sketch" - - 1 - 1 - - - 0 - ID_EDGES_MODULES - Module Edges: - 1 - - - m_OptDisplayModEdges - protected - - 1 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Line" "Filled" "Sketch" - - 1 - 1 - - - 0 - ID_TEXT_MODULES - Texts: - 1 - - - m_OptDisplayModTexts - protected - - 1 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - wxID_ANY - Pad Options: - - bRModuleSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - "Sketch" "Filled" - - 1 - 1 - - - 0 - ID_PADS_SHAPES - Pad Shapes: - 1 - - - m_OptDisplayPads - protected - - 1 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 0 - - 1 - 1 - - - 0 - wxID_ANY - Show pad clearance - - - m_OptDisplayPadClearence - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 1 - - 1 - 1 - - - 0 - wxID_ANY - Show pad number - - - m_OptDisplayPadNumber - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - 1 - - 1 - 1 - - - 0 - wxID_ANY - Show pad NoConnect - - - m_OptDisplayPadNoConn - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - - bRightSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - wxID_ANY - Others: - - sRightUpperSizer - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - "Line" "Filled" "Sketch" - - 1 - 1 - - - 0 - wxID_ANY - Display other items: - 1 - - - m_OptDisplayDrawings - protected - - 1 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - "Yes" "No" - - 1 - 1 - - - 0 - wxID_ANY - Show page limits - 1 - - - m_Show_Page_Limits - protected - - 0 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - 10 - protected - 10 - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - - - 1 - 0 - 1 - - - 0 - wxID_OK - OK - - - m_buttonOK - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - - - 1 - 0 - 1 - - - 0 - wxID_CANCEL - Cancel - - - m_buttonCANCEL - protected - - - - - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + UTF-8 + connect + dialog_display_options_base + 1000 + none + 1 + DialogDisplayOptions_base + + . + + 1 + 1 + 1 + 0 + + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_DISPLAY_OPTIONS_BASE + + 731,291 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Display options + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bMainSizer + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Tracks and vias: + + sLeftBoxSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + "Sketch" "Filled" + + 1 + 1 + + + 0 + wxID_DISPLAY_TRACK + Tracks: + 1 + + + m_OptDisplayTracks + protected + + 1 + + wxRA_SPECIFY_COLS + + Select how tracks are displayed + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Sketch" "Filled" + + 1 + 1 + + + 0 + ID_VIAS_SHAPES + Via Shapes: + 1 + + + m_OptDisplayVias + protected + + 1 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Never" "Defined holes" "Always" + + 1 + 1 + + + 0 + ID_VIAS_HOLES + Show Via Holes: + 1 + + + m_OptDisplayViaHole + protected + + 1 + + wxRA_SPECIFY_COLS + + Show (or not) via holes. If Defined Holes is selected, only the non default size holes are shown + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + Routing help: + + sbMiddleLeftSizer + wxVERTICAL + none + + + 5 + wxALL + 0 + + + "Do not show" "On pads" "On tracks" "On pads and tracks" + + 1 + 1 + + + 0 + wxID_ANY + Show Net Names: + 1 + + + m_ShowNetNamesOption + protected + + 3 + + wxRA_SPECIFY_COLS + + Show or not net names on pads and/or tracks + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Never" "New track" "New track with via area" "New and edited tracks with via area" "Always" + + 1 + 1 + + + 0 + ID_SHOW_CLEARANCE + Show Tracks Clearance: + 1 + + + m_OptDisplayTracksClearance + protected + + 3 + + wxRA_SPECIFY_COLS + + Show( or not) tracks clearance area. If New track is selected, track clearance area is shown only when creating the track. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Footprints: + + sMiddleRightSizer + wxHORIZONTAL + none + + + 5 + + 0 + + + bLModuleSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + + "Line" "Filled" "Sketch" + + 1 + 1 + + + 0 + ID_EDGES_MODULES + Module Edges: + 1 + + + m_OptDisplayModEdges + protected + + 1 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Line" "Filled" "Sketch" + + 1 + 1 + + + 0 + ID_TEXT_MODULES + Texts: + 1 + + + m_OptDisplayModTexts + protected + + 1 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + wxID_ANY + Pad Options: + + bRModuleSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + "Sketch" "Filled" + + 1 + 1 + + + 0 + ID_PADS_SHAPES + Pad Shapes: + 1 + + + m_OptDisplayPads + protected + + 1 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 0 + + 1 + 1 + + + 0 + wxID_ANY + Show pad clearance + + + m_OptDisplayPadClearence + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 1 + + 1 + 1 + + + 0 + wxID_ANY + Show pad number + + + m_OptDisplayPadNumber + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + 1 + + 1 + 1 + + + 0 + wxID_ANY + Show pad NoConnect + + + m_OptDisplayPadNoConn + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + bRightSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + Others: + + sRightUpperSizer + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + "Line" "Filled" "Sketch" + + 1 + 1 + + + 0 + wxID_ANY + Display other items: + 1 + + + m_OptDisplayDrawings + protected + + 1 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + "Yes" "No" + + 1 + 1 + + + 0 + wxID_ANY + Show page limits + 1 + + + m_Show_Page_Limits + protected + + 0 + + wxRA_SPECIFY_COLS + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 10 + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + + + 1 + 0 + 1 + + + 0 + wxID_OK + OK + + + m_buttonOK + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + + + 1 + 0 + 1 + + + 0 + wxID_CANCEL + Cancel + + + m_buttonCANCEL + protected + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp index a338d0a973..c0c475ab80 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp @@ -150,12 +150,12 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( sbSizer2PAN = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan:") ), wxVERTICAL ); m_MiddleButtonPANOpt = new wxCheckBox( this, wxID_MIDDLEBUTTONPAN, _("Middle Button PAN Enabled"), wxDefaultPosition, wxDefaultSize, 0 ); - m_MiddleButtonPANOpt->SetToolTip( _("Allows auto pan when creating a track, or moving an item.") ); + m_MiddleButtonPANOpt->SetToolTip( _("Use middle mouse button dragging to pan") ); sbSizer2PAN->Add( m_MiddleButtonPANOpt, 0, wxALL, 5 ); m_OptMiddleButtonPanLimited = new wxCheckBox( this, wxID_MIDDLEBUTTONPAN, _("Middle Button PAN Limited"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptMiddleButtonPanLimited->SetToolTip( _("Allows auto pan when creating a track, or moving an item.") ); + m_OptMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") ); sbSizer2PAN->Add( m_OptMiddleButtonPanLimited, 0, wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp index ed370978d2..fa0465708d 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp @@ -1842,7 +1842,7 @@ 0 - Allows auto pan when creating a track, or moving an item. + Use middle mouse button dragging to pan wxFILTER_NONE wxDefaultValidator @@ -1930,7 +1930,7 @@ 0 - Allows auto pan when creating a track, or moving an item. + Middle mouse button panning limited by current scrollbar size wxFILTER_NONE wxDefaultValidator