From e96a3b41ee49e6e01736bad6fa51f4422aea9730 Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Sun, 31 May 2026 09:34:55 +0200 Subject: [PATCH] Remove generated files from QmakePlugin --- QmakePlugin/CMakeLists.txt | 25 ++- QmakePlugin/NewQtProj.cpp | 134 -------------- QmakePlugin/NewQtProj.h | 69 ------- QmakePlugin/NewQtProj_qmakeplugin_bitmaps.cpp | 49 ----- QmakePlugin/newqtprojdlg.h | 2 +- QmakePlugin/qmakesettingsbasedlg.cpp | 174 ------------------ QmakePlugin/qmakesettingsbasedlg.h | 96 ---------- ...akesettingsbasedlg_qmakeplugin_bitmaps.cpp | 49 ----- QmakePlugin/qmakesettingsdlg.h | 2 +- QmakePlugin/qmakesettingstab.h | 2 +- QmakePlugin/qmaketab.h | 2 +- QmakePlugin/qmaketabbase.cpp | 98 ---------- QmakePlugin/qmaketabbase.h | 79 -------- .../qmaketabbase_qmakeplugin_bitmaps.cpp | 47 ----- 14 files changed, 28 insertions(+), 800 deletions(-) delete mode 100644 QmakePlugin/NewQtProj.cpp delete mode 100644 QmakePlugin/NewQtProj.h delete mode 100644 QmakePlugin/NewQtProj_qmakeplugin_bitmaps.cpp delete mode 100644 QmakePlugin/qmakesettingsbasedlg.cpp delete mode 100644 QmakePlugin/qmakesettingsbasedlg.h delete mode 100644 QmakePlugin/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp delete mode 100644 QmakePlugin/qmaketabbase.cpp delete mode 100644 QmakePlugin/qmaketabbase.h delete mode 100644 QmakePlugin/qmaketabbase_qmakeplugin_bitmaps.cpp diff --git a/QmakePlugin/CMakeLists.txt b/QmakePlugin/CMakeLists.txt index 206c5be5cf..8b4167dade 100644 --- a/QmakePlugin/CMakeLists.txt +++ b/QmakePlugin/CMakeLists.txt @@ -12,10 +12,32 @@ if(USE_PCH AND NOT MINGW) add_definitions(-Winvalid-pch) endif() +wxcrafter_target( + QmakePluginNewProj + "${CMAKE_CURRENT_SOURCE_DIR}/NewQtProj.wxcp" + "${CMAKE_CURRENT_BINARY_DIR}" + "NewQtProj.cpp" + "NewQtProj.hpp" + "NewQtProj_qmakeplugin_bitmaps.cpp") +wxcrafter_target( + QmakePluginSettings + "${CMAKE_CURRENT_SOURCE_DIR}/qmakesettingsbasedlg.wxcp" + "${CMAKE_CURRENT_BINARY_DIR}" + "qmakesettingsbasedlg.cpp" + "qmakesettingsbasedlg.hpp" + "qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp") +wxcrafter_target( + QmakePluginTab + "${CMAKE_CURRENT_SOURCE_DIR}/qmaketabbase.wxcp" + "${CMAKE_CURRENT_BINARY_DIR}" + "qmaketabbase.cpp" + "qmaketabbase.hpp" + "qmaketabbase_qmakeplugin_bitmaps.cpp") + file(GLOB SRCS "*.cpp") # Define the output -add_library(${PLUGIN_NAME} SHARED ${SRCS}) +add_library(${PLUGIN_NAME} SHARED ${SRCS} ${WXCRAFTER_QmakePluginNewProj_OUTPUTS} ${WXCRAFTER_QmakePluginSettings_OUTPUTS} ${WXCRAFTER_QmakePluginTab_OUTPUTS}) if(UNIX OR APPLE) set_target_properties(${PLUGIN_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -27,6 +49,7 @@ endif() # CodeLite plugins doesn't use the "lib" prefix. set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "") +target_include_directories(${PLUGIN_NAME} PUBLIC "${WXCRAFTER_QmakePluginSettings_OUTPUTDIR}") target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} libcodelite plugin) # Installation destination cl_install_plugin(${PLUGIN_NAME}) diff --git a/QmakePlugin/NewQtProj.cpp b/QmakePlugin/NewQtProj.cpp deleted file mode 100644 index d65dd4755e..0000000000 --- a/QmakePlugin/NewQtProj.cpp +++ /dev/null @@ -1,134 +0,0 @@ -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: NewQtProj.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#include "NewQtProj.h" - - -// Declare the bitmap loading function -extern void wxCrafterM0lZAnInitBitmapResources(); - -static bool bBitmapLoaded = false; - - -NewQtProjBaseDlg::NewQtProjBaseDlg(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) - : wxDialog(parent, id, title, pos, size, style) -{ - if ( !bBitmapLoaded ) { - // We need to initialise the default bitmap handler - wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); - wxCrafterM0lZAnInitBitmapResources(); - bBitmapLoaded = true; - } - - wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL); - this->SetSizer(bSizer5); - - wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 0); - fgSizer2->SetFlexibleDirection( wxBOTH ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - fgSizer2->AddGrowableCol(1); - - bSizer5->Add(fgSizer2, 0, wxALL|wxEXPAND, 5); - - m_staticText5 = new wxStaticText(this, wxID_ANY, _("Project name:"), wxDefaultPosition, wxSize(-1, -1), 0); - - fgSizer2->Add(m_staticText5, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - m_textCtrlProjName = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); - #if wxVERSION_NUMBER >= 3000 - m_textCtrlProjName->SetHint(wxT("")); - #endif - - fgSizer2->Add(m_textCtrlProjName, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); - - m_staticText7 = new wxStaticText(this, wxID_ANY, _("Project path:"), wxDefaultPosition, wxSize(-1, -1), 0); - - fgSizer2->Add(m_staticText7, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - m_dirPicker4 = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxSize(-1,-1), wxDIRP_DEFAULT_STYLE); - - fgSizer2->Add(m_dirPicker4, 0, wxALL|wxEXPAND, 5); - - m_staticText13 = new wxStaticText(this, wxID_ANY, _("Project kind:"), wxDefaultPosition, wxSize(-1, -1), 0); - - fgSizer2->Add(m_staticText13, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - wxArrayString m_choiceProjKindArr; - m_choiceProjKind = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_choiceProjKindArr, 0); - - fgSizer2->Add(m_choiceProjKind, 0, wxALL|wxEXPAND, 5); - - m_staticText12 = new wxStaticText(this, wxID_ANY, _("QMake to use:"), wxDefaultPosition, wxSize(-1, -1), 0); - - fgSizer2->Add(m_staticText12, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - wxBoxSizer* boxSizer6 = new wxBoxSizer(wxHORIZONTAL); - - fgSizer2->Add(boxSizer6, 1, wxEXPAND, 5); - - wxArrayString m_choiceQmakeArr; - m_choiceQmake = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_choiceQmakeArr, 0); - - boxSizer6->Add(m_choiceQmake, 1, wxLEFT|wxTOP|wxBOTTOM|wxEXPAND, 5); - - m_buttonSelectConfig = new wxButton(this, wxID_ANY, _("New..."), wxDefaultPosition, wxSize(-1, -1), wxBU_EXACTFIT); - m_buttonSelectConfig->SetToolTip(_("Open the QMakeSettings configuration dialog")); - - boxSizer6->Add(m_buttonSelectConfig, 0, wxALL|wxEXPAND, 5); - - wxStaticBoxSizer* sbSizer1 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Other settings:")), wxVERTICAL); - - bSizer5->Add(sbSizer1, 0, wxALL|wxEXPAND, 5); - - m_checkBoxUseSepDirectory = new wxCheckBox(this, wxID_ANY, _("Create the project under a separate directory"), wxDefaultPosition, wxSize(-1, -1), 0); - m_checkBoxUseSepDirectory->SetValue(true); - - sbSizer1->Add(m_checkBoxUseSepDirectory, 0, wxALL|wxEXPAND, 5); - - bSizer5->Add(0, 0, 1, wxALL|wxEXPAND, 5); - - wxBoxSizer* bSizer6 = new wxBoxSizer(wxHORIZONTAL); - - bSizer5->Add(bSizer6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5); - - m_buttonCancel = new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer6->Add(m_buttonCancel, 0, wxALL, 5); - - m_buttonOk = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize(-1, -1), 0); - m_buttonOk->SetDefault(); - - bSizer6->Add(m_buttonOk, 0, wxALL, 5); - - SetName(wxT("NewQtProjBaseDlg")); - SetSize(-1,-1); - if (GetSizer()) { - GetSizer()->Fit(this); - } - if(GetParent()) { - CentreOnParent(); - } else { - CentreOnScreen(); - } -#if wxVERSION_NUMBER >= 2900 - if(!wxPersistenceManager::Get().Find(this)) { - wxPersistenceManager::Get().RegisterAndRestore(this); - } else { - wxPersistenceManager::Get().Restore(this); - } -#endif - // Connect events - m_buttonSelectConfig->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(NewQtProjBaseDlg::OnNewQmakeSettings), NULL, this); - m_buttonOk->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(NewQtProjBaseDlg::OnOKUI), NULL, this); - -} - -NewQtProjBaseDlg::~NewQtProjBaseDlg() -{ - m_buttonSelectConfig->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(NewQtProjBaseDlg::OnNewQmakeSettings), NULL, this); - m_buttonOk->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(NewQtProjBaseDlg::OnOKUI), NULL, this); - -} diff --git a/QmakePlugin/NewQtProj.h b/QmakePlugin/NewQtProj.h deleted file mode 100644 index 9d5ef2c57f..0000000000 --- a/QmakePlugin/NewQtProj.h +++ /dev/null @@ -1,69 +0,0 @@ -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: NewQtProj.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#ifndef CL_QMAKEPLUGIN_NEWQTPROJ_BASE_CLASSES_H -#define CL_QMAKEPLUGIN_NEWQTPROJ_BASE_CLASSES_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if wxVERSION_NUMBER >= 2900 -#include -#include -#include -#include -#endif - -class NewQtProjBaseDlg : public wxDialog -{ -protected: - wxStaticText* m_staticText5; - wxTextCtrl* m_textCtrlProjName; - wxStaticText* m_staticText7; - wxDirPickerCtrl* m_dirPicker4; - wxStaticText* m_staticText13; - wxChoice* m_choiceProjKind; - wxStaticText* m_staticText12; - wxChoice* m_choiceQmake; - wxButton* m_buttonSelectConfig; - wxCheckBox* m_checkBoxUseSepDirectory; - wxButton* m_buttonCancel; - wxButton* m_buttonOk; - -protected: - virtual void OnNewQmakeSettings(wxCommandEvent& event) { event.Skip(); } - virtual void OnOKUI(wxUpdateUIEvent& event) { event.Skip(); } - -public: - wxStaticText* GetStaticText5() { return m_staticText5; } - wxTextCtrl* GetTextCtrlProjName() { return m_textCtrlProjName; } - wxStaticText* GetStaticText7() { return m_staticText7; } - wxDirPickerCtrl* GetDirPicker4() { return m_dirPicker4; } - wxStaticText* GetStaticText13() { return m_staticText13; } - wxChoice* GetChoiceProjKind() { return m_choiceProjKind; } - wxStaticText* GetStaticText12() { return m_staticText12; } - wxChoice* GetChoiceQmake() { return m_choiceQmake; } - wxButton* GetButtonSelectConfig() { return m_buttonSelectConfig; } - wxCheckBox* GetCheckBoxUseSepDirectory() { return m_checkBoxUseSepDirectory; } - wxButton* GetButtonCancel() { return m_buttonCancel; } - wxButton* GetButtonOk() { return m_buttonOk; } - NewQtProjBaseDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Qmake project"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); - virtual ~NewQtProjBaseDlg(); -}; - -#endif diff --git a/QmakePlugin/NewQtProj_qmakeplugin_bitmaps.cpp b/QmakePlugin/NewQtProj_qmakeplugin_bitmaps.cpp deleted file mode 100644 index ce28e2e9d2..0000000000 --- a/QmakePlugin/NewQtProj_qmakeplugin_bitmaps.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// This file was automatically generated by wxrc, do not edit by hand. -// - -#include - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include -#include -#include -#include - -#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805 - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime) -#else - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFile(name, data, size) -#endif - -static size_t xml_res_size_0 = 137; -static unsigned char xml_res_file_0[] = { -60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, -110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, -115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, -47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103, -47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101, -114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45, -45,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; - -void wxCrafterM0lZAnInitBitmapResources() -{ - - // Check for memory FS. If not present, load the handler: - { - wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one")); - wxFileSystem fsys; - wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file")); - wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file")); - if (f) delete f; - else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); - } - - XRC_ADD_FILE(wxT("XRC_resource/NewQtProj_qmakeplugin_bitmaps.cpp$_mnt_SanDisk128-common_david_devel_git_CL_QmakePlugin_NewQtProj_qmakeplugin_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/NewQtProj_qmakeplugin_bitmaps.cpp$_mnt_SanDisk128-common_david_devel_git_CL_QmakePlugin_NewQtProj_qmakeplugin_bitmaps.xrc")); -} diff --git a/QmakePlugin/newqtprojdlg.h b/QmakePlugin/newqtprojdlg.h index 372e3b1028..b8cb6ec947 100644 --- a/QmakePlugin/newqtprojdlg.h +++ b/QmakePlugin/newqtprojdlg.h @@ -31,7 +31,7 @@ Subclass of NewQtProjBaseDlg, which is generated by wxFormBuilder. */ -#include "NewQtProj.h" +#include "NewQtProj.hpp" class QmakeConf; class IManager; diff --git a/QmakePlugin/qmakesettingsbasedlg.cpp b/QmakePlugin/qmakesettingsbasedlg.cpp deleted file mode 100644 index 676cac6d5e..0000000000 --- a/QmakePlugin/qmakesettingsbasedlg.cpp +++ /dev/null @@ -1,174 +0,0 @@ -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: qmakesettingsbasedlg.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#include "qmakesettingsbasedlg.h" - -// Declare the bitmap loading function -extern void wxCrafterljRDukInitBitmapResources(); - -static bool bBitmapLoaded = false; - -QMakeSettingsBaseDlg::QMakeSettingsBaseDlg(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, - const wxSize& size, long style) - : wxDialog(parent, id, title, pos, size, style) -{ - if(!bBitmapLoaded) { - // We need to initialise the default bitmap handler - wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); - wxCrafterljRDukInitBitmapResources(); - bBitmapLoaded = true; - } - - wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); - this->SetSizer(mainSizer); - - m_staticText5 = new wxStaticText(this, wxID_ANY, _("Add / modify qmake configurations:"), wxDefaultPosition, - wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - mainSizer->Add(m_staticText5, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - - wxBoxSizer* bSizer3 = new wxBoxSizer(wxVERTICAL); - - mainSizer->Add(bSizer3, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - m_notebook->SetName(wxT("m_notebook")); - - bSizer3->Add(m_notebook, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticline1 = - new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), wxLI_HORIZONTAL); - - mainSizer->Add(m_staticline1, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - wxBoxSizer* bSizer2 = new wxBoxSizer(wxHORIZONTAL); - - mainSizer->Add(bSizer2, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(5)); - - m_buttonNew = new wxButton(this, wxID_ANY, _("&New..."), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - m_buttonNew->SetToolTip(_("Create new qmake settings")); - - bSizer2->Add(m_buttonNew, 0, wxALL, WXC_FROM_DIP(5)); - - m_buttonCancel = - new wxButton(this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - bSizer2->Add(m_buttonCancel, 0, wxALL, WXC_FROM_DIP(5)); - - m_buttonOk = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - m_buttonOk->SetDefault(); - - bSizer2->Add(m_buttonOk, 0, wxALL, WXC_FROM_DIP(5)); - -#if wxVERSION_NUMBER >= 2900 - if(!wxPersistenceManager::Get().Find(m_notebook)) { - wxPersistenceManager::Get().RegisterAndRestore(m_notebook); - } else { - wxPersistenceManager::Get().Restore(m_notebook); - } -#endif - - SetName(wxT("QMakeSettingsBaseDlg")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); - if(GetSizer()) { - GetSizer()->Fit(this); - } - if(GetParent()) { - CentreOnParent(wxBOTH); - } else { - CentreOnScreen(wxBOTH); - } -#if wxVERSION_NUMBER >= 2900 - if(!wxPersistenceManager::Get().Find(this)) { - wxPersistenceManager::Get().RegisterAndRestore(this); - } else { - wxPersistenceManager::Get().Restore(this); - } -#endif - // Connect events - m_notebook->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(QMakeSettingsBaseDlg::OnRightDown), NULL, this); - m_buttonNew->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(QMakeSettingsBaseDlg::OnNewQmakeSettings), - NULL, this); - m_buttonOk->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(QMakeSettingsBaseDlg::OnOK), NULL, this); -} - -QMakeSettingsBaseDlg::~QMakeSettingsBaseDlg() -{ - m_notebook->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(QMakeSettingsBaseDlg::OnRightDown), NULL, this); - m_buttonNew->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(QMakeSettingsBaseDlg::OnNewQmakeSettings), NULL, this); - m_buttonOk->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(QMakeSettingsBaseDlg::OnOK), NULL, this); -} - -QmakeSettingsTabBase::QmakeSettingsTabBase(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style) - : wxPanel(parent, id, pos, size, style) -{ - if(!bBitmapLoaded) { - // We need to initialise the default bitmap handler - wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); - wxCrafterljRDukInitBitmapResources(); - bBitmapLoaded = true; - } - - wxBoxSizer* bSizer4 = new wxBoxSizer(wxVERTICAL); - this->SetSizer(bSizer4); - - wxFlexGridSizer* fgSizer2 = new wxFlexGridSizer(0, 2, 0, 0); - fgSizer2->SetFlexibleDirection(wxBOTH); - fgSizer2->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); - fgSizer2->AddGrowableCol(1); - - bSizer4->Add(fgSizer2, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText1 = new wxStaticText(this, wxID_ANY, _("qmake executable:"), wxDefaultPosition, - wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - fgSizer2->Add(m_staticText1, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_filePickerQmakeExec = - new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a file"), wxT("*"), wxDefaultPosition, - wxDLG_UNIT(this, wxSize(-1, -1)), - wxFLP_DEFAULT_STYLE | wxFLP_USE_TEXTCTRL | wxFLP_FILE_MUST_EXIST | wxFLP_OPEN); - m_filePickerQmakeExec->SetFocus(); - - fgSizer2->Add(m_filePickerQmakeExec, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText2 = - new wxStaticText(this, wxID_ANY, _("QMAKESPEC:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - fgSizer2->Add(m_staticText2, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - wxArrayString m_comboBoxQmakespecArr; - m_comboBoxQmakespec = new wxComboBox(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), - m_comboBoxQmakespecArr, 0); -#if wxVERSION_NUMBER >= 3000 - m_comboBoxQmakespec->SetHint(wxT("")); -#endif - - fgSizer2->Add(m_comboBoxQmakespec, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - m_staticText4 = - new wxStaticText(this, wxID_ANY, _("QTDIR:"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - - fgSizer2->Add(m_staticText4, 0, wxALL | wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); - - m_textCtrlQtdir = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); - m_textCtrlQtdir->SetToolTip(_("Set QTDIR to the directory where you've installed Qt")); -#if wxVERSION_NUMBER >= 3000 - m_textCtrlQtdir->SetHint(wxT("")); -#endif - - fgSizer2->Add(m_textCtrlQtdir, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); - - SetName(wxT("QmakeSettingsTabBase")); - SetSize(wxDLG_UNIT(this, wxSize(-1, -1))); - if(GetSizer()) { - GetSizer()->Fit(this); - } -} - -QmakeSettingsTabBase::~QmakeSettingsTabBase() {} diff --git a/QmakePlugin/qmakesettingsbasedlg.h b/QmakePlugin/qmakesettingsbasedlg.h deleted file mode 100644 index cc3a2c2918..0000000000 --- a/QmakePlugin/qmakesettingsbasedlg.h +++ /dev/null @@ -1,96 +0,0 @@ -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: qmakesettingsbasedlg.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#ifndef _CODELITE_QMAKEPLUGIN_QMAKESETTINGSBASEDLG_BASE_CLASSES_H -#define _CODELITE_QMAKEPLUGIN_QMAKESETTINGSBASEDLG_BASE_CLASSES_H - -// clang-format off -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if wxVERSION_NUMBER >= 2900 -#include -#include -#include -#include -#endif - -#ifdef WXC_FROM_DIP -#undef WXC_FROM_DIP -#endif -#if wxVERSION_NUMBER >= 3100 -#define WXC_FROM_DIP(x) wxWindow::FromDIP(x, NULL) -#else -#define WXC_FROM_DIP(x) x -#endif - -// clang-format on - -class QMakeSettingsBaseDlg : public wxDialog -{ -protected: - wxStaticText* m_staticText5; - wxNotebook* m_notebook; - wxStaticLine* m_staticline1; - wxButton* m_buttonNew; - wxButton* m_buttonCancel; - wxButton* m_buttonOk; - -protected: - virtual void OnRightDown(wxMouseEvent& event) { event.Skip(); } - virtual void OnNewQmakeSettings(wxCommandEvent& event) { event.Skip(); } - virtual void OnOK(wxCommandEvent& event) { event.Skip(); } - -public: - wxStaticText* GetStaticText5() { return m_staticText5; } - wxNotebook* GetNotebook() { return m_notebook; } - wxStaticLine* GetStaticline1() { return m_staticline1; } - wxButton* GetButtonNew() { return m_buttonNew; } - wxButton* GetButtonCancel() { return m_buttonCancel; } - wxButton* GetButtonOk() { return m_buttonOk; } - QMakeSettingsBaseDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("QMake Settings"), - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), - long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); - virtual ~QMakeSettingsBaseDlg(); -}; - -class QmakeSettingsTabBase : public wxPanel -{ -protected: - wxStaticText* m_staticText1; - wxFilePickerCtrl* m_filePickerQmakeExec; - wxStaticText* m_staticText2; - wxComboBox* m_comboBoxQmakespec; - wxStaticText* m_staticText4; - wxTextCtrl* m_textCtrlQtdir; - -protected: -public: - wxStaticText* GetStaticText1() { return m_staticText1; } - wxFilePickerCtrl* GetFilePickerQmakeExec() { return m_filePickerQmakeExec; } - wxStaticText* GetStaticText2() { return m_staticText2; } - wxComboBox* GetComboBoxQmakespec() { return m_comboBoxQmakespec; } - wxStaticText* GetStaticText4() { return m_staticText4; } - wxTextCtrl* GetTextCtrlQtdir() { return m_textCtrlQtdir; } - QmakeSettingsTabBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxSize(-1, -1), long style = wxTAB_TRAVERSAL); - virtual ~QmakeSettingsTabBase(); -}; - -#endif diff --git a/QmakePlugin/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp b/QmakePlugin/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp deleted file mode 100644 index 1ea7ca7f86..0000000000 --- a/QmakePlugin/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// This file was automatically generated by wxrc, do not edit by hand. -// - -#include - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include -#include -#include -#include - -#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805 - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime) -#else - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFile(name, data, size) -#endif - -static size_t xml_res_size_0 = 137; -static unsigned char xml_res_file_0[] = { -60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, -110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, -115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, -47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103, -47,119,120,120,114,99,34,62,10,32,32,60,33,45,45,32,72,97,110,100,108,101, -114,32,71,101,110,101,114,97,116,105,111,110,32,105,115,32,79,78,32,45, -45,62,10,60,47,114,101,115,111,117,114,99,101,62,10}; - -void wxCrafterljRDukInitBitmapResources() -{ - - // Check for memory FS. If not present, load the handler: - { - wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one")); - wxFileSystem fsys; - wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file")); - wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file")); - if (f) delete f; - else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); - } - - XRC_ADD_FILE(wxT("XRC_resource/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp$C__src_codelite_QmakePlugin_qmakesettingsbasedlg_qmakeplugin_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/qmakesettingsbasedlg_qmakeplugin_bitmaps.cpp$C__src_codelite_QmakePlugin_qmakesettingsbasedlg_qmakeplugin_bitmaps.xrc")); -} diff --git a/QmakePlugin/qmakesettingsdlg.h b/QmakePlugin/qmakesettingsdlg.h index 0964aaa11c..704131c248 100644 --- a/QmakePlugin/qmakesettingsdlg.h +++ b/QmakePlugin/qmakesettingsdlg.h @@ -26,7 +26,7 @@ #ifndef __qmakesettingsdlg__ #define __qmakesettingsdlg__ -#include "qmakesettingsbasedlg.h" +#include "qmakesettingsbasedlg.hpp" class QmakeConf; class IManager; diff --git a/QmakePlugin/qmakesettingstab.h b/QmakePlugin/qmakesettingstab.h index 671dd21c67..27f445dc90 100644 --- a/QmakePlugin/qmakesettingstab.h +++ b/QmakePlugin/qmakesettingstab.h @@ -32,7 +32,7 @@ Subclass of QmakeSettingsTabBase, which is generated by wxFormBuilder. */ class QmakeConf; -#include "qmakesettingsbasedlg.h" +#include "qmakesettingsbasedlg.hpp" /** Implementing QmakeSettingsTabBase */ class QmakeSettingsTab : public QmakeSettingsTabBase diff --git a/QmakePlugin/qmaketab.h b/QmakePlugin/qmaketab.h index d7dd79bd80..ea24a7414c 100644 --- a/QmakePlugin/qmaketab.h +++ b/QmakePlugin/qmaketab.h @@ -32,7 +32,7 @@ Subclass of QMakeTabBase, which is generated by wxFormBuilder. */ #include "qmakeconf.h" -#include "qmaketabbase.h" +#include "qmaketabbase.hpp" class IManager; /** Implementing QMakeTabBase */ diff --git a/QmakePlugin/qmaketabbase.cpp b/QmakePlugin/qmaketabbase.cpp deleted file mode 100644 index e076ce85bd..0000000000 --- a/QmakePlugin/qmaketabbase.cpp +++ /dev/null @@ -1,98 +0,0 @@ -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: qmaketabbase.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#include "qmaketabbase.h" - - -// Declare the bitmap loading function -extern void wxCraftergbQa9FInitBitmapResources(); - -static bool bBitmapLoaded = false; - - -QMakeTabBase::QMakeTabBase(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) - : wxPanel(parent, id, pos, size, style) -{ - if ( !bBitmapLoaded ) { - // We need to initialise the default bitmap handler - wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); - wxCraftergbQa9FInitBitmapResources(); - bBitmapLoaded = true; - } - - wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL); - this->SetSizer(mainSizer); - - m_checkBoxUseQmake = new wxCheckBox(this, wxID_ANY, _("This project uses qmake"), wxDefaultPosition, wxSize(-1, -1), 0); - m_checkBoxUseQmake->SetValue(false); - - mainSizer->Add(m_checkBoxUseQmake, 0, wxALL, 5); - - wxFlexGridSizer* fgSizer1 = new wxFlexGridSizer(2, 2, 0, 0); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - fgSizer1->AddGrowableCol(1); - - mainSizer->Add(fgSizer1, 0, wxALL|wxEXPAND, 5); - - m_staticText3 = new wxStaticText(this, wxID_ANY, _("qmake settings:"), wxDefaultPosition, wxSize(-1, -1), 0); - m_staticText3->SetToolTip(_("Select the QMake to be used for this build configuration as defined in 'Plugins -> QMake -> Settings'")); - - fgSizer1->Add(m_staticText3, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - wxArrayString m_choiceQmakeSettingsArr; - m_choiceQmakeSettings = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_choiceQmakeSettingsArr, 0); - m_choiceQmakeSettings->SetToolTip(_("Select the QMake to be used for this build configuration as defined in 'Plugins -> QMake -> Settings'")); - - fgSizer1->Add(m_choiceQmakeSettings, 0, wxALL|wxEXPAND, 5); - - m_staticText4 = new wxStaticText(this, wxID_ANY, _("qmake execution line:"), wxDefaultPosition, wxSize(-1, -1), 0); - - fgSizer1->Add(m_staticText4, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); - - m_textCtrlQmakeExeLine = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); - #if wxVERSION_NUMBER >= 3000 - m_textCtrlQmakeExeLine->SetHint(wxT("")); - #endif - - fgSizer1->Add(m_textCtrlQmakeExeLine, 0, wxALL|wxEXPAND, 5); - - m_staticText5 = new wxStaticText(this, wxID_ANY, _("CodeLite will place the below text after the auto generated section (so you may override the generated variables)"), wxDefaultPosition, wxSize(-1, -1), 0); - - mainSizer->Add(m_staticText5, 0, wxALL|wxEXPAND, 5); - - m_textCtrlFreeText = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), wxTE_RICH2|wxTE_PROCESS_TAB|wxTE_MULTILINE|wxTE_DONTWRAP); - wxFont m_textCtrlFreeTextFont(9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Sans")); - m_textCtrlFreeText->SetFont(m_textCtrlFreeTextFont); - - mainSizer->Add(m_textCtrlFreeText, 1, wxALL|wxEXPAND, 5); - - SetName(wxT("QMakeTabBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { - GetSizer()->Fit(this); - } - CentreOnParent(wxBOTH); - // Connect events - m_staticText3->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_choiceQmakeSettings->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_staticText4->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_textCtrlQmakeExeLine->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_staticText5->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_textCtrlFreeText->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - -} - -QMakeTabBase::~QMakeTabBase() -{ - m_staticText3->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_choiceQmakeSettings->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_staticText4->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_textCtrlQmakeExeLine->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_staticText5->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - m_textCtrlFreeText->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(QMakeTabBase::OnUseQmake), NULL, this); - -} diff --git a/QmakePlugin/qmaketabbase.h b/QmakePlugin/qmaketabbase.h deleted file mode 100644 index 5270f57ac2..0000000000 --- a/QmakePlugin/qmaketabbase.h +++ /dev/null @@ -1,79 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// Copyright : (C) 2015 Eran Ifrah -// File name : qmaketabbase.h -// -// ------------------------------------------------------------------------- -// A -// _____ _ _ _ _ -// / __ \ | | | | (_) | -// | / \/ ___ __| | ___| | _| |_ ___ -// | | / _ \ / _ |/ _ \ | | | __/ _ ) -// | \__/\ (_) | (_| | __/ |___| | || __/ -// \____/\___/ \__,_|\___\_____/_|\__\___| -// -// F i l e -// -// 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 2 of the License, or -// (at your option) any later version. -// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// This file was auto-generated by codelite's wxCrafter Plugin -// wxCrafter project file: qmaketabbase.wxcp -// Do not modify this file by hand! -////////////////////////////////////////////////////////////////////// - -#ifndef CODELITE_QMAKEPLUGIN_QMAKETABBASE_BASE_CLASSES_H -#define CODELITE_QMAKEPLUGIN_QMAKETABBASE_BASE_CLASSES_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if wxVERSION_NUMBER >= 2900 -#include -#include -#include -#include -#endif - -class QMakeTabBase : public wxPanel -{ -protected: - wxCheckBox* m_checkBoxUseQmake; - wxStaticText* m_staticText3; - wxChoice* m_choiceQmakeSettings; - wxStaticText* m_staticText4; - wxTextCtrl* m_textCtrlQmakeExeLine; - wxStaticText* m_staticText5; - wxTextCtrl* m_textCtrlFreeText; - -protected: - virtual void OnUseQmake(wxUpdateUIEvent& event) { event.Skip(); } - -public: - wxCheckBox* GetCheckBoxUseQmake() { return m_checkBoxUseQmake; } - wxStaticText* GetStaticText3() { return m_staticText3; } - wxChoice* GetChoiceQmakeSettings() { return m_choiceQmakeSettings; } - wxStaticText* GetStaticText4() { return m_staticText4; } - wxTextCtrl* GetTextCtrlQmakeExeLine() { return m_textCtrlQmakeExeLine; } - wxStaticText* GetStaticText5() { return m_staticText5; } - wxTextCtrl* GetTextCtrlFreeText() { return m_textCtrlFreeText; } - QMakeTabBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxTAB_TRAVERSAL); - virtual ~QMakeTabBase(); -}; - -#endif diff --git a/QmakePlugin/qmaketabbase_qmakeplugin_bitmaps.cpp b/QmakePlugin/qmaketabbase_qmakeplugin_bitmaps.cpp deleted file mode 100644 index d20b833573..0000000000 --- a/QmakePlugin/qmaketabbase_qmakeplugin_bitmaps.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// -// This file was automatically generated by wxrc, do not edit by hand. -// - -#include - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include -#include -#include -#include - -#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805 - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime) -#else - #define XRC_ADD_FILE(name, data, size, mime) \ - wxMemoryFSHandler::AddFile(name, data, size) -#endif - -static size_t xml_res_size_0 = 90; -static unsigned char xml_res_file_0[] = { -60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, -110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, -115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, -47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103, -47,119,120,120,114,99,34,47,62,10}; - -void wxCraftergbQa9FInitBitmapResources() -{ - - // Check for memory FS. If not present, load the handler: - { - wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one")); - wxFileSystem fsys; - wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file")); - wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file")); - if (f) delete f; - else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); - } - - XRC_ADD_FILE(wxT("XRC_resource/qmaketabbase_qmakeplugin_bitmaps.cpp$C__src_codelite_QmakePlugin_qmaketabbase_qmakeplugin_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/qmaketabbase_qmakeplugin_bitmaps.cpp$C__src_codelite_QmakePlugin_qmaketabbase_qmakeplugin_bitmaps.xrc")); -}