X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNickname.cpp;h=c67302cffaf858dede32cdff5547e8119d1acd83;hb=56eff3f03cf38a27161b3279318c474e0421111c;hp=62937afa498f4596f5dbe4098f9a5251b60e5e94;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index 62937af..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 )
@@ -33,15 +44,22 @@ void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
 
 void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 {
+	
+	// Process the data.
+	
 	long ListCtrlIndex;
 
 	if (EditorMode == FALSE){
@@ -157,11 +175,16 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorNickname::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -198,7 +221,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
 		
 		striter = NicknamesListLanguagePtr->find(NicknamesListIndex);
 		 
-		if (striter->first == NicknamesListIndex){
+		if (striter->first == NicknamesListIndex &&
+			striter != NicknamesListLanguagePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -211,7 +235,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
 		
 		intiter = NicknamesListPrefPtr->find(NicknamesListIndex);
 		
-		if (intiter->first == NicknamesListIndex && intiter->second > 0){
+		if (intiter->first == NicknamesListIndex && intiter->second > 0 &&
+			intiter != NicknamesListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -236,6 +261,8 @@ void frmContactEditorNickname::SetupPointers(std::map<int, wxString> *NicknamesL
 	int NicknamesIndex )
 {
 
+	// Setup the pointers.
+	
 	NicknamesListPtr = NicknamesList;
 	NicknamesListAltIDPtr = NicknamesListAltID;
 	NicknamesListPIDPtr = NicknamesListPID;