frmContactEditor(*): Call Layout on szrGeneral after adding priorty control

[xestiaab/.git] / source / contacteditor / frmContactEditorTitles.cpp

diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp
index 9c8861d..f1e4e24 100644 (file)
--- a/source/contacteditor/frmContactEditorTitles.cpp
+++ b/source/contacteditor/frmContactEditorTitles.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorTitles.cpp - frmContactEditorTitles form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book 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, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "frmContactEditorTitles.h"
 
 #include <map>
@@ -8,21 +26,21 @@ frmContactEditorTitles::frmContactEditorTitles( wxWindow* parent )
 :
 frmContactEditorTitlesADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
-}
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
 
-void frmContactEditorTitles::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
 }
 
 void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 {
+       
+       // Process action.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -55,9 +73,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 {
                
@@ -74,9 +92,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()));
                
                }               
        
@@ -94,9 +112,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 {
                
@@ -116,9 +134,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 {
                
@@ -133,6 +151,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+       
+       // Set the editor mode.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -157,7 +178,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
                
                striter = TitlesListPtr->find(TitlesListIndex);
                 
-               if (striter->first == TitlesListIndex){
+               if (striter->first == TitlesListIndex &&
+                       striter != TitlesListPtr->end()){
                
                        strValue = striter->second;
                
@@ -171,11 +193,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
                
                intiter = TitlesListPrefPtr->find(TitlesListIndex);
                
-               if (intiter->first == TitlesListIndex && intiter->second > 0){
+               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);
                
                }       
                
@@ -187,7 +209,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorTitles::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close the window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
@@ -201,6 +227,8 @@ void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
        int TitlesIndex )
 {
 
+       // Setup the pointers.
+       
        TitlesListPtr = TitlesList;
        TitlesListLanguagePtr = TitlesListLanguage;
        TitlesListAltIDPtr = TitlesListAltID;