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

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

diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp
index ab0a64d..ee8693c 100644 (file)
--- a/source/contacteditor/frmContactEditorNotes.cpp
+++ b/source/contacteditor/frmContactEditorNotes.cpp
@@ -26,7 +26,9 @@ frmContactEditorNotesADT( parent )
        // Setup the editor window.
        
        EditorMode = FALSE;
-       sliPriority->Disable();
+       priorityCtrl = new XABPriorityCtrl(tabPriority);
+       szrPriority->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrPriority->Layout();
        
        // Setup the language combo box.
        
@@ -44,19 +46,6 @@ frmContactEditorNotesADT( parent )
        
 }
 
-void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
-{
-       
-       // Enable/disable the priority setting.
-       
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
-       
-}
-
 void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 {
        
@@ -93,9 +82,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
                
                // Add note priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+                       NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -126,9 +115,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
                coldata.SetText(txtNote->GetValue());
                ListCtrlIndex = NotesListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -151,9 +140,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
                
                NotesListPrefPtr->erase(NotesListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+                       NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -189,9 +178,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
                
                NotesListCtrlPtr->SetItem(longSelected, 0, txtNote->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -264,9 +253,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
                if (intiter->first == NotesListIndex && intiter->second > 0 &&
                        intiter != NotesListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }