diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp index a5346d0b37..fcc5be912a 100644 --- a/pcbnew/dialogs/dialog_edit_module_text.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text.cpp @@ -9,7 +9,7 @@ * Copyright (C) 2015 Jean-Pierre Charras * Copyright (C) 2013 Dick Hollenbeck, dick@softplc.com * Copyright (C) 2008-2013 Wayne Stambaugh - * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,6 +45,7 @@ #include #include +#include #include diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.cpp b/pcbnew/dialogs/dialog_edit_module_text_base.cpp index efca3b4e10..fbf5c26af5 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 1 2016) +// C++ code generated with wxFormBuilder (version Apr 9 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -14,149 +14,154 @@ DialogEditModuleText_base::DialogEditModuleText_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 ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + + + bMainSizer->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Footprint %s (%s) orientation %.1f"), wxDefaultPosition, wxDefaultSize, 0 ); m_ModuleInfoText->Wrap( -1 ); m_ModuleInfoText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - + bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer9; bSizer9 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 7, 2, 0, 0 ); fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); - + m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextDataTitle->Wrap( -1 ); fgSizer1->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + fgSizer1->Add( m_Name, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Width"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXTitle->Wrap( -1 ); fgSizer1->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Height"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYTitle->Wrap( -1 ); fgSizer1->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_WidthTitle->Wrap( -1 ); fgSizer1->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosXTitle->Wrap( -1 ); fgSizer1->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosYTitle->Wrap( -1 ); fgSizer1->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_TxtPosCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel->Wrap( -1 ); fgSizer1->Add( m_LayerLabel, 0, wxALL, 5 ); - - m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_LayerSelectionCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - - bSizer10->Add( fgSizer1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 4, 1, 0, 0 ); - fgSizer3->SetFlexibleDirection( wxBOTH ); - fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); - - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 ); - fgSizer2->SetFlexibleDirection( wxVERTICAL ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); - + + + bSizer10->Add( fgSizer1, 3, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizer5; + bSizer5 = new wxBoxSizer( wxHORIZONTAL ); + wxString m_ShowChoices[] = { _("Visible"), _("Invisible") }; int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString ); m_Show = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS ); m_Show->SetSelection( 0 ); - fgSizer2->Add( m_Show, 1, wxEXPAND|wxRIGHT, 5 ); - + bSizer5->Add( m_Show, 1, wxEXPAND|wxRIGHT, 5 ); + wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); - m_Style->SetSelection( 0 ); - fgSizer2->Add( m_Style, 1, wxEXPAND|wxLEFT, 5 ); - - - fgSizer3->Add( fgSizer2, 1, wxALL|wxEXPAND, 5 ); - + m_Style->SetSelection( 1 ); + bSizer5->Add( m_Style, 1, wxEXPAND|wxLEFT, 5 ); + + + bSizer4->Add( bSizer5, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + wxString m_OrientChoices[] = { _("0.0"), _("+90.0"), _("-90.0"), _("Other") }; int m_OrientNChoices = sizeof( m_OrientChoices ) / sizeof( wxString ); m_Orient = new wxRadioBox( this, wxID_ANY, _("Orientation"), wxDefaultPosition, wxDefaultSize, m_OrientNChoices, m_OrientChoices, 1, wxRA_SPECIFY_COLS ); m_Orient->SetSelection( 2 ); - fgSizer3->Add( m_Orient, 1, wxALL|wxEXPAND, 5 ); - + bSizer4->Add( m_Orient, 1, wxALL|wxEXPAND, 5 ); + m_staticTextRotation = new wxStaticText( this, wxID_ANY, _("Rotation (in 0.1 degrees):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRotation->Wrap( -1 ); - fgSizer3->Add( m_staticTextRotation, 0, wxEXPAND, 5 ); - + bSizer4->Add( m_staticTextRotation, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + m_OrientValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_OrientValue, 0, wxEXPAND, 5 ); - - - bSizer10->Add( fgSizer3, 0, wxALL|wxEXPAND, 5 ); - - - bSizer9->Add( bSizer10, 0, wxEXPAND, 5 ); - - - bMainSizer->Add( bSizer9, 0, wxALL|wxEXPAND, 5 ); - + bSizer4->Add( m_OrientValue, 0, wxALL|wxEXPAND, 5 ); + + + bSizer10->Add( bSizer4, 2, wxBOTTOM|wxEXPAND|wxRIGHT, 5 ); + + + bSizer9->Add( bSizer10, 1, wxEXPAND, 5 ); + + + bMainSizer->Add( bSizer9, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( 0, 0, 0, wxEXPAND, 5 ); + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - - - bMainSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - + + + bMainSizer->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - + bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + + bMainSizer->Add( 0, 0, 0, wxBOTTOM|wxEXPAND, 5 ); + + this->SetSizer( bMainSizer ); this->Layout(); - + // Connect Events m_Orient->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogEditModuleText_base::ModuleOrientEvent ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); @@ -167,5 +172,5 @@ DialogEditModuleText_base::~DialogEditModuleText_base() // Disconnect Events m_Orient->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DialogEditModuleText_base::ModuleOrientEvent ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.fbp b/pcbnew/dialogs/dialog_edit_module_text_base.fbp index a3ed7c37e1..8d31e45782 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_text_base.fbp @@ -44,7 +44,7 @@ DialogEditModuleText_base - 410,391 + 479,413 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Text Properties @@ -94,10 +94,20 @@ wxVERTICAL none + 5 + wxEXPAND|wxTOP + 0 + + 0 + protected + 0 + + + 5 wxALL|wxALIGN_CENTER_HORIZONTAL 0 - + 1 1 1 @@ -176,11 +186,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -257,29 +267,29 @@ - + 5 wxALL|wxEXPAND - 0 - + 1 + bSizer9 wxVERTICAL none - + 5 wxEXPAND - 0 - + 1 + bSizer10 wxHORIZONTAL none - + 5 wxALL|wxEXPAND - 1 - + 3 + 2 wxHORIZONTAL 1 @@ -291,11 +301,11 @@ none 7 0 - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -374,11 +384,11 @@ - + 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -465,11 +475,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -548,11 +558,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -639,11 +649,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -722,11 +732,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -813,11 +823,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -896,11 +906,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -987,11 +997,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1070,11 +1080,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -1161,11 +1171,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1244,11 +1254,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -1335,7 +1345,7 @@ - + 5 wxALL 0 @@ -1418,11 +1428,11 @@ - + 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -1511,38 +1521,24 @@ - + 5 - wxALL|wxEXPAND - 1 - - 1 - wxBOTH - - - 0 + wxBOTTOM|wxEXPAND|wxRIGHT + 2 + - fgSizer3 - wxFLEX_GROWMODE_ALL + bSizer4 + wxVERTICAL none - 4 - 0 - + 5 - wxALL|wxEXPAND - 1 - - 2 - wxVERTICAL - - - 0 + wxEXPAND|wxLEFT|wxRIGHT + 0 + - fgSizer2 - wxFLEX_GROWMODE_ALL + bSizer5 + wxHORIZONTAL none - 1 - 0 5 wxEXPAND|wxRIGHT @@ -1683,7 +1679,7 @@ 1 Resizable - 0 + 1 1 wxRA_SPECIFY_COLS @@ -1815,11 +1811,11 @@ - + 5 - wxEXPAND + wxEXPAND|wxLEFT|wxTOP 0 - + 1 1 1 @@ -1898,11 +1894,11 @@ - + 5 - wxEXPAND + wxALL|wxEXPAND 0 - + 1 1 1 @@ -1995,11 +1991,21 @@ - + + 5 + wxEXPAND + 0 + + 0 + protected + 0 + + + 5 wxEXPAND | wxALL 0 - + 1 1 1 @@ -2076,21 +2082,21 @@ - + 5 - wxEXPAND - 1 - + wxEXPAND|wxTOP + 0 + 0 protected 0 - + 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 - + 0 1 0 @@ -2112,6 +2118,16 @@ + + 5 + wxBOTTOM|wxEXPAND + 0 + + 0 + protected + 0 + + diff --git a/pcbnew/dialogs/dialog_edit_module_text_base.h b/pcbnew/dialogs/dialog_edit_module_text_base.h index a2f5704c25..2cd6b7dd17 100644 --- a/pcbnew/dialogs/dialog_edit_module_text_base.h +++ b/pcbnew/dialogs/dialog_edit_module_text_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2013) +// C++ code generated with wxFormBuilder (version Apr 9 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,7 +11,9 @@ #include #include #include -#include "class_pcb_layer_box_selector.h" +class DIALOG_SHIM; +class PCB_LAYER_BOX_SELECTOR; + #include "dialog_shim.h" #include #include @@ -35,7 +37,7 @@ class DialogEditModuleText_base : public DIALOG_SHIM { private: - + protected: wxStaticText* m_ModuleInfoText; wxStaticLine* m_staticline1; @@ -62,17 +64,17 @@ class DialogEditModuleText_base : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void ModuleOrientEvent( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 410,391 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 479,413 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DialogEditModuleText_base(); - + }; #endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__