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

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

diff --git a/source/contacteditor/frmContactEditorWebsites.cpp b/source/contacteditor/frmContactEditorWebsites.cpp
index d752438..5f85776 100644 (file)
--- a/source/contacteditor/frmContactEditorWebsites.cpp
+++ b/source/contacteditor/frmContactEditorWebsites.cpp
@@ -26,21 +26,19 @@ frmContactEditorWebsites::frmContactEditorWebsites( wxWindow* parent )
 :
 frmContactEditorWebsitesADT( parent )
 {
+       
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
-}
-
-void frmContactEditorWebsites::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
+       
 }
 
 void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 {
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -73,9 +71,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
                
                // Add the website priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, sliPriority->GetValue()));
+                       WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -92,9 +90,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
                coldata.SetText(txtWebsite->GetValue());
                ListCtrlIndex = WebsiteListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       WebsiteListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       WebsiteListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }               
        
@@ -112,9 +110,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
                
                WebsiteListPrefPtr->erase(WebsiteListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, sliPriority->GetValue()));
+                       WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -134,9 +132,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
                
                WebsiteListCtrlPtr->SetItem(longSelected, 0, txtWebsite->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       WebsiteListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       WebsiteListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -147,10 +145,12 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
                this->Close();
        
        }
+       
 }
 
 void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType)
 {
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -189,11 +189,11 @@ void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType
                
                intiter = WebsiteListPrefPtr->find(WebsiteListIndex);
                
-               if (intiter->first == WebsiteListIndex && intiter->second > 0){
+               if (intiter->first == WebsiteListIndex && intiter->second > 0 &&
+                       intiter != WebsiteListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }               
                
@@ -205,7 +205,11 @@ void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType
 
 void frmContactEditorWebsites::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close the window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorWebsites::SetupPointers(std::map<int, wxString> *WebsiteList,
@@ -219,6 +223,8 @@ void frmContactEditorWebsites::SetupPointers(std::map<int, wxString> *WebsiteLis
        int WebsiteIndex )
 {
 
+       // Setup the pointers.
+       
        WebsiteListPtr = WebsiteList;
        WebsiteListAltIDPtr = WebsiteListAltID;
        WebsiteListPIDPtr = WebsiteListPID;