From 56eff3f03cf38a27161b3279318c474e0421111c Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 6 Mar 2017 11:14:03 +0000
Subject: [PATCH] frmContactEditorNickname/Notes: Use list of ISO 639-1
 languages

---
 .../frmContactEditorNickname.cpp              | 13 ++++++++++++-
 .../contacteditor/frmContactEditorNickname.h  |  2 ++
 .../contacteditor/frmContactEditorNotes.cpp   | 19 +++++++++++++++++--
 source/contacteditor/frmContactEditorNotes.h  |  4 ++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index 9c909a9..c67302c 100644
--- a/source/contacteditor/frmContactEditorNickname.cpp
+++ b/source/contacteditor/frmContactEditorNickname.cpp
@@ -17,13 +17,24 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmContactEditorNickname.h"
-#include "../common/textprocessing.h"
 
 frmContactEditorNickname::frmContactEditorNickname( wxWindow* parent )
 :
 frmContactEditorNicknameADT( parent )
 {
 
+	std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
+	
+	wxArrayString LanguageList;
+	
+	for (auto LanguageItem : LanguageCodeList){
+		
+		LanguageList.Add((wxString)LanguageItem, 1);
+		
+	}
+	
+	cmbLanguage->Append(LanguageList);
+	
 }
 
 void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
diff --git a/source/contacteditor/frmContactEditorNickname.h b/source/contacteditor/frmContactEditorNickname.h
index e8ea37a..e14699c 100644
--- a/source/contacteditor/frmContactEditorNickname.h
+++ b/source/contacteditor/frmContactEditorNickname.h
@@ -28,6 +28,8 @@ Subclass of frmContactEditorNicknameADT, which is generated by wxFormBuilder.
 #include <string>
 #include "../AppXestiaAddrBk.h"
 #include "../enums.h"
+#include "../common/textprocessing.h"
+#include "../common/languages.h"
 
 //// end generated include
 
diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp
index b2b6983..ab0a64d 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 )
 :
@@ -29,6 +27,21 @@ frmContactEditorNotesADT( parent )
 	
 	EditorMode = FALSE;
 	sliPriority->Disable();
+	
+	// Setup the language combo box.
+	
+	std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
+	
+	wxArrayString LanguageList;
+	
+	for (auto LanguageItem : LanguageCodeList){
+		
+		LanguageList.Add((wxString)LanguageItem, 1);
+		
+	}
+	
+	cmbLanguage->Append(LanguageList);
+	
 }
 
 void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
@@ -233,6 +246,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = NotesListLangPtr->find(NotesListIndex);
 		
+		strValue.clear();
+		
 		if (striter->first == NotesListIndex &&
 			striter != NotesListLangPtr->end()){
 		
diff --git a/source/contacteditor/frmContactEditorNotes.h b/source/contacteditor/frmContactEditorNotes.h
index bdded43..ad7267e 100644
--- a/source/contacteditor/frmContactEditorNotes.h
+++ b/source/contacteditor/frmContactEditorNotes.h
@@ -25,8 +25,12 @@ Subclass of frmContactEditorNotesADT, which is generated by wxFormBuilder.
 */
 
 #include <map>
+#include <wx/tokenzr.h>
+
 #include "../AppXestiaAddrBk.h"
 #include "../enums.h"
+#include "../common/textprocessing.h"
+#include "../common/languages.h"
 
 //// end generated include
 
-- 
2.39.2