X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcontacteditor%2FfrmContactEditorNickname.cpp;h=6af836b8264147fcc60f22074cb8b98b7c345312;hb=026f712767e01c4c9720e868d72b3cb16333fafa;hp=62937afa498f4596f5dbe4098f9a5251b60e5e94;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index 62937af..6af836b 100644
--- a/source/contacteditor/frmContactEditorNickname.cpp
+++ b/source/contacteditor/frmContactEditorNickname.cpp
@@ -17,13 +17,28 @@
// with Xestia Address Book. If not, see
#include "frmContactEditorNickname.h"
-#include "../common/textprocessing.h"
frmContactEditorNickname::frmContactEditorNickname( wxWindow* parent )
:
frmContactEditorNicknameADT( parent )
{
+ std::vector LanguageCodeList = GetLanguageCodeList();
+
+ wxArrayString LanguageList;
+
+ for (auto LanguageItem : LanguageCodeList){
+
+ LanguageList.Add((wxString)LanguageItem, 1);
+
+ }
+
+ cmbLanguage->Append(LanguageList);
+
+ priorityCtrl = new XABPriorityCtrl(tabGeneral);
+ szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+ szrGeneral->Layout();
+
}
void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
@@ -31,17 +46,11 @@ void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
// Do nothing with this subroutine for the time being.
}
-void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
-{
- if (chkUsePref->IsChecked()){
- sliPriority->Enable();
- } else {
- sliPriority->Disable();
- }
-}
-
void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
{
+
+ // Process the data.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
@@ -76,15 +85,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
// Add nickname priority.
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+ NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
} else {
NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, 0));
- }
+ }
// Add the data to the form.
@@ -95,9 +104,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
coldata.SetText(txtNickname->GetValue());
ListCtrlIndex = NicknamesListCtrlPtr->InsertItem(coldata);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
}
@@ -116,9 +125,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
NicknamesListPrefPtr->erase(NicknamesListIndex);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+ NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
} else {
@@ -139,15 +148,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
NicknamesListCtrlPtr->SetItem(longSelected, 0, txtNickname->GetValue());
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
} else {
NicknamesListCtrlPtr->SetItem(longSelected, 1, wxT(""));
- }
+ }
this->Close();
@@ -157,11 +166,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 +212,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,11 +226,11 @@ 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();
- chkUsePref->SetValue(TRUE);
+ priorityCtrl->SetValue(intiter->second);
+ priorityCtrl->EnablePriority(true);
}
@@ -236,6 +251,8 @@ void frmContactEditorNickname::SetupPointers(std::map *NicknamesL
int NicknamesIndex )
{
+ // Setup the pointers.
+
NicknamesListPtr = NicknamesList;
NicknamesListAltIDPtr = NicknamesListAltID;
NicknamesListPIDPtr = NicknamesListPID;