From d31103846f5542c6464c53ef1b39dc8798a44004 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 4 Jan 2025 13:06:09 +0000 Subject: [PATCH] Naming conventions and split some dlgs out of panel_jobs_base.fbp. --- kicad/CMakeLists.txt | 5 +- .../dialogs/dialog_copyfiles_job_settings.cpp | 53 + kicad/dialogs/dialog_copyfiles_job_settings.h | 38 + .../dialog_copyfiles_job_settings_base.cpp | 83 ++ .../dialog_copyfiles_job_settings_base.fbp | 502 ++++++++++ .../dialog_copyfiles_job_settings_base.h | 58 ++ ...=> dialog_executecommand_job_settings.cpp} | 13 +- ...h => dialog_executecommand_job_settings.h} | 6 +- ...ialog_executecommand_job_settings_base.cpp | 82 ++ ...ialog_executecommand_job_settings_base.fbp | 502 ++++++++++ .../dialog_executecommand_job_settings_base.h | 57 ++ kicad/dialogs/panel_jobs.cpp | 47 +- kicad/dialogs/panel_jobs_base.cpp | 145 --- kicad/dialogs/panel_jobs_base.fbp | 934 ------------------ kicad/dialogs/panel_jobs_base.h | 62 -- 15 files changed, 1395 insertions(+), 1192 deletions(-) create mode 100644 kicad/dialogs/dialog_copyfiles_job_settings.cpp create mode 100644 kicad/dialogs/dialog_copyfiles_job_settings.h create mode 100644 kicad/dialogs/dialog_copyfiles_job_settings_base.cpp create mode 100644 kicad/dialogs/dialog_copyfiles_job_settings_base.fbp create mode 100644 kicad/dialogs/dialog_copyfiles_job_settings_base.h rename kicad/dialogs/{dialog_special_execute.cpp => dialog_executecommand_job_settings.cpp} (74%) rename kicad/dialogs/{dialog_special_execute.h => dialog_executecommand_job_settings.h} (82%) create mode 100644 kicad/dialogs/dialog_executecommand_job_settings_base.cpp create mode 100644 kicad/dialogs/dialog_executecommand_job_settings_base.fbp create mode 100644 kicad/dialogs/dialog_executecommand_job_settings_base.h diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index 54dea6bb81..e295f0f73f 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -18,7 +18,10 @@ include_directories( set( KICAD_SRCS dialogs/dialog_job_config_base.cpp - dialogs/dialog_special_execute.cpp + dialogs/dialog_copyfiles_job_settings.cpp + dialogs/dialog_copyfiles_job_settings_base.cpp + dialogs/dialog_executecommand_job_settings.cpp + dialogs/dialog_executecommand_job_settings_base.cpp dialogs/dialog_update_check_prompt_base.cpp dialogs/dialog_update_check_prompt.cpp dialogs/dialog_update_notice_base.cpp diff --git a/kicad/dialogs/dialog_copyfiles_job_settings.cpp b/kicad/dialogs/dialog_copyfiles_job_settings.cpp new file mode 100644 index 0000000000..4dac11816a --- /dev/null +++ b/kicad/dialogs/dialog_copyfiles_job_settings.cpp @@ -0,0 +1,53 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2024 Mark Roszko + * Copyright The KiCad Developers, see AUTHORS.txt for contributors. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "dialog_copyfiles_job_settings.h" +#include + + +DIALOG_COPYFILES_JOB_SETTINGS::DIALOG_COPYFILES_JOB_SETTINGS( wxWindow* aParent, + JOB_SPECIAL_COPYFILES* aJob ) : + DIALOG_COPYFILES_JOB_SETTINGS_BASE( aParent ), + m_job( aJob ) +{ + m_textCtrlSource->SetValidator( wxTextValidator( wxFILTER_EMPTY ) ); + + SetupStandardButtons(); +} + + +bool DIALOG_COPYFILES_JOB_SETTINGS::TransferDataToWindow() +{ + m_textCtrlSource->SetValue( m_job->m_source ); + m_textCtrlDest->SetValue( m_job->m_dest ); + m_cbGenerateError->SetValue( m_job->m_generateErrorOnNoCopy ); + m_cbOverwrite->SetValue( m_job->m_overwriteDest ); + return true; +} + + +bool DIALOG_COPYFILES_JOB_SETTINGS::TransferDataFromWindow() +{ + m_job->m_source = m_textCtrlSource->GetValue(); + m_job->m_dest = m_textCtrlDest->GetValue(); + m_job->m_generateErrorOnNoCopy = m_cbGenerateError->GetValue(); + m_job->m_overwriteDest = m_cbOverwrite->GetValue(); + return true; +} diff --git a/kicad/dialogs/dialog_copyfiles_job_settings.h b/kicad/dialogs/dialog_copyfiles_job_settings.h new file mode 100644 index 0000000000..434ec1db05 --- /dev/null +++ b/kicad/dialogs/dialog_copyfiles_job_settings.h @@ -0,0 +1,38 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2024 Mark Roszko + * Copyright The KiCad Developers, see AUTHORS.txt for contributors. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "dialog_copyfiles_job_settings_base.h" + +class JOB_SPECIAL_COPYFILES; + +class DIALOG_COPYFILES_JOB_SETTINGS : public DIALOG_COPYFILES_JOB_SETTINGS_BASE +{ +public: + DIALOG_COPYFILES_JOB_SETTINGS( wxWindow* aParent, JOB_SPECIAL_COPYFILES* aJob ); + + + bool TransferDataToWindow() override; + bool TransferDataFromWindow() override; + +private: + JOB_SPECIAL_COPYFILES* m_job; +}; + + diff --git a/kicad/dialogs/dialog_copyfiles_job_settings_base.cpp b/kicad/dialogs/dialog_copyfiles_job_settings_base.cpp new file mode 100644 index 0000000000..feb24744be --- /dev/null +++ b/kicad/dialogs/dialog_copyfiles_job_settings_base.cpp @@ -0,0 +1,83 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_copyfiles_job_settings_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_COPYFILES_JOB_SETTINGS_BASE::DIALOG_COPYFILES_JOB_SETTINGS_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( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 0, 2, 5, 5 ); + fgSizer1->SetFlexibleDirection( wxBOTH ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_textSource = new wxStaticText( this, wxID_ANY, _("Source:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textSource->Wrap( -1 ); + fgSizer1->Add( m_textSource, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlSource = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlSource->SetMinSize( wxSize( 350,-1 ) ); + + fgSizer1->Add( m_textCtrlSource, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + m_textDest = new wxStaticText( this, wxID_ANY, _("Destination:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textDest->Wrap( -1 ); + fgSizer1->Add( m_textDest, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlDest = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlDest->SetMinSize( wxSize( 350,-1 ) ); + + fgSizer1->Add( m_textCtrlDest, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + + bSizerMain->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerBottom; + bSizerBottom = new wxBoxSizer( wxVERTICAL ); + + m_cbGenerateError = new wxCheckBox( this, wxID_ANY, _("Generate error if no files copied"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBottom->Add( m_cbGenerateError, 0, wxLEFT, 5 ); + + m_cbOverwrite = new wxCheckBox( this, wxID_ANY, _("Overwrite files in destination"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbOverwrite->SetValue(true); + bSizerBottom->Add( m_cbOverwrite, 0, wxLEFT|wxTOP, 5 ); + + + bSizerMain->Add( bSizerBottom, 0, wxALL|wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + bSizerMain->Fit( this ); + + this->Centre( wxBOTH ); + + // Connect Events + m_cbGenerateError->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_COPYFILES_JOB_SETTINGS_BASE::OnRecordOutputClicked ), NULL, this ); +} + +DIALOG_COPYFILES_JOB_SETTINGS_BASE::~DIALOG_COPYFILES_JOB_SETTINGS_BASE() +{ + // Disconnect Events + m_cbGenerateError->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_COPYFILES_JOB_SETTINGS_BASE::OnRecordOutputClicked ), NULL, this ); + +} diff --git a/kicad/dialogs/dialog_copyfiles_job_settings_base.fbp b/kicad/dialogs/dialog_copyfiles_job_settings_base.fbp new file mode 100644 index 0000000000..48214ed353 --- /dev/null +++ b/kicad/dialogs/dialog_copyfiles_job_settings_base.fbp @@ -0,0 +1,502 @@ + + + + + C++ + ; + 1 + connect + none + + + 0 + 0 + res + UTF-8 + dialog_copyfiles_job_settings_base + 1000 + 1 + 1 + UI + dialog_copyfiles_job_settings + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_COPYFILES_JOB_SETTINGS_BASE + + + wxDEFAULT_DIALOG_STYLE + DIALOG_SHIM; dialog_shim.h; forward_declare + Copy Files Job Settings + + 0 + + + + + + bSizerMain + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 2 + wxBOTH + + + 5 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Source: + 0 + + 0 + + + 0 + + 1 + m_textSource + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 350,-1 + 1 + m_textCtrlSource + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + wxTextValidator + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Destination: + 0 + + 0 + + + 0 + + 1 + m_textDest + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 350,-1 + 1 + m_textCtrlDest + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + wxDefaultValidator + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + bSizerBottom + wxVERTICAL + none + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Generate error if no files copied + + 0 + + + 0 + + 1 + m_cbGenerateError + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRecordOutputClicked + + + + 5 + wxLEFT|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Overwrite files in destination + + 0 + + + 0 + + 1 + m_cbOverwrite + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + + + + diff --git a/kicad/dialogs/dialog_copyfiles_job_settings_base.h b/kicad/dialogs/dialog_copyfiles_job_settings_base.h new file mode 100644 index 0000000000..2fdf24b108 --- /dev/null +++ b/kicad/dialogs/dialog_copyfiles_job_settings_base.h @@ -0,0 +1,58 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_COPYFILES_JOB_SETTINGS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_COPYFILES_JOB_SETTINGS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_textSource; + wxTextCtrl* m_textCtrlSource; + wxStaticText* m_textDest; + wxTextCtrl* m_textCtrlDest; + wxCheckBox* m_cbGenerateError; + wxCheckBox* m_cbOverwrite; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, override them in your derived class + virtual void OnRecordOutputClicked( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_COPYFILES_JOB_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Files Job Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + + ~DIALOG_COPYFILES_JOB_SETTINGS_BASE(); + +}; + diff --git a/kicad/dialogs/dialog_special_execute.cpp b/kicad/dialogs/dialog_executecommand_job_settings.cpp similarity index 74% rename from kicad/dialogs/dialog_special_execute.cpp rename to kicad/dialogs/dialog_executecommand_job_settings.cpp index fec2f07875..d99726d2a7 100644 --- a/kicad/dialogs/dialog_special_execute.cpp +++ b/kicad/dialogs/dialog_executecommand_job_settings.cpp @@ -18,18 +18,19 @@ * with this program. If not, see . */ -#include +#include #include -DIALOG_SPECIAL_EXECUTE::DIALOG_SPECIAL_EXECUTE( wxWindow* aParent, JOB_SPECIAL_EXECUTE* aJob ) : - DIALOG_SPECIAL_EXECUTE_BASE( aParent ), +DIALOG_EXECUTECOMMAND_JOB_SETTINGS::DIALOG_EXECUTECOMMAND_JOB_SETTINGS( wxWindow* aParent, + JOB_SPECIAL_EXECUTE* aJob ) : + DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE( aParent ), m_job( aJob ) { SetupStandardButtons(); } -bool DIALOG_SPECIAL_EXECUTE::TransferDataFromWindow() +bool DIALOG_EXECUTECOMMAND_JOB_SETTINGS::TransferDataFromWindow() { m_job->m_command = m_textCtrlCommand->GetValue(); m_job->m_ignoreExitcode = m_cbIgnoreExitCode->GetValue(); @@ -40,7 +41,7 @@ bool DIALOG_SPECIAL_EXECUTE::TransferDataFromWindow() } -bool DIALOG_SPECIAL_EXECUTE::TransferDataToWindow() +bool DIALOG_EXECUTECOMMAND_JOB_SETTINGS::TransferDataToWindow() { m_textCtrlCommand->SetValue( m_job->m_command ); m_cbIgnoreExitCode->SetValue( m_job->m_ignoreExitcode ); @@ -52,7 +53,7 @@ bool DIALOG_SPECIAL_EXECUTE::TransferDataToWindow() } -void DIALOG_SPECIAL_EXECUTE::OnRecordOutputClicked( wxCommandEvent& aEvent ) +void DIALOG_EXECUTECOMMAND_JOB_SETTINGS::OnRecordOutputClicked( wxCommandEvent& aEvent ) { m_textCtrlOutputPath->Enable( m_cbRecordOutput->GetValue() ); } \ No newline at end of file diff --git a/kicad/dialogs/dialog_special_execute.h b/kicad/dialogs/dialog_executecommand_job_settings.h similarity index 82% rename from kicad/dialogs/dialog_special_execute.h rename to kicad/dialogs/dialog_executecommand_job_settings.h index d58a0c09a9..90f534f2a6 100644 --- a/kicad/dialogs/dialog_special_execute.h +++ b/kicad/dialogs/dialog_executecommand_job_settings.h @@ -18,14 +18,14 @@ * with this program. If not, see . */ -#include +#include class JOB_SPECIAL_EXECUTE; -class DIALOG_SPECIAL_EXECUTE: public DIALOG_SPECIAL_EXECUTE_BASE +class DIALOG_EXECUTECOMMAND_JOB_SETTINGS: public DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE { public: - DIALOG_SPECIAL_EXECUTE( wxWindow* aParent, JOB_SPECIAL_EXECUTE* aJob ); + DIALOG_EXECUTECOMMAND_JOB_SETTINGS( wxWindow* aParent, JOB_SPECIAL_EXECUTE* aJob ); bool TransferDataFromWindow() override; bool TransferDataToWindow() override; diff --git a/kicad/dialogs/dialog_executecommand_job_settings_base.cpp b/kicad/dialogs/dialog_executecommand_job_settings_base.cpp new file mode 100644 index 0000000000..a05c39d0f6 --- /dev/null +++ b/kicad/dialogs/dialog_executecommand_job_settings_base.cpp @@ -0,0 +1,82 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_executecommand_job_settings_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE::DIALOG_EXECUTECOMMAND_JOB_SETTINGS_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( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 0, 2, 5, 5 ); + fgSizer1->SetFlexibleDirection( wxBOTH ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_textCommand = new wxStaticText( this, wxID_ANY, _("Command:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textCommand->Wrap( -1 ); + fgSizer1->Add( m_textCommand, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlCommand = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlCommand->SetMinSize( wxSize( 350,-1 ) ); + + fgSizer1->Add( m_textCtrlCommand, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + m_textOutputPath = new wxStaticText( this, wxID_ANY, _("Output path:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textOutputPath->Wrap( -1 ); + fgSizer1->Add( m_textOutputPath, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + m_textCtrlOutputPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlOutputPath->SetMinSize( wxSize( 350,-1 ) ); + + fgSizer1->Add( m_textCtrlOutputPath, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + + bSizerMain->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerBottom; + bSizerBottom = new wxBoxSizer( wxVERTICAL ); + + m_cbRecordOutput = new wxCheckBox( this, wxID_ANY, _("Record output messages"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBottom->Add( m_cbRecordOutput, 0, wxLEFT, 5 ); + + m_cbIgnoreExitCode = new wxCheckBox( this, wxID_ANY, _("Ignore non-zero exit code"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerBottom->Add( m_cbIgnoreExitCode, 0, wxLEFT|wxTOP, 5 ); + + + bSizerMain->Add( bSizerBottom, 0, wxALL|wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + bSizerMain->Fit( this ); + + this->Centre( wxBOTH ); + + // Connect Events + m_cbRecordOutput->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE::OnRecordOutputClicked ), NULL, this ); +} + +DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE::~DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE() +{ + // Disconnect Events + m_cbRecordOutput->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE::OnRecordOutputClicked ), NULL, this ); + +} diff --git a/kicad/dialogs/dialog_executecommand_job_settings_base.fbp b/kicad/dialogs/dialog_executecommand_job_settings_base.fbp new file mode 100644 index 0000000000..f2d9058674 --- /dev/null +++ b/kicad/dialogs/dialog_executecommand_job_settings_base.fbp @@ -0,0 +1,502 @@ + + + + + C++ + ; + 1 + connect + none + + + 0 + 0 + res + UTF-8 + dialog_executecommand_job_settings_base + 1000 + 1 + 1 + UI + dialog_executecommand_job_settings + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE + + + wxDEFAULT_DIALOG_STYLE + DIALOG_SHIM; dialog_shim.h; forward_declare + Execute Command Job Settings + + 0 + + + + + + bSizerMain + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 2 + wxBOTH + + + 5 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Command: + 0 + + 0 + + + 0 + + 1 + m_textCommand + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 350,-1 + 1 + m_textCtrlCommand + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Output path: + 0 + + 0 + + + 0 + + 1 + m_textOutputPath + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 350,-1 + 1 + m_textCtrlOutputPath + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + bSizerBottom + wxVERTICAL + none + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Record output messages + + 0 + + + 0 + + 1 + m_cbRecordOutput + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRecordOutputClicked + + + + 5 + wxLEFT|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Ignore non-zero exit code + + 0 + + + 0 + + 1 + m_cbIgnoreExitCode + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + + + + + diff --git a/kicad/dialogs/dialog_executecommand_job_settings_base.h b/kicad/dialogs/dialog_executecommand_job_settings_base.h new file mode 100644 index 0000000000..170b026947 --- /dev/null +++ b/kicad/dialogs/dialog_executecommand_job_settings_base.h @@ -0,0 +1,57 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_textCommand; + wxTextCtrl* m_textCtrlCommand; + wxStaticText* m_textOutputPath; + wxTextCtrl* m_textCtrlOutputPath; + wxCheckBox* m_cbRecordOutput; + wxCheckBox* m_cbIgnoreExitCode; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, override them in your derived class + virtual void OnRecordOutputClicked( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Execute Command Job Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + + ~DIALOG_EXECUTECOMMAND_JOB_SETTINGS_BASE(); + +}; + diff --git a/kicad/dialogs/panel_jobs.cpp b/kicad/dialogs/panel_jobs.cpp index 781cc928e2..9f58debc15 100644 --- a/kicad/dialogs/panel_jobs.cpp +++ b/kicad/dialogs/panel_jobs.cpp @@ -19,11 +19,11 @@ */ #include "panel_jobs.h" +#include "dialog_copyfiles_job_settings.h" #include #include #include #include -#include #include #include #include @@ -31,7 +31,6 @@ #include #include #include -#include #include #include @@ -46,7 +45,7 @@ #include #include -#include +#include struct JOB_TYPE_INFO @@ -306,42 +305,6 @@ private: }; -class DIALOG_COPYFILES_JOB : public DIALOG_COPYFILES_JOB_BASE -{ -public: - DIALOG_COPYFILES_JOB( wxWindow* aParent, JOB_SPECIAL_COPYFILES* aJob ) : - DIALOG_COPYFILES_JOB_BASE( aParent ), m_job( aJob ) - { - SetAffirmativeId( wxID_OK ); - - m_textCtrlSource->SetValidator( wxTextValidator( wxFILTER_EMPTY ) ); - } - - - bool TransferDataToWindow() override - { - m_textCtrlSource->SetValue( m_job->m_source ); - m_textCtrlDest->SetValue( m_job->m_dest ); - m_cbGenerateError->SetValue( m_job->m_generateErrorOnNoCopy ); - m_cbOverwrite->SetValue( m_job->m_overwriteDest ); - return true; - } - - - bool TransferDataFromWindow() override - { - m_job->m_source = m_textCtrlSource->GetValue(); - m_job->m_dest = m_textCtrlDest->GetValue(); - m_job->m_generateErrorOnNoCopy = m_cbGenerateError->GetValue(); - m_job->m_overwriteDest = m_cbOverwrite->GetValue(); - return true; - } - -private: - JOB_SPECIAL_COPYFILES* m_job; -}; - - class PANEL_JOB_OUTPUT : public PANEL_JOB_OUTPUT_BASE { public: @@ -774,7 +737,8 @@ bool PANEL_JOBS::OpenJobOptionsForListItem( size_t aItemIndex ) { JOB_SPECIAL_EXECUTE* specialJob = static_cast( job.m_job.get() ); - DIALOG_SPECIAL_EXECUTE dialog( m_frame, specialJob ); + DIALOG_EXECUTECOMMAND_JOB_SETTINGS dialog( m_frame, specialJob ); + if( dialog.ShowModal() == wxID_OK ) { m_jobsFile->SetDirty(); @@ -786,7 +750,8 @@ bool PANEL_JOBS::OpenJobOptionsForListItem( size_t aItemIndex ) { JOB_SPECIAL_COPYFILES* specialJob = static_cast( job.m_job.get() ); - DIALOG_COPYFILES_JOB dialog( m_frame, specialJob ); + DIALOG_COPYFILES_JOB_SETTINGS dialog( m_frame, specialJob ); + if( dialog.ShowModal() == wxID_OK ) { m_jobsFile->SetDirty(); diff --git a/kicad/dialogs/panel_jobs_base.cpp b/kicad/dialogs/panel_jobs_base.cpp index f2aed35fe2..bba3cfc4bf 100644 --- a/kicad/dialogs/panel_jobs_base.cpp +++ b/kicad/dialogs/panel_jobs_base.cpp @@ -310,151 +310,6 @@ DIALOG_JOB_OUTPUT_BASE::~DIALOG_JOB_OUTPUT_BASE() } -DIALOG_SPECIAL_EXECUTE_BASE::DIALOG_SPECIAL_EXECUTE_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( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizerMain; - bSizerMain = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 5, 5 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_textCommand = new wxStaticText( this, wxID_ANY, _("Command:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_textCommand->Wrap( -1 ); - fgSizer1->Add( m_textCommand, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlCommand = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlCommand->SetMinSize( wxSize( 350,-1 ) ); - - fgSizer1->Add( m_textCtrlCommand, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - m_textOutputPath = new wxStaticText( this, wxID_ANY, _("Output path:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_textOutputPath->Wrap( -1 ); - fgSizer1->Add( m_textOutputPath, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlOutputPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlOutputPath->SetMinSize( wxSize( 350,-1 ) ); - - fgSizer1->Add( m_textCtrlOutputPath, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - - bSizerMain->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizerBottom; - bSizerBottom = new wxBoxSizer( wxVERTICAL ); - - m_cbRecordOutput = new wxCheckBox( this, wxID_ANY, _("Record output messages"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBottom->Add( m_cbRecordOutput, 0, wxLEFT, 5 ); - - m_cbIgnoreExitCode = new wxCheckBox( this, wxID_ANY, _("Ignore non-zero exit code"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBottom->Add( m_cbIgnoreExitCode, 0, wxLEFT|wxTOP, 5 ); - - - bSizerMain->Add( bSizerBottom, 0, wxALL|wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( bSizerMain ); - this->Layout(); - bSizerMain->Fit( this ); - - this->Centre( wxBOTH ); - - // Connect Events - m_cbRecordOutput->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SPECIAL_EXECUTE_BASE::OnRecordOutputClicked ), NULL, this ); -} - -DIALOG_SPECIAL_EXECUTE_BASE::~DIALOG_SPECIAL_EXECUTE_BASE() -{ - // Disconnect Events - m_cbRecordOutput->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SPECIAL_EXECUTE_BASE::OnRecordOutputClicked ), NULL, this ); - -} - -DIALOG_COPYFILES_JOB_BASE::DIALOG_COPYFILES_JOB_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( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizerMain; - bSizerMain = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 5, 5 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_textSource = new wxStaticText( this, wxID_ANY, _("Source:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_textSource->Wrap( -1 ); - fgSizer1->Add( m_textSource, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlSource = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlSource->SetMinSize( wxSize( 350,-1 ) ); - - fgSizer1->Add( m_textCtrlSource, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - m_textDest = new wxStaticText( this, wxID_ANY, _("Destination:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_textDest->Wrap( -1 ); - fgSizer1->Add( m_textDest, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - m_textCtrlDest = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_textCtrlDest->SetMinSize( wxSize( 350,-1 ) ); - - fgSizer1->Add( m_textCtrlDest, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - - bSizerMain->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizerBottom; - bSizerBottom = new wxBoxSizer( wxVERTICAL ); - - m_cbGenerateError = new wxCheckBox( this, wxID_ANY, _("Generate error if no files copied"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBottom->Add( m_cbGenerateError, 0, wxLEFT, 5 ); - - m_cbOverwrite = new wxCheckBox( this, wxID_ANY, _("Overwrite files in destination"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbOverwrite->SetValue(true); - bSizerBottom->Add( m_cbOverwrite, 0, wxLEFT|wxTOP, 5 ); - - - bSizerMain->Add( bSizerBottom, 0, wxALL|wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bSizerMain->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( bSizerMain ); - this->Layout(); - bSizerMain->Fit( this ); - - this->Centre( wxBOTH ); - - // Connect Events - m_cbGenerateError->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_COPYFILES_JOB_BASE::OnRecordOutputClicked ), NULL, this ); -} - -DIALOG_COPYFILES_JOB_BASE::~DIALOG_COPYFILES_JOB_BASE() -{ - // Disconnect Events - m_cbGenerateError->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_COPYFILES_JOB_BASE::OnRecordOutputClicked ), NULL, this ); - -} - DIALOG_OUTPUT_RUN_RESULTS_BASE::DIALOG_OUTPUT_RUN_RESULTS_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( 450,250 ), wxDefaultSize ); diff --git a/kicad/dialogs/panel_jobs_base.fbp b/kicad/dialogs/panel_jobs_base.fbp index 7da3772cb6..93922372f5 100644 --- a/kicad/dialogs/panel_jobs_base.fbp +++ b/kicad/dialogs/panel_jobs_base.fbp @@ -1986,940 +1986,6 @@ - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 0 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_SPECIAL_EXECUTE_BASE - - - wxDEFAULT_DIALOG_STYLE - DIALOG_SHIM; dialog_shim.h; forward_declare - Execute Command Job Options - - 0 - - - - - - bSizerMain - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 2 - wxBOTH - - - 5 - - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Command: - 0 - - 0 - - - 0 - - 1 - m_textCommand - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 350,-1 - 1 - m_textCtrlCommand - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Output path: - 0 - - 0 - - - 0 - - 1 - m_textOutputPath - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 350,-1 - 1 - m_textCtrlOutputPath - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - bSizerBottom - wxVERTICAL - none - - 5 - wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Record output messages - - 0 - - - 0 - - 1 - m_cbRecordOutput - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRecordOutputClicked - - - - 5 - wxLEFT|wxTOP - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Ignore non-zero exit code - - 0 - - - 0 - - 1 - m_cbIgnoreExitCode - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - - - - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 0 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_COPYFILES_JOB_BASE - - - wxDEFAULT_DIALOG_STYLE - DIALOG_SHIM; dialog_shim.h; forward_declare - Copy Files Job Options - - 0 - - - - - - bSizerMain - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 2 - wxBOTH - - - 5 - - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Source: - 0 - - 0 - - - 0 - - 1 - m_textSource - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 350,-1 - 1 - m_textCtrlSource - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - wxTextValidator - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Destination: - 0 - - 0 - - - 0 - - 1 - m_textDest - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - 350,-1 - 1 - m_textCtrlDest - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - wxDefaultValidator - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - bSizerBottom - wxVERTICAL - none - - 5 - wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Generate error if no files copied - - 0 - - - 0 - - 1 - m_cbGenerateError - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRecordOutputClicked - - - - 5 - wxLEFT|wxTOP - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Overwrite files in destination - - 0 - - - 0 - - 1 - m_cbOverwrite - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - - - 0 wxAUI_MGR_DEFAULT diff --git a/kicad/dialogs/panel_jobs_base.h b/kicad/dialogs/panel_jobs_base.h index 12acf56c09..044e69d8af 100644 --- a/kicad/dialogs/panel_jobs_base.h +++ b/kicad/dialogs/panel_jobs_base.h @@ -36,8 +36,6 @@ class WX_GRID; #include #include #include -#include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -144,66 +142,6 @@ class DIALOG_JOB_OUTPUT_BASE : public DIALOG_SHIM }; -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_SPECIAL_EXECUTE_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_SPECIAL_EXECUTE_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxStaticText* m_textCommand; - wxTextCtrl* m_textCtrlCommand; - wxStaticText* m_textOutputPath; - wxTextCtrl* m_textCtrlOutputPath; - wxCheckBox* m_cbRecordOutput; - wxCheckBox* m_cbIgnoreExitCode; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, override them in your derived class - virtual void OnRecordOutputClicked( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_SPECIAL_EXECUTE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Execute Command Job Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - - ~DIALOG_SPECIAL_EXECUTE_BASE(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_COPYFILES_JOB_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_COPYFILES_JOB_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxStaticText* m_textSource; - wxTextCtrl* m_textCtrlSource; - wxStaticText* m_textDest; - wxTextCtrl* m_textCtrlDest; - wxCheckBox* m_cbGenerateError; - wxCheckBox* m_cbOverwrite; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, override them in your derived class - virtual void OnRecordOutputClicked( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_COPYFILES_JOB_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Copy Files Job Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - - ~DIALOG_COPYFILES_JOB_BASE(); - -}; - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_OUTPUT_RUN_RESULTS_BASE ///////////////////////////////////////////////////////////////////////////////