From ce6b921249b87bb62df485af240697ba81cd409d Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 3 Sep 2017 08:23:43 +0100 Subject: [PATCH] frmContactEditorCategory: Implemented priority control --- source/AppXestiaAddrBk.cpp | 77 ++++--------------- source/AppXestiaAddrBk.h | 10 +-- .../frmContactEditorCategory.cpp | 37 +++------ .../contacteditor/frmContactEditorCategory.h | 4 +- 4 files changed, 32 insertions(+), 96 deletions(-) diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index edf21c9..fcb9c4c 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -5511,85 +5511,40 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi wxBoxSizer* bSizer251; bSizer251 = new wxBoxSizer( wxVERTICAL ); - nbkIM = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - tabGeneral = new wxPanel( nbkIM, 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 ); + nbkCategory = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + tabGeneral = new wxPanel( nbkCategory, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblCategory = new wxStaticText( tabGeneral, wxID_ANY, wxT("Category Name:"), wxDefaultPosition, wxDefaultSize, 0 ); lblCategory->Wrap( 0 ); - fgSizer6->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtCategory = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( txtCategory, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtCategory, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 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 ); - nbkIM->AddPage( tabGeneral, wxT("General"), false ); + szrGeneral->Fit( tabGeneral ); + nbkCategory->AddPage( tabGeneral, wxT("General"), false ); - bSizer251->Add( nbkIM, 1, wxEXPAND | wxALL, 5 ); + bSizer251->Add( nbkCategory, 1, wxEXPAND | wxALL, 5 ); wxBoxSizer* bSizer252; bSizer252 = new wxBoxSizer( wxHORIZONTAL ); @@ -5610,7 +5565,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this ); } @@ -5618,7 +5572,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi frmContactEditorCategoryADT::~frmContactEditorCategoryADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this ); diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h index b816af7..038aca4 100644 --- a/source/AppXestiaAddrBk.h +++ b/source/AppXestiaAddrBk.h @@ -1553,29 +1553,25 @@ class frmContactEditorCategoryADT : public wxDialog private: protected: - wxNotebook* nbkIM; + wxNotebook* nbkCategory; wxPanel* tabGeneral; + wxFlexGridSizer* szrGeneral; wxStaticText* lblCategory; wxTextCtrl* txtCategory; wxStaticText* lblType; wxChoice* cmbType; 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: - frmContactEditorCategoryADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Category Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,245 ), long style = wxDEFAULT_DIALOG_STYLE ); + frmContactEditorCategoryADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Category Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,298 ), long style = wxDEFAULT_DIALOG_STYLE ); ~frmContactEditorCategoryADT(); }; diff --git a/source/contacteditor/frmContactEditorCategory.cpp b/source/contacteditor/frmContactEditorCategory.cpp index bb61083..6df0ef3 100644 --- a/source/contacteditor/frmContactEditorCategory.cpp +++ b/source/contacteditor/frmContactEditorCategory.cpp @@ -28,26 +28,14 @@ frmContactEditorCategoryADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); + priorityCtrl = new XABPriorityCtrl(tabGeneral); + szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); cmbType->Append(wxT("")); cmbType->Append(_("Home")); cmbType->Append(_("Work")); } -void frmContactEditorCategory::EnablePriority( wxCommandEvent& event ) -{ - - // Enable/disable the priority setting. - - if (chkUsePref->IsChecked()){ - sliPriority->Enable(); - } else { - sliPriority->Disable(); - } - -} - void frmContactEditorCategory::ProcessAction( wxCommandEvent& event ) { @@ -85,9 +73,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event ) // Setup Category Priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, sliPriority->GetValue())); + CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, priorityCtrl->GetValue())); } else { @@ -104,9 +92,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event ) coldata.SetText(txtCategory->GetValue()); ListCtrlIndex = CategoryListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - CategoryListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + CategoryListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } @@ -142,9 +130,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event ) CategoryListPrefPtr->erase(CategoryListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, sliPriority->GetValue())); + CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, priorityCtrl->GetValue())); } else { @@ -164,9 +152,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event ) CategoryListCtrlPtr->SetItem(longSelected, 0, txtCategory->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - CategoryListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + CategoryListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else { @@ -253,9 +241,8 @@ void frmContactEditorCategory::SetEditorMode(bool EditMode) if (intiter->first == CategoryListIndex && intiter->second > 0 && intiter != CategoryListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); } diff --git a/source/contacteditor/frmContactEditorCategory.h b/source/contacteditor/frmContactEditorCategory.h index d467aa3..db394e8 100644 --- a/source/contacteditor/frmContactEditorCategory.h +++ b/source/contacteditor/frmContactEditorCategory.h @@ -27,6 +27,7 @@ Subclass of frmContactEditorCategoryADT, which is generated by wxFormBuilder. #include #include "../AppXestiaAddrBk.h" #include "../enums.h" +#include "../widgets/XABPriorityCtrl.h" //// end generated include @@ -35,7 +36,6 @@ class frmContactEditorCategory : public frmContactEditorCategoryADT { protected: // Handlers for frmContactEditorCategoryADT events. - void EnablePriority( wxCommandEvent& event ); void ProcessAction( wxCommandEvent& event ); void CloseWindow( wxCommandEvent& event ); public: @@ -64,7 +64,7 @@ class frmContactEditorCategory : public frmContactEditorCategoryADT wxListCtrl *CategoryListCtrlPtr; int CategoryListIndex; SectionType EditSectionType; - + XABPriorityCtrl *priorityCtrl = nullptr; }; #endif // __frmContactEditorCategory__ -- 2.39.2