diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index 37930adb07..8d55c300c0 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -92,24 +92,18 @@ void DialogLabelEditor::InitDialog() break; } - unsigned MINTEXTWIDTH = 40; // M's are big characters, a few establish a lot of width + int MINTEXTWIDTH = 40; // M's are big characters, a few establish a lot of width - if( m_CurrentText->m_Text.Length() < MINTEXTWIDTH ) + int max_len = 0; + if ( !multiLine ) { - wxString textWidth; - textWidth.Append( 'M', MINTEXTWIDTH ); - EnsureTextCtrlWidth( m_textLabel, &textWidth ); - } - else if ( !multiLine ) - { - EnsureTextCtrlWidth( m_textLabel ); + max_len =m_CurrentText->m_Text.Length(); } else { // calculate the length of the biggest line // we cannot use the length of the entire text that has no meaning - int max_len = 0; - int curr_len = 0; + int curr_len = MINTEXTWIDTH; int imax = m_CurrentText->m_Text.Len(); for( int count = 0; count < imax; count++ ) { @@ -125,10 +119,13 @@ void DialogLabelEditor::InitDialog() max_len = curr_len; } } - wxString textWidth; - textWidth.Append( 'M', max_len ); - EnsureTextCtrlWidth( m_textLabel, &textWidth ); } + if( max_len < MINTEXTWIDTH ) + max_len = MINTEXTWIDTH; + + wxString textWidth; + textWidth.Append( 'M', MINTEXTWIDTH ); + EnsureTextCtrlWidth( m_textLabel, &textWidth ); // Set validators m_TextOrient->SetSelection( m_CurrentText->GetSchematicTextOrientation() ); diff --git a/eeschema/dialogs/dialog_edit_label_base.cpp b/eeschema/dialogs/dialog_edit_label_base.cpp index b373a075bb..87030fc16c 100644 --- a/eeschema/dialogs/dialog_edit_label_base.cpp +++ b/eeschema/dialogs/dialog_edit_label_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -107,4 +107,5 @@ DialogLabelEditor_Base::~DialogLabelEditor_Base() m_textLabelMultiLine->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DialogLabelEditor_Base::OnEnterKey ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnCancelClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogLabelEditor_Base::OnOkClick ), NULL, this ); + } diff --git a/eeschema/dialogs/dialog_edit_label_base.fbp b/eeschema/dialogs/dialog_edit_label_base.fbp index 955c5b1b4f..b49a834eee 100644 --- a/eeschema/dialogs/dialog_edit_label_base.fbp +++ b/eeschema/dialogs/dialog_edit_label_base.fbp @@ -2,9 +2,11 @@ - + C++ 1 + source_name + 0 UTF-8 connect dialog_edit_label_base @@ -12,66 +14,73 @@ none 1 dialog_edit_label_base - + . - + 1 + 1 1 0 - - - + + + + 1 1 - - - + impl_virtual + + + 0 wxID_ANY - - + + DialogLabelEditor_Base - + 359,347 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Text Editor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxVERTICAL none @@ -85,7 +94,7 @@ 1 0 3 - + m_textControlSizer wxFLEX_GROWMODE_SPECIFIED protected @@ -96,50 +105,55 @@ wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY &Text: - - + + m_staticText1 protected - - - - + + + + Enter the text to be used within the schematic - - - + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -147,7 +161,7 @@ wxEXPAND 1 - + -1,-1 bSizeText wxVERTICAL none @@ -156,54 +170,59 @@ wxEXPAND|wxLEFT 0 - - + + + 1 1 - - + + 0 wxID_VALUESINGLE - + 0 - + m_textLabelSingleLine protected - - + + wxTE_PROCESS_ENTER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnEnterKey - - - + + + @@ -211,54 +230,59 @@ wxEXPAND|wxLEFT 1 - - + + + 1 1 - - + + 0 wxID_VALUEMULTI - + 0 -1,60 m_textLabelMultiLine protected - - + + wxTE_MULTILINE|wxTE_PROCESS_ENTER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnEnterKey - - - + + + @@ -268,50 +292,55 @@ wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY &Size: - - + + m_SizeTitle protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -319,7 +348,7 @@ wxEXPAND 1 - + bSizeCtrlSizer wxHORIZONTAL none @@ -328,54 +357,59 @@ wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_SIZE - + 0 - + m_TextSize protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -383,50 +417,55 @@ wxALIGN_CENTER_VERTICAL|wxLEFT 0 - - + + + 1 1 - - + + 0 wxID_ANY units - - + + m_staticSizeUnits protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -438,7 +477,7 @@ wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 - + m_OptionsSizer wxHORIZONTAL none @@ -447,53 +486,58 @@ wxRIGHT|wxTOP 1 - + "Right" "Up" "Left" "Down" - + + 1 1 - - + + 0 wxID_ANY O&rientation 1 - - + + m_TextOrient protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -501,53 +545,58 @@ wxLEFT|wxRIGHT|wxTOP 1 - + "Normal" "Italic" "Bold" "Bold Italic" - + + 1 1 - - + + 0 wxID_ANY St&yle 1 - - + + m_TextStyle protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -555,53 +604,58 @@ wxALL|wxLEFT|wxTOP 1 - + "Input" "Output" "Bidirectional" "Tri-State" "Passive" - + + 1 1 - - + + 0 wxID_ANY S&hape 1 - - + + m_TextShape protected - + 0 - + wxRA_SPECIFY_COLS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -619,17 +673,17 @@ 1 0 0 - + m_sdbSizer1 protected - + OnCancelClick - - - + + + OnOkClick - - + + diff --git a/eeschema/dialogs/dialog_edit_label_base.h b/eeschema/dialogs/dialog_edit_label_base.h index 914fb24d35..e8a567db84 100644 --- a/eeschema/dialogs/dialog_edit_label_base.h +++ b/eeschema/dialogs/dialog_edit_label_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -54,12 +54,13 @@ class DialogLabelEditor_Base : public wxDialog wxButton* m_sdbSizer1Cancel; // Virtual event handlers, overide them in your derived class - virtual void OnEnterKey( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnEnterKey( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } public: + DialogLabelEditor_Base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 359,347 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DialogLabelEditor_Base(); diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp index b2eed498a9..8971192425 100644 --- a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp +++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.cpp @@ -11,7 +11,7 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetSizeHints( wxSize( 350,-1 ), wxDefaultSize ); wxBoxSizer* m_mainSizer; m_mainSizer = new wxBoxSizer( wxVERTICAL ); @@ -21,6 +21,7 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 4, 3, 0, 0 ); + fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -85,7 +86,6 @@ DIALOG_SCH_EDIT_SHEET_PIN_BASE::DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent this->SetSizer( m_mainSizer ); this->Layout(); - m_mainSizer->Fit( this ); this->Centre( wxBOTH ); } diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp index 8d7ecb7fc9..1c16d3ba54 100644 --- a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp +++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp @@ -34,10 +34,10 @@ 0 wxID_ANY - + 350,-1 DIALOG_SCH_EDIT_SHEET_PIN_BASE - + 350,189 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Sheet Pin Properties @@ -100,7 +100,7 @@ 3 wxBOTH - + 1 0 diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h index 42cb65e77b..743a952c59 100644 --- a/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h +++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin_base.h @@ -52,7 +52,7 @@ class DIALOG_SCH_EDIT_SHEET_PIN_BASE : public wxDialog public: - DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sheet Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_SCH_EDIT_SHEET_PIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Sheet Pin Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,189 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SCH_EDIT_SHEET_PIN_BASE(); };