X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNotes.cpp;h=ee8693c5573d374e9d411d30cd4f0e51b3127a0a;hp=b2b6983848b1e59d7450f92d7c1cdbe2ebc8cfcc;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=8ba3a36ac9f0f28190f521902e76297003722276

diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp
index b2b6983..ee8693c 100644
--- a/source/contacteditor/frmContactEditorNotes.cpp
+++ b/source/contacteditor/frmContactEditorNotes.cpp
@@ -17,8 +17,6 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmContactEditorNotes.h"
-#include "../common/textprocessing.h"
-#include <wx/tokenzr.h>
 
 frmContactEditorNotes::frmContactEditorNotes( wxWindow* parent )
 :
@@ -28,20 +26,24 @@ frmContactEditorNotesADT( parent )
 	// Setup the editor window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
-{
+	priorityCtrl = new XABPriorityCtrl(tabPriority);
+	szrPriority->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrPriority->Layout();
+	
+	// Setup the language combo box.
+	
+	std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
 	
-	// Enable/disable the priority setting.
+	wxArrayString LanguageList;
 	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
+	for (auto LanguageItem : LanguageCodeList){
+		
+		LanguageList.Add((wxString)LanguageItem, 1);
+		
 	}
 	
+	cmbLanguage->Append(LanguageList);
+	
 }
 
 void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
@@ -80,9 +82,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 		
 		// Add note priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+			NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -113,9 +115,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtNote->GetValue());
 		ListCtrlIndex =	NotesListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -138,9 +140,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 		
 		NotesListPrefPtr->erase(NotesListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+			NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -176,9 +178,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 		
 		NotesListCtrlPtr->SetItem(longSelected, 0, txtNote->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -233,6 +235,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = NotesListLangPtr->find(NotesListIndex);
 		
+		strValue.clear();
+		
 		if (striter->first == NotesListIndex &&
 			striter != NotesListLangPtr->end()){
 		
@@ -249,9 +253,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 		if (intiter->first == NotesListIndex && intiter->second > 0 &&
 			intiter != NotesListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}