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 XML conversion to ConvertToV3.
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditorIM.cpp
diff --git
a/source/contacteditor/frmContactEditorIM.cpp
b/source/contacteditor/frmContactEditorIM.cpp
index
adffd15
..
40bfef1
100644
(file)
--- a/
source/contacteditor/frmContactEditorIM.cpp
+++ b/
source/contacteditor/frmContactEditorIM.cpp
@@
-37,6
+37,7
@@
frmContactEditorIMADT( parent )
cmbIMType->Append(wxT("Skype"));
cmbIMType->Append(wxT("XMPP"));
cmbIMType->Append(wxT("Yahoo"));
cmbIMType->Append(wxT("Skype"));
cmbIMType->Append(wxT("XMPP"));
cmbIMType->Append(wxT("Yahoo"));
+ cmbIMType->Append(_("Other"));
}
}
@@
-81,8
+82,7
@@
void frmContactEditorIM::ProcessAction( wxCommandEvent& event )
// Add the address to the list (maps).
wxString strIMAddress;
// Add the address to the list (maps).
wxString strIMAddress;
- wxString strValue;
-
+
// Strip out the colons.
strIMAddress.Replace(wxT(":"), wxT(""), TRUE);
// Strip out the colons.
strIMAddress.Replace(wxT(":"), wxT(""), TRUE);
@@
-93,38
+93,36
@@
void frmContactEditorIM::ProcessAction( wxCommandEvent& event )
if (strIMTypeValue == wxT("AIM")){
if (strIMTypeValue == wxT("AIM")){
- strIMAddress.Append(wxT("aim
:
"));
+ strIMAddress.Append(wxT("aim"));
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
- strIMAddress.Append(wxT("gg
:
"));
+ strIMAddress.Append(wxT("gg"));
} else if (strIMTypeValue == wxT("ICQ")){
} else if (strIMTypeValue == wxT("ICQ")){
- strIMAddress.Append(wxT("icq
:"));
+ strIMAddress.Append(wxT("icq
"));
} else if (strIMTypeValue == wxT("Skype")){
} else if (strIMTypeValue == wxT("Skype")){
- strIMAddress.Append(wxT("skype
:"));
+ strIMAddress.Append(wxT("skype
"));
} else if (strIMTypeValue == wxT("XMPP")){
} else if (strIMTypeValue == wxT("XMPP")){
- strIMAddress.Append(wxT("xmpp
:"));
+ strIMAddress.Append(wxT("xmpp
"));
} else if (strIMTypeValue == wxT("Yahoo")){
} else if (strIMTypeValue == wxT("Yahoo")){
- strIMAddress.Append(wxT("yahoo
:"));
+ strIMAddress.Append(wxT("yahoo
"));
} else {
} else {
- strIMAddress.Append(strIMTypeValue
+ wxT(":")
);
+ strIMAddress.Append(strIMTypeValue);
}
}
- strIMAddress.Append(strValue);
- strIMAddress.Append(txtUsername->GetValue());
-
- IMListPtr->insert(std::make_pair(IMListIndex, strIMAddress));
+ IMListTypeInfoPtr->insert(std::make_pair(IMListIndex, strIMAddress));
+ IMListPtr->insert(std::make_pair(IMListIndex, txtUsername->GetValue()));
// Set the type.
// Set the type.
@@
-178,52
+176,47
@@
void frmContactEditorIM::ProcessAction( wxCommandEvent& event )
// Edit the address in the list.
wxString strIMAddress;
// Edit the address in the list.
wxString strIMAddress;
- wxString strValue;
long longSelected = -1;
long longSelected = -1;
- // Strip out the colons.
-
- strIMAddress.Replace(wxT(":"), wxT(""), TRUE);
-
// Specify the type.
strIMTypeValue = cmbIMType->GetString(cmbIMType->GetSelection());
// Specify the type.
strIMTypeValue = cmbIMType->GetString(cmbIMType->GetSelection());
-
+
if (strIMTypeValue == wxT("AIM")){
if (strIMTypeValue == wxT("AIM")){
- strIMAddress.Append(wxT("aim
:
"));
+ strIMAddress.Append(wxT("aim"));
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
- strIMAddress.Append(wxT("gg
:
"));
+ strIMAddress.Append(wxT("gg"));
} else if (strIMTypeValue == wxT("ICQ")){
} else if (strIMTypeValue == wxT("ICQ")){
- strIMAddress.Append(wxT("icq
:"));
+ strIMAddress.Append(wxT("icq
"));
} else if (strIMTypeValue == wxT("Skype")){
} else if (strIMTypeValue == wxT("Skype")){
- strIMAddress.Append(wxT("skype
:"));
+ strIMAddress.Append(wxT("skype
"));
} else if (strIMTypeValue == wxT("XMPP")){
} else if (strIMTypeValue == wxT("XMPP")){
- strIMAddress.Append(wxT("xmpp
:"));
+ strIMAddress.Append(wxT("xmpp
"));
} else if (strIMTypeValue == wxT("Yahoo")){
} else if (strIMTypeValue == wxT("Yahoo")){
- strIMAddress.Append(wxT("yahoo
:"));
+ strIMAddress.Append(wxT("yahoo
"));
} else {
} else {
- strIMAddress.Append(strIMTypeValue
+ wxT(":")
);
+ strIMAddress.Append(strIMTypeValue);
}
}
-
- strIMAddress.Append(strValue);
- strIMAddress.Append(txtUsername->GetValue());
-
+
IMListPtr->erase(IMListIndex);
IMListPtr->erase(IMListIndex);
- IMListPtr->insert(std::make_pair(IMListIndex, strIMAddress));
+ IMListPtr->insert(std::make_pair(IMListIndex, txtUsername->GetValue()));
+
+ IMListTypeInfoPtr->erase(IMListIndex);
+ IMListTypeInfoPtr->insert(std::make_pair(IMListIndex, strIMAddress));
// Set the priority.
// Set the priority.
@@
-296,8
+289,8
@@
void frmContactEditorIM::SetEditorMode(bool EditMode, SectionType SectType)
wxString strValue;
wxString strIMType;
wxString strIMUser;
wxString strValue;
wxString strIMType;
wxString strIMUser;
-
- // Setup the IM Type.
+
+ // Setup the IM Type.
striter = IMListPtr->find(IMListIndex);
striter = IMListPtr->find(IMListIndex);
@@
-305,39
+298,45
@@
void frmContactEditorIM::SetEditorMode(bool EditMode, SectionType SectType)
strValue = striter->second;
strValue = striter->second;
- }
+ }
- wxStringTokenizer IMAddressToken(strValue, wxT(":"));
- strIMType = IMAddressToken.GetNextToken();
- strIMUser = IMAddressToken.GetNextToken();
+ strIMUser = IMListPtr->find(IMListIndex)->second;
+ strIMType = IMListTypeInfoPtr->find(IMListIndex)->second;
if (strIMType == wxT("aim")){
cmbIMType->SetValue(wxT("AIM"));
if (strIMType == wxT("aim")){
cmbIMType->SetValue(wxT("AIM"));
+ cmbIMType->SetSelection(0);
} else if (strIMType == wxT("gg")){
cmbIMType->SetValue(wxT("Gadu-Gadu"));
} else if (strIMType == wxT("gg")){
cmbIMType->SetValue(wxT("Gadu-Gadu"));
+ cmbIMType->SetSelection(1);
} else if (strIMType == wxT("icq")){
cmbIMType->SetValue(wxT("ICQ"));
} else if (strIMType == wxT("icq")){
cmbIMType->SetValue(wxT("ICQ"));
+ cmbIMType->SetSelection(2);
} else if (strIMType == wxT("skype")){
cmbIMType->SetValue(wxT("Skype"));
} else if (strIMType == wxT("skype")){
cmbIMType->SetValue(wxT("Skype"));
+ cmbIMType->SetSelection(3);
} else if (strIMType == wxT("xmpp")){
} else if (strIMType == wxT("xmpp")){
- cmbIMType->SetValue(wxT("XMPP"));
+ cmbIMType->SetValue(wxT("XMPP"));
+ cmbIMType->SetSelection(4);
} else if (strIMType == wxT("yahoo")){
cmbIMType->SetValue(wxT("Yahoo"));
} else if (strIMType == wxT("yahoo")){
cmbIMType->SetValue(wxT("Yahoo"));
+ cmbIMType->SetSelection(5);
} else {
cmbIMType->SetValue(strIMType);
} else {
cmbIMType->SetValue(strIMType);
+ cmbIMType->SetSelection(6);
}
}
@@
-367,6
+366,7
@@
void frmContactEditorIM::SetupPointers( std::map<int, wxString> *IMList,
std::map<int, wxString> *IMListAltID,
std::map<int, wxString> *IMListPID,
std::map<int, wxString> *IMListType,
std::map<int, wxString> *IMListAltID,
std::map<int, wxString> *IMListPID,
std::map<int, wxString> *IMListType,
+ std::map<int, wxString> *IMListTypeInfo,
std::map<int, wxString> *IMListTokens,
std::map<int, wxString> *IMListMediatype,
std::map<int, int> *IMListPref,
std::map<int, wxString> *IMListTokens,
std::map<int, wxString> *IMListMediatype,
std::map<int, int> *IMListPref,
@@
-378,6
+378,7
@@
void frmContactEditorIM::SetupPointers( std::map<int, wxString> *IMList,
IMListAltIDPtr = IMListAltID;
IMListPIDPtr = IMListPID;
IMListTypePtr = IMListType;
IMListAltIDPtr = IMListAltID;
IMListPIDPtr = IMListPID;
IMListTypePtr = IMListType;
+ IMListTypeInfoPtr = IMListTypeInfo;
IMListTokensPtr = IMListTokens;
IMListMediatypePtr = IMListMediatype;
IMListPrefPtr = IMListPref;
IMListTokensPtr = IMListTokens;
IMListMediatypePtr = IMListMediatype;
IMListPrefPtr = IMListPref;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy