X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorRoles.cpp;h=43f6b9e92ce8fca614d185c300ed4bdfe0224eda;hp=30a20b49f5c27ef4ba643eea7f5f2709eb9f9987;hb=fbdcc86f91568d451c1469f9acc9b19f62b82ade;hpb=1e038086c27e3da18da6ebfa1bb3d3acf5d0f0d7 diff --git a/source/contacteditor/frmContactEditorRoles.cpp b/source/contacteditor/frmContactEditorRoles.cpp index 30a20b4..43f6b9e 100644 --- a/source/contacteditor/frmContactEditorRoles.cpp +++ b/source/contacteditor/frmContactEditorRoles.cpp @@ -30,19 +30,9 @@ frmContactEditorRolesADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); -} - -void frmContactEditorRoles::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); } @@ -83,9 +73,9 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event ) // Add the website priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue())); + RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue())); } else { @@ -102,11 +92,11 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event ) coldata.SetText(txtRole->GetValue()); ListCtrlIndex = RolesListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); - } + } this->Close(); @@ -122,15 +112,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event ) RolesListPrefPtr->erase(RolesListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue())); + RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue())); } else { RolesListPrefPtr->insert(std::make_pair(RolesListIndex, 0)); - } + } // Update the form. @@ -144,15 +134,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event ) RolesListCtrlPtr->SetItem(longSelected, 0, txtRole->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else { RolesListCtrlPtr->SetItem(longSelected, 1, wxT("")); - } + } this->Close(); @@ -205,9 +195,8 @@ void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType) if (intiter->first == RolesListIndex && intiter->second > 0 && intiter != RolesListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); }