From 27661edff6d3303d33cd4a1d59d45388a0809951 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 10 Nov 2021 00:54:02 +0000 Subject: [PATCH] Apply a bit of Kicad look & feel. Also fixes a spelling error in a string. --- kicad/pcm/dialogs/dialog_manage_repositories_base.cpp | 6 +++--- kicad/pcm/dialogs/dialog_manage_repositories_base.fbp | 6 +++--- kicad/pcm/dialogs/dialog_pcm_base.cpp | 4 ++-- kicad/pcm/dialogs/dialog_pcm_base.fbp | 4 ++-- kicad/pcm/dialogs/dialog_pcm_progress_base.cpp | 8 ++++---- kicad/pcm/dialogs/dialog_pcm_progress_base.fbp | 10 +++++----- kicad/pcm/dialogs/dialog_pcm_progress_base.h | 2 +- kicad/pcm/dialogs/panel_packages_view.cpp | 2 +- kicad/pcm/dialogs/panel_packages_view_base.cpp | 10 +++++----- kicad/pcm/dialogs/panel_packages_view_base.fbp | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp index 79b2a8e462..eed0fc3ea0 100644 --- a/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp +++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.cpp @@ -33,7 +33,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare // Columns m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( true ); - m_grid->SetColLabelSize( 30 ); + m_grid->SetColLabelSize( 22 ); m_grid->SetColLabelValue( 0, _("Name") ); m_grid->SetColLabelValue( 1, _("URL") ); m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -50,7 +50,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare m_TopSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 ); - m_MainSizer->Add( m_TopSizer, 1, wxEXPAND, 5 ); + m_MainSizer->Add( m_TopSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* m_BottomSizer; m_BottomSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -80,7 +80,7 @@ DIALOG_MANAGE_REPOSITORIES_BASE::DIALOG_MANAGE_REPOSITORIES_BASE( wxWindow* pare m_BottomSizer->Add( m_sdbSizer1, 1, wxEXPAND, 5 ); - m_MainSizer->Add( m_BottomSizer, 0, wxEXPAND, 5 ); + m_MainSizer->Add( m_BottomSizer, 0, wxEXPAND|wxLEFT, 5 ); this->SetSizer( m_MainSizer ); diff --git a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp index 3cd9ec53b0..ec708ef1e3 100644 --- a/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp +++ b/kicad/pcm/dialogs/dialog_manage_repositories_base.fbp @@ -60,7 +60,7 @@ none 5 - wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 @@ -94,7 +94,7 @@ 0 1 wxALIGN_CENTER - 30 + 22 "Name" "URL" wxALIGN_CENTER 2 @@ -160,7 +160,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT 0 diff --git a/kicad/pcm/dialogs/dialog_pcm_base.cpp b/kicad/pcm/dialogs/dialog_pcm_base.cpp index 7104cddc95..7c5226f78c 100644 --- a/kicad/pcm/dialogs/dialog_pcm_base.cpp +++ b/kicad/pcm/dialogs/dialog_pcm_base.cpp @@ -38,7 +38,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bSizer6->Add( m_buttonManage, 0, wxALL, 5 ); - bSizer4->Add( bSizer6, 0, wxEXPAND, 5 ); + bSizer4->Add( bSizer6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_contentNotebook = new wxNotebook( m_panelRepository, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); @@ -143,7 +143,7 @@ DIALOG_PCM_BASE::DIALOG_PCM_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_BottomSizer->Add( m_closeButton, 0, wxALL, 5 ); - m_MainSizer->Add( m_BottomSizer, 0, wxEXPAND, 5 ); + m_MainSizer->Add( m_BottomSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); this->SetSizer( m_MainSizer ); diff --git a/kicad/pcm/dialogs/dialog_pcm_base.fbp b/kicad/pcm/dialogs/dialog_pcm_base.fbp index 1120606865..088859f84f 100644 --- a/kicad/pcm/dialogs/dialog_pcm_base.fbp +++ b/kicad/pcm/dialogs/dialog_pcm_base.fbp @@ -186,7 +186,7 @@ none 5 - wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 0 @@ -710,7 +710,7 @@ 5 - wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 diff --git a/kicad/pcm/dialogs/dialog_pcm_progress_base.cpp b/kicad/pcm/dialogs/dialog_pcm_progress_base.cpp index 82732596bf..3d124384ea 100644 --- a/kicad/pcm/dialogs/dialog_pcm_progress_base.cpp +++ b/kicad/pcm/dialogs/dialog_pcm_progress_base.cpp @@ -18,7 +18,7 @@ DIALOG_PCM_PROGRESS_BASE::DIALOG_PCM_PROGRESS_BASE( wxWindow* parent, wxWindowID m_panelDownload = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelDownload, wxID_ANY, _("Download progress") ), wxVERTICAL ); + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panelDownload, wxID_ANY, _("Download Progress") ), wxVERTICAL ); m_downloadText = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Waiting..."), wxDefaultPosition, wxDefaultSize, 0 ); m_downloadText->Wrap( -1 ); @@ -39,7 +39,7 @@ DIALOG_PCM_PROGRESS_BASE::DIALOG_PCM_PROGRESS_BASE( wxWindow* parent, wxWindowID bSizer3 = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Overall progress") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Overall Progress") ), wxVERTICAL ); m_overallGauge = new wxGauge( sbSizer2->GetStaticBox(), wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL ); m_overallGauge->SetValue( 0 ); @@ -52,10 +52,10 @@ DIALOG_PCM_PROGRESS_BASE::DIALOG_PCM_PROGRESS_BASE( wxWindow* parent, wxWindowID sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Details") ), wxVERTICAL ); m_reporter = new WX_HTML_REPORT_BOX( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,200 ), wxHW_SCROLLBAR_AUTO ); - sbSizer3->Add( m_reporter, 1, wxALL|wxEXPAND, 5 ); + sbSizer3->Add( m_reporter, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); - bSizer3->Add( sbSizer3, 1, wxEXPAND, 5 ); + bSizer3->Add( sbSizer3, 1, wxEXPAND|wxTOP, 5 ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxHORIZONTAL ); diff --git a/kicad/pcm/dialogs/dialog_pcm_progress_base.fbp b/kicad/pcm/dialogs/dialog_pcm_progress_base.fbp index dec9fd0baa..36d421d62d 100644 --- a/kicad/pcm/dialogs/dialog_pcm_progress_base.fbp +++ b/kicad/pcm/dialogs/dialog_pcm_progress_base.fbp @@ -48,7 +48,7 @@ 500,500 wxCAPTION ; ; forward_declare - Applying package changes + Applying Package Changes @@ -115,7 +115,7 @@ wxTAB_TRAVERSAL wxID_ANY - Download progress + Download Progress sbSizer1 wxVERTICAL @@ -315,7 +315,7 @@ 0 wxID_ANY - Overall progress + Overall Progress sbSizer2 wxVERTICAL @@ -389,7 +389,7 @@ 5 - wxEXPAND + wxEXPAND|wxTOP 1 wxID_ANY @@ -401,7 +401,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT 1 1 diff --git a/kicad/pcm/dialogs/dialog_pcm_progress_base.h b/kicad/pcm/dialogs/dialog_pcm_progress_base.h index a69295a06e..2faf25789d 100644 --- a/kicad/pcm/dialogs/dialog_pcm_progress_base.h +++ b/kicad/pcm/dialogs/dialog_pcm_progress_base.h @@ -55,7 +55,7 @@ class DIALOG_PCM_PROGRESS_BASE : public wxDialog public: - DIALOG_PCM_PROGRESS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Applying package changes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,500 ), long style = wxCAPTION ); + DIALOG_PCM_PROGRESS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Applying Package Changes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,500 ), long style = wxCAPTION ); ~DIALOG_PCM_PROGRESS_BASE(); }; diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp index 81b359c93d..35f29b4a28 100644 --- a/kicad/pcm/dialogs/panel_packages_view.cpp +++ b/kicad/pcm/dialogs/panel_packages_view.cpp @@ -263,7 +263,7 @@ void PANEL_PACKAGES_VIEW::setPackageDetails( const PACKAGE_VIEW_DATA& aPackageDa void PANEL_PACKAGES_VIEW::unsetPackageDetails() { - m_infoText->ChangeValue( _( "Pick a package on the left panel to view it's description." ) ); + m_infoText->ChangeValue( _( "Pick a package on the left panel to view its description." ) ); m_gridVersions->Freeze(); diff --git a/kicad/pcm/dialogs/panel_packages_view_base.cpp b/kicad/pcm/dialogs/panel_packages_view_base.cpp index c2b3efc39d..31aac9257d 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.cpp +++ b/kicad/pcm/dialogs/panel_packages_view_base.cpp @@ -26,7 +26,7 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID bSizer1->Add( bSizer7, 0, wxEXPAND, 5 ); - m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); + m_splitter1 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH ); m_splitter1->SetSashGravity( 0.55 ); m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( PANEL_PACKAGES_VIEW_BASE::m_splitter1OnIdle ), NULL, this ); m_splitter1->SetMinimumPaneSize( 300 ); @@ -77,10 +77,10 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID m_gridVersions->AutoSizeColumns(); m_gridVersions->EnableDragColMove( false ); m_gridVersions->EnableDragColSize( true ); - m_gridVersions->SetColLabelSize( 30 ); + m_gridVersions->SetColLabelSize( 22 ); m_gridVersions->SetColLabelValue( 0, _("Version") ); - m_gridVersions->SetColLabelValue( 1, _("Dl Size") ); - m_gridVersions->SetColLabelValue( 2, _("Inst Size") ); + m_gridVersions->SetColLabelValue( 1, _("Download Size") ); + m_gridVersions->SetColLabelValue( 2, _("Install Size") ); m_gridVersions->SetColLabelValue( 3, _("Comp") ); m_gridVersions->SetColLabelValue( 4, _("Status") ); m_gridVersions->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -127,7 +127,7 @@ PANEL_PACKAGES_VIEW_BASE::PANEL_PACKAGES_VIEW_BASE( wxWindow* parent, wxWindowID m_panelDetails->Layout(); bSizer3->Fit( m_panelDetails ); m_splitter1->SplitVertically( m_packageListWindow, m_panelDetails, 0 ); - bSizer1->Add( m_splitter1, 1, wxEXPAND, 5 ); + bSizer1->Add( m_splitter1, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); this->SetSizer( bSizer1 ); diff --git a/kicad/pcm/dialogs/panel_packages_view_base.fbp b/kicad/pcm/dialogs/panel_packages_view_base.fbp index 747b94d2ae..af97604524 100644 --- a/kicad/pcm/dialogs/panel_packages_view_base.fbp +++ b/kicad/pcm/dialogs/panel_packages_view_base.fbp @@ -190,7 +190,7 @@ 5 - wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 1 @@ -242,7 +242,7 @@ 1 wxSPLIT_VERTICAL - wxSP_3D + wxSP_3DSASH ; ; forward_declare 0 @@ -702,8 +702,8 @@ 0 1 wxALIGN_CENTER - 30 - "Version" "Dl Size" "Inst Size" "Comp" "Status" + 22 + "Version" "Download Size" "Install Size" "Comp" "Status" wxALIGN_CENTER 5