From 155cb4f158e72d77142465d56e3f20fc8b3acfe6 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Mon, 18 Feb 2013 15:14:53 -0500 Subject: [PATCH] Minor dialog spacing, grammar, and UI policy fixes. --- common/dialogs/dialog_list_selector_base.cpp | 2 +- common/dialogs/dialog_list_selector_base.fbp | 2 +- eeschema/dialogs/dialog_build_BOM_base.cpp | 15 +- eeschema/dialogs/dialog_build_BOM_base.fbp | 16 +- eeschema/dialogs/dialog_build_BOM_base.h | 6 +- .../dialogs/dialog_cleaning_options_base.cpp | 6 +- .../dialogs/dialog_cleaning_options_base.fbp | 6 +- pcbnew/dialogs/dialog_cleaning_options_base.h | 6 +- ...ialog_general_options_BoardEditor_base.cpp | 66 +- ...ialog_general_options_BoardEditor_base.fbp | 78 +- .../dialog_general_options_BoardEditor_base.h | 2 +- .../dialogs/dialog_global_deletion_base.cpp | 40 +- .../dialogs/dialog_global_deletion_base.fbp | 44 +- pcbnew/dialogs/dialog_global_deletion_base.h | 6 +- ...log_global_modules_fields_edition_base.cpp | 49 +- ...log_global_modules_fields_edition_base.fbp | 46 +- ...ialog_global_modules_fields_edition_base.h | 6 +- pcbnew/dialogs/dialog_pad_properties_base.cpp | 2 + pcbnew/dialogs/dialog_pad_properties_base.fbp | 2 +- pcbnew/dialogs/dialog_set_grid.fbp | 760 +++++++++--------- pcbnew/dialogs/dialog_set_grid_base.cpp | 69 +- pcbnew/dialogs/dialog_set_grid_base.h | 6 +- 22 files changed, 636 insertions(+), 599 deletions(-) diff --git a/common/dialogs/dialog_list_selector_base.cpp b/common/dialogs/dialog_list_selector_base.cpp index e626e76986..c115a1d7ec 100644 --- a/common/dialogs/dialog_list_selector_base.cpp +++ b/common/dialogs/dialog_list_selector_base.cpp @@ -50,7 +50,7 @@ EDA_LIST_DIALOG_BASE::EDA_LIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, con m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 ); + bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bSizerMain ); diff --git a/common/dialogs/dialog_list_selector_base.fbp b/common/dialogs/dialog_list_selector_base.fbp index 63d6d162d1..4b93523c05 100644 --- a/common/dialogs/dialog_list_selector_base.fbp +++ b/common/dialogs/dialog_list_selector_base.fbp @@ -612,7 +612,7 @@ 5 - wxALIGN_RIGHT + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_build_BOM_base.cpp b/eeschema/dialogs/dialog_build_BOM_base.cpp index cfdb347391..06643f28bf 100644 --- a/eeschema/dialogs/dialog_build_BOM_base.cpp +++ b/eeschema/dialogs/dialog_build_BOM_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -34,10 +34,10 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c m_ListCmpbyValItems = new wxCheckBox( this, wxID_ANY, _("Components by value"), wxDefaultPosition, wxDefaultSize, 0 ); sbListOptionsSizer->Add( m_ListCmpbyValItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierarchy pins by name"), wxDefaultPosition, wxDefaultSize, 0 ); + m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by name"), wxDefaultPosition, wxDefaultSize, 0 ); sbListOptionsSizer->Add( m_GenListLabelsbyVal, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierarchy pins by sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by sheet"), wxDefaultPosition, wxDefaultSize, 0 ); sbListOptionsSizer->Add( m_GenListLabelsbySheet, 0, wxALL, 5 ); @@ -59,7 +59,7 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c sbOptionsSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 ); - bSizerUpper->Add( sbOptionsSizer, 10, wxALL|wxEXPAND, 5 ); + bSizerUpper->Add( sbOptionsSizer, 3, wxALL|wxEXPAND, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -119,13 +119,13 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c bRightSizer->Add( sbAddToListSelectionSizer, 1, wxEXPAND, 5 ); - bSizerUpper->Add( bRightSizer, 0, wxALL|wxEXPAND, 5 ); + bSizerUpper->Add( bRightSizer, 2, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bSizerUpper, 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, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -134,11 +134,12 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_OutputFormCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this ); diff --git a/eeschema/dialogs/dialog_build_BOM_base.fbp b/eeschema/dialogs/dialog_build_BOM_base.fbp index a8717b98c0..706d74dbba 100644 --- a/eeschema/dialogs/dialog_build_BOM_base.fbp +++ b/eeschema/dialogs/dialog_build_BOM_base.fbp @@ -42,10 +42,10 @@ DIALOG_BUILD_BOM_BASE - 424,388 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - List of Material + List of Materials @@ -103,7 +103,7 @@ 5 wxALL|wxEXPAND - 10 + 3 wxID_ANY Options: @@ -421,7 +421,7 @@ 0 0 wxID_ANY - Hierarchy pins by name + Hierarchical pins by name 0 @@ -509,7 +509,7 @@ 0 0 wxID_ANY - Hierarchy pins by sheets + Hierarchical pins by sheet 0 @@ -839,7 +839,7 @@ 5 wxALL|wxEXPAND - 0 + 2 bRightSizer @@ -1949,7 +1949,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2030,7 +2030,7 @@ 5 - wxALIGN_RIGHT + wxALL|wxEXPAND 0 0 diff --git a/eeschema/dialogs/dialog_build_BOM_base.h b/eeschema/dialogs/dialog_build_BOM_base.h index 297674b347..4d99245485 100644 --- a/eeschema/dialogs/dialog_build_BOM_base.h +++ b/eeschema/dialogs/dialog_build_BOM_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -73,7 +75,7 @@ class DIALOG_BUILD_BOM_BASE : public DIALOG_SHIM public: - DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,388 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Materials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_BUILD_BOM_BASE(); }; diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.cpp b/pcbnew/dialogs/dialog_cleaning_options_base.cpp index bc95a5cd21..7668ae9603 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.cpp +++ b/pcbnew/dialogs/dialog_cleaning_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -24,7 +24,7 @@ DIALOG_CLEANING_OPTIONS_BASE::DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wx bSizerUpper->Add( m_cleanViasOpt, 0, wxALL, 5 ); - m_mergeSegmOpt = new wxCheckBox( this, wxID_ANY, _("Merge colinear segments"), wxDefaultPosition, wxDefaultSize, 0 ); + m_mergeSegmOpt = new wxCheckBox( this, wxID_ANY, _("Merge overlapping segments"), wxDefaultPosition, wxDefaultSize, 0 ); m_mergeSegmOpt->SetToolTip( _("merge aligned track segments, and remove null segments") ); bSizerUpper->Add( m_mergeSegmOpt, 0, wxALL, 5 ); @@ -47,7 +47,7 @@ DIALOG_CLEANING_OPTIONS_BASE::DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wx m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); + bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.fbp b/pcbnew/dialogs/dialog_cleaning_options_base.fbp index f6ef10ec86..85166997f9 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.fbp +++ b/pcbnew/dialogs/dialog_cleaning_options_base.fbp @@ -45,7 +45,7 @@ 243,146 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Cleaning options + Cleaning Options @@ -221,7 +221,7 @@ 0 0 wxID_ANY - Merge colinear segments + Merge overlapping segments 0 @@ -449,7 +449,7 @@ 5 - wxALIGN_RIGHT|wxALL + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_cleaning_options_base.h b/pcbnew/dialogs/dialog_cleaning_options_base.h index 23e2ba30bb..e43280135e 100644 --- a/pcbnew/dialogs/dialog_cleaning_options_base.h +++ b/pcbnew/dialogs/dialog_cleaning_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -53,7 +55,7 @@ class DIALOG_CLEANING_OPTIONS_BASE : public DIALOG_SHIM bool mergeSegments; bool deleteUnconnectedSegm; - DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Cleaning options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 243,146 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_CLEANING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Cleaning Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 243,146 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_CLEANING_OPTIONS_BASE(); }; diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp index a9cc22d6b2..7a9e3b3b49 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.cpp @@ -22,10 +22,10 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( wxBoxSizer* bLeftSizer; bLeftSizer = new wxBoxSizer( wxVERTICAL ); - wxString m_PolarDisplayChoices[] = { _("No Display"), _("Display") }; + wxString m_PolarDisplayChoices[] = { _("Rectangular"), _("Polar") }; int m_PolarDisplayNChoices = sizeof( m_PolarDisplayChoices ) / sizeof( wxString ); - m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Display Polar Coord"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS ); - m_PolarDisplay->SetSelection( 1 ); + m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Coordinates"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS ); + m_PolarDisplay->SetSelection( 0 ); m_PolarDisplay->SetToolTip( _("Activates the display of relative coordinates from relative origin (set by the space key)\nto the cursor, in polar coordinates (angle and distance)") ); bLeftSizer->Add( m_PolarDisplay, 0, wxALL|wxEXPAND, 5 ); @@ -47,30 +47,30 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 ); - bSizerUpper->Add( bLeftSizer, 1, wxEXPAND, 5 ); + bSizerUpper->Add( bLeftSizer, 3, wxALL|wxEXPAND, 5 ); wxBoxSizer* bMiddleLeftSizer; bMiddleLeftSizer = new wxBoxSizer( wxVERTICAL ); - m_staticTextmaxlinks = new wxStaticText( this, wxID_ANY, _("Max Links:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextmaxlinks = new wxStaticText( this, wxID_ANY, _("Maximum Links:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextmaxlinks->Wrap( -1 ); bMiddleLeftSizer->Add( m_staticTextmaxlinks, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_MaxShowLinks = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 5, 1 ); m_MaxShowLinks->SetToolTip( _("Adjust the number of ratsnets shown from cursor to closest pads") ); - bMiddleLeftSizer->Add( m_MaxShowLinks, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bMiddleLeftSizer->Add( m_MaxShowLinks, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticTextautosave = new wxStaticText( this, wxID_ANY, _("Auto Save (minutes):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextautosave->Wrap( -1 ); - bMiddleLeftSizer->Add( m_staticTextautosave, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bMiddleLeftSizer->Add( m_staticTextautosave, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); m_SaveTime = new wxSpinCtrl( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 60, 0 ); m_SaveTime->SetToolTip( _("Delay after the first change to create a backup file of the board on disk.") ); - bMiddleLeftSizer->Add( m_SaveTime, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bMiddleLeftSizer->Add( m_SaveTime, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); - m_staticTextRotationAngle = new wxStaticText( this, wxID_ANY, _("Rotation Angle"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextRotationAngle = new wxStaticText( this, wxID_ANY, _("Rotation Angle:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRotationAngle->Wrap( -1 ); bMiddleLeftSizer->Add( m_staticTextRotationAngle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -80,52 +80,53 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( m_RotationAngle->SetSelection( 0 ); m_RotationAngle->SetToolTip( _("Footprints rotation increment, for rotate menu or hot key.") ); - bMiddleLeftSizer->Add( m_RotationAngle, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bMiddleLeftSizer->Add( m_RotationAngle, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); - bSizerUpper->Add( bMiddleLeftSizer, 1, wxEXPAND, 5 ); + bSizerUpper->Add( bMiddleLeftSizer, 3, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* bMiddleRightBoxSizer; - bMiddleRightBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); + bMiddleRightBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL ); - m_DrcOn = new wxCheckBox( this, wxID_DRC_ONOFF, _("Drc ON"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DrcOn = new wxCheckBox( this, wxID_DRC_ONOFF, _("Enforce design rules when routing"), wxDefaultPosition, wxDefaultSize, 0 ); m_DrcOn->SetValue(true); m_DrcOn->SetToolTip( _("Enable/disable the DRC control.\nWhen DRC is disable, all connections are allowed.") ); bMiddleRightBoxSizer->Add( m_DrcOn, 0, wxALL|wxEXPAND, 5 ); - m_ShowGlobalRatsnest = new wxCheckBox( this, wxID_GENERAL_RATSNEST, _("Show Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ShowGlobalRatsnest = new wxCheckBox( this, wxID_GENERAL_RATSNEST, _("Show ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ShowGlobalRatsnest->SetValue(true); m_ShowGlobalRatsnest->SetToolTip( _("Show (or not) the full rastnest.") ); bMiddleRightBoxSizer->Add( m_ShowGlobalRatsnest, 0, wxALL, 5 ); - m_ShowModuleRatsnest = new wxCheckBox( this, wxID_RATSNEST_MODULE, _("Show Mod Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ShowModuleRatsnest = new wxCheckBox( this, wxID_RATSNEST_MODULE, _("Show footprint ratsnest"), wxDefaultPosition, wxDefaultSize, 0 ); m_ShowModuleRatsnest->SetToolTip( _("Shows (or not) the local ratsnest relative to a footprint, when moving it.\nThis ratsnest is useful to place a footprint.") ); bMiddleRightBoxSizer->Add( m_ShowModuleRatsnest, 0, wxALL, 5 ); - m_TrackAutodel = new wxCheckBox( this, wxID_TRACK_AUTODEL, _("Tracks Auto Del"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackAutodel = new wxCheckBox( this, wxID_TRACK_AUTODEL, _("Delete unconnected tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_TrackAutodel->SetToolTip( _("Enable/disable the automatic track deletion when recreating a track.") ); bMiddleRightBoxSizer->Add( m_TrackAutodel, 0, wxALL, 5 ); - m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Track only 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Limit tracks to 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); m_Track_45_Only_Ctrl->SetToolTip( _("If enabled, force tracks directions to H, V or 45 degrees, when creating a track.") ); bMiddleRightBoxSizer->Add( m_Track_45_Only_Ctrl, 0, wxALL, 5 ); - m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Segments 45 Only"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Limit graphic lines to 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 ); m_Segments_45_Only_Ctrl->SetToolTip( _("If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers.") ); bMiddleRightBoxSizer->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 ); - m_Track_DoubleSegm_Ctrl = new wxCheckBox( this, wxID_ANY, _("Double Segm Track"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Track_DoubleSegm_Ctrl = new wxCheckBox( this, wxID_ANY, _("Use double segmented tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_Track_DoubleSegm_Ctrl->SetToolTip( _("If enabled, uses two track segments, with 45 degrees angle between them when creating a new track ") ); bMiddleRightBoxSizer->Add( m_Track_DoubleSegm_Ctrl, 0, wxALL, 5 ); - bSizerUpper->Add( bMiddleRightBoxSizer, 1, 0, 5 ); + bSizerUpper->Add( bMiddleRightBoxSizer, 4, wxALL|wxEXPAND, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -147,39 +148,39 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( bRightSizer->Add( m_MagneticTrackOptCtrl, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer2PAN; - sbSizer2PAN = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan:") ), wxVERTICAL ); + sbSizer2PAN = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pan") ), wxVERTICAL ); - m_ZoomNoCenterOpt = new wxCheckBox( this, wxID_ANY, _("Zoom off center"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ZoomNoCenterOpt = new wxCheckBox( this, wxID_ANY, _("Do not center and warp mouse on zoom"), wxDefaultPosition, wxDefaultSize, 0 ); m_ZoomNoCenterOpt->SetToolTip( _("Keep the cursor at its current location when zooming") ); - sbSizer2PAN->Add( m_ZoomNoCenterOpt, 0, wxALL, 5 ); + sbSizer2PAN->Add( m_ZoomNoCenterOpt, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); - m_MiddleButtonPANOpt = new wxCheckBox( this, wxID_ANY, _("Middle Button PAN Enabled"), wxDefaultPosition, wxDefaultSize, 0 ); + m_MiddleButtonPANOpt = new wxCheckBox( this, wxID_ANY, _("Use middle mouse button to pan"), wxDefaultPosition, wxDefaultSize, 0 ); m_MiddleButtonPANOpt->SetToolTip( _("Use middle mouse button dragging to pan") ); - sbSizer2PAN->Add( m_MiddleButtonPANOpt, 0, wxALL, 5 ); + sbSizer2PAN->Add( m_MiddleButtonPANOpt, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); - m_OptMiddleButtonPanLimited = new wxCheckBox( this, wxID_MIDDLEBUTTONPAN, _("Middle Button PAN Limited"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OptMiddleButtonPanLimited = new wxCheckBox( this, wxID_MIDDLEBUTTONPAN, _("Limit panning to scroll size"), wxDefaultPosition, wxDefaultSize, 0 ); m_OptMiddleButtonPanLimited->SetToolTip( _("Middle mouse button panning limited by current scrollbar size") ); - sbSizer2PAN->Add( m_OptMiddleButtonPanLimited, 0, wxALL, 5 ); + sbSizer2PAN->Add( m_OptMiddleButtonPanLimited, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); - m_AutoPANOpt = new wxCheckBox( this, wxID_AUTOPAN, _("Auto PAN"), wxDefaultPosition, wxDefaultSize, 0 ); + m_AutoPANOpt = new wxCheckBox( this, wxID_AUTOPAN, _("Pan while moving object"), wxDefaultPosition, wxDefaultSize, 0 ); m_AutoPANOpt->SetToolTip( _("Allows auto pan when creating a track, or moving an item.") ); sbSizer2PAN->Add( m_AutoPANOpt, 0, wxALL, 5 ); - bRightSizer->Add( sbSizer2PAN, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); + bRightSizer->Add( sbSizer2PAN, 1, wxALL|wxEXPAND, 5 ); - bSizerUpper->Add( bRightSizer, 1, wxEXPAND, 5 ); + bSizerUpper->Add( bRightSizer, 5, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bSizerUpper, 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, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -188,11 +189,12 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bMainSizer->Add( m_sdbSizer, 0, wxEXPAND, 5 ); + bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_MiddleButtonPANOpt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE::OnMiddleBtnPanEnbl ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp index ebd1a46fa9..84eccc123e 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.fbp @@ -42,10 +42,10 @@ DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE - 611,346 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - General settings + General Settings @@ -102,8 +102,8 @@ none 5 - wxEXPAND - 1 + wxALL|wxEXPAND + 3 bLeftSizer @@ -127,7 +127,7 @@ 1 0 - "No Display" "Display" + "Rectangular" "Polar" 1 1 @@ -142,7 +142,7 @@ 0 0 wxID_POLAR_CTRL - Display Polar Coord + Coordinates 1 0 @@ -159,7 +159,7 @@ 1 Resizable - 1 + 0 1 wxRA_SPECIFY_COLS @@ -383,8 +383,8 @@ 5 - wxEXPAND - 1 + wxALL|wxEXPAND + 3 bMiddleLeftSizer @@ -422,7 +422,7 @@ 0 0 wxID_ANY - Max Links: + Maximum Links: 0 @@ -475,7 +475,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -562,7 +562,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -645,7 +645,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -762,7 +762,7 @@ 0 0 wxID_ANY - Rotation Angle + Rotation Angle: 0 @@ -815,7 +815,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -905,11 +905,11 @@ 5 - - 1 + wxALL|wxEXPAND + 4 wxID_ANY - Options: + Options bMiddleRightBoxSizer wxVERTICAL @@ -948,7 +948,7 @@ 0 0 wxID_DRC_ONOFF - Drc ON + Enforce design rules when routing 0 @@ -1021,7 +1021,7 @@ 1 0 - 0 + 1 1 1 @@ -1036,7 +1036,7 @@ 0 0 wxID_GENERAL_RATSNEST - Show Ratsnest + Show ratsnest 0 @@ -1124,7 +1124,7 @@ 0 0 wxID_RATSNEST_MODULE - Show Mod Ratsnest + Show footprint ratsnest 0 @@ -1212,7 +1212,7 @@ 0 0 wxID_TRACK_AUTODEL - Tracks Auto Del + Delete unconnected tracks 0 @@ -1300,7 +1300,7 @@ 0 0 wxID_TRACKS45 - Track only 45 degrees + Limit tracks to 45 degrees 0 @@ -1388,7 +1388,7 @@ 0 0 wxID_SEGMENTS45 - Segments 45 Only + Limit graphic lines to 45 degrees 0 @@ -1476,7 +1476,7 @@ 0 0 wxID_ANY - Double Segm Track + Use double segmented tracks 0 @@ -1535,8 +1535,8 @@ 5 - wxEXPAND - 1 + wxALL|wxEXPAND + 5 bRightSizer @@ -1724,11 +1724,11 @@ 5 - wxEXPAND|wxBOTTOM|wxLEFT + wxALL|wxEXPAND 1 wxID_ANY - Pan: + Pan sbSizer2PAN wxVERTICAL @@ -1736,7 +1736,7 @@ 5 - wxALL + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1767,7 +1767,7 @@ 0 0 wxID_ANY - Zoom off center + Do not center and warp mouse on zoom 0 @@ -1824,7 +1824,7 @@ 5 - wxALL + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1855,7 +1855,7 @@ 0 0 wxID_ANY - Middle Button PAN Enabled + Use middle mouse button to pan 0 @@ -1912,7 +1912,7 @@ 5 - wxALL + wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1943,7 +1943,7 @@ 0 0 wxID_MIDDLEBUTTONPAN - Middle Button PAN Limited + Limit panning to scroll size 0 @@ -2031,7 +2031,7 @@ 0 0 wxID_AUTOPAN - Auto PAN + Pan while moving object 0 @@ -2094,7 +2094,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2175,7 +2175,7 @@ 5 - wxEXPAND + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h index d9b41e5e34..3e6937bfa1 100644 --- a/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_general_options_BoardEditor_base.h @@ -91,7 +91,7 @@ class DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE : public DIALOG_SHIM public: - DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 611,346 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE(); }; diff --git a/pcbnew/dialogs/dialog_global_deletion_base.cpp b/pcbnew/dialogs/dialog_global_deletion_base.cpp index 29ce125595..309bd56163 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.cpp +++ b/pcbnew/dialogs/dialog_global_deletion_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -20,48 +20,48 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi bSizerUpper = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sbSizerLeft; - sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Items to delete") ), wxVERTICAL ); + sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Items to Delete") ), wxVERTICAL ); - m_DelZones = new wxCheckBox( this, wxID_ANY, _("Delete Zones"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelZones = new wxCheckBox( this, wxID_ANY, _("Zones"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelZones, 0, wxALL, 5 ); - m_DelTexts = new wxCheckBox( this, wxID_ANY, _("Delete Texts"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelTexts = new wxCheckBox( this, wxID_ANY, _("Text"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelTexts, 0, wxALL, 5 ); - m_DelBoardEdges = new wxCheckBox( this, wxID_ANY, _("Delete Board Outlines"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelBoardEdges = new wxCheckBox( this, wxID_ANY, _("Board outlines"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelBoardEdges, 0, wxALL, 5 ); - m_DelDrawings = new wxCheckBox( this, wxID_ANY, _("Delete Drawings"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelDrawings = new wxCheckBox( this, wxID_ANY, _("Drawings"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelDrawings, 0, wxALL, 5 ); - m_DelModules = new wxCheckBox( this, wxID_ANY, _("Delete Modules"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelModules = new wxCheckBox( this, wxID_ANY, _("Footprints"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelModules, 0, wxALL, 5 ); - m_DelTracks = new wxCheckBox( this, wxID_ANY, _("Delete Tracks"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelTracks = new wxCheckBox( this, wxID_ANY, _("Tracks"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelTracks, 0, wxALL, 5 ); - m_DelMarkers = new wxCheckBox( this, wxID_ANY, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 ); + m_DelMarkers = new wxCheckBox( this, wxID_ANY, _("Markers"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelMarkers, 0, wxALL, 5 ); m_DelAlls = new wxCheckBox( this, wxID_ANY, _("Clear Board"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerLeft->Add( m_DelAlls, 0, wxALL, 5 ); - bSizerUpper->Add( sbSizerLeft, 1, wxEXPAND|wxALL, 5 ); + bSizerUpper->Add( sbSizerLeft, 2, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizerRight; bSizerRight = new wxBoxSizer( wxVERTICAL ); sbTrackFilter = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Track Filter") ), wxVERTICAL ); - m_TrackFilterAR = new wxCheckBox( this, wxID_ANY, _("AutoRouted Tracks"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackFilterAR = new wxCheckBox( this, wxID_ANY, _("Automatically routed tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_TrackFilterAR->SetValue(true); sbTrackFilter->Add( m_TrackFilterAR, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_TrackFilterLocked = new wxCheckBox( this, wxID_ANY, _("Locked Tracks"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackFilterLocked = new wxCheckBox( this, wxID_ANY, _("Locked tracks"), wxDefaultPosition, wxDefaultSize, 0 ); sbTrackFilter->Add( m_TrackFilterLocked, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_TrackFilterNormal = new wxCheckBox( this, wxID_ANY, _("Normal Tracks"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TrackFilterNormal = new wxCheckBox( this, wxID_ANY, _("Normal tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_TrackFilterNormal->SetValue(true); sbTrackFilter->Add( m_TrackFilterNormal, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -72,9 +72,9 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi bSizerRight->Add( sbTrackFilter, 0, wxALL|wxEXPAND, 5 ); - wxString m_rbLayersOptionChoices[] = { _("All Layers"), _("Current Layer Only") }; + wxString m_rbLayersOptionChoices[] = { _("All layers"), _("Current layer only") }; int m_rbLayersOptionNChoices = sizeof( m_rbLayersOptionChoices ) / sizeof( wxString ); - m_rbLayersOption = new wxRadioBox( this, wxID_ANY, _("Layers Filter"), wxDefaultPosition, wxDefaultSize, m_rbLayersOptionNChoices, m_rbLayersOptionChoices, 1, wxRA_SPECIFY_COLS ); + m_rbLayersOption = new wxRadioBox( this, wxID_ANY, _("Layer Filter"), wxDefaultPosition, wxDefaultSize, m_rbLayersOptionNChoices, m_rbLayersOptionChoices, 1, wxRA_SPECIFY_COLS ); m_rbLayersOption->SetSelection( 0 ); bSizerRight->Add( m_rbLayersOption, 0, wxALL|wxEXPAND, 5 ); @@ -83,16 +83,17 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi bSizerRight->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_textCtrlCurrLayer = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_textCtrlCurrLayer->SetMaxLength( 0 ); bSizerRight->Add( m_textCtrlCurrLayer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizerUpper->Add( bSizerRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerUpper->Add( bSizerRight, 3, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bSizerMain->Add( bSizerUpper, 0, wxEXPAND, 5 ); + bSizerMain->Add( bSizerUpper, 1, wxALL|wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + bSizerMain->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -101,11 +102,12 @@ DIALOG_GLOBAL_DELETION_BASE::DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWi m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizerMain->Add( m_sdbSizer1, 0, wxEXPAND, 5 ); + bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_global_deletion_base.fbp b/pcbnew/dialogs/dialog_global_deletion_base.fbp index 2c6aef17c3..8dd4781553 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.fbp +++ b/pcbnew/dialogs/dialog_global_deletion_base.fbp @@ -42,10 +42,10 @@ DIALOG_GLOBAL_DELETION_BASE - 365,292 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - + Delete Items @@ -93,8 +93,8 @@ none 5 - wxEXPAND - 0 + wxALL|wxEXPAND + 1 bSizerUpper @@ -103,10 +103,10 @@ 5 wxEXPAND|wxALL - 1 + 2 wxID_ANY - Items to delete + Items to Delete sbSizerLeft wxVERTICAL @@ -145,7 +145,7 @@ 0 0 wxID_ANY - Delete Zones + Zones 0 @@ -233,7 +233,7 @@ 0 0 wxID_ANY - Delete Texts + Text 0 @@ -321,7 +321,7 @@ 0 0 wxID_ANY - Delete Board Outlines + Board outlines 0 @@ -409,7 +409,7 @@ 0 0 wxID_ANY - Delete Drawings + Drawings 0 @@ -497,7 +497,7 @@ 0 0 wxID_ANY - Delete Modules + Footprints 0 @@ -585,7 +585,7 @@ 0 0 wxID_ANY - Delete Tracks + Tracks 0 @@ -673,7 +673,7 @@ 0 0 wxID_ANY - Delete Markers + Markers 0 @@ -820,8 +820,8 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 3 bSizerRight @@ -872,7 +872,7 @@ 0 0 wxID_ANY - AutoRouted Tracks + Automatically routed tracks 0 @@ -960,7 +960,7 @@ 0 0 wxID_ANY - Locked Tracks + Locked tracks 0 @@ -1048,7 +1048,7 @@ 0 0 wxID_ANY - Normal Tracks + Normal tracks 0 @@ -1211,7 +1211,7 @@ 1 0 - "All Layers" "Current Layer Only" + "All layers" "Current layer only" 1 1 @@ -1226,7 +1226,7 @@ 0 0 wxID_ANY - Layers Filter + Layer Filter 1 0 @@ -1463,7 +1463,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1544,7 +1544,7 @@ 5 - wxEXPAND + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_global_deletion_base.h b/pcbnew/dialogs/dialog_global_deletion_base.h index 40985848df..f14c9637fa 100644 --- a/pcbnew/dialogs/dialog_global_deletion_base.h +++ b/pcbnew/dialogs/dialog_global_deletion_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -67,7 +69,7 @@ class DIALOG_GLOBAL_DELETION_BASE : public DIALOG_SHIM public: - DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 365,292 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GLOBAL_DELETION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Delete Items"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GLOBAL_DELETION_BASE(); }; diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp index dd58594904..7a2caafd5e 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -23,39 +23,38 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ bLeftSizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields:") ), wxVERTICAL ); + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint Fields") ), wxVERTICAL ); - m_ReferenceOpt = new wxCheckBox( this, wxID_ANY, _("Modify reference"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ReferenceOpt = new wxCheckBox( this, wxID_ANY, _("Reference designator"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_ReferenceOpt, 0, wxALL|wxEXPAND, 5 ); - m_ValueOpt = new wxCheckBox( this, wxID_ANY, _("Modify value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ValueOpt = new wxCheckBox( this, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_ValueOpt, 0, wxALL|wxEXPAND, 5 ); - m_OtherFields = new wxCheckBox( this, wxID_ANY, _("Modify other fields"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OtherFields = new wxCheckBox( this, wxID_ANY, _("User defined"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_OtherFields, 0, wxALL|wxEXPAND, 5 ); - bLeftSizer->Add( sbSizer1, 1, wxEXPAND|wxRIGHT, 5 ); + bLeftSizer->Add( sbSizer1, 1, wxBOTTOM|wxEXPAND|wxRIGHT, 5 ); - m_staticTextFilter = new wxStaticText( this, wxID_ANY, _("Modules Filter:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextFilter = new wxStaticText( this, wxID_ANY, _("Footprint Filter:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextFilter->Wrap( -1 ); m_staticTextFilter->SetToolTip( _("A string to filter modules to edit.\nIf not void, footprint names should match this filter.\nA filter can be something like SM* (case insensitive)") ); bLeftSizer->Add( m_staticTextFilter, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_ModuleFilter = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_ModuleFilter->SetMinSize( wxSize( 180,-1 ) ); - - bLeftSizer->Add( m_ModuleFilter, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_ModuleFilter->SetMaxLength( 0 ); + bLeftSizer->Add( m_ModuleFilter, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - bSizerUpper->Add( bLeftSizer, 1, wxEXPAND, 5 ); + bSizerUpper->Add( bLeftSizer, 2, wxEXPAND, 5 ); wxBoxSizer* bRightSizer; bRightSizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizerSettings; - sbSizerSettings = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current Design Settings:") ), wxVERTICAL ); + sbSizerSettings = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current Text Dimensions") ), wxVERTICAL ); wxFlexGridSizer* fgSizerCurrSettings; fgSizerCurrSettings = new wxFlexGridSizer( 3, 3, 0, 0 ); @@ -63,23 +62,25 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ fgSizerCurrSettings->SetFlexibleDirection( wxBOTH ); fgSizerCurrSettings->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText3 = new wxStaticText( this, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( this, wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); fgSizerCurrSettings->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); m_SizeX_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeX_Value->SetMaxLength( 0 ); fgSizerCurrSettings->Add( m_SizeX_Value, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_SizeXunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXunit->Wrap( -1 ); fgSizerCurrSettings->Add( m_SizeXunit, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( this, wxID_ANY, _("Height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); fgSizerCurrSettings->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 ); m_SizeY_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + m_SizeY_Value->SetMaxLength( 0 ); + fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_SizeYunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYunit->Wrap( -1 ); @@ -87,29 +88,30 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ m_staticText9 = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); - fgSizerCurrSettings->Add( m_staticText9, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + fgSizerCurrSettings->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); m_TicknessValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerCurrSettings->Add( m_TicknessValue, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + m_TicknessValue->SetMaxLength( 0 ); + fgSizerCurrSettings->Add( m_TicknessValue, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); m_Ticknessunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_Ticknessunit->Wrap( -1 ); - fgSizerCurrSettings->Add( m_Ticknessunit, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerCurrSettings->Add( m_Ticknessunit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); sbSizerSettings->Add( fgSizerCurrSettings, 1, wxEXPAND, 5 ); - bRightSizer->Add( sbSizerSettings, 0, wxEXPAND|wxLEFT, 5 ); + bRightSizer->Add( sbSizerSettings, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - bSizerUpper->Add( bRightSizer, 0, wxEXPAND, 5 ); + bSizerUpper->Add( bRightSizer, 3, wxEXPAND, 5 ); - bMainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 ); + bMainSizer->Add( bSizerUpper, 1, wxALL|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, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); @@ -118,11 +120,12 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - bMainSizer->Add( m_sdbSizerButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bMainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_sdbSizerButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::OnCancelClick ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp index 1cb0a6b557..0a183904ee 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp @@ -42,10 +42,10 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE - 409,199 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Global Module Fields Edition + Set Text Size @@ -93,7 +93,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 @@ -103,7 +103,7 @@ 5 wxEXPAND - 1 + 2 bLeftSizer @@ -111,11 +111,11 @@ none 5 - wxEXPAND|wxRIGHT + wxBOTTOM|wxEXPAND|wxRIGHT 1 wxID_ANY - Fields: + Footprint Fields sbSizer1 wxVERTICAL @@ -154,7 +154,7 @@ 0 0 wxID_ANY - Modify reference + Reference designator 0 @@ -242,7 +242,7 @@ 0 0 wxID_ANY - Modify value + Value 0 @@ -330,7 +330,7 @@ 0 0 wxID_ANY - Modify other fields + User defined 0 @@ -419,7 +419,7 @@ 0 0 wxID_ANY - Modules Filter: + Footprint Filter: 0 @@ -472,7 +472,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -508,7 +508,7 @@ 0 0 - 180,-1 + -1,-1 1 m_ModuleFilter 1 @@ -566,7 +566,7 @@ 5 wxEXPAND - 0 + 3 bRightSizer @@ -574,11 +574,11 @@ none 5 - wxEXPAND|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 wxID_ANY - Current Design Settings: + Current Text Dimensions sbSizerSettings wxVERTICAL @@ -632,7 +632,7 @@ 0 0 wxID_ANY - Size X: + Width: 0 @@ -889,7 +889,7 @@ 0 0 wxID_ANY - Size Y: + Height: 0 @@ -942,7 +942,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1116,7 +1116,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -1199,7 +1199,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -1290,7 +1290,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1381,7 +1381,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1462,7 +1462,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h index 1518ee6810..c366c3788f 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -63,7 +65,7 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM public: - DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Module Fields Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 409,199 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Set Text Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE(); }; diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 764255fd43..21e66b3dac 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -20,6 +20,8 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bSizerUpper = new wxBoxSizer( wxHORIZONTAL ); m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_notebook->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); + m_panelGeneral = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bGeneralSizer; bGeneralSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index d6c97631b8..a4561cdf35 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -114,7 +114,7 @@ - + wxSYS_COLOUR_BTNFACE 1 diff --git a/pcbnew/dialogs/dialog_set_grid.fbp b/pcbnew/dialogs/dialog_set_grid.fbp index 2861883161..1065bee7b8 100644 --- a/pcbnew/dialogs/dialog_set_grid.fbp +++ b/pcbnew/dialogs/dialog_set_grid.fbp @@ -45,7 +45,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Grid Origin and User Grid Size + Grid Properties @@ -102,11 +102,11 @@ none 5 - wxEXPAND|wxALL + wxALL|wxEXPAND 1 - + wxID_ANY - User Grid Size + User Defined Grid sbLeftSizer wxVERTICAL @@ -130,7 +130,7 @@ 1 0 - "Inches" "mm" + "Inches" "Millimeters" 1 1 @@ -145,7 +145,7 @@ 0 0 wxID_ANY - Grid Size Units + Units 1 0 @@ -202,362 +202,370 @@ - + 5 - + wxALL|wxEXPAND 0 - - 10 - protected - 10 - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - User Grid Size X - - 0 - - - 0 + + 2 + wxBOTH + + + 0 - 1 - m_staticTextSizeX - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_OptGridSizeX - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - User Grid Size Y - - 0 - - - 0 - - 1 - m_staticTextSizeY - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_OptGridSizeY - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fgSizer31 + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Size X: + + 0 + + + 0 + + 1 + m_staticTextSizeX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_OptGridSizeX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Size Y: + + 0 + + + 0 + + 1 + m_staticTextSizeY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_OptGridSizeY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -574,10 +582,10 @@ 5 wxEXPAND|wxALL - 1 + 0 wxID_ANY - Grid Origin + Origin sbRightSizer wxVERTICAL @@ -601,7 +609,7 @@ 0 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxTOP 0 1 @@ -631,7 +639,7 @@ 0 0 wxID_ANY - Grid origin X: + X: 0 @@ -684,7 +692,7 @@ 5 - wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -775,7 +783,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT|wxTOP 0 1 @@ -858,7 +866,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxTOP 0 1 @@ -888,7 +896,7 @@ 0 0 wxID_ANY - Grid origin Y: + Y: 0 @@ -941,7 +949,7 @@ 5 - wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 0 1 @@ -1032,7 +1040,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL 0 1 @@ -1211,7 +1219,7 @@ 1 wxID_ANY - Grid for fast switching + Fast Switching sbSizer4 wxVERTICAL @@ -1235,7 +1243,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxTOP 0 1 @@ -1265,7 +1273,7 @@ 0 0 wxID_ANY - Fast Grid 1: + Grid 1: 0 @@ -1318,7 +1326,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 1 @@ -1409,7 +1417,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxTOP 0 1 @@ -1439,7 +1447,7 @@ 0 0 wxID_ANY - Fast Grid 2: + Grid 2: 0 @@ -1591,7 +1599,7 @@ 5 - wxALIGN_RIGHT|wxTOP|wxBOTTOM + wxALL|wxEXPAND|wxTOP 0 0 diff --git a/pcbnew/dialogs/dialog_set_grid_base.cpp b/pcbnew/dialogs/dialog_set_grid_base.cpp index d50d1d185a..0eed82d94f 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.cpp +++ b/pcbnew/dialogs/dialog_set_grid_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -20,39 +20,46 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sbLeftSizer; - sbLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Grid Size") ), wxVERTICAL ); + sbLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Defined Grid") ), wxVERTICAL ); - wxString m_UnitGridChoices[] = { _("Inches"), _("mm") }; + wxString m_UnitGridChoices[] = { _("Inches"), _("Millimeters") }; int m_UnitGridNChoices = sizeof( m_UnitGridChoices ) / sizeof( wxString ); - m_UnitGrid = new wxRadioBox( this, wxID_ANY, _("Grid Size Units"), wxDefaultPosition, wxDefaultSize, m_UnitGridNChoices, m_UnitGridChoices, 1, wxRA_SPECIFY_COLS ); + m_UnitGrid = new wxRadioBox( this, wxID_ANY, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitGridNChoices, m_UnitGridChoices, 1, wxRA_SPECIFY_COLS ); m_UnitGrid->SetSelection( 0 ); sbLeftSizer->Add( m_UnitGrid, 0, wxALL|wxEXPAND, 5 ); + wxFlexGridSizer* fgSizer31; + fgSizer31 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer31->SetFlexibleDirection( wxBOTH ); + fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - sbLeftSizer->Add( 10, 10, 0, 0, 5 ); - - m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("User Grid Size X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSizeX = new wxStaticText( this, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeX->Wrap( -1 ); - sbLeftSizer->Add( m_staticTextSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer31->Add( m_staticTextSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_OptGridSizeX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - sbLeftSizer->Add( m_OptGridSizeX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_OptGridSizeX->SetMaxLength( 0 ); + fgSizer31->Add( m_OptGridSizeX, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("User Grid Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextSizeY = new wxStaticText( this, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeY->Wrap( -1 ); - sbLeftSizer->Add( m_staticTextSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer31->Add( m_staticTextSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_OptGridSizeY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - sbLeftSizer->Add( m_OptGridSizeY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_OptGridSizeY->SetMaxLength( 0 ); + fgSizer31->Add( m_OptGridSizeY, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - bUpperSizer->Add( sbLeftSizer, 1, wxEXPAND|wxALL, 5 ); + sbLeftSizer->Add( fgSizer31, 0, wxALL|wxEXPAND, 5 ); + + + bUpperSizer->Add( sbLeftSizer, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbRightSizer; - sbRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid Origin") ), wxVERTICAL ); + sbRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Origin") ), wxVERTICAL ); wxFlexGridSizer* fgSizerGridOrigin; fgSizerGridOrigin = new wxFlexGridSizer( 2, 3, 0, 0 ); @@ -60,27 +67,29 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con fgSizerGridOrigin->SetFlexibleDirection( wxBOTH ); fgSizerGridOrigin->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextGridPosX = new wxStaticText( this, wxID_ANY, _("Grid origin X:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGridPosX = new wxStaticText( this, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGridPosX->Wrap( -1 ); - fgSizerGridOrigin->Add( m_staticTextGridPosX, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + fgSizerGridOrigin->Add( m_staticTextGridPosX, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxTOP, 5 ); m_GridOriginXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + m_GridOriginXCtrl->SetMaxLength( 0 ); + fgSizerGridOrigin->Add( m_GridOriginXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP, 5 ); m_TextPosXUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosXUnits->Wrap( -1 ); - fgSizerGridOrigin->Add( m_TextPosXUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerGridOrigin->Add( m_TextPosXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT|wxTOP, 5 ); - m_staticTextGridPosY = new wxStaticText( this, wxID_ANY, _("Grid origin Y:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGridPosY = new wxStaticText( this, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGridPosY->Wrap( -1 ); - fgSizerGridOrigin->Add( m_staticTextGridPosY, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + fgSizerGridOrigin->Add( m_staticTextGridPosY, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxTOP, 5 ); m_GridOriginYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + m_GridOriginYCtrl->SetMaxLength( 0 ); + fgSizerGridOrigin->Add( m_GridOriginYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_TextPosYUnits = new wxStaticText( this, wxID_ANY, _("Inches"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosYUnits->Wrap( -1 ); - fgSizerGridOrigin->Add( m_TextPosYUnits, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerGridOrigin->Add( m_TextPosYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 5 ); sbRightSizer->Add( fgSizerGridOrigin, 0, wxALL|wxEXPAND, 5 ); @@ -89,10 +98,10 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con sbRightSizer->Add( m_buttonReset, 0, wxALL|wxEXPAND, 5 ); - bSizer4->Add( sbRightSizer, 1, wxEXPAND|wxALL, 5 ); + bSizer4->Add( sbRightSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer4; - sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Grid for fast switching") ), wxVERTICAL ); + sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fast Switching") ), wxVERTICAL ); wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 ); @@ -100,16 +109,16 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextGrid1 = new wxStaticText( this, wxID_ANY, _("Fast Grid 1:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrid1 = new wxStaticText( this, wxID_ANY, _("Grid 1:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGrid1->Wrap( -1 ); - fgSizer3->Add( m_staticTextGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + fgSizer3->Add( m_staticTextGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT|wxTOP, 5 ); m_comboBoxGrid1 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer3->Add( m_comboBoxGrid1, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + fgSizer3->Add( m_comboBoxGrid1, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - m_staticTextGrid2 = new wxStaticText( this, wxID_ANY, _("Fast Grid 2:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextGrid2 = new wxStaticText( this, wxID_ANY, _("Grid 2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextGrid2->Wrap( -1 ); - fgSizer3->Add( m_staticTextGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + fgSizer3->Add( m_staticTextGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxTOP, 5 ); m_comboBoxGrid2 = new wxComboBox( this, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer3->Add( m_comboBoxGrid2, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); @@ -133,7 +142,7 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxTOP|wxBOTTOM, 5 ); + bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND|wxTOP, 5 ); this->SetSizer( bSizerMain ); diff --git a/pcbnew/dialogs/dialog_set_grid_base.h b/pcbnew/dialogs/dialog_set_grid_base.h index 0fc0dc5bac..568974bf1b 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.h +++ b/pcbnew/dialogs/dialog_set_grid_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) +// C++ code generated with wxFormBuilder (version Oct 8 2012) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,8 @@ #include #include #include +class DIALOG_SHIM; + #include "dialog_shim.h" #include #include @@ -65,7 +67,7 @@ class DIALOG_SET_GRID_BASE : public DIALOG_SHIM public: - DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grid Origin and User Grid Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Grid Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SET_GRID_BASE(); };