diff --git a/eeschema/dialogs/dialog_sch_sheet_props.cpp b/eeschema/dialogs/dialog_sch_sheet_props.cpp index e7c42de4fc..9bcac719d8 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props.cpp @@ -83,9 +83,6 @@ DIALOG_SCH_SHEET_PROPS::DIALOG_SCH_SHEET_PROPS( SCH_EDIT_FRAME* aParent, SCH_SHE m_hiearchicalPathLabel->SetFont( infoFont ); m_heirarchyPath->SetFont( infoFont ); m_heirarchyPath->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) ); - m_timestampLabel->SetFont( infoFont ); - m_textCtrlTimeStamp->SetFont( infoFont ); - m_textCtrlTimeStamp->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_MENU ) ); // wxFormBuilder doesn't include this event... m_grid->Connect( wxEVT_GRID_CELL_CHANGING, @@ -166,7 +163,6 @@ bool DIALOG_SCH_SHEET_PROPS::TransferDataToWindow() // set up the read-only fields m_heirarchyPath->SetValue( m_frame->GetCurrentSheet().PathHumanReadable() ); - m_textCtrlTimeStamp->SetValue( m_sheet->m_Uuid.AsString() ); Layout(); diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp index 950c027727..e983ca2ca5 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp @@ -154,47 +154,34 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi bSizer5->Add( sbSizer2, 1, wxEXPAND|wxBOTTOM, 5 ); - m_longForm->Add( bSizer5, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_longForm->Add( bSizer5, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); mainSizer->Add( m_longForm, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + mainSizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + wxBoxSizer* bSizerBottom; bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 4, 0 ); + fgSizer1 = new wxFlexGridSizer( 1, 2, 0, 0 ); fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_hiearchicalPathLabel = new wxStaticText( this, wxID_ANY, _("Hierarchical path:"), wxDefaultPosition, wxDefaultSize, 0 ); m_hiearchicalPathLabel->Wrap( -1 ); - fgSizer1->Add( m_hiearchicalPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + fgSizer1->Add( m_hiearchicalPathLabel, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10 ); m_heirarchyPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); m_heirarchyPath->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - fgSizer1->Add( m_heirarchyPath, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - m_timestampLabel = new wxStaticText( this, wxID_ANY, _("Unique identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_timestampLabel->Wrap( -1 ); - fgSizer1->Add( m_timestampLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); - m_textCtrlTimeStamp->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - m_textCtrlTimeStamp->SetToolTip( _("Unique ID that identifies the symbol") ); - - fgSizer1->Add( m_textCtrlTimeStamp, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_heirarchyPath, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - bSizerBottom->Add( fgSizer1, 1, wxEXPAND|wxLEFT, 5 ); - - - mainSizer->Add( bSizerBottom, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP, 5 ); + bSizerBottom->Add( fgSizer1, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_stdDialogButtonSizer = new wxStdDialogButtonSizer(); m_stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); @@ -203,7 +190,10 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi m_stdDialogButtonSizer->AddButton( m_stdDialogButtonSizerCancel ); m_stdDialogButtonSizer->Realize(); - mainSizer->Add( m_stdDialogButtonSizer, 0, wxEXPAND|wxALL, 5 ); + bSizerBottom->Add( m_stdDialogButtonSizer, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + mainSizer->Add( bSizerBottom, 0, wxEXPAND|wxLEFT, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp index 1ca0c8ce9a..4e5c7a2b97 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp @@ -497,7 +497,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 @@ -974,9 +974,67 @@ + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; forward_declare + 0 + + + + + + 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT 0 @@ -985,7 +1043,7 @@ none 5 - wxEXPAND|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALL 1 2 @@ -997,11 +1055,11 @@ fgSizer1 wxFLEX_GROWMODE_SPECIFIED none - 0 - 4 + 1 + 0 - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + 10 + wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1062,7 +1120,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1124,209 +1182,26 @@ wxBORDER_NONE - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Unique identifier: - 0 - - 0 - - - 0 - - 1 - m_timestampLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_BTNFACE - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrlTimeStamp - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - Unique ID that identifies the symbol - - wxFILTER_NONE - wxDefaultValidator - - - - - wxBORDER_NONE - - - - - - 5 - wxEXPAND|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; forward_declare - 0 - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_stdDialogButtonSizer - protected + + 5 + wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_stdDialogButtonSizer + protected + + diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.h b/eeschema/dialogs/dialog_sch_sheet_props_base.h index 39e995e434..eaba5e2cce 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.h +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.h @@ -56,11 +56,9 @@ class DIALOG_SCH_SHEET_PROPS_BASE : public DIALOG_SHIM COLOR_SWATCH* m_borderSwatch; wxStaticText* m_backgroundColorLabel; COLOR_SWATCH* m_backgroundSwatch; + wxStaticLine* m_staticline1; wxStaticText* m_hiearchicalPathLabel; wxTextCtrl* m_heirarchyPath; - wxStaticText* m_timestampLabel; - wxTextCtrl* m_textCtrlTimeStamp; - wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_stdDialogButtonSizer; wxButton* m_stdDialogButtonSizerOK; wxButton* m_stdDialogButtonSizerCancel;