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

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

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index 9a72372..1600bb0 100644 (file)
--- a/source/contacteditor/frmContactEditorPicture.cpp
+++ b/source/contacteditor/frmContactEditorPicture.cpp
@@ -33,25 +33,25 @@ frmContactEditorPicture::frmContactEditorPicture( wxWindow* parent )
 :
 frmContactEditorPictureADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
        
        cmbType->Append(wxT(""));
        cmbType->Append(_("Home"));
        cmbType->Append(_("Work"));
-}
-
-void frmContactEditorPicture::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       
 }
 
 void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 {
+       
+       // Process data.
+       
        long ListCtrlIndex;
        
        if (EditorMode == FALSE){
@@ -161,9 +161,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                
                // Setup Organisation Priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       PictureListPrefPtr->insert(std::make_pair(PictureListIndex, sliPriority->GetValue()));
+                       PictureListPrefPtr->insert(std::make_pair(PictureListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -212,9 +212,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                
                }               
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       PictureListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       PictureListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -247,9 +247,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                
                PictureListPrefPtr->erase(PictureListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       PictureListPrefPtr->insert(std::make_pair(PictureListIndex, sliPriority->GetValue()));
+                       PictureListPrefPtr->insert(std::make_pair(PictureListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -267,8 +267,7 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                        return;
                }               
                
-               if (PictureLogo == TRUE){
-               
+               if (PictureLogo == TRUE){               
                        PictureListCtrlPtr->SetItem(longSelected, 0, _("Picture"));
                        
                } else {
@@ -279,9 +278,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                
                PictureListCtrlPtr->SetItem(longSelected, 1, strValue);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       PictureListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       PictureListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -296,11 +295,18 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorPicture::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorPicture::SetEditorMode(bool EditMode)
 {
+       
+       // Set the editor mode.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -326,7 +332,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
                
                striter = PictureListTypePtr->find(PictureListIndex);
                 
-               if (striter->first == PictureListIndex){
+               if (striter->first == PictureListIndex &&
+                       striter != PictureListTypePtr->end()){
                
                        strValue = striter->second;
                
@@ -352,11 +359,11 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
                
                intiter = PictureListPrefPtr->find(PictureListIndex);
                
-               if (intiter->first == PictureListIndex && intiter->second > 0){
+               if (intiter->first == PictureListIndex && intiter->second > 0 &&
+                       intiter != PictureListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }       
                
@@ -378,6 +385,8 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
        bool PictureLogoIn )
 {
 
+       // Setup the pointers.
+       
        PictureListPtr = PictureList;
        PictureListAltIDPtr = PictureListAltID;
        PictureListPIDPtr = PictureListPID;