Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added unit tests for CommonFunctions/ResetUnusedString
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditorNickname.cpp
diff --git
a/source/contacteditor/frmContactEditorNickname.cpp
b/source/contacteditor/frmContactEditorNickname.cpp
index
62937af
..
9c909a9
100644
(file)
--- a/
source/contacteditor/frmContactEditorNickname.cpp
+++ b/
source/contacteditor/frmContactEditorNickname.cpp
@@
-33,15
+33,22
@@
void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
{
void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
{
+
+ // Enable/disable the priority.
+
if (chkUsePref->IsChecked()){
sliPriority->Enable();
} else {
sliPriority->Disable();
}
if (chkUsePref->IsChecked()){
sliPriority->Enable();
} else {
sliPriority->Disable();
}
+
}
void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
{
}
void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
{
+
+ // Process the data.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
long ListCtrlIndex;
if (EditorMode == FALSE){
@@
-157,11
+164,16
@@
void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
void frmContactEditorNickname::CloseWindow( wxCommandEvent& event )
{
void frmContactEditorNickname::CloseWindow( wxCommandEvent& event )
{
+
+ // Close this window.
+
this->Close();
this->Close();
+
}
void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType)
{
}
void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType)
{
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
@@
-198,7
+210,8
@@
void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
striter = NicknamesListLanguagePtr->find(NicknamesListIndex);
striter = NicknamesListLanguagePtr->find(NicknamesListIndex);
- if (striter->first == NicknamesListIndex){
+ if (striter->first == NicknamesListIndex &&
+ striter != NicknamesListLanguagePtr->end()){
strValue = striter->second;
strValue = striter->second;
@@
-211,7
+224,8
@@
void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
intiter = NicknamesListPrefPtr->find(NicknamesListIndex);
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();
sliPriority->SetValue(intiter->second);
sliPriority->Enable();
@@
-236,6
+250,8
@@
void frmContactEditorNickname::SetupPointers(std::map<int, wxString> *NicknamesL
int NicknamesIndex )
{
int NicknamesIndex )
{
+ // Setup the pointers.
+
NicknamesListPtr = NicknamesList;
NicknamesListAltIDPtr = NicknamesListAltID;
NicknamesListPIDPtr = NicknamesListPID;
NicknamesListPtr = NicknamesList;
NicknamesListAltIDPtr = NicknamesListAltID;
NicknamesListPIDPtr = NicknamesListPID;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy