Skip to content

K
kicad-source-mirror
Commit 5aec4604 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

apply DIALOG_SHIM to dialog_lib_edit_text_base and make... 

apply DIALOG_SHIM to dialog_lib_edit_text_base and make dialog_lib_edit_pin_base apportion more width for pin name
parent 7d154606
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4093 additions and 4212 deletions
eeschema/dialogs/dialog_edit_one_field.cpp
View file @ 5aec4604
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <dialog_edit_one_field.h> #include <dialog_edit_one_field.h>
void DIALOG_EDIT_ONE_FIELD::initDlg_base( ) void DIALOG_EDIT_ONE_FIELD::initDlg_base()
{ {
wxString msg; wxString msg;
...@@ -64,18 +64,17 @@ void DIALOG_EDIT_ONE_FIELD::initDlg_base( ) ...@@ -64,18 +64,17 @@ void DIALOG_EDIT_ONE_FIELD::initDlg_base( )
switch ( m_textHjustify ) switch ( m_textHjustify )
{ {
case GR_TEXT_HJUSTIFY_LEFT: case GR_TEXT_HJUSTIFY_LEFT:
m_TextHJustificationOpt->SetSelection( 0 ); m_TextHJustificationOpt->SetSelection( 0 );
break; break;
case GR_TEXT_HJUSTIFY_CENTER:
m_TextHJustificationOpt->SetSelection( 1 );
break;
case GR_TEXT_HJUSTIFY_RIGHT: case GR_TEXT_HJUSTIFY_CENTER:
m_TextHJustificationOpt->SetSelection( 2 ); m_TextHJustificationOpt->SetSelection( 1 );
break; break;
case GR_TEXT_HJUSTIFY_RIGHT:
m_TextHJustificationOpt->SetSelection( 2 );
break;
} }
switch ( m_textVjustify ) switch ( m_textVjustify )
...@@ -100,7 +99,7 @@ void DIALOG_EDIT_ONE_FIELD::initDlg_base( ) ...@@ -100,7 +99,7 @@ void DIALOG_EDIT_ONE_FIELD::initDlg_base( )
} }
void DIALOG_LIB_EDIT_ONE_FIELD::initDlg( ) void DIALOG_LIB_EDIT_ONE_FIELD::initDlg()
{ {
m_textsize = m_field->m_Size.x; m_textsize = m_field->m_Size.x;
m_TextValue->SetValue( m_field->m_Text ); m_TextValue->SetValue( m_field->m_Text );
...@@ -118,7 +117,7 @@ void DIALOG_LIB_EDIT_ONE_FIELD::initDlg( ) ...@@ -118,7 +117,7 @@ void DIALOG_LIB_EDIT_ONE_FIELD::initDlg( )
m_textHjustify = m_field->m_HJustify; m_textHjustify = m_field->m_HJustify;
m_textVjustify = m_field->m_VJustify; m_textVjustify = m_field->m_VJustify;
initDlg_base( ); initDlg_base();
} }
wxString DIALOG_LIB_EDIT_ONE_FIELD::GetTextField() wxString DIALOG_LIB_EDIT_ONE_FIELD::GetTextField()
...@@ -195,7 +194,7 @@ void DIALOG_LIB_EDIT_ONE_FIELD::TransfertDataToField() ...@@ -195,7 +194,7 @@ void DIALOG_LIB_EDIT_ONE_FIELD::TransfertDataToField()
} }
void DIALOG_SCH_EDIT_ONE_FIELD::initDlg( ) void DIALOG_SCH_EDIT_ONE_FIELD::initDlg()
{ {
m_textsize = m_field->m_Size.x; m_textsize = m_field->m_Size.x;
m_TextValue->SetValue( m_field->m_Text ); m_TextValue->SetValue( m_field->m_Text );
...@@ -211,7 +210,7 @@ void DIALOG_SCH_EDIT_ONE_FIELD::initDlg( ) ...@@ -211,7 +210,7 @@ void DIALOG_SCH_EDIT_ONE_FIELD::initDlg( )
m_textHjustify = m_field->m_HJustify; m_textHjustify = m_field->m_HJustify;
m_textVjustify = m_field->m_VJustify; m_textVjustify = m_field->m_VJustify;
initDlg_base( ); initDlg_base();
} }
......
eeschema/dialogs/dialog_edit_one_field.h
View file @ 5aec4604
#ifndef _DIALOG_EDIT_ONE_FIELD_H_ #ifndef DIALOG_EDIT_ONE_FIELD_H_
#define _DIALOG_EDIT_ONE_FIELD_H_ #define DIALOG_EDIT_ONE_FIELD_H_
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
...@@ -53,7 +53,8 @@ public: ...@@ -53,7 +53,8 @@ public:
SetTitle( aTitle ); SetTitle( aTitle );
} }
~DIALOG_EDIT_ONE_FIELD() {}; // ~DIALOG_EDIT_ONE_FIELD() {};
virtual void TransfertDataToField(); virtual void TransfertDataToField();
void SetTextField( const wxString& aText ) void SetTextField( const wxString& aText )
...@@ -101,6 +102,7 @@ private: ...@@ -101,6 +102,7 @@ private:
void initDlg( ); void initDlg( );
}; };
// Class to edit a schematic component field // Class to edit a schematic component field
class DIALOG_SCH_EDIT_ONE_FIELD : public DIALOG_EDIT_ONE_FIELD class DIALOG_SCH_EDIT_ONE_FIELD : public DIALOG_EDIT_ONE_FIELD
{ {
...@@ -117,7 +119,8 @@ public: ...@@ -117,7 +119,8 @@ public:
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints(this);
Centre(); Centre();
} }
~DIALOG_SCH_EDIT_ONE_FIELD() {};
// ~DIALOG_SCH_EDIT_ONE_FIELD() {};
void TransfertDataToField(); void TransfertDataToField();
wxString GetTextField(); wxString GetTextField();
...@@ -126,5 +129,4 @@ private: ...@@ -126,5 +129,4 @@ private:
void initDlg( ); void initDlg( );
}; };
#endif // DIALOG_EDIT_ONE_FIELD_H_
#endif // _DIALOG_EDIT_ONE_FIELD_H_
eeschema/dialogs/dialog_lib_edit_pin_base.h
View file @ 5aec4604
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 17 2012) // C++ code generated with wxFormBuilder (version Apr 11 2012)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_LIB_EDIT_PIN_BASE_H__ #ifndef __DIALOG_LIB_EDIT_PIN_BASE_H__
#define __DIALOG_LIB_EDIT_PIN_BASE_H__ #define __DIALOG_LIB_EDIT_PIN_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
#include "wx/bmpcbox.h" #include "wx/bmpcbox.h"
#include "dialog_shim.h" #include "dialog_shim.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_LIB_EDIT_PIN_BASE /// Class DIALOG_LIB_EDIT_PIN_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_LIB_EDIT_PIN_BASE : public DIALOG_SHIM class DIALOG_LIB_EDIT_PIN_BASE : public DIALOG_SHIM
{ {
private: private:
protected: protected:
enum enum
{ {
ID_M_TEXTPINNAME = 1000, ID_M_TEXTPINNAME = 1000,
ID_M_STATICTEXTPADNAME, ID_M_STATICTEXTPADNAME,
ID_M_TEXTPADNAME, ID_M_TEXTPADNAME,
ID_M_STATICTEXTNAMESIZE, ID_M_STATICTEXTNAMESIZE,
ID_M_TEXTPINNAMETEXTSIZE, ID_M_TEXTPINNAMETEXTSIZE,
ID_M_STATICNAMETEXTSIZEUNITS, ID_M_STATICNAMETEXTSIZEUNITS,
ID_M_STATICTEXTPADNAMESIZE, ID_M_STATICTEXTPADNAMESIZE,
ID_M_TEXTPADNAMETEXTSIZE, ID_M_TEXTPADNAMETEXTSIZE,
ID_M_STATICNUMBERTEXTSIZEUNITS, ID_M_STATICNUMBERTEXTSIZEUNITS,
ID_M_STATICTEXTPINLEN, ID_M_STATICTEXTPINLEN,
ID_M_TEXTLENGTH, ID_M_TEXTLENGTH,
ID_M_STATICLENGTHUNITS ID_M_STATICLENGTHUNITS
}; };
wxStaticText* m_staticTextPinName; wxStaticText* m_staticTextPinName;
wxTextCtrl* m_textPinName; wxTextCtrl* m_textPinName;
wxStaticText* m_staticTextPadName; wxStaticText* m_staticTextPadName;
wxTextCtrl* m_textPadName; wxTextCtrl* m_textPadName;
wxStaticText* m_staticTextOrient; wxStaticText* m_staticTextOrient;
wxBitmapComboBox* m_choiceOrientation; wxBitmapComboBox* m_choiceOrientation;
wxStaticText* m_staticTextEType; wxStaticText* m_staticTextEType;
wxBitmapComboBox* m_choiceElectricalType; wxBitmapComboBox* m_choiceElectricalType;
wxStaticText* m_staticTextGstyle; wxStaticText* m_staticTextGstyle;
wxBitmapComboBox* m_choiceStyle; wxBitmapComboBox* m_choiceStyle;
wxCheckBox* m_checkApplyToAllParts; wxCheckBox* m_checkApplyToAllParts;
wxCheckBox* m_checkApplyToAllConversions; wxCheckBox* m_checkApplyToAllConversions;
wxCheckBox* m_checkShow; wxCheckBox* m_checkShow;
wxStaticText* m_staticTextNameSize; wxStaticText* m_staticTextNameSize;
wxTextCtrl* m_textPinNameTextSize; wxTextCtrl* m_textPinNameTextSize;
wxStaticText* m_staticNameTextSizeUnits; wxStaticText* m_staticNameTextSizeUnits;
wxStaticText* m_staticTextPadNameSize; wxStaticText* m_staticTextPadNameSize;
wxTextCtrl* m_textPadNameTextSize; wxTextCtrl* m_textPadNameTextSize;
wxStaticText* m_staticNumberTextSizeUnits; wxStaticText* m_staticNumberTextSizeUnits;
wxStaticText* m_staticTextPinLen; wxStaticText* m_staticTextPinLen;
wxTextCtrl* m_textLength; wxTextCtrl* m_textLength;
wxStaticText* m_staticLengthUnits; wxStaticText* m_staticLengthUnits;
wxPanel* m_panelShowPin; wxPanel* m_panelShowPin;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxStdDialogButtonSizer* m_sdbSizerButtons; wxStdDialogButtonSizer* m_sdbSizerButtons;
wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsOK;
wxButton* m_sdbSizerButtonsCancel; wxButton* m_sdbSizerButtonsCancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); } virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); }
virtual void OnPropertiesChange( wxCommandEvent& event ) { event.Skip(); } virtual void OnPropertiesChange( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPaintShowPanel( wxPaintEvent& event ) { event.Skip(); } virtual void OnPaintShowPanel( wxPaintEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_LIB_EDIT_PIN_BASE(); ~DIALOG_LIB_EDIT_PIN_BASE();
}; };
#endif //__DIALOG_LIB_EDIT_PIN_BASE_H__ #endif //__DIALOG_LIB_EDIT_PIN_BASE_H__
eeschema/dialogs/dialog_lib_edit_text_base.fbp
View file @ 5aec4604
This source diff could not be displayed because it is too large. You can view the blob instead.
eeschema/dialogs/dialog_lib_edit_text_base.h
View file @ 5aec4604
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 30 2011) // C++ code generated with wxFormBuilder (version Apr 11 2012)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_LIB_EDIT_TEXT_BASE_H__ #ifndef __DIALOG_LIB_EDIT_TEXT_BASE_H__
#define __DIALOG_LIB_EDIT_TEXT_BASE_H__ #define __DIALOG_LIB_EDIT_TEXT_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include "dialog_shim.h"
#include <wx/stattext.h> #include <wx/string.h>
#include <wx/gdicmn.h> #include <wx/stattext.h>
#include <wx/font.h> #include <wx/gdicmn.h>
#include <wx/colour.h> #include <wx/font.h>
#include <wx/settings.h> #include <wx/colour.h>
#include <wx/textctrl.h> #include <wx/settings.h>
#include <wx/sizer.h> #include <wx/textctrl.h>
#include <wx/checkbox.h> #include <wx/sizer.h>
#include <wx/statline.h> #include <wx/checkbox.h>
#include <wx/statbox.h> #include <wx/statline.h>
#include <wx/radiobox.h> #include <wx/statbox.h>
#include <wx/button.h> #include <wx/radiobox.h>
#include <wx/dialog.h> #include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_LIB_EDIT_TEXT_BASE ///////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_LIB_EDIT_TEXT_BASE
class DIALOG_LIB_EDIT_TEXT_BASE : public wxDialog ///////////////////////////////////////////////////////////////////////////////
{ class DIALOG_LIB_EDIT_TEXT_BASE : public DIALOG_SHIM
private: {
private:
protected:
wxStaticText* m_staticText1; protected:
wxTextCtrl* m_TextValue; wxStaticText* m_staticText1;
wxStaticText* m_TextSizeText; wxTextCtrl* m_TextValue;
wxTextCtrl* m_TextSize; wxStaticText* m_TextSizeText;
wxCheckBox* m_Orient; wxTextCtrl* m_TextSize;
wxStaticLine* m_staticline1; wxCheckBox* m_Orient;
wxCheckBox* m_CommonUnit; wxStaticLine* m_staticline1;
wxCheckBox* m_CommonConvert; wxCheckBox* m_CommonUnit;
wxCheckBox* m_Invisible; wxCheckBox* m_CommonConvert;
wxRadioBox* m_TextShapeOpt; wxCheckBox* m_Invisible;
wxRadioBox* m_TextHJustificationOpt; wxRadioBox* m_TextShapeOpt;
wxRadioBox* m_TextVJustificationOpt; wxRadioBox* m_TextHJustificationOpt;
wxStdDialogButtonSizer* m_sdbSizerButtons; wxRadioBox* m_TextVJustificationOpt;
wxButton* m_sdbSizerButtonsOK; wxStdDialogButtonSizer* m_sdbSizerButtons;
wxButton* m_sdbSizerButtonsCancel; wxButton* m_sdbSizerButtonsOK;
wxButton* m_sdbSizerButtonsCancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } // Virtual event handlers, overide them in your derived class
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public:
public:
DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_LIB_EDIT_TEXT_BASE(); DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_LIB_EDIT_TEXT_BASE();
};
};
#endif //__DIALOG_LIB_EDIT_TEXT_BASE_H__
#endif //__DIALOG_LIB_EDIT_TEXT_BASE_H__
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment