diff --git a/pcbnew/dialogs/dialog_display_options_base.cpp b/pcbnew/dialogs/dialog_display_options_base.cpp index 5e30109330..2033a7be48 100644 --- a/pcbnew/dialogs/dialog_display_options_base.cpp +++ b/pcbnew/dialogs/dialog_display_options_base.cpp @@ -20,19 +20,19 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi bupperSizer = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sLeftBoxSizer; - sLeftBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tracks and vias:") ), wxVERTICAL ); + sLeftBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tracks and Vias:") ), wxVERTICAL ); - m_OptDisplayTracks = new wxCheckBox( this, wxID_ANY, _("Tracks sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayTracks = new wxCheckBox( this, wxID_ANY, _("Show tracks in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); sLeftBoxSizer->Add( m_OptDisplayTracks, 0, wxALL, 5 ); - m_OptDisplayVias = new wxCheckBox( this, wxID_ANY, _("Vias sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayVias = new wxCheckBox( this, wxID_ANY, _("Show vias in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); sLeftBoxSizer->Add( m_OptDisplayVias, 0, wxALL, 5 ); wxString m_OptDisplayViaHoleChoices[] = { _("Never"), _("Defined holes"), _("Always") }; int m_OptDisplayViaHoleNChoices = sizeof( m_OptDisplayViaHoleChoices ) / sizeof( wxString ); m_OptDisplayViaHole = new wxRadioBox( this, ID_VIAS_HOLES, _("Show Via Holes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleNChoices, m_OptDisplayViaHoleChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayViaHole->SetSelection( 1 ); - m_OptDisplayViaHole->SetToolTip( _("Show (or not) via holes.\nIf Defined Holes is selected, only the non default size holes are shown") ); + m_OptDisplayViaHole->SetSelection( 0 ); + m_OptDisplayViaHole->SetToolTip( _("Show or hide via holes.\nIf Defined Holes is selected, only the non default size holes are shown") ); sLeftBoxSizer->Add( m_OptDisplayViaHole, 1, wxALL|wxEXPAND, 5 ); @@ -40,21 +40,21 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi bupperSizer->Add( sLeftBoxSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbMiddleLeftSizer; - sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Routing help:") ), wxVERTICAL ); + sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Routing Help:") ), wxVERTICAL ); wxString m_ShowNetNamesOptionChoices[] = { _("Do not show"), _("On pads"), _("On tracks"), _("On pads and tracks") }; int m_ShowNetNamesOptionNChoices = sizeof( m_ShowNetNamesOptionChoices ) / sizeof( wxString ); m_ShowNetNamesOption = new wxRadioBox( this, wxID_ANY, _("Show Net Names:"), wxDefaultPosition, wxDefaultSize, m_ShowNetNamesOptionNChoices, m_ShowNetNamesOptionChoices, 1, wxRA_SPECIFY_COLS ); - m_ShowNetNamesOption->SetSelection( 3 ); - m_ShowNetNamesOption->SetToolTip( _("Show or not net names on pads and/or tracks") ); + m_ShowNetNamesOption->SetSelection( 0 ); + m_ShowNetNamesOption->SetToolTip( _("Show or hide net names on pads and/or tracks") ); - sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 1, wxALL|wxEXPAND, 5 ); + sbMiddleLeftSizer->Add( m_ShowNetNamesOption, 0, wxALL|wxEXPAND, 5 ); wxString m_OptDisplayTracksClearanceChoices[] = { _("Never"), _("New track"), _("New track with via area"), _("New and edited tracks with via area"), _("Always") }; int m_OptDisplayTracksClearanceNChoices = sizeof( m_OptDisplayTracksClearanceChoices ) / sizeof( wxString ); - m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Tracks Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS ); - m_OptDisplayTracksClearance->SetSelection( 3 ); - m_OptDisplayTracksClearance->SetToolTip( _("Show( or not) tracks clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") ); + m_OptDisplayTracksClearance = new wxRadioBox( this, ID_SHOW_CLEARANCE, _("Show Track Clearance:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceNChoices, m_OptDisplayTracksClearanceChoices, 1, wxRA_SPECIFY_COLS ); + m_OptDisplayTracksClearance->SetSelection( 0 ); + m_OptDisplayTracksClearance->SetToolTip( _("Show or hide the track and via clearance area.\nIf New track is selected, track clearance area is shown only when creating the track.") ); sbMiddleLeftSizer->Add( m_OptDisplayTracksClearance, 1, wxALL|wxEXPAND, 5 ); @@ -67,15 +67,15 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi wxStaticBoxSizer* sfootprintSizer; sfootprintSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprints:") ), wxVERTICAL ); - m_OptDisplayModOutlines = new wxCheckBox( this, wxID_ANY, _("Outlines sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayModOutlines = new wxCheckBox( this, wxID_ANY, _("Show outlines in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); sfootprintSizer->Add( m_OptDisplayModOutlines, 0, wxALL, 5 ); m_OptDisplayModTexts - = new wxCheckBox( this, wxID_ANY, _("Texts sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + = new wxCheckBox( this, wxID_ANY, _("Show text in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); sfootprintSizer->Add( m_OptDisplayModTexts , 0, wxALL, 5 ); - m_OptDisplayPads = new wxCheckBox( this, wxID_ANY, _("Pads sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayPads = new wxCheckBox( this, wxID_ANY, _("Show pads in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); sfootprintSizer->Add( m_OptDisplayPads, 0, wxALL, 5 ); m_OptDisplayPadClearence = new wxCheckBox( this, wxID_ANY, _("Show pad clearance"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -85,7 +85,7 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi m_OptDisplayPadNumber->SetValue(true); sfootprintSizer->Add( m_OptDisplayPadNumber, 0, wxALL, 5 ); - m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show pad NoConnect"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayPadNoConn = new wxCheckBox( this, wxID_ANY, _("Show pad no net connection indicator"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayPadNoConn->SetValue(true); sfootprintSizer->Add( m_OptDisplayPadNoConn, 0, wxALL, 5 ); @@ -93,9 +93,9 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi b_rightSizer->Add( sfootprintSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* s_otherSizer; - s_otherSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Others:") ), wxVERTICAL ); + s_otherSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Other:") ), wxVERTICAL ); - m_OptDisplayDrawings = new wxCheckBox( this, wxID_ANY, _("Graphic items sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptDisplayDrawings = new wxCheckBox( this, wxID_ANY, _("Show graphic items in sketch mode"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptDisplayDrawings->SetValue(true); s_otherSizer->Add( m_OptDisplayDrawings, 0, wxALL, 5 ); @@ -113,7 +113,7 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi bMainSizer->Add( bupperSizer, 1, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + bMainSizer->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -122,11 +122,12 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer, 0, wxEXPAND|wxALL, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DISPLAY_OPTIONS_BASE::OnCancelClick ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_display_options_base.fbp b/pcbnew/dialogs/dialog_display_options_base.fbp index bfb48421cc..cc4821f1c3 100644 --- a/pcbnew/dialogs/dialog_display_options_base.fbp +++ b/pcbnew/dialogs/dialog_display_options_base.fbp @@ -44,10 +44,10 @@ DIALOG_DISPLAY_OPTIONS_BASE - 562,361 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Display options + Display Options @@ -108,7 +108,7 @@ 0 wxID_ANY - Tracks and vias: + Tracks and Vias: sLeftBoxSizer wxVERTICAL @@ -147,7 +147,7 @@ 0 0 wxID_ANY - Tracks sketch mode + Show tracks in sketch mode 0 @@ -235,7 +235,7 @@ 0 0 wxID_ANY - Vias sketch mode + Show vias in sketch mode 0 @@ -340,13 +340,13 @@ 1 Resizable - 1 + 0 1 wxRA_SPECIFY_COLS 0 - Show (or not) via holes. If Defined Holes is selected, only the non default size holes are shown + Show or hide via holes. If Defined Holes is selected, only the non default size holes are shown wxFILTER_NONE wxDefaultValidator @@ -388,7 +388,7 @@ 0 wxID_ANY - Routing help: + Routing Help: sbMiddleLeftSizer wxVERTICAL @@ -397,7 +397,7 @@ 5 wxALL|wxEXPAND - 1 + 0 1 1 @@ -444,13 +444,13 @@ 1 Resizable - 3 + 0 1 wxRA_SPECIFY_COLS 0 - Show or not net names on pads and/or tracks + Show or hide net names on pads and/or tracks wxFILTER_NONE wxDefaultValidator @@ -517,7 +517,7 @@ 0 0 ID_SHOW_CLEARANCE - Show Tracks Clearance: + Show Track Clearance: 1 0 @@ -534,13 +534,13 @@ 1 Resizable - 3 + 0 1 wxRA_SPECIFY_COLS 0 - Show( or not) tracks clearance area. If New track is selected, track clearance area is shown only when creating the track. + Show or hide the track and via clearance area. If New track is selected, track clearance area is shown only when creating the track. wxFILTER_NONE wxDefaultValidator @@ -630,7 +630,7 @@ 0 0 wxID_ANY - Outlines sketch mode + Show outlines in sketch mode 0 @@ -718,7 +718,7 @@ 0 0 wxID_ANY - Texts sketch mode + Show text in sketch mode 0 @@ -806,7 +806,7 @@ 0 0 wxID_ANY - Pads sketch mode + Show pads in sketch mode 0 @@ -1070,7 +1070,7 @@ 0 0 wxID_ANY - Show pad NoConnect + Show pad no net connection indicator 0 @@ -1133,7 +1133,7 @@ 1 wxID_ANY - Others: + Other: s_otherSizer wxVERTICAL @@ -1172,7 +1172,7 @@ 0 0 wxID_ANY - Graphic items sketch mode + Show graphic items in sketch mode 0 @@ -1323,7 +1323,7 @@ 5 - wxEXPAND | wxALL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1404,7 +1404,7 @@ 5 - wxEXPAND|wxALL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 0 diff --git a/pcbnew/dialogs/dialog_display_options_base.h b/pcbnew/dialogs/dialog_display_options_base.h index 817c2bd4ee..3f180e9ac5 100644 --- a/pcbnew/dialogs/dialog_display_options_base.h +++ b/pcbnew/dialogs/dialog_display_options_base.h @@ -69,7 +69,7 @@ class DIALOG_DISPLAY_OPTIONS_BASE : public DIALOG_SHIM public: - DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Display options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 562,361 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_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_DISPLAY_OPTIONS_BASE(); };