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

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

diff --git a/source/contacteditor/frmContactEditorEmail.cpp b/source/contacteditor/frmContactEditorEmail.cpp
index 4755bba..fa3bb3e 100644 (file)
--- a/source/contacteditor/frmContactEditorEmail.cpp
+++ b/source/contacteditor/frmContactEditorEmail.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorEmail.cpp - frmContactEditorEmail 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 "frmContactEditorEmail.h"
 #include <map>
 #include "../common/textprocessing.h"
@@ -6,21 +24,21 @@ frmContactEditorEmail::frmContactEditorEmail( wxWindow* parent )
 :
 frmContactEditorEmailADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
-}
-
-void frmContactEditorEmail::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
+       
 }
 
 void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 {
+       
+       // Process action.
+       
        long ListCtrlIndex;
        
        if (EditorMode == FALSE){
@@ -52,9 +70,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
                
                // Add Email priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue()));
+                       EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -71,9 +89,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
                coldata.SetText(txtEmail->GetValue());
                ListCtrlIndex = EmailListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -92,9 +110,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
                
                EmailListPrefPtr->erase(EmailListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue()));
+                       EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -112,9 +130,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
                
                EmailListCtrlPtr->SetItem(longSelected, 0, txtEmail->GetValue());               
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -130,12 +148,18 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorEmail::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorEmail::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
+       // Set the editor mode.
+       
        // Set the editor mode for adding or editing an email address.
 
        if (EditMode == FALSE){
@@ -170,13 +194,13 @@ void frmContactEditorEmail::SetEditorMode(bool EditMode, SectionType SectType)
                
                intiter = EmailListPrefPtr->find(EmailListIndex);
                
-               if (intiter->first == EmailListIndex && intiter->second > 0){
+               if (intiter->first == EmailListIndex && intiter->second > 0 &&
+                       intiter != EmailListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
-               }       
+               }
                
        }
        
@@ -205,4 +229,5 @@ void frmContactEditorEmail::SetupPointers(std::map<int, wxString> *EmailList,
        EmailListPrefPtr = EmailListPref;
        EmailListCtrlPtr = EmailListCtrl;
        EmailListIndex = EmailIndex;
+       
 }
\ No newline at end of file