haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow arbitrary angles for footprint field texts

This commit is contained in:
Patrick Pereira 2016-04-08 19:18:44 -04:00 committed by Chris Pavlina
parent 5504c17787
commit 342ba51e6d
7 changed files with 688 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/eda_text.h
View File

@ -135,7 +135,6 @@ public:
void SetOrientation( double aOrientation ) void SetOrientation( double aOrientation )
{ {
NORMALIZE_ANGLE_POS( aOrientation );
m_Orient = aOrientation; m_Orient = aOrientation;
} }
double GetOrientation() const { return m_Orient; } double GetOrientation() const { return m_Orient; }

7
pcbnew/class_text_mod.cpp
View File

@ -340,12 +340,13 @@ double TEXTE_MODULE::GetDrawRotation() const
if( module ) if( module )
rotation += module->GetOrientation(); rotation += module->GetOrientation();
NORMALIZE_ANGLE_POS( rotation ); // For angle = -90 .. 90 deg
// For angle = 0 .. 180 deg
while( rotation > 900 ) while( rotation > 900 )
rotation -= 1800; rotation -= 1800;
while( rotation < -900 )
rotation += 1800;
return rotation; return rotation;
} }

113
pcbnew/dialogs/dialog_edit_module_text.cpp
View File

@ -159,6 +159,34 @@ void DialogEditModuleText::initDlg( )
if( !m_currentText->IsVisible() ) if( !m_currentText->IsVisible() )
m_Show->SetSelection( 1 ); m_Show->SetSelection( 1 );
bool select = false;
switch( int( m_currentText->GetOrientation() ) )
{
case 0:
m_Orient->SetSelection( 0 );
break;
case 900:
case -2700:
m_Orient->SetSelection( 1 );
break;
case -900:
case 2700:
m_Orient->SetSelection( 2 );
break;
default:
m_Orient->SetSelection( 3 );
select = true;
break;
}
wxString msg2;
msg2 << m_currentText->GetOrientation();
m_OrientValue->SetValue( msg2 );
m_OrientValue->Enable( select );
// Configure the layers list selector // Configure the layers list selector
if( !m_parent->GetBoard()->IsLayerEnabled( m_currentText->GetLayer() ) ) if( !m_parent->GetBoard()->IsLayerEnabled( m_currentText->GetLayer() ) )
// Footprints are built outside the current board, so items cann be // Footprints are built outside the current board, so items cann be
@ -178,6 +206,30 @@ void DialogEditModuleText::initDlg( )
} }
} }
void DialogEditModuleText::ModuleOrientEvent( wxCommandEvent& event )
{
switch( m_Orient->GetSelection() )
{
case 0:
m_OrientValue->Enable( false );
m_OrientValue->SetValue( wxT( "0" ) );
break;
case 1:
m_OrientValue->Enable( false );
m_OrientValue->SetValue( wxT( "900" ) );
break;
case 2:
m_OrientValue->Enable( false );
m_OrientValue->SetValue( wxT( "-900" ) );
break;
default:
m_OrientValue->Enable( true );
break;
}
}
void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) void DialogEditModuleText::OnOkClick( wxCommandEvent& event )
{ {
@ -239,8 +291,65 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event )
m_currentText->SetVisible( m_Show->GetSelection() == 0 ); m_currentText->SetVisible( m_Show->GetSelection() == 0 );
int text_orient = (m_Orient->GetSelection() == 0) ? 0 : 900; bool select = false;
m_currentText->SetOrientation( text_orient ); switch( m_Orient->GetSelection() )
{
case 0:
m_currentText->SetOrientation( 0 );
break;
case 1:
m_currentText->SetOrientation( 900 );
break;
case 2:
m_currentText->SetOrientation( -900 );
break;
default:
select = true;
long orient = 0;
msg = m_OrientValue->GetValue();
msg.ToLong( &orient );
m_currentText->SetOrientation( orient );
break;
};
switch( int( m_currentText->GetOrientation() ) )
{
case 0:
m_Orient->SetSelection( 0 );
break;
case 900:
case -2700:
m_Orient->SetSelection( 1 );
break;
case -900:
case 2700:
m_Orient->SetSelection( 2 );
break;
default:
m_Orient->SetSelection( 3 );
long orient = 0;
msg = m_OrientValue->GetValue();
msg.ToLong( &orient );
while( orient < -900 )
orient += 1800;
while( orient > 900 )
orient -= 1800;
m_currentText->SetOrientation( orient );
select = true;
break;
}
msg << m_currentText->GetOrientation();
m_OrientValue->SetValue( msg );
m_OrientValue->Enable( select );
m_currentText->SetDrawCoord(); m_currentText->SetDrawCoord();

1
pcbnew/dialogs/dialog_edit_module_text.h
View File

@ -48,6 +48,7 @@ private:
void initDlg( ); void initDlg( );
void OnOkClick( wxCommandEvent& event ); void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
void ModuleOrientEvent( wxCommandEvent& event );
}; };
#endif /* DIALOG_EDIT_MODULE_TEXT_H */ #endif /* DIALOG_EDIT_MODULE_TEXT_H */

