X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorEmail.cpp;h=6ee02195233198854e2354d5e20d8852bdb4dbbe;hp=aaaab18459320e21338a4a7bcad2d889359d6b27;hb=43c4a20cee4670cdb166ea9c27e74398af1039c5;hpb=bfe817b5bfae33a1eb666c463643ec119cd1d66d diff --git a/source/contacteditor/frmContactEditorEmail.cpp b/source/contacteditor/frmContactEditorEmail.cpp index aaaab18..6ee0219 100644 --- a/source/contacteditor/frmContactEditorEmail.cpp +++ b/source/contacteditor/frmContactEditorEmail.cpp @@ -28,20 +28,8 @@ frmContactEditorEmailADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); - -} - -void frmContactEditorEmail::EnablePriority( wxCommandEvent& event ) -{ - - // Enable/disable the priority setting. - - if (chkUsePref->IsChecked()){ - sliPriority->Enable(); - } else { - sliPriority->Disable(); - } + priorityCtrl = new XABPriorityCtrl(tabGeneral); + szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); } @@ -81,9 +69,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event ) // Add Email priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue())); + EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue())); } else { @@ -100,9 +88,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event ) coldata.SetText(txtEmail->GetValue()); ListCtrlIndex = EmailListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } @@ -121,9 +109,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event ) EmailListPrefPtr->erase(EmailListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue())); + EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue())); } else { @@ -141,9 +129,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event ) EmailListCtrlPtr->SetItem(longSelected, 0, txtEmail->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else { @@ -208,9 +196,8 @@ void frmContactEditorEmail::SetEditorMode(bool EditMode, SectionType SectType) if (intiter->first == EmailListIndex && intiter->second > 0 && intiter != EmailListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); }