X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorLanguages.cpp;h=64305ae16924948fdec439491134d896e9477ef3;hp=26f67b052bb733e2294a77257139c0f8fe546520;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=b18da836f35622073bdf5e3f8396f9265ea86163 diff --git a/source/contacteditor/frmContactEditorLanguages.cpp b/source/contacteditor/frmContactEditorLanguages.cpp index 26f67b0..64305ae 100644 --- a/source/contacteditor/frmContactEditorLanguages.cpp +++ b/source/contacteditor/frmContactEditorLanguages.cpp @@ -28,19 +28,9 @@ frmContactEditorLanguagesADT( parent ) // Setup the window. EditorMode = FALSE; - sliPriority->Disable(); -} - -void frmContactEditorLanguages::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(); } @@ -84,9 +74,8 @@ void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectTyp if (intiter->first == LanguageListIndex && intiter->second > 0 && intiter != LanguageListPrefPtr->end()){ - sliPriority->SetValue(intiter->second); - sliPriority->Enable(); - chkUsePref->SetValue(TRUE); + priorityCtrl->SetValue(intiter->second); + priorityCtrl->EnablePriority(true); } @@ -130,9 +119,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event ) // Add Language priority. - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, sliPriority->GetValue())); + LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, priorityCtrl->GetValue())); } else { @@ -149,9 +138,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event ) coldata.SetText(txtLanguage->GetValue()); ListCtrlIndex = LanguageListCtrlPtr->InsertItem(coldata); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - LanguageListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + LanguageListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } @@ -170,9 +159,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event ) LanguageListPrefPtr->erase(LanguageListIndex); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, sliPriority->GetValue())); + LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, priorityCtrl->GetValue())); } else { @@ -190,9 +179,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event ) LanguageListCtrlPtr->SetItem(longSelected, 0, txtLanguage->GetValue()); - if (chkUsePref->IsChecked()){ + if (priorityCtrl->IsPriorityChecked()){ - LanguageListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue())); + LanguageListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue())); } else {