Minor dialog spacing, grammar, and sizer fixes. (0564cbc7) · Commits · Elphel / kicad-source-mirror

cvpcb/dialogs/dialog_display_options_base.cpp

+13 −12

Original line number	Diff line number	Diff line
		@@ -24,13 +24,13 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(

		wxString m_EdgesDisplayOptionChoices[] = { _("Line"), _("Filled"), _("Sketch") };
		int m_EdgesDisplayOptionNChoices = sizeof( m_EdgesDisplayOptionChoices ) / sizeof( wxString );
		m_EdgesDisplayOption = new wxRadioBox( this, ID_EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionNChoices, m_EdgesDisplayOptionChoices, 1, wxRA_SPECIFY_COLS );
		m_EdgesDisplayOption = new wxRadioBox( this, ID_EDGE_SELECT, _("Edges"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionNChoices, m_EdgesDisplayOptionChoices, 1, wxRA_SPECIFY_COLS );
		m_EdgesDisplayOption->SetSelection( 0 );
		bSizerLeft->Add( m_EdgesDisplayOption, 1, wxALL\|wxEXPAND, 5 );

		wxString m_TextDisplayOptionChoices[] = { _("Line"), _("Filled"), _("Sketch") };
		int m_TextDisplayOptionNChoices = sizeof( m_TextDisplayOptionChoices ) / sizeof( wxString );
		m_TextDisplayOption = new wxRadioBox( this, ID_TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionNChoices, m_TextDisplayOptionChoices, 1, wxRA_SPECIFY_COLS );
		m_TextDisplayOption = new wxRadioBox( this, ID_TEXT_SELECT, _("Text"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionNChoices, m_TextDisplayOptionChoices, 1, wxRA_SPECIFY_COLS );
		m_TextDisplayOption->SetSelection( 0 );
		bSizerLeft->Add( m_TextDisplayOption, 1, wxALL\|wxEXPAND, 5 );

		@@ -41,10 +41,10 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(
		bSizerRight = new wxBoxSizer( wxVERTICAL );

		wxStaticBoxSizer* sbSizerPads;
		sbSizerPads = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pads:") ), wxVERTICAL );
		sbSizerPads = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pads") ), wxVERTICAL );

		m_IsShowPadFill = new wxCheckBox( this, ID_PADFILL_OPT, _("Fill &pad"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerPads->Add( m_IsShowPadFill, 0, wxALL\|wxEXPAND, 5 );
		sbSizerPads->Add( m_IsShowPadFill, 0, wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_IsShowPadNum = new wxCheckBox( this, wxID_ANY, _("Show pad &number"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerPads->Add( m_IsShowPadNum, 0, wxALL\|wxEXPAND, 5 );
		@@ -53,24 +53,24 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(
		bSizerRight->Add( sbSizerPads, 1, wxEXPAND\|wxALL, 5 );

		wxStaticBoxSizer* sbSizerViewOpt;
		sbSizerViewOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan:") ), wxVERTICAL );
		sbSizerViewOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan and Zoom") ), wxVERTICAL );

		m_IsZoomNoCenter = new wxCheckBox( this, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 );
		m_IsZoomNoCenter = new wxCheckBox( this, wxID_ANY, _("Do not center and warp cusor on zoom"), wxDefaultPosition, wxDefaultSize, 0 );
		m_IsZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") );

		sbSizerViewOpt->Add( m_IsZoomNoCenter, 0, wxALL, 5 );
		sbSizerViewOpt->Add( m_IsZoomNoCenter, 0, wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_IsMiddleButtonPan = new wxCheckBox( this, wxID_ANY, _("Middle Button PAN Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerViewOpt->Add( m_IsMiddleButtonPan, 0, wxALL\|wxEXPAND, 5 );
		m_IsMiddleButtonPan = new wxCheckBox( this, wxID_ANY, _("Use middle mouse button to pan"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerViewOpt->Add( m_IsMiddleButtonPan, 0, wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_IsMiddleButtonPanLimited = new wxCheckBox( this, wxID_ANY, _("Middle Button PAN Limited"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerViewOpt->Add( m_IsMiddleButtonPanLimited, 0, wxALL, 5 );
		m_IsMiddleButtonPanLimited = new wxCheckBox( this, wxID_ANY, _("Limit panning to scroll size"), wxDefaultPosition, wxDefaultSize, 0 );
		sbSizerViewOpt->Add( m_IsMiddleButtonPanLimited, 0, wxALL\|wxEXPAND, 5 );


		bSizerRight->Add( sbSizerViewOpt, 1, wxALL\|wxEXPAND, 5 );


		bUpperSizer->Add( bSizerRight, 1, wxEXPAND, 5 );
		bUpperSizer->Add( bSizerRight, 2, wxEXPAND, 5 );


		bSizerMain->Add( bUpperSizer, 1, wxEXPAND, 5 );
		@@ -92,6 +92,7 @@ DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE(

		this->SetSizer( bSizerMain );
		this->Layout();
		bSizerMain->Fit( this );

		// Connect Events
		m_IsMiddleButtonPan->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE::OnMiddleBtnPanEnbl ), NULL, this );

cvpcb/dialogs/dialog_display_options_base.fbp

+13 −13

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		<property name="minimum_size"></property>
		<property name="name">DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE</property>
		<property name="pos"></property>
		<property name="size">362,251</property>
		<property name="size">-1,-1</property>
		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
		<property name="title">Display Options</property>
		@@ -142,7 +142,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">ID_EDGE_SELECT</property>
		<property name="label">Edges:</property>
		<property name="label">Edges</property>
		<property name="majorDimension">1</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		@@ -232,7 +232,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">ID_TEXT_SELECT</property>
		<property name="label">Texts:</property>
		<property name="label">Text</property>
		<property name="majorDimension">1</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		@@ -294,7 +294,7 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">1</property>
		<property name="proportion">2</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		<property name="name">bSizerRight</property>
		@@ -306,7 +306,7 @@
		<property name="proportion">1</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<property name="id">wxID_ANY</property>
		<property name="label">Pads:</property>
		<property name="label">Pads</property>
		<property name="minimum_size"></property>
		<property name="name">sbSizerPads</property>
		<property name="orient">wxVERTICAL</property>
		@@ -314,7 +314,7 @@
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="flag">wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxCheckBox" expanded="1">
		<property name="BottomDockable">1</property>
		@@ -496,7 +496,7 @@
		<property name="proportion">1</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<property name="id">wxID_ANY</property>
		<property name="label">Pan:</property>
		<property name="label">Pan and Zoom</property>
		<property name="minimum_size"></property>
		<property name="name">sbSizerViewOpt</property>
		<property name="orient">wxVERTICAL</property>
		@@ -504,7 +504,7 @@
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxCheckBox" expanded="1">
		<property name="BottomDockable">1</property>
		@@ -535,7 +535,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Zoom off center</property>
		<property name="label">Do not center and warp cusor on zoom</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>
		@@ -592,7 +592,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="flag">wxEXPAND\|wxLEFT\|wxRIGHT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxCheckBox" expanded="1">
		<property name="BottomDockable">1</property>
		@@ -623,7 +623,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Middle Button PAN Enabled</property>
		<property name="label">Use middle mouse button to pan</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>
		@@ -680,7 +680,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxCheckBox" expanded="1">
		<property name="BottomDockable">1</property>
		@@ -711,7 +711,7 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Middle Button PAN Limited</property>
		<property name="label">Limit panning to scroll size</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>

cvpcb/dialogs/dialog_display_options_base.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ class DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE : public DIALOG_SHIM

		public:

		DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 362,251 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
		DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
		~DIALOG_FOOTPRINTS_DISPLAY_OPTIONS_BASE();

		};

eeschema/dialogs/dialog_eeschema_options_base.cpp

+13 −16

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@

		///////////////////////////////////////////////////////////////////////////

		BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, wxDialog )
		BEGIN_EVENT_TABLE( DIALOG_EESCHEMA_OPTIONS_BASE, DIALOG_SHIM )
		EVT_CHOICE( wxID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnChooseUnits )
		EVT_CHECKBOX( xwID_ANY, DIALOG_EESCHEMA_OPTIONS_BASE::_wxFB_OnMiddleBtnPanEnbl )
		END_EVENT_TABLE()

		DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
		DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
		{
		this->SetSizeHints( wxDefaultSize, wxDefaultSize );

		@@ -35,7 +35,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		bSizer3 = new wxBoxSizer( wxVERTICAL );

		wxFlexGridSizer* fgSizer1;
		fgSizer1 = new wxFlexGridSizer( 8, 3, 0, 0 );
		fgSizer1 = new wxFlexGridSizer( 9, 3, 0, 0 );
		fgSizer1->AddGrowableCol( 0 );
		fgSizer1->AddGrowableCol( 1 );
		fgSizer1->AddGrowableCol( 2 );
		@@ -132,7 +132,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx

		fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL\|wxEXPAND, 3 );

		m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save time interval:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText221 = new wxStaticText( m_panel1, wxID_ANY, _("Auto save &time interval:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticText221->Wrap( -1 );
		fgSizer1->Add( m_staticText221, 1, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

		@@ -149,28 +149,28 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		wxBoxSizer* bSizer2;
		bSizer2 = new wxBoxSizer( wxVERTICAL );

		m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show g&rid"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkShowGrid = new wxCheckBox( m_panel1, wxID_ANY, _("Show gr&id"), wxDefaultPosition, wxDefaultSize, 0 );
		bSizer2->Add( m_checkShowGrid, 0, wxALL\|wxEXPAND, 3 );

		m_checkShowHiddenPins = new wxCheckBox( m_panel1, wxID_ANY, _("Show hi&dden pins"), wxDefaultPosition, wxDefaultSize, 0 );
		bSizer2->Add( m_checkShowHiddenPins, 0, wxALL\|wxEXPAND, 3 );

		m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkEnableZoomNoCenter = new wxCheckBox( m_panel1, wxID_ANY, _("Do not center and &warp cursor on zoom"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkEnableZoomNoCenter->SetToolTip( _("Keep the cursor at its current location when zooming") );

		bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxALL, 5 );
		bSizer2->Add( m_checkEnableZoomNoCenter, 0, wxALL, 3 );

		m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Enable middle mouse button panning"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkEnableMiddleButtonPan = new wxCheckBox( m_panel1, xwID_ANY, _("Use &middle mouse button to pan"), 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"), wxDefaultPosition, wxDefaultSize, 0 );
		m_checkMiddleButtonPanLimited = new wxCheckBox( m_panel1, wxID_ANY, _("&Limit panning to scroll size"), 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 );
		m_checkAutoPan = new wxCheckBox( m_panel1, wxID_ANY, _("Pan while moving ob&ject"), wxDefaultPosition, wxDefaultSize, 0 );
		bSizer2->Add( m_checkAutoPan, 0, wxALL\|wxEXPAND, 3 );

		m_checkHVOrientation = new wxCheckBox( m_panel1, wxID_ANY, _("Allow buses and wires to be placed in H or V &orientation only"), wxDefaultPosition, wxDefaultSize, 0 );
		@@ -183,10 +183,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		bSizer3->Add( bSizer2, 0, wxEXPAND, 0 );


		bSizer3->Add( 0, 0, 1, wxALL\|wxEXPAND, 10 );


		p1mainSizer->Add( bSizer3, 1, wxALL\|wxEXPAND, 12 );
		p1mainSizer->Add( bSizer3, 1, wxALL\|wxEXPAND, 6 );


		m_panel1->SetSizer( p1mainSizer );
		@@ -303,10 +300,10 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
		m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
		m_sdbSizer1->Realize();

		bOptionsSizer->Add( m_sdbSizer1, 0, wxALL\|wxEXPAND, 12 );
		bOptionsSizer->Add( m_sdbSizer1, 0, wxALL\|wxEXPAND, 6 );


		mainSizer->Add( bOptionsSizer, 1, 0, 12 );
		mainSizer->Add( bOptionsSizer, 1, wxEXPAND, 12 );


		this->SetSizer( mainSizer );

eeschema/dialogs/dialog_eeschema_options_base.fbp

+15 −25

File changed.

Preview size limit exceeded, changes collapsed.

Admin message