From 8ae672ba33a6fcf4f9dd8f6d68500573111787d4 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Tue, 29 Aug 2017 19:41:24 +0100 Subject: [PATCH] frmContactEditorTitles: Implemented priority control --- source/AppXestiaAddrBk.cpp | 65 +++---------------- source/AppXestiaAddrBk.h | 8 +-- .../contacteditor/frmContactEditorTitles.cpp | 37 ++++------- source/contacteditor/frmContactEditorTitles.h | 3 +- 4 files changed, 25 insertions(+), 88 deletions(-) diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 33b689a..c9ea1cb 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -4616,71 +4616,26 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow nbkTitles = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkTitles, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblTitle = new wxStaticText( tabGeneral, wxID_ANY, wxT("Title:"), wxDefaultPosition, wxDefaultSize, 0 ); lblTitle->Wrap( -1 ); - fgSizer6->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkTitles->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkTitles, 1, wxEXPAND | wxALL, 5 ); @@ -4704,7 +4659,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this ); } @@ -4712,7 +4666,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow frmContactEditorTitlesADT::~frmContactEditorTitlesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this ); diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h index 8ae04b9..bb1a42d 100644 --- a/source/AppXestiaAddrBk.h +++ b/source/AppXestiaAddrBk.h @@ -1180,25 +1180,21 @@ class frmContactEditorTitlesADT : public wxDialog protected: wxNotebook* nbkTitles; wxPanel* tabGeneral; + wxFlexGridSizer* szrGeneral; wxStaticText* lblTitle; wxTextCtrl* txtTitle; wxStaticText* lblPriority; - wxCheckBox* chkUsePref; - wxSlider* sliPriority; - wxStaticText* lblHigh; - wxStaticText* lblLow; wxButton* btnAction; wxButton* btnClose; // Virtual event handlers, overide them in your derived class - virtual void EnablePriority( wxCommandEvent& event ) { event.Skip(); } virtual void ProcessAction( wxCommandEvent& event ) { event.Skip(); } virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); } public: - frmContactEditorTitlesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Title Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,204 ), long style = wxDEFAULT_DIALOG_STYLE ); + frmContactEditorTitlesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Title Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 386,231 ), long style = wxDEFAULT_DIALOG_STYLE ); ~frmContactEditorTitlesADT(); }; diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp index 8f9b6bc..edc602f 100644 --- a/source/contacteditor/frmContactEditorTitles.cpp +++ b/source/contacteditor/frmContactEditorTitles.cpp @@ -30,20 +30,8 @@ frmContactEditorTitlesADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); -} - -void frmContactEditorTitles::EnablePriority( wxCommandEvent& event ) -{ - - // Enable/disable the priority setting. - - if (chkUsePref->IsChecked()){ - sliPriority->Enable(); - } else { - sliPriority->Disable(); - } - + priorityCtrl = new XABPriorityCtrl(tabGeneral); + szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); } void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) @@ -83,9 +71,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) // Add the website priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, sliPriority->GetValue())); + TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, priorityCtrl->GetValue())); } else { @@ -102,9 +90,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) coldata.SetText(txtTitle->GetValue()); ListCtrlIndex = TitlesListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - TitlesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + TitlesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } @@ -122,9 +110,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) TitlesListPrefPtr->erase(TitlesListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, sliPriority->GetValue())); + TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, priorityCtrl->GetValue())); } else { @@ -144,9 +132,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event ) TitlesListCtrlPtr->SetItem(longSelected, 0, txtTitle->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - TitlesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + TitlesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else { @@ -206,9 +194,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType) if (intiter->first == TitlesListIndex && intiter->second > 0 && intiter != TitlesListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); } diff --git a/source/contacteditor/frmContactEditorTitles.h b/source/contacteditor/frmContactEditorTitles.h index 061ba01..ae59432 100644 --- a/source/contacteditor/frmContactEditorTitles.h +++ b/source/contacteditor/frmContactEditorTitles.h @@ -27,6 +27,7 @@ Subclass of frmContactEditorTitlesADT, which is generated by wxFormBuilder. #include #include "../AppXestiaAddrBk.h" #include "../enums.h" +#include "../widgets/XABPriorityCtrl.h" //// end generated include @@ -35,7 +36,6 @@ class frmContactEditorTitles : public frmContactEditorTitlesADT { protected: // Handlers for frmContactEditorTitlesADT events. - void EnablePriority( wxCommandEvent& event ); void ProcessAction( wxCommandEvent& event ); void CloseWindow( wxCommandEvent& event ); public: @@ -66,6 +66,7 @@ class frmContactEditorTitles : public frmContactEditorTitlesADT wxListCtrl *TitlesListCtrlPtr; int TitlesListIndex; SectionType EditSectionType; + XABPriorityCtrl *priorityCtrl = nullptr; }; #endif // __frmContactEditorTitles__ -- 2.39.2