diff --git a/pcbnew/dialog_export_3Dfiles_base.cpp b/pcbnew/dialog_export_3Dfiles_base.cpp index e312d5a42c..1c5f3b6fc6 100644 --- a/pcbnew/dialog_export_3Dfiles_base.cpp +++ b/pcbnew/dialog_export_3Dfiles_base.cpp @@ -45,10 +45,10 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_rbSelectUnits->SetSelection( 0 ); bLowerSizer->Add( m_rbSelectUnits, 1, wxALL|wxEXPAND, 5 ); - wxString m_rb3DFilesOptionChoices[] = { _("Copy 3D Shapes Files in Subdir"), _("Use Absolute Path in Wrml File ") }; + wxString m_rb3DFilesOptionChoices[] = { _("Copy 3D Shapes Files in Subdir"), _("Use Absolute Path in Vrml File ") }; int m_rb3DFilesOptionNChoices = sizeof( m_rb3DFilesOptionChoices ) / sizeof( wxString ); m_rb3DFilesOption = new wxRadioBox( this, wxID_ANY, _("3D Shapes Files Option:"), wxDefaultPosition, wxDefaultSize, m_rb3DFilesOptionNChoices, m_rb3DFilesOptionChoices, 1, wxRA_SPECIFY_COLS ); - m_rb3DFilesOption->SetSelection( 0 ); + m_rb3DFilesOption->SetSelection( 1 ); bLowerSizer->Add( m_rb3DFilesOption, 1, wxALL|wxEXPAND, 5 ); bSizer1->Add( bLowerSizer, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialog_export_3Dfiles_base.fbp b/pcbnew/dialog_export_3Dfiles_base.fbp index f0cf0f5a21..74d44bbb94 100644 --- a/pcbnew/dialog_export_3Dfiles_base.fbp +++ b/pcbnew/dialog_export_3Dfiles_base.fbp @@ -365,7 +365,7 @@ 1 - "Copy 3D Shapes Files in Subdir" "Use Absolute Path in Wrml File " + "Copy 3D Shapes Files in Subdir" "Use Absolute Path in Vrml File " 1 @@ -379,7 +379,7 @@ m_rb3DFilesOption protected - 0 + 1 wxRA_SPECIFY_COLS diff --git a/pcbnew/dialog_gendrill_base.cpp b/pcbnew/dialog_gendrill_base.cpp index df5989c803..0b9daf1b0d 100644 --- a/pcbnew/dialog_gendrill_base.cpp +++ b/pcbnew/dialog_gendrill_base.cpp @@ -25,7 +25,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con m_Choice_Unit->SetSelection( 1 ); m_LeftBoxSizer->Add( m_Choice_Unit, 0, wxALL|wxEXPAND, 5 ); - wxString m_Choice_Zeros_FormatChoices[] = { _("decimal format"), _("suppress leading zeros"), _("suppress trailing zeros"), _("keep zeros") }; + wxString m_Choice_Zeros_FormatChoices[] = { _("Decimal format"), _("Suppress leading zeros"), _("Suppress trailing zeros"), _("Keep zeros") }; int m_Choice_Zeros_FormatNChoices = sizeof( m_Choice_Zeros_FormatChoices ) / sizeof( wxString ); m_Choice_Zeros_Format = new wxRadioBox( this, wxID_ANY, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatNChoices, m_Choice_Zeros_FormatChoices, 1, wxRA_SPECIFY_COLS ); m_Choice_Zeros_Format->SetSelection( 0 ); @@ -41,7 +41,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con m_LeftBoxSizer->Add( m_Choice_Precision, 0, wxALL|wxEXPAND, 5 ); - wxString m_Choice_Drill_OffsetChoices[] = { _("absolute"), _("auxiliary axis") }; + wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") }; int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString ); m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS ); m_Choice_Drill_Offset->SetSelection( 0 ); @@ -54,7 +54,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con wxBoxSizer* bMiddleBoxSizer; bMiddleBoxSizer = new wxBoxSizer( wxVERTICAL ); - wxString m_Choice_Drill_MapChoices[] = { _("None"), _("drill sheet (HPGL)"), _("drill sheet (PostScript)"), _("Drill sheet (Gerber)"), _("Drill sheet (DXF)") }; + wxString m_Choice_Drill_MapChoices[] = { _("None"), _("Drill map (HPGL)"), _("Drill map (PostScript)"), _("Drill map (Gerber)"), _("Drill map (DXF)") }; int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString ); m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS ); m_Choice_Drill_Map->SetSelection( 0 ); @@ -87,20 +87,20 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con m_PenNum = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbHPGOptionsSizer->Add( m_PenNum, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - bMiddleBoxSizer->Add( sbHPGOptionsSizer, 1, wxEXPAND, 5 ); + bMiddleBoxSizer->Add( sbHPGOptionsSizer, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbOptSizer; sbOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); - m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 ); sbOptSizer->Add( m_Check_Mirror, 0, wxALL, 5 ); - m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("minimal header"), wxDefaultPosition, wxDefaultSize, 0 ); + m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("Minimal header"), wxDefaultPosition, wxDefaultSize, 0 ); sbOptSizer->Add( m_Check_Minimal, 0, wxALL, 5 ); - bMiddleBoxSizer->Add( sbOptSizer, 1, wxEXPAND, 5 ); + bMiddleBoxSizer->Add( sbOptSizer, 0, wxEXPAND, 5 ); bMainSizer->Add( bMiddleBoxSizer, 1, wxEXPAND, 5 ); @@ -145,19 +145,19 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con m_BuriedViasInfoMsg->Wrap( -1 ); sbSizerHoles->Add( m_BuriedViasInfoMsg, 0, wxALL, 5 ); + sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - sbSizerHoles->Add( 10, 10, 1, wxEXPAND, 5 ); + bRightBoxSizer->Add( sbSizerInfo, 0, wxEXPAND|wxTOP, 5 ); + + + bRightBoxSizer->Add( 10, 10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); m_OkButton->SetDefault(); - sbSizerHoles->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + bRightBoxSizer->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); m_CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerHoles->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - - bRightBoxSizer->Add( sbSizerInfo, 1, wxEXPAND|wxTOP, 5 ); + bRightBoxSizer->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); bMainSizer->Add( bRightBoxSizer, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialog_gendrill_base.fbp b/pcbnew/dialog_gendrill_base.fbp index 79dfe0191b..dee44347e4 100644 --- a/pcbnew/dialog_gendrill_base.fbp +++ b/pcbnew/dialog_gendrill_base.fbp @@ -32,7 +32,7 @@ DIALOG_GENDRILL_BASE - 447,439 + 447,412 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Drill Files Generation @@ -144,7 +144,7 @@ 0 - "decimal format" "suppress leading zeros" "suppress trailing zeros" "keep zeros" + "Decimal format" "Suppress leading zeros" "Suppress trailing zeros" "Keep zeros" 1 @@ -252,7 +252,7 @@ 0 - "absolute" "auxiliary axis" + "Absolute" "Auxiliary axis" 1 @@ -317,7 +317,7 @@ 0 - "None" "drill sheet (HPGL)" "drill sheet (PostScript)" "Drill sheet (Gerber)" "Drill sheet (DXF)" + "None" "Drill map (HPGL)" "Drill map (PostScript)" "Drill map (Gerber)" "Drill map (DXF)" 1 @@ -422,7 +422,7 @@ 5 wxEXPAND - 1 + 0 wxID_ANY HPGL plotter Options: @@ -648,7 +648,7 @@ 5 wxEXPAND - 1 + 0 wxID_ANY Options: @@ -670,7 +670,7 @@ 0 wxID_ANY - mirror y axis + Mirror y axis m_Check_Mirror @@ -722,7 +722,7 @@ 0 wxID_ANY - minimal header + Minimal header m_Check_Minimal @@ -777,7 +777,7 @@ 5 wxEXPAND|wxTOP - 1 + 0 wxID_ANY Info: @@ -1132,124 +1132,124 @@ - - 5 - wxEXPAND - 1 - - 10 - protected - 10 - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - - - 1 - 1 - - - 0 - wxID_OK - OK - - - m_OkButton - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - wxID_CANCEL - Cancel - - - m_CancelButton - protected - - - - - - - - - OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - - - + + 5 + wxEXPAND|wxALIGN_CENTER_HORIZONTAL + 1 + + 10 + protected + 10 + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + + + 1 + 1 + + + 0 + wxID_OK + OK + + + m_OkButton + protected + + + + + + + + + OnOkClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND + 0 + + + + 0 + 1 + + + 0 + wxID_CANCEL + Cancel + + + m_CancelButton + protected + + + + + + + + + OnCancelClick + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialog_gendrill_base.h b/pcbnew/dialog_gendrill_base.h index d44a4b482c..b8136d83f1 100644 --- a/pcbnew/dialog_gendrill_base.h +++ b/pcbnew/dialog_gendrill_base.h @@ -67,7 +67,7 @@ class DIALOG_GENDRILL_BASE : public wxDialog public: - DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,439 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,412 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GENDRILL_BASE(); }; diff --git a/pcbnew/dialog_general_options.cpp b/pcbnew/dialog_general_options.cpp index b0378c2622..c0bbaef8d8 100644 --- a/pcbnew/dialog_general_options.cpp +++ b/pcbnew/dialog_general_options.cpp @@ -50,7 +50,7 @@ void Dialog_GeneralOptions::init() m_ShowModuleRatsnest->SetValue( g_Show_Module_Ratsnest ); m_ShowGlobalRatsnest->SetValue( m_Board->IsElementVisible(RATSNEST_VISIBLE) ); m_TrackAutodel->SetValue( g_AutoDeleteOldTrack ); - m_Track_45_Only_Ctrl->SetValue( Track_45_Only ); + m_Track_45_Only_Ctrl->SetValue( g_Track_45_Only_Allowed ); m_Segments_45_Only_Ctrl->SetValue( Segments_45_Only ); m_AutoPANOpt->SetValue( m_Parent->DrawPanel->m_AutoPAN_Enable ); m_Segments_45_Only_Ctrl->SetValue( Segments_45_Only ); @@ -92,7 +92,7 @@ void Dialog_GeneralOptions::OnOkClick( wxCommandEvent& event ) g_Show_Module_Ratsnest = m_ShowModuleRatsnest->GetValue(); g_AutoDeleteOldTrack = m_TrackAutodel->GetValue(); Segments_45_Only = m_Segments_45_Only_Ctrl->GetValue(); - Track_45_Only = m_Track_45_Only_Ctrl->GetValue(); + g_Track_45_Only_Allowed = m_Track_45_Only_Ctrl->GetValue(); m_Parent->DrawPanel->m_AutoPAN_Enable = m_AutoPANOpt->GetValue(); g_TwoSegmentTrackBuild = m_Track_DoubleSegm_Ctrl->GetValue(); diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp index c76df22c58..0edb5aed33 100644 --- a/pcbnew/editrack.cpp +++ b/pcbnew/editrack.cpp @@ -736,7 +736,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, } } - if( Track_45_Only ) + if( g_Track_45_Only_Allowed ) { if( g_TwoSegmentTrackBuild ) { diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index f41099570c..953fb72ec2 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -43,8 +43,8 @@ bool g_Drag_Pistes_On; bool g_Show_Module_Ratsnest; bool g_Show_Pads_Module_in_Move = true; bool g_Raccord_45_Auto = true; -bool Track_45_Only; -bool Segments_45_Only; +bool g_Track_45_Only_Allowed = true; // True to allow horiz, vert. and 45deg only tracks +bool Segments_45_Only; // True to allow horiz, vert. and 45deg only graphic segments bool g_TwoSegmentTrackBuild = true; bool g_HighLight_Status; diff --git a/pcbnew/pcbnew.h b/pcbnew/pcbnew.h index b1ee5dc5ae..6409eb3c2e 100644 --- a/pcbnew/pcbnew.h +++ b/pcbnew/pcbnew.h @@ -60,7 +60,7 @@ extern bool g_Raccord_45_Auto; extern const wxString g_FootprintLibFileWildcard; // Wildcard for footprint libraries filesnames -extern bool Track_45_Only; +extern bool g_Track_45_Only_Allowed; extern bool Segments_45_Only; extern wxString g_Shapes3DExtBuffer; extern wxString g_DocModulesFileName;