X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorLanguages.cpp;h=64305ae16924948fdec439491134d896e9477ef3;hp=0cd628c68b9cfef3e02a14d93257c309b5398183;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=ca109c344b3fb17cf7000c87eb656febee3a6316 diff --git a/source/contacteditor/frmContactEditorLanguages.cpp b/source/contacteditor/frmContactEditorLanguages.cpp index 0cd628c..64305ae 100644 --- a/source/contacteditor/frmContactEditorLanguages.cpp +++ b/source/contacteditor/frmContactEditorLanguages.cpp @@ -24,17 +24,14 @@ frmContactEditorLanguages::frmContactEditorLanguages( wxWindow* parent ) : frmContactEditorLanguagesADT( parent ) { + + // Setup the window. + EditorMode = FALSE; - sliPriority->Disable(); -} - -void frmContactEditorLanguages::EnablePriority( wxCommandEvent& event ) -{ - if (chkUsePref->IsChecked()){ - sliPriority->Enable(); - } else { - sliPriority->Disable(); - } + priorityCtrl = new XABPriorityCtrl(tabGeneral); + szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5); + szrGeneral->Layout(); + } void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectType) @@ -77,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); } @@ -91,6 +87,8 @@ void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectTyp void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event ) { + // Process the action. + long ListCtrlIndex; if (EditorMode == FALSE){ @@ -121,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 { @@ -140,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())); } @@ -161,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 { @@ -181,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 { @@ -227,4 +225,5 @@ void frmContactEditorLanguages::SetupPointers(std::map *LanguageL LanguageListPrefPtr = LanguageListPref; LanguageListCtrlPtr = LanguageListCtrl; LanguageListIndex = LanguageIndex; + } \ No newline at end of file