X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGeoposition.cpp;h=e8c89eb9d454020e5432caa8f1ab209d8f7400ea;hb=ce6b921249b87bb62df485af240697ba81cd409d;hp=4f9160541918342fdac09f7ba23a2e7f225e1e65;hpb=eb299104a989ec7edd01ffa94d5164138db93fea;p=xestiaab%2F.git diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp index 4f91605..e8c89eb 100644 --- a/source/contacteditor/frmContactEditorGeoposition.cpp +++ b/source/contacteditor/frmContactEditorGeoposition.cpp @@ -28,19 +28,8 @@ 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); } @@ -86,9 +75,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 +123,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 +142,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 +163,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 +183,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 {