152
pcbnew/dialogs/dialog_edit_module_text_base.cpp
View File

@ -1,10 +1,12 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Apr 1 2016)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "class_pcb_layer_box_selector.h"
#include "dialog_edit_module_text_base.h" #include "dialog_edit_module_text_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -12,146 +14,158 @@
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 ) 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 ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Footprint %s (%s) orientation %.1f"), wxDefaultPosition, wxDefaultSize, 0 ); m_ModuleInfoText = new wxStaticText( this, wxID_ANY, _("Footprint %s (%s) orientation %.1f"), wxDefaultPosition, wxDefaultSize, 0 );
m_ModuleInfoText->Wrap( -1 ); m_ModuleInfoText->Wrap( -1 );
m_ModuleInfoText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); m_ModuleInfoText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); bMainSizer->Add( m_ModuleInfoText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 );
wxBoxSizer* bSizer9; wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxVERTICAL ); bSizer9 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer10; wxBoxSizer* bSizer10;
bSizer10 = new wxBoxSizer( wxHORIZONTAL ); bSizer10 = new wxBoxSizer( wxHORIZONTAL );
wxFlexGridSizer* fgSizer1; wxFlexGridSizer* fgSizer1;
fgSizer1 = new wxFlexGridSizer( 7, 2, 0, 0 ); fgSizer1 = new wxFlexGridSizer( 7, 2, 0, 0 );
fgSizer1->AddGrowableCol( 1 ); fgSizer1->AddGrowableCol( 1 );
fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextDataTitle = new wxStaticText( this, wxID_ANY, _("Reference:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextDataTitle->Wrap( -1 ); m_TextDataTitle->Wrap( -1 );
fgSizer1->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_TextDataTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Name = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_Name->SetMaxLength( 0 );
fgSizer1->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_Name, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Width"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXTitle = new wxStaticText( this, wxID_ANY, _("Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeXTitle->Wrap( -1 ); m_SizeXTitle->Wrap( -1 );
fgSizer1->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_SizeXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TxtSizeCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TxtSizeCtrlX->SetMaxLength( 0 );
fgSizer1->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer1->Add( m_TxtSizeCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Height"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYTitle = new wxStaticText( this, wxID_ANY, _("Height"), wxDefaultPosition, wxDefaultSize, 0 );
m_SizeYTitle->Wrap( -1 ); m_SizeYTitle->Wrap( -1 );
fgSizer1->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_SizeYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TxtSizeCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TxtSizeCtrlY->SetMaxLength( 0 );
fgSizer1->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer1->Add( m_TxtSizeCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_WidthTitle = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
m_WidthTitle->Wrap( -1 ); m_WidthTitle->Wrap( -1 );
fgSizer1->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_WidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TxtWidthCtlr = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TxtWidthCtlr->SetMaxLength( 0 );
fgSizer1->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer1->Add( m_TxtWidthCtlr, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosXTitle = new wxStaticText( this, wxID_ANY, _("Offset X"), wxDefaultPosition, wxDefaultSize, 0 );
m_PosXTitle->Wrap( -1 ); m_PosXTitle->Wrap( -1 );
fgSizer1->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_PosXTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TxtPosCtrlX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TxtPosCtrlX->SetMaxLength( 0 );
fgSizer1->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer1->Add( m_TxtPosCtrlX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 ); m_PosYTitle = new wxStaticText( this, wxID_ANY, _("Offset Y"), wxDefaultPosition, wxDefaultSize, 0 );
m_PosYTitle->Wrap( -1 ); m_PosYTitle->Wrap( -1 );
fgSizer1->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_PosYTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TxtPosCtrlY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TxtPosCtrlY->SetMaxLength( 0 );
fgSizer1->Add( m_TxtPosCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer1->Add( m_TxtPosCtrlY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
m_LayerLabel->Wrap( -1 ); m_LayerLabel->Wrap( -1 );
fgSizer1->Add( m_LayerLabel, 0, wxALL, 5 ); 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 ); fgSizer1->Add( m_LayerSelectionCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
bSizer10->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); bSizer10->Add( fgSizer1, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
wxFlexGridSizer* fgSizer3;
bSizer9->Add( bSizer10, 0, wxEXPAND, 5 ); fgSizer3 = new wxFlexGridSizer( 4, 1, 0, 0 );
fgSizer3->SetFlexibleDirection( wxBOTH );
wxBoxSizer* bSizer4; fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
bSizer4 = new wxBoxSizer( wxHORIZONTAL );
wxFlexGridSizer* fgSizer2;
wxString m_StyleChoices[] = { _("Normal"), _("Italic") }; fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 );
int m_StyleNChoices = sizeof( m_StyleChoices ) / sizeof( wxString ); fgSizer2->SetFlexibleDirection( wxVERTICAL );
m_Style = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleNChoices, m_StyleChoices, 1, wxRA_SPECIFY_COLS ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
m_Style->SetSelection( 0 );
bSizer4->Add( m_Style, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
wxString m_OrientChoices[] = { _("Horizontal"), _("Vertical") };
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( 0 );
bSizer4->Add( m_Orient, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
wxString m_ShowChoices[] = { _("Visible"), _("Invisible") }; wxString m_ShowChoices[] = { _("Visible"), _("Invisible") };
int m_ShowNChoices = sizeof( m_ShowChoices ) / sizeof( wxString ); 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 = new wxRadioBox( this, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, m_ShowNChoices, m_ShowChoices, 1, wxRA_SPECIFY_COLS );
m_Show->SetSelection( 0 ); m_Show->SetSelection( 0 );
bSizer4->Add( m_Show, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); fgSizer2->Add( m_Show, 1, wxEXPAND|wxRIGHT, 5 );
wxString m_StyleChoices[] = { _("Normal"), _("Italic") };
bSizer9->Add( bSizer4, 0, wxEXPAND, 5 ); 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 );
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 );
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 );
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 ); bMainSizer->Add( bSizer9, 0, wxALL|wxEXPAND, 5 );
m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bMainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); bMainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
bMainSizer->Add( 0, 0, 1, wxEXPAND, 5 ); bMainSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize(); m_sdbSizer1->Realize();
bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
this->SetSizer( bMainSizer ); this->SetSizer( bMainSizer );
this->Layout(); this->Layout();
bMainSizer->Fit( this );
// Connect Events // 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 ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this );
} }
DialogEditModuleText_base::~DialogEditModuleText_base() DialogEditModuleText_base::~DialogEditModuleText_base()
{ {
// Disconnect Events // 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 ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this );
} }

757
pcbnew/dialogs/dialog_edit_module_text_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="11" /> <FileVersion major="1" minor="13" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
@ -44,7 +44,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DialogEditModuleText_base</property> <property name="name">DialogEditModuleText_base</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">410,391</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Footprint Text Properties</property> <property name="title">Footprint Text Properties</property>
@ -281,13 +281,13 @@
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">2</property> <property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxHORIZONTAL</property>
<property name="growablecols">1</property> <property name="growablecols">1</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">0</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">fgSizer1</property> <property name="name">fgSizer1</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
<property name="permission">none</property> <property name="permission">none</property>
<property name="rows">7</property> <property name="rows">7</property>
<property name="vgap">0</property> <property name="vgap">0</property>
@ -1511,285 +1511,484 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer4</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxRadioBox" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="BottomDockable">1</property> <property name="cols">1</property>
<property name="LeftDockable">1</property> <property name="flexible_direction">wxBOTH</property>
<property name="RightDockable">1</property> <property name="growablecols"></property>
<property name="TopDockable">1</property> <property name="growablerows"></property>
<property name="aui_layer"></property> <property name="hgap">0</property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;Normal&quot; &quot;Italic&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Style</property>
<property name="majorDimension">1</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="name">fgSizer3</property>
<property name="name">m_Style</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
<property name="pane_border">1</property> <property name="permission">none</property>
<property name="pane_position"></property> <property name="rows">4</property>
<property name="pane_size"></property> <property name="vgap">0</property>
<property name="permission">protected</property> <object class="sizeritem" expanded="1">
<property name="pin_button">1</property> <property name="border">5</property>
<property name="pos"></property> <property name="flag">wxALL|wxEXPAND</property>
<property name="resize">Resizable</property> <property name="proportion">1</property>
<property name="selection">0</property> <object class="wxFlexGridSizer" expanded="1">
<property name="show">1</property> <property name="cols">2</property>
<property name="size"></property> <property name="flexible_direction">wxVERTICAL</property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="growablecols"></property>
<property name="subclass"></property> <property name="growablerows"></property>
<property name="toolbar_pane">0</property> <property name="hgap">0</property>
<property name="tooltip"></property> <property name="minimum_size"></property>
<property name="validator_data_type"></property> <property name="name">fgSizer2</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property>
<property name="validator_type">wxDefaultValidator</property> <property name="permission">none</property>
<property name="validator_variable"></property> <property name="rows">1</property>
<property name="window_extra_style"></property> <property name="vgap">0</property>
<property name="window_name"></property> <object class="sizeritem" expanded="0">
<property name="window_style"></property> <property name="border">5</property>
<event name="OnChar"></event> <property name="flag">wxEXPAND|wxRIGHT</property>
<event name="OnEnterWindow"></event> <property name="proportion">1</property>
<event name="OnEraseBackground"></event> <object class="wxRadioBox" expanded="0">
<event name="OnKeyDown"></event> <property name="BottomDockable">1</property>
<event name="OnKeyUp"></event> <property name="LeftDockable">1</property>
<event name="OnKillFocus"></event> <property name="RightDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="TopDockable">1</property>
<event name="OnLeftDClick"></event> <property name="aui_layer"></property>
<event name="OnLeftDown"></event> <property name="aui_name"></property>
<event name="OnLeftUp"></event> <property name="aui_position"></property>
<event name="OnMiddleDClick"></event> <property name="aui_row"></property>
<event name="OnMiddleDown"></event> <property name="best_size"></property>
<event name="OnMiddleUp"></event> <property name="bg"></property>
<event name="OnMotion"></event> <property name="caption"></property>
<event name="OnMouseEvents"></event> <property name="caption_visible">1</property>
<event name="OnMouseWheel"></event> <property name="center_pane">0</property>
<event name="OnPaint"></event> <property name="choices">&quot;Visible&quot; &quot;Invisible&quot;</property>
<event name="OnRadioBox"></event> <property name="close_button">1</property>
<event name="OnRightDClick"></event> <property name="context_help"></property>
<event name="OnRightDown"></event> <property name="context_menu">1</property>
<event name="OnRightUp"></event> <property name="default_pane">0</property>
<event name="OnSetFocus"></event> <property name="dock">Dock</property>
<event name="OnSize"></event> <property name="dock_fixed">1</property>
<event name="OnUpdateUI"></event> <property name="docking">Left</property>
</object> <property name="enabled">1</property>
</object> <property name="fg"></property>
<object class="sizeritem" expanded="1"> <property name="floatable">1</property>
<property name="border">5</property> <property name="font"></property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="gripper">0</property>
<property name="proportion">1</property> <property name="hidden">0</property>
<object class="wxRadioBox" expanded="1"> <property name="id">wxID_ANY</property>
<property name="BottomDockable">1</property> <property name="label">Display</property>
<property name="LeftDockable">1</property> <property name="majorDimension">1</property>
<property name="RightDockable">1</property> <property name="max_size"></property>
<property name="TopDockable">1</property> <property name="maximize_button">0</property>
<property name="aui_layer"></property> <property name="maximum_size"></property>
<property name="aui_name"></property> <property name="min_size"></property>
<property name="aui_position"></property> <property name="minimize_button">0</property>
<property name="aui_row"></property> <property name="minimum_size"></property>
<property name="best_size"></property> <property name="moveable">1</property>
<property name="bg"></property> <property name="name">m_Show</property>
<property name="caption"></property> <property name="pane_border">1</property>
<property name="caption_visible">1</property> <property name="pane_position"></property>
<property name="center_pane">0</property> <property name="pane_size"></property>
<property name="choices">&quot;Horizontal&quot; &quot;Vertical&quot;</property> <property name="permission">protected</property>
<property name="close_button">1</property> <property name="pin_button">1</property>
<property name="context_help"></property> <property name="pos"></property>
<property name="context_menu">1</property> <property name="resize">Resizable</property>
<property name="default_pane">0</property> <property name="selection">0</property>
<property name="dock">Dock</property> <property name="show">1</property>
<property name="dock_fixed">0</property> <property name="size"></property>
<property name="docking">Left</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="enabled">1</property> <property name="subclass"></property>
<property name="fg"></property> <property name="toolbar_pane">0</property>
<property name="floatable">1</property> <property name="tooltip"></property>
<property name="font"></property> <property name="validator_data_type"></property>
<property name="gripper">0</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="hidden">0</property> <property name="validator_type">wxDefaultValidator</property>
<property name="id">wxID_ANY</property> <property name="validator_variable"></property>
<property name="label">Orientation</property> <property name="window_extra_style"></property>
<property name="majorDimension">1</property> <property name="window_name"></property>
<property name="max_size"></property> <property name="window_style"></property>
<property name="maximize_button">0</property> <event name="OnChar"></event>
<property name="maximum_size"></property> <event name="OnEnterWindow"></event>
<property name="min_size"></property> <event name="OnEraseBackground"></event>
<property name="minimize_button">0</property> <event name="OnKeyDown"></event>
<property name="minimum_size"></property> <event name="OnKeyUp"></event>
<property name="moveable">1</property> <event name="OnKillFocus"></event>
<property name="name">m_Orient</property> <event name="OnLeaveWindow"></event>
<property name="pane_border">1</property> <event name="OnLeftDClick"></event>
<property name="pane_position"></property> <event name="OnLeftDown"></event>
<property name="pane_size"></property> <event name="OnLeftUp"></event>
<property name="permission">protected</property> <event name="OnMiddleDClick"></event>
<property name="pin_button">1</property> <event name="OnMiddleDown"></event>
<property name="pos"></property> <event name="OnMiddleUp"></event>
<property name="resize">Resizable</property> <event name="OnMotion"></event>
<property name="selection">0</property> <event name="OnMouseEvents"></event>
<property name="show">1</property> <event name="OnMouseWheel"></event>
<property name="size"></property> <event name="OnPaint"></event>
<property name="style">wxRA_SPECIFY_COLS</property> <event name="OnRadioBox"></event>
<property name="subclass"></property> <event name="OnRightDClick"></event>
<property name="toolbar_pane">0</property> <event name="OnRightDown"></event>
<property name="tooltip"></property> <event name="OnRightUp"></event>
<property name="validator_data_type"></property> <event name="OnSetFocus"></event>
<property name="validator_style">wxFILTER_NONE</property> <event name="OnSize"></event>
<property name="validator_type">wxDefaultValidator</property> <event name="OnUpdateUI"></event>
<property name="validator_variable"></property> </object>
<property name="window_extra_style"></property> </object>
<property name="window_name"></property> <object class="sizeritem" expanded="0">
<property name="window_style"></property> <property name="border">5</property>
<event name="OnChar"></event> <property name="flag">wxEXPAND|wxLEFT</property>
<event name="OnEnterWindow"></event> <property name="proportion">1</property>
<event name="OnEraseBackground"></event> <object class="wxRadioBox" expanded="0">
<event name="OnKeyDown"></event> <property name="BottomDockable">1</property>
<event name="OnKeyUp"></event> <property name="LeftDockable">1</property>
<event name="OnKillFocus"></event> <property name="RightDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="TopDockable">1</property>
<event name="OnLeftDClick"></event> <property name="aui_layer"></property>
<event name="OnLeftDown"></event> <property name="aui_name"></property>
<event name="OnLeftUp"></event> <property name="aui_position"></property>
<event name="OnMiddleDClick"></event> <property name="aui_row"></property>
<event name="OnMiddleDown"></event> <property name="best_size"></property>
<event name="OnMiddleUp"></event> <property name="bg"></property>
<event name="OnMotion"></event> <property name="caption"></property>
<event name="OnMouseEvents"></event> <property name="caption_visible">1</property>
<event name="OnMouseWheel"></event> <property name="center_pane">0</property>
<event name="OnPaint"></event> <property name="choices">&quot;Normal&quot; &quot;Italic&quot;</property>
<event name="OnRadioBox"></event> <property name="close_button">1</property>
<event name="OnRightDClick"></event> <property name="context_help"></property>
<event name="OnRightDown"></event> <property name="context_menu">1</property>
<event name="OnRightUp"></event> <property name="default_pane">0</property>
<event name="OnSetFocus"></event> <property name="dock">Dock</property>
<event name="OnSize"></event> <property name="dock_fixed">1</property>
<event name="OnUpdateUI"></event> <property name="docking">Left</property>
</object> <property name="enabled">1</property>
</object> <property name="fg"></property>
<object class="sizeritem" expanded="1"> <property name="floatable">1</property>
<property name="border">5</property> <property name="font"></property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="gripper">0</property>
<property name="proportion">1</property> <property name="hidden">0</property>
<object class="wxRadioBox" expanded="1"> <property name="id">wxID_ANY</property>
<property name="BottomDockable">1</property> <property name="label">Style</property>
<property name="LeftDockable">1</property> <property name="majorDimension">1</property>
<property name="RightDockable">1</property> <property name="max_size"></property>
<property name="TopDockable">1</property> <property name="maximize_button">0</property>
<property name="aui_layer"></property> <property name="maximum_size"></property>
<property name="aui_name"></property> <property name="min_size"></property>
<property name="aui_position"></property> <property name="minimize_button">0</property>
<property name="aui_row"></property> <property name="minimum_size"></property>
<property name="best_size"></property> <property name="moveable">1</property>
<property name="bg"></property> <property name="name">m_Style</property>
<property name="caption"></property> <property name="pane_border">1</property>
<property name="caption_visible">1</property> <property name="pane_position"></property>
<property name="center_pane">0</property> <property name="pane_size"></property>
<property name="choices">&quot;Visible&quot; &quot;Invisible&quot;</property> <property name="permission">protected</property>
<property name="close_button">1</property> <property name="pin_button">1</property>
<property name="context_help"></property> <property name="pos"></property>
<property name="context_menu">1</property> <property name="resize">Resizable</property>
<property name="default_pane">0</property> <property name="selection">0</property>
<property name="dock">Dock</property> <property name="show">1</property>
<property name="dock_fixed">0</property> <property name="size"></property>
<property name="docking">Left</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="enabled">1</property> <property name="subclass"></property>
<property name="fg"></property> <property name="toolbar_pane">0</property>
<property name="floatable">1</property> <property name="tooltip"></property>
<property name="font"></property> <property name="validator_data_type"></property>
<property name="gripper">0</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="hidden">0</property> <property name="validator_type">wxDefaultValidator</property>
<property name="id">wxID_ANY</property> <property name="validator_variable"></property>
<property name="label">Display</property> <property name="window_extra_style"></property>
<property name="majorDimension">1</property> <property name="window_name"></property>
<property name="max_size"></property> <property name="window_style"></property>
<property name="maximize_button">0</property> <event name="OnChar"></event>
<property name="maximum_size"></property> <event name="OnEnterWindow"></event>
<property name="min_size"></property> <event name="OnEraseBackground"></event>
<property name="minimize_button">0</property> <event name="OnKeyDown"></event>
<property name="minimum_size"></property> <event name="OnKeyUp"></event>
<property name="moveable">1</property> <event name="OnKillFocus"></event>
<property name="name">m_Show</property> <event name="OnLeaveWindow"></event>
<property name="pane_border">1</property> <event name="OnLeftDClick"></event>
<property name="pane_position"></property> <event name="OnLeftDown"></event>
<property name="pane_size"></property> <event name="OnLeftUp"></event>
<property name="permission">protected</property> <event name="OnMiddleDClick"></event>
<property name="pin_button">1</property> <event name="OnMiddleDown"></event>
<property name="pos"></property> <event name="OnMiddleUp"></event>
<property name="resize">Resizable</property> <event name="OnMotion"></event>
<property name="selection">0</property> <event name="OnMouseEvents"></event>
<property name="show">1</property> <event name="OnMouseWheel"></event>
<property name="size"></property> <event name="OnPaint"></event>
<property name="style">wxRA_SPECIFY_COLS</property> <event name="OnRadioBox"></event>
<property name="subclass"></property> <event name="OnRightDClick"></event>
<property name="toolbar_pane">0</property> <event name="OnRightDown"></event>
<property name="tooltip"></property> <event name="OnRightUp"></event>
<property name="validator_data_type"></property> <event name="OnSetFocus"></event>
<property name="validator_style">wxFILTER_NONE</property> <event name="OnSize"></event>
<property name="validator_type">wxDefaultValidator</property> <event name="OnUpdateUI"></event>
<property name="validator_variable"></property> </object>
<property name="window_extra_style"></property> </object>
<property name="window_name"></property> </object>
<property name="window_style"></property> </object>
<event name="OnChar"></event> <object class="sizeritem" expanded="0">
<event name="OnEnterWindow"></event> <property name="border">5</property>
<event name="OnEraseBackground"></event> <property name="flag">wxALL|wxEXPAND</property>
<event name="OnKeyDown"></event> <property name="proportion">1</property>
<event name="OnKeyUp"></event> <object class="wxRadioBox" expanded="0">
<event name="OnKillFocus"></event> <property name="BottomDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="LeftDockable">1</property>
<event name="OnLeftDClick"></event> <property name="RightDockable">1</property>
<event name="OnLeftDown"></event> <property name="TopDockable">1</property>
<event name="OnLeftUp"></event> <property name="aui_layer"></property>
<event name="OnMiddleDClick"></event> <property name="aui_name"></property>
<event name="OnMiddleDown"></event> <property name="aui_position"></property>
<event name="OnMiddleUp"></event> <property name="aui_row"></property>
<event name="OnMotion"></event> <property name="best_size"></property>
<event name="OnMouseEvents"></event> <property name="bg"></property>
<event name="OnMouseWheel"></event> <property name="caption"></property>
<event name="OnPaint"></event> <property name="caption_visible">1</property>
<event name="OnRadioBox"></event> <property name="center_pane">0</property>
<event name="OnRightDClick"></event> <property name="choices">&quot;0.0&quot; &quot;+90.0&quot; &quot;-90.0&quot; &quot;Other&quot;</property>
<event name="OnRightDown"></event> <property name="close_button">1</property>
<event name="OnRightUp"></event> <property name="context_help"></property>
<event name="OnSetFocus"></event> <property name="context_menu">1</property>
<event name="OnSize"></event> <property name="default_pane">0</property>
<event name="OnUpdateUI"></event> <property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Center</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Orientation</property>
<property name="majorDimension">1</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_Orient</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">2</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioBox">ModuleOrientEvent</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Rotation (in 0.1 degrees):</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextRotation</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_OrientValue</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object> </object>
</object> </object>
</object> </object>

19
pcbnew/dialogs/dialog_edit_module_text_base.h
View File

@ -35,7 +35,7 @@
class DialogEditModuleText_base : public DIALOG_SHIM class DialogEditModuleText_base : public DIALOG_SHIM
{ {
private: private:
protected: protected:
wxStaticText* m_ModuleInfoText; wxStaticText* m_ModuleInfoText;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
@ -53,23 +53,26 @@ class DialogEditModuleText_base : public DIALOG_SHIM
wxTextCtrl* m_TxtPosCtrlY; wxTextCtrl* m_TxtPosCtrlY;
wxStaticText* m_LayerLabel; wxStaticText* m_LayerLabel;
PCB_LAYER_BOX_SELECTOR* m_LayerSelectionCtrl; PCB_LAYER_BOX_SELECTOR* m_LayerSelectionCtrl;
wxRadioBox* m_Show;
wxRadioBox* m_Style; wxRadioBox* m_Style;
wxRadioBox* m_Orient; wxRadioBox* m_Orient;
wxRadioBox* m_Show; wxStaticText* m_staticTextRotation;
wxTextCtrl* m_OrientValue;
wxStaticLine* m_staticline2; wxStaticLine* m_staticline2;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void ModuleOrientEvent( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DialogEditModuleText_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), 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( 410,391 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DialogEditModuleText_base(); ~DialogEditModuleText_base();
}; };
#endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__ #endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__