From 615c49315f1f8d8d11238424035bf32eea1ba749 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sat, 6 Apr 2019 08:15:44 -0400 Subject: [PATCH] Minor symbol library rescue dialog fixes. Adjust the sizer proportions slightly to eliminate the reported bug. This may not be the ideal way to do this and there could be some issues on other platforms but it does resolve the issue on gtk3. Fixes lp:1820084 https://bugs.launchpad.net/kicad/+bug/1820084 --- eeschema/dialogs/dialog_rescue_each_base.cpp | 104 +-- eeschema/dialogs/dialog_rescue_each_base.fbp | 868 ++++++------------- eeschema/dialogs/dialog_rescue_each_base.h | 20 +- 3 files changed, 308 insertions(+), 684 deletions(-) diff --git a/eeschema/dialogs/dialog_rescue_each_base.cpp b/eeschema/dialogs/dialog_rescue_each_base.cpp index dfc87bf5a5..9f91251aba 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.cpp +++ b/eeschema/dialogs/dialog_rescue_each_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Feb 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,110 +12,116 @@ DIALOG_RESCUE_EACH_BASE::DIALOG_RESCUE_EACH_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( wxSize( 400,-1 ), wxDefaultSize ); - + wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + + wxBoxSizer* bSizer8; + bSizer8 = new wxBoxSizer( wxVERTICAL ); + m_htmlPrompt = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); m_htmlPrompt->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - m_htmlPrompt->SetMinSize( wxSize( -1,50 ) ); - - bSizerMain->Add( m_htmlPrompt, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_htmlPrompt->SetMinSize( wxSize( -1,80 ) ); + + bSizer8->Add( m_htmlPrompt, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + m_titleSymbols = new wxStaticText( this, wxID_ANY, _("Symbols to update:"), wxDefaultPosition, wxDefaultSize, 0 ); m_titleSymbols->Wrap( -1 ); m_titleSymbols->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - - bSizerMain->Add( m_titleSymbols, 0, wxLEFT|wxRIGHT, 10 ); - + + bSizer8->Add( m_titleSymbols, 0, wxLEFT|wxRIGHT, 10 ); + m_ListOfConflicts = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerMain->Add( m_ListOfConflicts, 3, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - + bSizer8->Add( m_ListOfConflicts, 2, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); + m_titleInstances = new wxStaticText( this, wxID_ANY, _("Instances of this symbol:"), wxDefaultPosition, wxDefaultSize, 0 ); m_titleInstances->Wrap( -1 ); m_titleInstances->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - - bSizerMain->Add( m_titleInstances, 0, wxRIGHT|wxLEFT, 10 ); - + + bSizer8->Add( m_titleInstances, 0, wxRIGHT|wxLEFT, 10 ); + m_ListOfInstances = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerMain->Add( m_ListOfInstances, 2, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); - + bSizer8->Add( m_ListOfInstances, 2, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); + + + bSizerMain->Add( bSizer8, 2, wxEXPAND, 5 ); + wxBoxSizer* bSizerPreviews; bSizerPreviews = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerLeftPreview; bSizerLeftPreview = new wxBoxSizer( wxVERTICAL ); - + m_previewOldLabel = new wxStaticText( this, wxID_ANY, _("Cached Symbol:"), wxDefaultPosition, wxDefaultSize, 0 ); m_previewOldLabel->Wrap( -1 ); m_previewOldLabel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + bSizerLeftPreview->Add( m_previewOldLabel, 0, 0, 5 ); - + m_previewOldPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_SizerOldPanel = new wxBoxSizer( wxVERTICAL ); - - + + m_previewOldPanel->SetSizer( m_SizerOldPanel ); m_previewOldPanel->Layout(); m_SizerOldPanel->Fit( m_previewOldPanel ); bSizerLeftPreview->Add( m_previewOldPanel, 1, wxEXPAND | wxALL, 5 ); - - + + bSizerPreviews->Add( bSizerLeftPreview, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerRightPreview; bSizerRightPreview = new wxBoxSizer( wxVERTICAL ); - + m_previewNewLabel = new wxStaticText( this, wxID_ANY, _("Library Symbol:"), wxDefaultPosition, wxDefaultSize, 0 ); m_previewNewLabel->Wrap( -1 ); m_previewNewLabel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - + bSizerRightPreview->Add( m_previewNewLabel, 0, 0, 5 ); - + m_previewNewPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_SizerNewPanel = new wxBoxSizer( wxVERTICAL ); - - + + m_previewNewPanel->SetSizer( m_SizerNewPanel ); m_previewNewPanel->Layout(); m_SizerNewPanel->Fit( m_previewNewPanel ); bSizerRightPreview->Add( m_previewNewPanel, 1, wxEXPAND | wxALL, 5 ); - - + + bSizerPreviews->Add( bSizerRightPreview, 1, wxEXPAND, 5 ); - - - bSizerMain->Add( bSizerPreviews, 3, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - + + + bSizerMain->Add( bSizerPreviews, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); - + m_btnNeverShowAgain = new wxButton( this, wxID_ANY, _("Never Show Again"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer5->Add( m_btnNeverShowAgain, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); - - + + bSizer5->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtons->AddButton( m_stdButtonsOK ); m_stdButtonsCancel = new wxButton( this, wxID_CANCEL ); m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->Realize(); - + bSizer5->Add( m_stdButtons, 0, wxALL|wxEXPAND, 5 ); - - + + bSizerMain->Add( bSizer5, 0, wxEXPAND, 5 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); bSizerMain->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_RESCUE_EACH_BASE::OnDialogResize ) ); m_ListOfConflicts->Connect( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler( DIALOG_RESCUE_EACH_BASE::OnConflictSelect ), NULL, this ); @@ -130,5 +136,5 @@ DIALOG_RESCUE_EACH_BASE::~DIALOG_RESCUE_EACH_BASE() m_ListOfConflicts->Disconnect( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler( DIALOG_RESCUE_EACH_BASE::OnConflictSelect ), NULL, this ); m_btnNeverShowAgain->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_RESCUE_EACH_BASE::OnNeverShowClick ), NULL, this ); m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_RESCUE_EACH_BASE::OnCancelClick ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_rescue_each_base.fbp b/eeschema/dialogs/dialog_rescue_each_base.fbp index 086b3a75b7..2e94e3a929 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.fbp +++ b/eeschema/dialogs/dialog_rescue_each_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_rescue_each_base 1000 none + 1 dialog_rescue_each_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -53,55 +55,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnDialogResize - bSizerMain @@ -109,431 +63,254 @@ none 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_BTNFACE - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,80 - 1 - m_htmlPrompt - 1 - - - protected - 1 - - Resizable - 1 - - wxHW_SCROLLBAR_AUTO - ; forward_declare - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Symbols to update: - 0 - - 0 - - - 0 - - 1 - m_titleSymbols - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 3 - - - - 1 - 1 - - - 0 - wxID_ANY - - - m_ListOfConflicts - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnConflictSelect - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Instances of this symbol: - 0 - - 0 - - - 0 - - 1 - m_titleInstances - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND 2 - - - - 1 - 1 - - - 0 - wxID_ANY - + - m_ListOfInstances - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bSizer8 + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_BTNFACE + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,80 + 1 + m_htmlPrompt + 1 + + + protected + 1 + + Resizable + 1 + + wxHW_SCROLLBAR_AUTO + ; forward_declare + 0 + + + + + + + + 10 + wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,92,-1,70,0 + 0 + 0 + wxID_ANY + Symbols to update: + 0 + + 0 + + + 0 + + 1 + m_titleSymbols + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 2 + + + + 1 + 1 + + + 0 + wxID_ANY + + + m_ListOfConflicts + protected + + + + + + + + + OnConflictSelect + + + + 10 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,92,-1,70,0 + 0 + 0 + wxID_ANY + Instances of this symbol: + 0 + + 0 + + + 0 + + 1 + m_titleInstances + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 2 + + + + 1 + 1 + + + 0 + wxID_ANY + + + m_ListOfInstances + protected + + + + + + + + + + 10 wxEXPAND|wxRIGHT|wxLEFT - 3 + 1 bSizerPreviews @@ -607,36 +384,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -694,36 +441,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_SizerOldPanel @@ -802,36 +519,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -889,36 +576,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_SizerNewPanel @@ -1010,37 +667,7 @@ - - - - - - OnNeverShowClick - - - - - - - - - - - - - - - - - - - - - - - - @@ -1069,14 +696,7 @@ m_stdButtons protected - OnCancelClick - - - - - - diff --git a/eeschema/dialogs/dialog_rescue_each_base.h b/eeschema/dialogs/dialog_rescue_each_base.h index 47f61ce271..820faca0d1 100644 --- a/eeschema/dialogs/dialog_rescue_each_base.h +++ b/eeschema/dialogs/dialog_rescue_each_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Feb 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_RESCUE_EACH_BASE_H__ -#define __DIALOG_RESCUE_EACH_BASE_H__ +#pragma once #include #include @@ -37,7 +36,7 @@ class DIALOG_RESCUE_EACH_BASE : public DIALOG_SHIM { private: - + protected: wxHtmlWindow* m_htmlPrompt; wxStaticText* m_titleSymbols; @@ -54,19 +53,18 @@ class DIALOG_RESCUE_EACH_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_stdButtons; wxButton* m_stdButtonsOK; wxButton* m_stdButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnDialogResize( wxSizeEvent& event ) { event.Skip(); } virtual void OnConflictSelect( wxDataViewEvent& event ) { event.Skip(); } virtual void OnNeverShowClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_RESCUE_EACH_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Project Rescue Helper"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_RESCUE_EACH_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Project Rescue Helper"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_RESCUE_EACH_BASE(); - + }; -#endif //__DIALOG_RESCUE_EACH_BASE_H__