diff --git a/LiteEditor/BuildOrderDialog.cpp b/LiteEditor/BuildOrderDialog.cpp new file mode 100644 index 0000000000..ad96b7f2dd --- /dev/null +++ b/LiteEditor/BuildOrderDialog.cpp @@ -0,0 +1,234 @@ +#include "BuildOrderDialog.h" +#include "globals.h" +#include "imanager.h" +#include "project.h" +#include "workspace.h" +#include + +BuildOrderDialog::BuildOrderDialog(wxWindow* parent, const wxString& projectName) + : BuildOrderDialogBase(parent) + , m_projectName(projectName) +{ + SetLabel(_("Edit build order for project '") + projectName + "'"); + + m_dvListCtrlProjects->SetSortFunction( + [](clRowEntry* a, clRowEntry* b) { return a->GetLabel(0).CmpNoCase(b->GetLabel(0)) < 0; }); + + // determine the current project configuration + BuildConfigPtr selBuildConf = clCxxWorkspaceST::Get()->GetProjBuildConf(m_projectName, wxEmptyString); + wxString config_name; + if(selBuildConf) { + config_name = selBuildConf->GetName(); + } + + ProjectPtr proj = clCxxWorkspaceST::Get()->GetProject(m_projectName); + if(proj) { + // populate the choice control with the list of available configurations for this project + ProjectSettingsPtr settings = proj->GetSettings(); + if(settings) { + ProjectSettingsCookie cookie; + BuildConfigPtr bldConf = settings->GetFirstBuildConfiguration(cookie); + while(bldConf) { + wxString curr_config_name = bldConf->GetName(); + m_choiceProjectConfig->Append(curr_config_name); + bldConf = settings->GetNextBuildConfiguration(cookie); + } + } + } + + int index = m_choiceProjectConfig->FindString(config_name); + if(index != wxNOT_FOUND) { + m_choiceProjectConfig->SetSelection(index); + m_current_configuration = config_name; + Initialise(config_name); + } + ::clSetDialogBestSizeAndPosition(this); +} + +BuildOrderDialog::~BuildOrderDialog() {} + +void BuildOrderDialog::OnApplyButton(wxCommandEvent& event) +{ + wxUnusedVar(event); + Save(m_current_configuration); +} + +void BuildOrderDialog::OnApplyButtonUI(wxUpdateUIEvent& event) { event.Enable(m_dirty); } +void BuildOrderDialog::OnConfigChanged(wxCommandEvent& event) { Initialise(event.GetString()); } + +void BuildOrderDialog::OnMoveDown(wxCommandEvent& event) +{ + wxUnusedVar(event); + int index = m_dvListCtrlBuildOrder->GetSelectedRow(); + if(index == (int)(m_dvListCtrlBuildOrder->GetItemCount() - 1)) { + return; + } + index++; + // we can basically move the next item up + DoMoveUp(index, m_dvListCtrlBuildOrder->GetItemText(m_dvListCtrlBuildOrder->RowToItem(index - 1))); +} + +void BuildOrderDialog::OnMoveUp(wxCommandEvent& event) +{ + wxUnusedVar(event); + int index = m_dvListCtrlBuildOrder->GetSelectedRow(); + if(index == wxNOT_FOUND || index == 0) { + return; + } + + DoMoveUp(index, m_dvListCtrlBuildOrder->GetItemText(m_dvListCtrlBuildOrder->RowToItem(index))); +} + +void BuildOrderDialog::DoMoveUp(int index, const wxString& projectName) +{ + wxString text = m_dvListCtrlBuildOrder->GetItemText(m_dvListCtrlBuildOrder->RowToItem(index)); + if(index == 0) { + return; + } + + wxArrayString projects = GetBuildOrderProjects(); + + int prev_row = index - 1; + projects.Insert(text, prev_row); + // we now have 2 instances of "text", remove the unwanted one + projects.RemoveAt(index + 1); + + int new_sel = projects.Index(projectName); + + m_dvListCtrlBuildOrder->DeleteAllItems(); + m_dvListCtrlBuildOrder->Begin(); + for(const wxString& project : projects) { + m_dvListCtrlBuildOrder->AppendItem(project); + } + m_dvListCtrlBuildOrder->Commit(); + if(new_sel != wxNOT_FOUND) { + m_dvListCtrlBuildOrder->SelectRow(new_sel); + m_dvListCtrlBuildOrder->EnsureVisible(m_dvListCtrlBuildOrder->RowToItem(new_sel)); + } + m_dirty = true; +} + +void BuildOrderDialog::OnMoveLeft(wxCommandEvent& event) +{ + wxUnusedVar(event); + int selected_row = m_dvListCtrlBuildOrder->GetSelectedRow(); + if(selected_row == wxNOT_FOUND) { + return; + } + + wxString project_name = m_dvListCtrlBuildOrder->GetItemText(m_dvListCtrlBuildOrder->RowToItem(selected_row)); + m_dvListCtrlBuildOrder->DeleteItem(selected_row); + + // m_dvListCtrlProjects is ordered list, it will be placed correctly + m_dvListCtrlProjects->AppendItem(project_name); + m_dvListCtrlProjects->Refresh(); + m_dirty = true; +} + +void BuildOrderDialog::OnMoveLeftUI(wxUpdateUIEvent& event) +{ + event.Enable(m_dvListCtrlBuildOrder->GetSelectedRow() != wxNOT_FOUND); +} + +void BuildOrderDialog::OnMoveRight(wxCommandEvent& event) +{ + wxUnusedVar(event); + int selected_row = m_dvListCtrlProjects->GetSelectedRow(); + if(selected_row == wxNOT_FOUND) { + return; + } + + // remove the item from the project list + wxString project_name = m_dvListCtrlProjects->GetItemText(m_dvListCtrlProjects->RowToItem(selected_row)); + m_dvListCtrlProjects->DeleteItem(selected_row); + + // append it in the build order + m_dvListCtrlBuildOrder->AppendItem(project_name); + m_dvListCtrlBuildOrder->Refresh(); + int last_row = m_dvListCtrlBuildOrder->GetItemCount() - 1; + m_dvListCtrlBuildOrder->EnsureVisible(m_dvListCtrlBuildOrder->RowToItem(last_row)); + m_dirty = true; +} + +void BuildOrderDialog::OnMoveRightUI(wxUpdateUIEvent& event) +{ + event.Enable(m_dvListCtrlProjects->GetSelectedRow() != wxNOT_FOUND); +} + +void BuildOrderDialog::Initialise(const wxString& config_name) +{ + if(config_name.empty()) + return; + + if(m_dirty && !m_current_configuration.empty()) { + if(::wxMessageBox(_("You have un-saved changes, would you like to save them before changing configuration?"), + "CodeLite", wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION) == wxYES) { + Save(m_current_configuration); + } + } + + // the choice control is already up-to-date + DoPopulateControl(config_name); + m_current_configuration = config_name; +} + +void BuildOrderDialog::DoPopulateControl(const wxString& configuration) +{ + wxString errMsg; + ProjectPtr proj = clCxxWorkspaceST::Get()->FindProjectByName(m_projectName, errMsg); + if(!proj) { + return; + } + + m_dvListCtrlBuildOrder->DeleteAllItems(); + m_dvListCtrlProjects->DeleteAllItems(); + + // initialize the build order listbox + wxStringSet_t deps_set; + wxArrayString depArr = proj->GetDependencies(configuration); + size_t i = 0; + for(i = 0; i < depArr.GetCount(); i++) { + deps_set.insert(depArr[i]); + m_dvListCtrlBuildOrder->AppendItem(depArr[i]); + } + + // initialize the project dependencies view + wxArrayString projArr; + clGetManager()->GetWorkspace()->GetProjectList(projArr); + + // add only projects that do not exist in the dependencies view + for(i = 0; i < projArr.GetCount(); i++) { + if((deps_set.count(projArr[i]) == 0) && (projArr.Item(i) != m_projectName)) { + m_dvListCtrlProjects->AppendItem(projArr.Item(i)); + } + } +} + +void BuildOrderDialog::Save(const wxString& config_name) +{ + // Save only if its dirty... + if(m_dirty) { + ProjectPtr proj = clCxxWorkspaceST::Get()->GetProject(m_projectName); + wxArrayString depsArr = GetBuildOrderProjects(); + proj->SetDependencies(depsArr, config_name); + } + m_dirty = false; +} + +wxArrayString BuildOrderDialog::GetBuildOrderProjects() const +{ + wxArrayString projects; + projects.reserve(m_dvListCtrlBuildOrder->GetItemCount()); + + for(size_t i = 0; i < m_dvListCtrlBuildOrder->GetItemCount(); ++i) { + projects.Add(m_dvListCtrlBuildOrder->GetItemText(m_dvListCtrlBuildOrder->RowToItem(i))); + } + return projects; +} + +void BuildOrderDialog::OnButtonOK(wxCommandEvent& event) +{ + wxUnusedVar(event); + Save(m_current_configuration); + EndModal(wxID_OK); +} diff --git a/LiteEditor/BuildOrderDialog.h b/LiteEditor/BuildOrderDialog.h new file mode 100644 index 0000000000..8c9485722a --- /dev/null +++ b/LiteEditor/BuildOrderDialog.h @@ -0,0 +1,36 @@ +#ifndef BUILDORDERDIALOG_H +#define BUILDORDERDIALOG_H + +#include "buildorderbasepage.h" +#include + +class BuildOrderDialog : public BuildOrderDialogBase +{ + wxString m_projectName; + wxString m_current_configuration; + bool m_dirty = false; + +public: + BuildOrderDialog(wxWindow* parent, const wxString& projectName); + virtual ~BuildOrderDialog(); + +protected: + void Initialise(const wxString& config); + void DoPopulateControl(const wxString& configuration); + void Save(const wxString& config_name); + void DoMoveUp(int index, const wxString& projectName); + wxArrayString GetBuildOrderProjects() const; + +protected: + void OnButtonOK(wxCommandEvent& event) override; + void OnApplyButton(wxCommandEvent& event) override; + void OnApplyButtonUI(wxUpdateUIEvent& event) override; + void OnConfigChanged(wxCommandEvent& event) override; + void OnMoveDown(wxCommandEvent& event) override; + void OnMoveLeft(wxCommandEvent& event) override; + void OnMoveLeftUI(wxUpdateUIEvent& event) override; + void OnMoveRight(wxCommandEvent& event) override; + void OnMoveRightUI(wxUpdateUIEvent& event) override; + void OnMoveUp(wxCommandEvent& event) override; +}; +#endif // BUILDORDERDIALOG_H diff --git a/LiteEditor/CodeLiteIDE.project b/LiteEditor/CodeLiteIDE.project index 61c9f22bed..dad1be1994 100644 --- a/LiteEditor/CodeLiteIDE.project +++ b/LiteEditor/CodeLiteIDE.project @@ -353,10 +353,6 @@ - - - - @@ -387,6 +383,8 @@ + + @@ -2294,8 +2292,8 @@ resources.cpp: resources.xrc - + @@ -2345,13 +2343,12 @@ resources.cpp: resources.xrc - - + @@ -2399,6 +2396,7 @@ resources.cpp: resources.xrc + diff --git a/LiteEditor/buildorderbasepage.cpp b/LiteEditor/buildorderbasepage.cpp index 6a12c42e52..4d76b59348 100644 --- a/LiteEditor/buildorderbasepage.cpp +++ b/LiteEditor/buildorderbasepage.cpp @@ -6,120 +6,181 @@ #include "buildorderbasepage.h" - // Declare the bitmap loading function extern void wxC312EInitBitmapResources(); static bool bBitmapLoaded = false; - -DependenciesPageBase::DependenciesPageBase(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) - : wxPanel(parent, id, pos, size, style) +BuildOrderDialogBase::BuildOrderDialogBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, + const wxSize& size, long style) + : wxDialog(parent, id, title, pos, size, style) { - if ( !bBitmapLoaded ) { + if(!bBitmapLoaded) { // We need to initialise the default bitmap handler wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); wxC312EInitBitmapResources(); bBitmapLoaded = true; } - + + wxBoxSizer* boxSizer32 = new wxBoxSizer(wxVERTICAL); + this->SetSizer(boxSizer32); + wxBoxSizer* boxSizer1 = new wxBoxSizer(wxVERTICAL); - this->SetSizer(boxSizer1); - - m_staticText3 = new wxStaticText(this, wxID_ANY, _("Select build order for configuration:"), wxDefaultPosition, wxSize(-1, -1), 0); - - boxSizer1->Add(m_staticText3, 0, wxALL, 5); - + + boxSizer32->Add(boxSizer1, 1, wxALL | wxEXPAND, WXC_FROM_DIP(0)); + + m_staticText3 = new wxStaticText(this, wxID_ANY, wxT("Select build order for configuration:"), wxDefaultPosition, + wxDLG_UNIT(this, wxSize(-1, -1)), 0); + + boxSizer1->Add(m_staticText3, 0, wxLEFT | wxRIGHT | wxTOP, WXC_FROM_DIP(10)); + wxArrayString m_choiceProjectConfigArr; - m_choiceProjectConfig = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_choiceProjectConfigArr, 0); - - boxSizer1->Add(m_choiceProjectConfig, 0, wxALL|wxEXPAND, 5); - - wxBoxSizer* bSizer3 = new wxBoxSizer(wxHORIZONTAL); - - boxSizer1->Add(bSizer3, 1, wxEXPAND, 5); - - wxBoxSizer* bSizer31 = new wxBoxSizer(wxVERTICAL); - - bSizer3->Add(bSizer31, 5, wxEXPAND, 5); - - m_staticText1 = new wxStaticText(this, wxID_ANY, _("Projects:"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer31->Add(m_staticText1, 0, wxLEFT|wxRIGHT|wxTOP, 5); - - wxArrayString m_checkListProjectListArr; - m_checkListProjectList = new wxCheckListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), m_checkListProjectListArr, wxLB_SINGLE); - - bSizer31->Add(m_checkListProjectList, 1, wxALL|wxEXPAND, 5); - + m_choiceProjectConfig = + new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), m_choiceProjectConfigArr, 0); + + boxSizer1->Add(m_choiceProjectConfig, 0, wxALL | wxEXPAND, WXC_FROM_DIP(10)); + + wxFlexGridSizer* flexGridSizer10 = new wxFlexGridSizer(0, 3, 0, 0); + flexGridSizer10->SetFlexibleDirection(wxBOTH); + flexGridSizer10->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); + flexGridSizer10->AddGrowableCol(0); + flexGridSizer10->AddGrowableCol(2); + flexGridSizer10->AddGrowableRow(0); + + boxSizer1->Add(flexGridSizer10, 1, wxALL | wxEXPAND, WXC_FROM_DIP(10)); + + m_dvListCtrlProjects = new clThemedOrderedListCtrl(this, wxID_ANY, wxDefaultPosition, + wxDLG_UNIT(this, wxSize(150, -1)), wxDV_ROW_LINES | wxDV_SINGLE); + + flexGridSizer10->Add(m_dvListCtrlProjects, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); + + m_dvListCtrlProjects->AppendTextColumn(wxT("Projects"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, + wxDATAVIEW_COL_RESIZABLE); + wxBoxSizer* boxSizer3 = new wxBoxSizer(wxVERTICAL); + + flexGridSizer10->Add(boxSizer3, 1, wxALL | wxEXPAND | wxALIGN_TOP, WXC_FROM_DIP(5)); + + m_button22 = new wxButton(this, wxID_ANY, wxT("-->"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + + boxSizer3->Add(m_button22, 0, wxALL, WXC_FROM_DIP(5)); + + m_button24 = new wxButton(this, wxID_ANY, wxT("<--"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + + boxSizer3->Add(m_button24, 0, wxALL, WXC_FROM_DIP(5)); + wxBoxSizer* bSizer4 = new wxBoxSizer(wxVERTICAL); - - bSizer3->Add(bSizer4, 6, wxEXPAND, 5); - - m_staticText2 = new wxStaticText(this, wxID_ANY, _("Build Order:"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer4->Add(m_staticText2, 0, wxLEFT|wxRIGHT|wxTOP, 5); - + + flexGridSizer10->Add(bSizer4, 6, wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* bSizer11 = new wxBoxSizer(wxHORIZONTAL); - - bSizer4->Add(bSizer11, 1, wxEXPAND, 5); - + + bSizer4->Add(bSizer11, 1, wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* bSizer5 = new wxBoxSizer(wxVERTICAL); - - bSizer11->Add(bSizer5, 1, wxEXPAND, 5); - - wxArrayString m_listBoxBuildOrderArr; - m_listBoxBuildOrder = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), m_listBoxBuildOrderArr, 0); - - bSizer5->Add(m_listBoxBuildOrder, 1, wxALL|wxEXPAND, 5); - + + bSizer11->Add(bSizer5, 1, wxEXPAND, WXC_FROM_DIP(5)); + + m_dvListCtrlBuildOrder = new clThemedListCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(150, -1)), + wxDV_ROW_LINES | wxDV_SINGLE); + + bSizer5->Add(m_dvListCtrlBuildOrder, 1, wxALL | wxEXPAND, WXC_FROM_DIP(5)); + + m_dvListCtrlBuildOrder->AppendTextColumn(wxT("Build Order"), wxDATAVIEW_CELL_INERT, WXC_FROM_DIP(-2), wxALIGN_LEFT, + wxDATAVIEW_COL_RESIZABLE); wxBoxSizer* bSizer6 = new wxBoxSizer(wxVERTICAL); - - bSizer11->Add(bSizer6, 0, wxEXPAND, 5); - + + bSizer11->Add(bSizer6, 0, wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* bSizer8 = new wxBoxSizer(wxVERTICAL); - - bSizer6->Add(bSizer8, 1, wxEXPAND, 5); - - m_buttonUp = new wxButton(this, wxID_UP, _("Up"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer8->Add(m_buttonUp, 0, wxALL|wxEXPAND, 5); - - m_buttonDown = new wxButton(this, wxID_DOWN, _("Down"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer8->Add(m_buttonDown, 0, wxALL|wxEXPAND, 5); - + + bSizer6->Add(bSizer8, 1, wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonUp = new wxButton(this, wxID_UP, wxT("Up"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + + bSizer8->Add(m_buttonUp, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); + + m_buttonDown = new wxButton(this, wxID_DOWN, wxT("Down"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + + bSizer8->Add(m_buttonDown, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); + wxBoxSizer* bSizer7 = new wxBoxSizer(wxVERTICAL); - - bSizer6->Add(bSizer7, 0, 0, 5); - - m_buttonApply = new wxButton(this, wxID_APPLY, _("Apply"), wxDefaultPosition, wxSize(-1, -1), 0); - - bSizer7->Add(m_buttonApply, 0, wxALL|wxEXPAND, 5); - - SetName(wxT("DependenciesPageBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { - GetSizer()->Fit(this); + + bSizer6->Add(bSizer7, 0, 0, WXC_FROM_DIP(5)); + + m_buttonApply = + new wxButton(this, wxID_APPLY, wxT("Apply"), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + m_buttonApply->SetDefault(); + m_buttonApply->SetFocus(); + + bSizer7->Add(m_buttonApply, 0, wxALL | wxEXPAND, WXC_FROM_DIP(5)); + + m_stdBtnSizer52 = new wxStdDialogButtonSizer(); + + boxSizer32->Add(m_stdBtnSizer52, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, WXC_FROM_DIP(10)); + + m_button54 = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + m_button54->SetDefault(); + m_stdBtnSizer52->AddButton(m_button54); + + m_button56 = new wxButton(this, wxID_CANCEL, wxT(""), wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, -1)), 0); + m_stdBtnSizer52->AddButton(m_button56); + m_stdBtnSizer52->Realize(); + + SetName(wxT("BuildOrderDialogBase")); + 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); } - CentreOnParent(wxBOTH); +#endif // Connect events - m_choiceProjectConfig->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(DependenciesPageBase::OnConfigChanged), NULL, this); - m_checkListProjectList->Connect(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(DependenciesPageBase::OnCheckListItemToggled), NULL, this); - m_buttonUp->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnMoveUp), NULL, this); - m_buttonDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnMoveDown), NULL, this); - m_buttonApply->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnApplyButton), NULL, this); - m_buttonApply->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(DependenciesPageBase::OnApplyButtonUI), NULL, this); - + m_choiceProjectConfig->Connect(wxEVT_COMMAND_CHOICE_SELECTED, + wxCommandEventHandler(BuildOrderDialogBase::OnConfigChanged), NULL, this); + m_button22->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveRight), NULL, + this); + m_button22->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnMoveRightUI), NULL, this); + m_button24->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnMoveLeftUI), NULL, this); + m_button24->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveLeft), NULL, + this); + m_buttonUp->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveUp), NULL, + this); + m_buttonDown->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveDown), NULL, + this); + m_buttonApply->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnApplyButton), + NULL, this); + m_buttonApply->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnApplyButtonUI), NULL, this); + m_button54->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnButtonOK), NULL, + this); } -DependenciesPageBase::~DependenciesPageBase() +BuildOrderDialogBase::~BuildOrderDialogBase() { - m_choiceProjectConfig->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(DependenciesPageBase::OnConfigChanged), NULL, this); - m_checkListProjectList->Disconnect(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler(DependenciesPageBase::OnCheckListItemToggled), NULL, this); - m_buttonUp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnMoveUp), NULL, this); - m_buttonDown->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnMoveDown), NULL, this); - m_buttonApply->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DependenciesPageBase::OnApplyButton), NULL, this); - m_buttonApply->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(DependenciesPageBase::OnApplyButtonUI), NULL, this); - + m_choiceProjectConfig->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, + wxCommandEventHandler(BuildOrderDialogBase::OnConfigChanged), NULL, this); + m_button22->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveRight), NULL, + this); + m_button22->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnMoveRightUI), NULL, this); + m_button24->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnMoveLeftUI), NULL, this); + m_button24->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveLeft), NULL, + this); + m_buttonUp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveUp), NULL, + this); + m_buttonDown->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnMoveDown), + NULL, this); + m_buttonApply->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnApplyButton), + NULL, this); + m_buttonApply->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(BuildOrderDialogBase::OnApplyButtonUI), NULL, + this); + m_button54->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(BuildOrderDialogBase::OnButtonOK), NULL, + this); } diff --git a/LiteEditor/buildorderbasepage.h b/LiteEditor/buildorderbasepage.h index a291392ec6..2ca52ff738 100644 --- a/LiteEditor/buildorderbasepage.h +++ b/LiteEditor/buildorderbasepage.h @@ -1,48 +1,25 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// Copyright : (C) 2015 Eran Ifrah -// File name : buildorderbasepage.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: depend_dlg_page.wxcp // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// -#ifndef CODELITE_LITEEDITOR_DEPEND_DLG_PAGE_BASE_CLASSES_H -#define CODELITE_LITEEDITOR_DEPEND_DLG_PAGE_BASE_CLASSES_H +#ifndef _CODELITE_LITEEDITOR_DEPEND_DLG_PAGE_BASE_CLASSES_H +#define _CODELITE_LITEEDITOR_DEPEND_DLG_PAGE_BASE_CLASSES_H +// clang-format off #include #include #include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include "clThemedListCtrl.h" #include #if wxVERSION_NUMBER >= 2900 #include @@ -51,39 +28,59 @@ #include #endif -class DependenciesPageBase : public wxPanel +#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 BuildOrderDialogBase : public wxDialog { protected: wxStaticText* m_staticText3; wxChoice* m_choiceProjectConfig; - wxStaticText* m_staticText1; - wxCheckListBox* m_checkListProjectList; - wxStaticText* m_staticText2; - wxListBox* m_listBoxBuildOrder; + clThemedOrderedListCtrl* m_dvListCtrlProjects; + wxButton* m_button22; + wxButton* m_button24; + clThemedListCtrl* m_dvListCtrlBuildOrder; wxButton* m_buttonUp; wxButton* m_buttonDown; wxButton* m_buttonApply; + wxStdDialogButtonSizer* m_stdBtnSizer52; + wxButton* m_button54; + wxButton* m_button56; protected: virtual void OnConfigChanged(wxCommandEvent& event) { event.Skip(); } - virtual void OnCheckListItemToggled(wxCommandEvent& event) { event.Skip(); } + virtual void OnMoveRight(wxCommandEvent& event) { event.Skip(); } + virtual void OnMoveRightUI(wxUpdateUIEvent& event) { event.Skip(); } + virtual void OnMoveLeftUI(wxUpdateUIEvent& event) { event.Skip(); } + virtual void OnMoveLeft(wxCommandEvent& event) { event.Skip(); } virtual void OnMoveUp(wxCommandEvent& event) { event.Skip(); } virtual void OnMoveDown(wxCommandEvent& event) { event.Skip(); } virtual void OnApplyButton(wxCommandEvent& event) { event.Skip(); } virtual void OnApplyButtonUI(wxUpdateUIEvent& event) { event.Skip(); } + virtual void OnButtonOK(wxCommandEvent& event) { event.Skip(); } public: wxStaticText* GetStaticText3() { return m_staticText3; } wxChoice* GetChoiceProjectConfig() { return m_choiceProjectConfig; } - wxStaticText* GetStaticText1() { return m_staticText1; } - wxCheckListBox* GetCheckListProjectList() { return m_checkListProjectList; } - wxStaticText* GetStaticText2() { return m_staticText2; } - wxListBox* GetListBoxBuildOrder() { return m_listBoxBuildOrder; } + clThemedOrderedListCtrl* GetDvListCtrlProjects() { return m_dvListCtrlProjects; } + wxButton* GetButton22() { return m_button22; } + wxButton* GetButton24() { return m_button24; } + clThemedListCtrl* GetDvListCtrlBuildOrder() { return m_dvListCtrlBuildOrder; } wxButton* GetButtonUp() { return m_buttonUp; } wxButton* GetButtonDown() { return m_buttonDown; } wxButton* GetButtonApply() { return m_buttonApply; } - DependenciesPageBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxTAB_TRAVERSAL); - virtual ~DependenciesPageBase(); + BuildOrderDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Build Order"), + const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), + long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); + virtual ~BuildOrderDialogBase(); }; #endif diff --git a/LiteEditor/depend_dlg_page.cpp b/LiteEditor/depend_dlg_page.cpp deleted file mode 100644 index 4672fdd4fb..0000000000 --- a/LiteEditor/depend_dlg_page.cpp +++ /dev/null @@ -1,223 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// copyright : (C) 2008 by Eran Ifrah -// file name : depend_dlg_page.cpp -// -// ------------------------------------------------------------------------- -// 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. -// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -#include "manager.h" -#include "project.h" -#include "depend_dlg_page.h" - -DependenciesPage::DependenciesPage(wxWindow* parent, const wxString& projectName) - : DependenciesPageBase(parent) - , m_projectName(projectName) - , m_dirty(false) -{ - Init(); -} - -void DependenciesPage::OnConfigChanged(wxCommandEvent& event) -{ - if(m_dirty) { - // save old configuration - if(wxMessageBox( - wxString::Format(_("Build order for configuration '%s' has been modified, would you like to save it?"), - m_currentSelection.GetData()), - _("CodeLite"), wxYES_NO | wxICON_QUESTION) == wxYES) { - Save(); - } - m_dirty = false; - } - - m_currentSelection = event.GetString(); - // switch to new configuration - DoPopulateControl(m_currentSelection); -} - -void DependenciesPage::OnMoveUp(wxCommandEvent& event) -{ - wxUnusedVar(event); - OnUpCommand(m_listBoxBuildOrder); -} - -void DependenciesPage::OnMoveDown(wxCommandEvent& event) -{ - wxUnusedVar(event); - OnDownCommand(m_listBoxBuildOrder); -} - -void DependenciesPage::OnUpCommand(wxListBox* list) -{ - wxString selectedString = list->GetStringSelection(); - - int sel = list->GetSelection(); - if(sel == wxNOT_FOUND) { - return; - } - - sel--; - if(sel < 0) { - return; - } - - // sel contains the new position we want to place the selection string - list->Delete(sel + 1); - list->Insert(selectedString, sel); - list->Select(sel); - m_dirty = true; -} - -void DependenciesPage::OnDownCommand(wxListBox* list) -{ - int sel = list->GetSelection(); - if(sel == wxNOT_FOUND) { - return; - } - - sel++; - if(sel >= (int)list->GetCount()) { - return; - } - - // sel contains the new position we want to place the selection string - wxString oldStr = list->GetString(sel); - - list->Delete(sel); - list->Insert(oldStr, sel - 1); - list->Select(sel); - m_dirty = true; -} - -void DependenciesPage::Save() -{ - // Save only if its dirty... - if(m_dirty) { - ProjectPtr proj = ManagerST::Get()->GetProject(m_projectName); - - wxArrayString depsArr; - for(size_t i = 0; i < m_listBoxBuildOrder->GetCount(); i++) { - depsArr.Add(m_listBoxBuildOrder->GetString((unsigned int)i)); - } - - if(m_currentSelection.IsEmpty()) { - return; - } - - proj->SetDependencies(depsArr, m_currentSelection); - } - m_dirty = false; -} - -void DependenciesPage::OnCheckListItemToggled(wxCommandEvent& event) -{ - int item = event.GetSelection(); - wxString name = m_checkListProjectList->GetString((unsigned int)item); - if(!m_checkListProjectList->IsChecked((unsigned int)item)) { - unsigned int buildOrderId = m_listBoxBuildOrder->FindString(name); - if(buildOrderId != (unsigned int)wxNOT_FOUND) { - m_listBoxBuildOrder->Delete(buildOrderId); - } - } else { - m_listBoxBuildOrder->Append(name); - } - m_dirty = true; -} - -void DependenciesPage::Init() -{ - wxString errMsg; - ProjectPtr proj = clCxxWorkspaceST::Get()->FindProjectByName(m_projectName, errMsg); - if(proj) { - - // populate the choice control with the list of available configurations for this project - ProjectSettingsPtr settings = proj->GetSettings(); - if(settings) { - ProjectSettingsCookie cookie; - BuildConfigPtr bldConf = settings->GetFirstBuildConfiguration(cookie); - while(bldConf) { - m_choiceProjectConfig->Append(bldConf->GetName()); - bldConf = settings->GetNextBuildConfiguration(cookie); - } - } - - // by default select the first configuration - if(m_choiceProjectConfig->GetCount() > 0) { - m_choiceProjectConfig->SetSelection(0); - } - - // select the active configuration - BuildConfigPtr selBuildConf = clCxxWorkspaceST::Get()->GetProjBuildConf(m_projectName, wxEmptyString); - if(selBuildConf) { - int where = m_choiceProjectConfig->FindString(selBuildConf->GetName()); - if(where != wxNOT_FOUND) { - m_choiceProjectConfig->SetSelection(where); - } - } - - m_currentSelection = m_choiceProjectConfig->GetStringSelection(); - DoPopulateControl(m_choiceProjectConfig->GetStringSelection()); - - } else { - wxMessageBox(errMsg, _("CodeLite")); - return; - } -} - -void DependenciesPage::DoPopulateControl(const wxString& configuration) -{ - wxString errMsg; - ProjectPtr proj = clCxxWorkspaceST::Get()->FindProjectByName(m_projectName, errMsg); - if(!proj) { - return; - } - - m_listBoxBuildOrder->Clear(); - m_checkListProjectList->Clear(); - - // initialize the build order listbox - wxArrayString depArr = proj->GetDependencies(configuration); - size_t i = 0; - for(i = 0; i < depArr.GetCount(); i++) { - wxString item = depArr.Item(i); - m_listBoxBuildOrder->Append(item); - } - - // initialize the project dependencies check list - wxArrayString projArr; - ManagerST::Get()->GetProjectList(projArr); - - for(i = 0; i < projArr.GetCount(); i++) { - - if(projArr.Item(i) != m_projectName) { - int idx = m_checkListProjectList->Append(projArr.Item(i)); - m_checkListProjectList->Check(idx, depArr.Index(projArr.Item(i)) != wxNOT_FOUND); - } - } -} - -void DependenciesPage::OnApplyButton(wxCommandEvent& event) -{ - wxUnusedVar(event); - Save(); -} - -void DependenciesPage::OnApplyButtonUI(wxUpdateUIEvent& event) { event.Enable(m_dirty); } diff --git a/LiteEditor/depend_dlg_page.h b/LiteEditor/depend_dlg_page.h deleted file mode 100644 index 45649ac82c..0000000000 --- a/LiteEditor/depend_dlg_page.h +++ /dev/null @@ -1,59 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// copyright : (C) 2008 by Eran Ifrah -// file name : depend_dlg_page.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. -// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -#ifndef __depend_dlg_page__ -#define __depend_dlg_page__ - -#include "buildorderbasepage.h" - -/** Implementing DependenciesPage */ -class DependenciesPage : public DependenciesPageBase -{ - wxString m_projectName; - bool m_dirty; - wxString m_currentSelection; - -protected: - // Handlers for DependenciesPage events. - void OnConfigChanged( wxCommandEvent& event ); - void OnCheckListItemToggled( wxCommandEvent& event ); - void OnMoveUp( wxCommandEvent& event ); - void OnMoveDown( wxCommandEvent& event ); - void OnApplyButton(wxCommandEvent &event); - void OnApplyButtonUI(wxUpdateUIEvent &event); - -protected: - void Init(); - void OnUpCommand(wxListBox *list); - void OnDownCommand(wxListBox *list); - void DoPopulateControl(const wxString &configuration); - -public: - /** Constructor */ - DependenciesPage( wxWindow* parent, const wxString &projectName ); - void Save(); -}; - -#endif // __depend_dlg_page__ diff --git a/LiteEditor/depend_dlg_page.wxcp b/LiteEditor/depend_dlg_page.wxcp index e8a5e36c65..a87ae75ae3 100644 --- a/LiteEditor/depend_dlg_page.wxcp +++ b/LiteEditor/depend_dlg_page.wxcp @@ -1,7 +1,7 @@ { "metadata": { "m_generatedFilesDir": ".", - "m_objCounter": 1, + "m_objCounter": 56, "m_includeFiles": [], "m_bitmapFunction": "wxC312EInitBitmapResources", "m_bitmapsFile": "depend_dlg_page_liteeditor_bitmaps.cpp", @@ -9,18 +9,18 @@ "m_outputFileName": "buildorderbasepage", "m_firstWindowId": 1000, "m_useEnum": false, - "m_useUnderscoreMacro": true, + "m_useUnderscoreMacro": false, "m_addHandlers": true, "m_templateClasses": [] }, "windows": [{ - "m_type": 4407, + "m_type": 4421, "proportion": 0, - "border": 0, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": ["wxTAB_TRAVERSAL"], - "m_sizerFlags": [], + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxDEFAULT_DIALOG_STYLE", "wxRESIZE_BORDER"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], "m_properties": [{ "type": "string", "m_label": "Size:", @@ -28,11 +28,11 @@ }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "DependenciesPageBase" + "m_value": "BuildOrderDialogBase" }, { "type": "multi-string", "m_label": "Tooltip:", @@ -73,14 +73,18 @@ "type": "string", "m_label": "Style:", "m_value": "" + }, { + "type": "bool", + "m_label": "Enable Window Persistency:", + "m_value": true }, { "type": "string", "m_label": "Title:", - "m_value": "" + "m_value": "Build Order" }, { "type": "virtualFolderPicker", "m_label": "Virtual Folder:", - "m_path": "" + "m_path": "CodeLiteIDE:Dialogs:ProjectManagement" }, { "type": "choice", "m_label": "Centre:", @@ -89,25 +93,45 @@ }, { "type": "string", "m_label": "Inherited Class", - "m_value": "DependenciesPage" + "m_value": "BuildOrderDialog" }, { "type": "string", "m_label": "File:", - "m_value": "depend_dlg_page" + "m_value": "BuildOrderDialog" }, { "type": "string", "m_label": "Class Decorator", "m_value": "" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File (16x16) :", + "m_path": "" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File (32x32) :", + "m_path": "" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File (64x64) :", + "m_path": "" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File (128x128):", + "m_path": "" + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File (256x256):", + "m_path": "" }], "m_events": [], "m_children": [{ "m_type": 4401, - "proportion": 0, - "border": 0, - "gbSpan": ",", - "gbPosition": ",", + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", "m_styles": [], - "m_sizerFlags": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "string", "m_label": "Minimum Size:", @@ -115,7 +139,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "boxSizer1" + "m_value": "boxSizer32" }, { "type": "string", "m_label": "Style:", @@ -128,170 +152,13 @@ }], "m_events": [], "m_children": [{ - "m_type": 4405, - "proportion": 0, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_staticText3" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Label:", - "m_value": "Select build order for configuration:" - }, { - "type": "string", - "m_label": "Wrap:", - "m_value": "-1" - }], - "m_events": [], - "m_children": [] - }, { - "m_type": 4411, - "proportion": 0, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_choiceProjectConfig" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Choices:", - "m_value": "" - }, { - "type": "string", - "m_label": "Selection:", - "m_value": "0" - }], - "m_events": [{ - "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED", - "m_eventClass": "wxCommandEvent", - "m_eventHandler": "wxCommandEventHandler", - "m_functionNameAndSignature": "OnConfigChanged(wxCommandEvent& event)", - "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.", - "m_noBody": false - }], - "m_children": [] - }, { "m_type": 4401, "proportion": 1, - "border": 5, + "border": 0, "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "string", "m_label": "Minimum Size:", @@ -299,7 +166,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer3" + "m_value": "boxSizer1" }, { "type": "string", "m_label": "Style:", @@ -307,18 +174,175 @@ }, { "type": "choice", "m_label": "Orientation:", - "m_selection": 1, + "m_selection": 0, "m_options": ["wxVERTICAL", "wxHORIZONTAL"] }], "m_events": [], "m_children": [{ - "m_type": 4401, - "proportion": 5, - "border": 5, + "m_type": 4405, + "proportion": 0, + "border": 10, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_staticText3" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Label:", + "m_value": "Select build order for configuration:" + }, { + "type": "string", + "m_label": "Wrap:", + "m_value": "-1" + }], + "m_events": [], + "m_children": [] + }, { + "m_type": 4411, + "proportion": 0, + "border": 10, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_choiceProjectConfig" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "multi-string", + "m_label": "Choices:", + "m_value": "" + }, { + "type": "string", + "m_label": "Selection:", + "m_value": "0" + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_CHOICE_SELECTED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnConfigChanged(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_CHOICE_SELECTED event, when an item on the list is selected.", + "m_noBody": false + }], + "m_children": [] + }, { + "m_type": 4403, + "proportion": 1, + "border": 10, "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "string", "m_label": "Minimum Size:", @@ -326,26 +350,45 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer31" + "m_value": "flexGridSizer10" }, { "type": "string", "m_label": "Style:", "m_value": "" }, { - "type": "choice", - "m_label": "Orientation:", - "m_selection": 0, - "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + "type": "string", + "m_label": "# Columns:", + "m_value": "3" + }, { + "type": "string", + "m_label": "# Rows:", + "m_value": "0" + }, { + "type": "string", + "m_label": "Growable columns:", + "m_value": "0,2" + }, { + "type": "string", + "m_label": "Growable rows:", + "m_value": "0" + }, { + "type": "string", + "m_label": "Horizontal gap:", + "m_value": "0" + }, { + "type": "string", + "m_label": "Vertical gap:", + "m_value": "0" }], "m_events": [], "m_children": [{ - "m_type": 4405, - "proportion": 0, + "m_type": 4469, + "proportion": 1, "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP"], + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxDV_ROW_LINES", "wxDV_SINGLE"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -353,15 +396,15 @@ }, { "type": "string", "m_label": "Size:", - "m_value": "" + "m_value": "150,-1" }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "m_staticText1" + "m_value": "m_dvListCtrlProjects" }, { "type": "multi-string", "m_label": "Tooltip:", @@ -393,215 +436,68 @@ }, { "type": "string", "m_label": "Class Name:", - "m_value": "" + "m_value": "clThemedOrderedListCtrl" }, { "type": "string", "m_label": "Include File:", - "m_value": "" + "m_value": "clThemedListCtrl.h" }, { "type": "string", "m_label": "Style:", "m_value": "" - }, { - "type": "multi-string", - "m_label": "Label:", - "m_value": "Projects:" - }, { - "type": "string", - "m_label": "Wrap:", - "m_value": "-1" }], "m_events": [], - "m_children": [] - }, { - "m_type": 4425, - "proportion": 1, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": ["wxLB_SINGLE"], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_checkListProjectList" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Choices:", - "m_value": "" - }], - "m_events": [{ - "m_eventName": "wxEVT_COMMAND_CHECKLISTBOX_TOGGLED", - "m_eventClass": "wxCommandEvent", - "m_eventHandler": "wxCommandEventHandler", - "m_functionNameAndSignature": "OnCheckListItemToggled(wxCommandEvent& event)", - "m_description": "Process a wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event\nwhen an item in the check list box is checked or unchecked.", - "m_noBody": false - }], - "m_children": [] - }] - }, { - "m_type": 4401, - "proportion": 6, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], - "m_properties": [{ - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "bSizer4" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "choice", - "m_label": "Orientation:", - "m_selection": 0, - "m_options": ["wxVERTICAL", "wxHORIZONTAL"] - }], - "m_events": [], - "m_children": [{ - "m_type": 4405, - "proportion": 0, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxLEFT", "wxRIGHT", "wxTOP"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_staticText2" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Label:", - "m_value": "Build Order:" - }, { - "type": "string", - "m_label": "Wrap:", - "m_value": "-1" - }], - "m_events": [], - "m_children": [] + "m_children": [{ + "m_type": 4472, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": [], + "m_properties": [{ + "type": "string", + "m_label": "Name:", + "m_value": "Projects" + }, { + "type": "string", + "m_label": "Width:", + "m_value": "-2" + }, { + "type": "choice", + "m_label": "Column Type", + "m_selection": 2, + "m_options": ["bitmap", "check", "text", "icontext", "progress", "choice"] + }, { + "type": "multi-string", + "m_label": "Choices:", + "m_value": "" + }, { + "type": "choice", + "m_label": "Alignment", + "m_selection": 0, + "m_options": ["wxALIGN_LEFT", "wxALIGN_RIGHT", "wxALIGN_CENTER"] + }, { + "type": "choice", + "m_label": "Cell Mode", + "m_selection": 0, + "m_options": ["wxDATAVIEW_CELL_INERT", "wxDATAVIEW_CELL_ACTIVATABLE", "wxDATAVIEW_CELL_EDITABLE"] + }, { + "type": "colHeaderFlags", + "m_label": "Column Flags", + "stringValue": "wxDATAVIEW_COL_RESIZABLE" + }], + "m_events": [], + "m_children": [] + }] }, { "m_type": 4401, "proportion": 1, "border": 5, - "gbSpan": ",", - "gbPosition": ",", + "gbSpan": "1,1", + "gbPosition": "0,0", "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_TOP"], "m_properties": [{ "type": "string", "m_label": "Minimum Size:", @@ -609,7 +505,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer11" + "m_value": "boxSizer3" }, { "type": "string", "m_label": "Style:", @@ -617,116 +513,245 @@ }, { "type": "choice", "m_label": "Orientation:", - "m_selection": 1, + "m_selection": 0, "m_options": ["wxVERTICAL", "wxHORIZONTAL"] }], "m_events": [], "m_children": [{ - "m_type": 4401, - "proportion": 1, + "m_type": 4400, + "proportion": 0, "border": 5, - "gbSpan": ",", - "gbPosition": ",", + "gbSpan": "1,1", + "gbPosition": "0,0", "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { "type": "string", "m_label": "Minimum Size:", "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer5" + "m_value": "m_button22" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" }, { "type": "string", "m_label": "Style:", "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "-->" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": false + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" }, { "type": "choice", - "m_label": "Orientation:", + "m_label": "Direction", "m_selection": 0, - "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] + }, { + "type": "string", + "m_label": "Margins:", + "m_value": "2,2" }], - "m_events": [], - "m_children": [{ - "m_type": 4412, - "proportion": 1, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_listBoxBuildOrder" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "multi-string", - "m_label": "Choices:", - "m_value": "" - }, { - "type": "string", - "m_label": "Selection:", - "m_value": "-1" - }], - "m_events": [], - "m_children": [] - }] + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnMoveRight(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }, { + "m_eventName": "wxEVT_UPDATE_UI", + "m_eventClass": "wxUpdateUIEvent", + "m_eventHandler": "wxUpdateUIEventHandler", + "m_functionNameAndSignature": "OnMoveRightUI(wxUpdateUIEvent& event)", + "m_description": "Process a wxEVT_UPDATE_UI event", + "m_noBody": false + }], + "m_children": [] + }, { + "m_type": 4400, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_button24" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "<--" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": false + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" + }, { + "type": "choice", + "m_label": "Direction", + "m_selection": 0, + "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] + }, { + "type": "string", + "m_label": "Margins:", + "m_value": "2,2" + }], + "m_events": [{ + "m_eventName": "wxEVT_UPDATE_UI", + "m_eventClass": "wxUpdateUIEvent", + "m_eventHandler": "wxUpdateUIEventHandler", + "m_functionNameAndSignature": "OnMoveLeftUI(wxUpdateUIEvent& event)", + "m_description": "Process a wxEVT_UPDATE_UI event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnMoveLeft(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "m_children": [] + }] + }, { + "m_type": 4401, + "proportion": 6, + "border": 5, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxEXPAND"], + "m_properties": [{ + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "bSizer4" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" }, { + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + }], + "m_events": [], + "m_children": [{ "m_type": 4401, - "proportion": 0, + "proportion": 1, "border": 5, "gbSpan": ",", "gbPosition": ",", @@ -739,7 +764,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer6" + "m_value": "bSizer11" }, { "type": "string", "m_label": "Style:", @@ -747,7 +772,7 @@ }, { "type": "choice", "m_label": "Orientation:", - "m_selection": 0, + "m_selection": 1, "m_options": ["wxVERTICAL", "wxHORIZONTAL"] }], "m_events": [], @@ -766,7 +791,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer8" + "m_value": "bSizer5" }, { "type": "string", "m_label": "Style:", @@ -779,124 +804,29 @@ }], "m_events": [], "m_children": [{ - "m_type": 4400, - "proportion": 0, - "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_UP" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_buttonUp" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "string", - "m_label": "Label:", - "m_value": "Up" - }, { - "type": "bool", - "m_label": "Default Button", - "m_value": false - }, { - "type": "bitmapPicker", - "m_label": "Bitmap File:", - "m_path": "" - }, { - "type": "choice", - "m_label": "Direction", - "m_selection": 0, - "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] - }, { - "type": "string", - "m_label": "Margins:", - "m_value": "2,2" - }], - "m_events": [{ - "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", - "m_eventClass": "wxCommandEvent", - "m_eventHandler": "wxCommandEventHandler", - "m_functionNameAndSignature": "OnMoveUp(wxCommandEvent& event)", - "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", - "m_noBody": false - }], - "m_children": [] - }, { - "m_type": 4400, - "proportion": 0, + "m_type": 4469, + "proportion": 1, "border": 5, - "gbSpan": ",", - "gbPosition": ",", - "m_styles": [], + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxDV_ROW_LINES", "wxDV_SINGLE"], "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "winid", "m_label": "ID:", - "m_winid": "wxID_DOWN" + "m_winid": "wxID_ANY" }, { "type": "string", "m_label": "Size:", - "m_value": "" + "m_value": "150,-1" }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "m_buttonDown" + "m_value": "m_dvListCtrlBuildOrder" }, { "type": "multi-string", "m_label": "Tooltip:", @@ -928,46 +858,60 @@ }, { "type": "string", "m_label": "Class Name:", - "m_value": "" + "m_value": "clThemedListCtrl" }, { "type": "string", "m_label": "Include File:", - "m_value": "" + "m_value": "clThemedListCtrl.h" }, { "type": "string", "m_label": "Style:", "m_value": "" - }, { - "type": "string", - "m_label": "Label:", - "m_value": "Down" - }, { - "type": "bool", - "m_label": "Default Button", - "m_value": false - }, { - "type": "bitmapPicker", - "m_label": "Bitmap File:", - "m_path": "" - }, { - "type": "choice", - "m_label": "Direction", - "m_selection": 0, - "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] - }, { - "type": "string", - "m_label": "Margins:", - "m_value": "2,2" - }], - "m_events": [{ - "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", - "m_eventClass": "wxCommandEvent", - "m_eventHandler": "wxCommandEventHandler", - "m_functionNameAndSignature": "OnMoveDown(wxCommandEvent& event)", - "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", - "m_noBody": false }], - "m_children": [] + "m_events": [], + "m_children": [{ + "m_type": 4472, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": [], + "m_properties": [{ + "type": "string", + "m_label": "Name:", + "m_value": "Build Order" + }, { + "type": "string", + "m_label": "Width:", + "m_value": "-2" + }, { + "type": "choice", + "m_label": "Column Type", + "m_selection": 2, + "m_options": ["bitmap", "check", "text", "icontext", "progress", "choice"] + }, { + "type": "multi-string", + "m_label": "Choices:", + "m_value": "" + }, { + "type": "choice", + "m_label": "Alignment", + "m_selection": 0, + "m_options": ["wxALIGN_LEFT", "wxALIGN_RIGHT", "wxALIGN_CENTER"] + }, { + "type": "choice", + "m_label": "Cell Mode", + "m_selection": 0, + "m_options": ["wxDATAVIEW_CELL_INERT", "wxDATAVIEW_CELL_ACTIVATABLE", "wxDATAVIEW_CELL_EDITABLE"] + }, { + "type": "colHeaderFlags", + "m_label": "Column Flags", + "stringValue": "wxDATAVIEW_COL_RESIZABLE" + }], + "m_events": [], + "m_children": [] + }] }] }, { "m_type": 4401, @@ -976,7 +920,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": [], + "m_sizerFlags": ["wxEXPAND"], "m_properties": [{ "type": "string", "m_label": "Minimum Size:", @@ -984,7 +928,7 @@ }, { "type": "string", "m_label": "Name:", - "m_value": "bSizer7" + "m_value": "bSizer6" }, { "type": "string", "m_label": "Style:", @@ -997,112 +941,488 @@ }], "m_events": [], "m_children": [{ - "m_type": 4400, - "proportion": 0, + "m_type": 4401, + "proportion": 1, "border": 5, "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_sizerFlags": ["wxEXPAND"], "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_APPLY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "" - }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "-1,-1" }, { "type": "string", "m_label": "Name:", - "m_value": "m_buttonApply" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "" + "m_value": "bSizer8" }, { - "type": "font", - "m_label": "Font:", + "type": "string", + "m_label": "Style:", "m_value": "" }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + }], + "m_events": [], + "m_children": [{ + "m_type": 4400, + "proportion": 0, + "border": 5, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_UP" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_buttonUp" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "Up" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": false + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" + }, { + "type": "choice", + "m_label": "Direction", + "m_selection": 0, + "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] + }, { + "type": "string", + "m_label": "Margins:", + "m_value": "2,2" + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnMoveUp(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "m_children": [] }, { + "m_type": 4400, + "proportion": 0, + "border": 5, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_DOWN" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_buttonDown" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "Down" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": false + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" + }, { + "type": "choice", + "m_label": "Direction", + "m_selection": 0, + "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] + }, { + "type": "string", + "m_label": "Margins:", + "m_value": "2,2" + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnMoveDown(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "m_children": [] + }] + }, { + "m_type": 4401, + "proportion": 0, + "border": 5, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": [], + "m_properties": [{ "type": "string", - "m_label": "Class Name:", - "m_value": "" + "m_label": "Minimum Size:", + "m_value": "-1,-1" }, { "type": "string", - "m_label": "Include File:", - "m_value": "" + "m_label": "Name:", + "m_value": "bSizer7" }, { "type": "string", "m_label": "Style:", "m_value": "" - }, { - "type": "string", - "m_label": "Label:", - "m_value": "Apply" - }, { - "type": "bool", - "m_label": "Default Button", - "m_value": false - }, { - "type": "bitmapPicker", - "m_label": "Bitmap File:", - "m_path": "" }, { "type": "choice", - "m_label": "Direction", + "m_label": "Orientation:", "m_selection": 0, - "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] - }, { - "type": "string", - "m_label": "Margins:", - "m_value": "2,2" - }], - "m_events": [{ - "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", - "m_eventClass": "wxCommandEvent", - "m_eventHandler": "wxCommandEventHandler", - "m_functionNameAndSignature": "OnApplyButton(wxCommandEvent& event)", - "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", - "m_noBody": false - }, { - "m_eventName": "wxEVT_UPDATE_UI", - "m_eventClass": "wxUpdateUIEvent", - "m_eventHandler": "wxUpdateUIEventHandler", - "m_functionNameAndSignature": "OnApplyButtonUI(wxUpdateUIEvent& event)", - "m_description": "Process a wxEVT_UPDATE_UI event", - "m_noBody": false + "m_options": ["wxVERTICAL", "wxHORIZONTAL"] }], - "m_children": [] + "m_events": [], + "m_children": [{ + "m_type": 4400, + "proportion": 0, + "border": 5, + "gbSpan": ",", + "gbPosition": ",", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_APPLY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_buttonApply" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": true + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Label:", + "m_value": "Apply" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": true + }, { + "type": "bitmapPicker", + "m_label": "Bitmap File:", + "m_path": "" + }, { + "type": "choice", + "m_label": "Direction", + "m_selection": 0, + "m_options": ["wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"] + }, { + "type": "string", + "m_label": "Margins:", + "m_value": "2,2" + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnApplyButton(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }, { + "m_eventName": "wxEVT_UPDATE_UI", + "m_eventClass": "wxUpdateUIEvent", + "m_eventHandler": "wxUpdateUIEventHandler", + "m_functionNameAndSignature": "OnApplyButtonUI(wxUpdateUIEvent& event)", + "m_description": "Process a wxEVT_UPDATE_UI event", + "m_noBody": false + }], + "m_children": [] + }] }] }] }] }] }] + }, { + "m_type": 4467, + "proportion": 0, + "border": 10, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_HORIZONTAL"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_stdBtnSizer52" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }], + "m_events": [], + "m_children": [{ + "m_type": 4468, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "choice", + "m_label": "ID:", + "m_selection": 0, + "m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"] + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_button54" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": true + }], + "m_events": [{ + "m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED", + "m_eventClass": "wxCommandEvent", + "m_eventHandler": "wxCommandEventHandler", + "m_functionNameAndSignature": "OnButtonOK(wxCommandEvent& event)", + "m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.", + "m_noBody": false + }], + "m_children": [] + }, { + "m_type": 4468, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "choice", + "m_label": "ID:", + "m_selection": 6, + "m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"] + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_button56" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Default Button", + "m_value": false + }], + "m_events": [], + "m_children": [] + }] }] }] }] diff --git a/LiteEditor/depend_dlg_page_liteeditor_bitmaps.cpp b/LiteEditor/depend_dlg_page_liteeditor_bitmaps.cpp index 32fe4f3197..707cef40b7 100644 --- a/LiteEditor/depend_dlg_page_liteeditor_bitmaps.cpp +++ b/LiteEditor/depend_dlg_page_liteeditor_bitmaps.cpp @@ -21,13 +21,15 @@ wxMemoryFSHandler::AddFile(name, data, size) #endif -static size_t xml_res_size_0 = 90; +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,110,100,111,119,115,46,111,114,103, -47,119,120,120,114,99,34,47,62,10}; +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 wxC312EInitBitmapResources() { diff --git a/LiteEditor/depends_dlg.cpp b/LiteEditor/depends_dlg.cpp deleted file mode 100644 index b1a70ad220..0000000000 --- a/LiteEditor/depends_dlg.cpp +++ /dev/null @@ -1,115 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// copyright : (C) 2008 by Eran Ifrah -// file name : depends_dlg.cpp -// -// ------------------------------------------------------------------------- -// 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. -// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -#include "windowattrmanager.h" -#include "depends_dlg.h" -#include "depend_dlg_page.h" -#include "manager.h" -#include -#include "macros.h" -#include "cProjectDependecySorter.h" - -/////////////////////////////////////////////////////////////////////////// - -DependenciesDlg::DependenciesDlg(wxWindow* parent, const wxString& projectName, int id, wxString title, wxPoint pos, - wxSize size, int style) - : wxDialog(parent, id, title, pos, size, style) - , m_projectName(projectName) -{ - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer(wxVERTICAL); - - m_book = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT); - mainSizer->Add(m_book, 1, wxEXPAND | wxALL, 5); - - m_staticline1 = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL); - mainSizer->Add(m_staticline1, 0, wxEXPAND | wxALL, 5); - - wxBoxSizer* btnSizer; - btnSizer = new wxBoxSizer(wxHORIZONTAL); - - m_buttonOK = new wxButton(this, wxID_ANY, _("&OK"), wxDefaultPosition, wxDefaultSize, 0); - btnSizer->Add(m_buttonOK, 0, wxALL, 5); - - m_buttonCancel = new wxButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0); - btnSizer->Add(m_buttonCancel, 0, wxALL, 5); - - mainSizer->Add(btnSizer, 0, wxALIGN_RIGHT, 5); - - this->SetSizer(mainSizer); - this->Layout(); - - m_book->GetChoiceCtrl()->SetFocus(); - Init(); - ::clSetDialogBestSizeAndPosition(this); -} - -DependenciesDlg::~DependenciesDlg() {} - -void DependenciesDlg::Init() -{ - // fill the pages of the choice book - wxArrayString projects; - ManagerST::Get()->GetProjectList(projects); - for(size_t i = 0; i < projects.GetCount(); i++) { - m_book->AddPage(new DependenciesPage(m_book, projects.Item(i)), projects.Item(i), false); - } - - CallAfter(&DependenciesDlg::DoSelectProject); - - // connect events - ConnectButton(m_buttonOK, DependenciesDlg::OnButtonOK); - ConnectButton(m_buttonCancel, DependenciesDlg::OnButtonCancel); -} - -void DependenciesDlg::OnButtonOK(wxCommandEvent& event) -{ - wxUnusedVar(event); - for(size_t i = 0; i < m_book->GetPageCount(); i++) { - DependenciesPage* page = dynamic_cast(m_book->GetPage(i)); - if(page) { page->Save(); } - } - EndModal(wxID_OK); -} - -void DependenciesDlg::OnButtonCancel(wxCommandEvent& event) -{ - wxUnusedVar(event); - EndModal(wxID_CANCEL); -} - -void DependenciesDlg::DoSelectProject() -{ - wxArrayString projects; - ManagerST::Get()->GetProjectList(projects); - int sel = projects.Index(m_projectName); - if(sel != wxNOT_FOUND) { m_book->ChangeSelection(sel); } - - // clProjectDependecySorter sorter; - // wxArrayString buildOrder; - // sorter.GetProjectBuildOrder(m_projectName, "Win_x64_Release", buildOrder);; -} diff --git a/LiteEditor/depends_dlg.h b/LiteEditor/depends_dlg.h deleted file mode 100644 index 02dd8e0b99..0000000000 --- a/LiteEditor/depends_dlg.h +++ /dev/null @@ -1,67 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// -// -// copyright : (C) 2008 by Eran Ifrah -// file name : depends_dlg.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. -// -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -#ifndef __depends_dlg__ -#define __depends_dlg__ - -#include - -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class DependenciesDlg -/////////////////////////////////////////////////////////////////////////////// -class DependenciesDlg : public wxDialog -{ -private: -protected: - wxChoicebook* m_book; - wxStaticLine* m_staticline1; - wxButton* m_buttonOK; - wxButton* m_buttonCancel; - wxString m_projectName; - - void Init(); - void DoSelectProject(); - - virtual void OnButtonOK(wxCommandEvent& event); - virtual void OnButtonCancel(wxCommandEvent& event); - -public: - DependenciesDlg(wxWindow* parent, - const wxString& projectName, - int id = wxID_ANY, - wxString title = _("Build Order"), - wxPoint pos = wxDefaultPosition, - wxSize size = wxSize(700, 450), - int style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER); - virtual ~DependenciesDlg(); -}; - -#endif //__depends_dlg__ diff --git a/LiteEditor/fileview.cpp b/LiteEditor/fileview.cpp index 8c651f2743..9a1db6d88c 100644 --- a/LiteEditor/fileview.cpp +++ b/LiteEditor/fileview.cpp @@ -23,6 +23,7 @@ ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// #include "fileview.h" +#include "BuildOrderDialog.h" #include "ICompilerLocator.h" #include "ImportFilesDialogNew.h" #include "NewVirtualFolderDlg.h" @@ -34,7 +35,6 @@ #include "cl_command_event.h" #include "compiler.h" #include "ctags_manager.h" -#include "depends_dlg.h" #include "dirtraverser.h" #include "drawingutils.h" #include "editor_config.h" @@ -1186,7 +1186,7 @@ void FileViewTree::OnBuildOrder(wxCommandEvent& event) wxUnusedVar(event); wxTreeItemId item = GetSingleSelection(); if(item.IsOk()) { - DependenciesDlg dlg(clMainFrame::Get(), GetItemText(item)); + BuildOrderDialog dlg(clMainFrame::Get(), GetItemText(item)); dlg.ShowModal(); } } diff --git a/ctagsd/ctagsd.project b/ctagsd/ctagsd.project index 62a15ab874..5d5de0e327 100644 --- a/ctagsd/ctagsd.project +++ b/ctagsd/ctagsd.project @@ -43,7 +43,7 @@ - + @@ -141,7 +141,6 @@ - diff --git a/le_exec/le_exec.project b/le_exec/le_exec.project index 3a83ad1a0e..e1811ed27f 100644 --- a/le_exec/le_exec.project +++ b/le_exec/le_exec.project @@ -192,8 +192,8 @@ - + + -