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

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

diff --git a/source/contacteditor/frmContactEditorRelated.cpp b/source/contacteditor/frmContactEditorRelated.cpp
index 04cc162..17117ca 100644 (file)
--- a/source/contacteditor/frmContactEditorRelated.cpp
+++ b/source/contacteditor/frmContactEditorRelated.cpp
@@ -26,8 +26,12 @@ frmContactEditorRelated::frmContactEditorRelated( wxWindow* parent )
 frmContactEditorRelatedADT( parent )
 {
        
+       // Setup the window.
+       
        EditorMode = FALSE;
-       sliPriority->Disable();
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
        
        // Setup the list of types for the related drop down box.
        
@@ -54,17 +58,11 @@ frmContactEditorRelatedADT( parent )
        
 }
 
-void frmContactEditorRelated::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
-}
-
 void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 {
+       
+       // Set the editor mode.
+       
        if (EditMode == FALSE){
        
                EditorMode = FALSE;
@@ -199,9 +197,8 @@ void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
                if (intiter->first == RelatedListIndex && intiter->second > 0 &&
                        intiter != RelatedListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }
                
@@ -213,6 +210,9 @@ void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 {
+       
+       // Process data.
+       
        long ListCtrlIndex;
        
        if (EditorMode == FALSE){
@@ -329,9 +329,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
                
                // Add Related Priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, sliPriority->GetValue()));
+                       RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -350,9 +350,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
                
                RelatedListCtrlPtr->SetItem(ListCtrlIndex, 1, txtRelated->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RelatedListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       RelatedListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }               
        
@@ -457,9 +457,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
                
                RelatedListPrefPtr->erase(RelatedListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, sliPriority->GetValue()));
+                       RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -485,9 +485,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
                RelatedListCtrlPtr->SetItem(longSelected, 0, cmbType->GetValue());
                RelatedListCtrlPtr->SetItem(longSelected, 1, txtRelated->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       RelatedListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       RelatedListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -502,7 +502,11 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorRelated::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorRelated::SetupPointers(std::map<int, wxString> *RelatedList,
@@ -516,6 +520,8 @@ void frmContactEditorRelated::SetupPointers(std::map<int, wxString> *RelatedList
        int RelatedIndex )
 {
 
+       // Setup the pointers.
+       
        RelatedListPtr = RelatedList;
        RelatedListRelTypePtr = RelatedListRelType;     
        RelatedListAltIDPtr = RelatedListAltID;