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

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

diff --git a/source/contacteditor/frmContactEditorRoles.cpp b/source/contacteditor/frmContactEditorRoles.cpp
index d33fdfa..064eb79 100644 (file)
--- a/source/contacteditor/frmContactEditorRoles.cpp
+++ b/source/contacteditor/frmContactEditorRoles.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorRoles.cpp - frmContactEditorRoles 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 "frmContactEditorRoles.h"
 
 #include <map>
@@ -8,21 +26,22 @@ frmContactEditorRoles::frmContactEditorRoles( wxWindow* parent )
 :
 frmContactEditorRolesADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
-}
-
-void frmContactEditorRoles::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
+       
 }
 
 void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 {
+       
+       // Process action.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -53,11 +72,11 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
                
                }
                
-               // Add the website priority.
+               // Add the roles priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue()));
+                       RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -74,11 +93,11 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
                coldata.SetText(txtRole->GetValue());
                ListCtrlIndex = RolesListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
-               }               
+               }
        
                this->Close();          
        
@@ -94,15 +113,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
                
                RolesListPrefPtr->erase(RolesListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue()));
+                       RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
                        RolesListPrefPtr->insert(std::make_pair(RolesListIndex, 0));
                
-               }               
+               }       
                
                // Update the form.
                
@@ -116,15 +135,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
                
                RolesListCtrlPtr->SetItem(longSelected, 0, txtRole->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
                        RolesListCtrlPtr->SetItem(longSelected, 1, wxT(""));
                
-               }               
+               }       
        
                this->Close();
        
@@ -133,6 +152,9 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+       
+       // Set the editor mode.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -171,11 +193,11 @@ void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
                
                intiter = RolesListPrefPtr->find(RolesListIndex);
                
-               if (intiter->first == RolesListIndex && intiter->second > 0){
+               if (intiter->first == RolesListIndex && intiter->second > 0 &&
+                       intiter != RolesListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }       
                
@@ -187,7 +209,11 @@ void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorRoles::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorRoles::SetupPointers(std::map<int, wxString> *RolesList,
@@ -201,6 +227,8 @@ void frmContactEditorRoles::SetupPointers(std::map<int, wxString> *RolesList,
        int RolesIndex )
 {
 
+       // Setup the pointers.
+       
        RolesListPtr = RolesList;
        RolesListLanguagePtr = RolesListLanguage;
        RolesListAltIDPtr = RolesListAltID;