X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorRelated.cpp;h=17117ca8f2eb2fb94f40fd637a474d34edcc1306;hp=6d94ef53e67fd93b014289b7cb61916ae0669b06;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=fd078514131d77670118c74f6c6c632b57f05fb8 diff --git a/source/contacteditor/frmContactEditorRelated.cpp b/source/contacteditor/frmContactEditorRelated.cpp index 6d94ef5..17117ca 100644 --- a/source/contacteditor/frmContactEditorRelated.cpp +++ b/source/contacteditor/frmContactEditorRelated.cpp @@ -29,7 +29,9 @@ 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. @@ -56,19 +58,6 @@ frmContactEditorRelatedADT( parent ) } -void frmContactEditorRelated::EnablePriority( wxCommandEvent& event ) -{ - - // Enable/disable the priority setting. - - if (chkUsePref->IsChecked()){ - sliPriority->Enable(); - } else { - sliPriority->Disable(); - } - -} - void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType) { @@ -208,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); } @@ -341,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 { @@ -362,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())); } @@ -469,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 { @@ -497,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 {