X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNotes.cpp;h=1bc24fcdab9e54329617bd0b89a33d06a6876a40;hp=ab0a64de66f323393cc292653c85a1130c8768d4;hb=10f1df124c922e4c82256456cb2c0d5c39af2a04;hpb=66582143bc7b3e31b38abcb86da63fd8f2f61415 diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp index ab0a64d..1bc24fc 100644 --- a/source/contacteditor/frmContactEditorNotes.cpp +++ b/source/contacteditor/frmContactEditorNotes.cpp @@ -26,7 +26,8 @@ frmContactEditorNotesADT( parent ) // Setup the editor window. EditorMode = FALSE; - sliPriority->Disable(); + priorityCtrl = new XABPriorityCtrl(tabPriority); + szrPriority->Add(priorityCtrl, 1, wxEXPAND, 5); // Setup the language combo box. @@ -44,19 +45,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 +81,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 +114,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 +139,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 +177,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 +252,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); }