From 8a278a0579574eb53bc315fc912bc3af0baf0d80 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 30 Dec 2020 17:59:02 +0100 Subject: [PATCH] update tuner_slider_base.fbp to our current wxFormBuilder version. --- eeschema/widgets/tuner_slider_base.cpp | 102 +++++----- eeschema/widgets/tuner_slider_base.fbp | 265 +++---------------------- eeschema/widgets/tuner_slider_base.h | 27 +-- 3 files changed, 97 insertions(+), 297 deletions(-) diff --git a/eeschema/widgets/tuner_slider_base.cpp b/eeschema/widgets/tuner_slider_base.cpp index 079638b0ad..a4a2bc3815 100644 --- a/eeschema/widgets/tuner_slider_base.cpp +++ b/eeschema/widgets/tuner_slider_base.cpp @@ -1,75 +1,75 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "tuner_slider_base.h" /////////////////////////////////////////////////////////////////////////// -TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { - wxBoxSizer* bSizer1; - bSizer1 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerUpper; + bSizerUpper = new wxBoxSizer( wxHORIZONTAL ); + m_name = new wxStaticText( this, wxID_ANY, _("Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_name->Wrap( -1 ); - bSizer2->Add( m_name, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + bSizerUpper->Add( m_name, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_closeBtn = new wxButton( this, wxID_ANY, _(" X "), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - bSizer2->Add( m_closeBtn, 0, wxALL, 5 ); - - - bSizer1->Add( bSizer2, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); - + bSizerUpper->Add( m_closeBtn, 0, wxALL, 5 ); + + + bSizerMain->Add( bSizerUpper, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerMiddle; + bSizerMiddle = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizerSlider; + bSizerSlider = new wxBoxSizer( wxVERTICAL ); + m_slider = new wxSlider( this, wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_LEFT|wxSL_VERTICAL ); - bSizer4->Add( m_slider, 1, 0, 5 ); - - - bSizer3->Add( bSizer4, 0, wxEXPAND, 5 ); - - wxGridSizer* gSizer1; - gSizer1 = new wxGridSizer( 0, 1, 0, 0 ); - + bSizerSlider->Add( m_slider, 1, 0, 5 ); + + + bSizerMiddle->Add( bSizerSlider, 0, wxEXPAND, 5 ); + + wxGridSizer* gSizerTxtCtr; + gSizerTxtCtr = new wxGridSizer( 0, 1, 0, 0 ); + m_maxText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); m_maxText->SetMinSize( wxSize( 70,-1 ) ); - - gSizer1->Add( m_maxText, 0, wxALIGN_TOP|wxALL, 5 ); - + + gSizerTxtCtr->Add( m_maxText, 0, wxALIGN_TOP|wxALL, 5 ); + m_valueText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); m_valueText->SetMinSize( wxSize( 70,-1 ) ); - - gSizer1->Add( m_valueText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + + gSizerTxtCtr->Add( m_valueText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_minText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); m_minText->SetMinSize( wxSize( 70,-1 ) ); - - gSizer1->Add( m_minText, 0, wxALIGN_BOTTOM|wxALL, 5 ); - - - bSizer3->Add( gSizer1, 1, wxEXPAND, 5 ); - - - bSizer1->Add( bSizer3, 1, wxEXPAND, 5 ); - + + gSizerTxtCtr->Add( m_minText, 0, wxALIGN_BOTTOM|wxALL, 5 ); + + + bSizerMiddle->Add( gSizerTxtCtr, 1, wxEXPAND, 5 ); + + + bSizerMain->Add( bSizerMiddle, 1, wxEXPAND, 5 ); + m_saveBtn = new wxButton( this, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer1->Add( m_saveBtn, 0, wxALL, 5 ); - - - this->SetSizer( bSizer1 ); + bSizerMain->Add( m_saveBtn, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); + + + this->SetSizer( bSizerMain ); this->Layout(); - + // Connect Events m_closeBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onClose ), NULL, this ); m_slider->Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( TUNER_SLIDER_BASE::onSliderChanged ), NULL, this ); @@ -104,5 +104,5 @@ TUNER_SLIDER_BASE::~TUNER_SLIDER_BASE() m_valueText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onValueTextEnter ), NULL, this ); m_minText->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( TUNER_SLIDER_BASE::onMinTextEnter ), NULL, this ); m_saveBtn->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TUNER_SLIDER_BASE::onSave ), NULL, this ); - + } diff --git a/eeschema/widgets/tuner_slider_base.fbp b/eeschema/widgets/tuner_slider_base.fbp index 8c9df7f743..532aa6c13f 100644 --- a/eeschema/widgets/tuner_slider_base.fbp +++ b/eeschema/widgets/tuner_slider_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ tuner_slider_base 1000 none + 1 TUNER_SLIDER_BASE @@ -42,54 +43,24 @@ TUNER_SLIDER_BASE - 97,283 + 126,283 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer1 + bSizerMain wxVERTICAL none 5 wxALL|wxEXPAND 0 - + - bSizer2 + bSizerUpper wxHORIZONTAL none @@ -125,6 +96,7 @@ 0 wxID_ANY Name + 0 0 @@ -150,29 +122,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -190,25 +139,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY X + + 0 0 @@ -223,6 +178,8 @@ protected 1 + + Resizable 1 @@ -238,29 +195,6 @@ onClose - - - - - - - - - - - - - - - - - - - - - - - @@ -269,18 +203,18 @@ 5 wxEXPAND 1 - + - bSizer3 + bSizerMiddle wxHORIZONTAL none - + 5 wxEXPAND 0 - + - bSizer4 + bSizerSlider wxVERTICAL none @@ -346,62 +280,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - onSliderChanged - - - - - - - - - - - - - + 5 wxEXPAND 1 - + 1 0 - gSizer1 + gSizerTxtCtr none 0 0 @@ -467,33 +359,7 @@ - - - - - - - - - - - - - - - - - - - - - - - onMaxTextEnter - - - @@ -558,33 +424,7 @@ - - - - - - - - - - - - - - - - - - - - - - - onValueTextEnter - - - @@ -649,33 +489,7 @@ - - - - - - - - - - - - - - - - - - - - - - - onMinTextEnter - - - @@ -684,7 +498,7 @@ 5 - wxALL + wxALL|wxALIGN_CENTER_HORIZONTAL 0 1 @@ -697,25 +511,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Save + + 0 0 @@ -730,6 +550,8 @@ protected 1 + + Resizable 1 @@ -745,29 +567,6 @@ onSave - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eeschema/widgets/tuner_slider_base.h b/eeschema/widgets/tuner_slider_base.h index f942912abe..2a01952a06 100644 --- a/eeschema/widgets/tuner_slider_base.h +++ b/eeschema/widgets/tuner_slider_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 24 2016) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __TUNER_SLIDER_BASE_H__ -#define __TUNER_SLIDER_BASE_H__ +#pragma once #include #include @@ -17,6 +16,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -29,10 +31,10 @@ /////////////////////////////////////////////////////////////////////////////// /// Class TUNER_SLIDER_BASE /////////////////////////////////////////////////////////////////////////////// -class TUNER_SLIDER_BASE : public wxPanel +class TUNER_SLIDER_BASE : public wxPanel { private: - + protected: wxStaticText* m_name; wxButton* m_closeBtn; @@ -41,7 +43,7 @@ class TUNER_SLIDER_BASE : public wxPanel wxTextCtrl* m_valueText; wxTextCtrl* m_minText; wxButton* m_saveBtn; - + // Virtual event handlers, overide them in your derived class virtual void onClose( wxCommandEvent& event ) { event.Skip(); } virtual void onSliderChanged( wxScrollEvent& event ) { event.Skip(); } @@ -49,13 +51,12 @@ class TUNER_SLIDER_BASE : public wxPanel virtual void onValueTextEnter( wxCommandEvent& event ) { event.Skip(); } virtual void onMinTextEnter( wxCommandEvent& event ) { event.Skip(); } virtual void onSave( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 97,283 ), long style = wxTAB_TRAVERSAL ); + + TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 126,283 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~TUNER_SLIDER_BASE(); - + }; -#endif //__TUNER_SLIDER_BASE_H__