X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGeoposition.cpp;h=bcc3e87a70e31897ce7633e146336ffa3e3532b7;hp=4f9160541918342fdac09f7ba23a2e7f225e1e65;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=eb299104a989ec7edd01ffa94d5164138db93fea diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp index 4f91605..bcc3e87 100644 --- a/source/contacteditor/frmContactEditorGeoposition.cpp +++ b/source/contacteditor/frmContactEditorGeoposition.cpp @@ -28,19 +28,9 @@ frmContactEditorGeopositionADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); -} - -void frmContactEditorGeoposition::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); + szrGeneral->Layout(); } @@ -86,9 +76,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT if (intiter->first == GeopositionListIndex && intiter->second > 0 && intiter != GeopositionListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); } @@ -135,9 +124,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event ) // Add Language priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue())); + GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue())); } else { @@ -154,9 +143,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event ) coldata.SetText(txtGeoposition->GetValue()); ListCtrlIndex = GeopositionListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } @@ -175,9 +164,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event ) GeopositionListPrefPtr->erase(GeopositionListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue())); + GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue())); } else { @@ -195,9 +184,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event ) GeopositionListCtrlPtr->SetItem(longSelected, 0, txtGeoposition->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else {