:
frmContactEditorIMADT( parent )
{
+
+ // Setup the window.
+
EditorMode = FALSE;
sliPriority->Disable();
cmbIMType->Append(wxT("Skype"));
cmbIMType->Append(wxT("XMPP"));
cmbIMType->Append(wxT("Yahoo"));
+ cmbIMType->Append(_("Other"));
}
void frmContactEditorIM::EnablePriority( wxCommandEvent& event )
{
+
+ // Enable/disable the priority setting.
+
if (chkUsePref->IsChecked()){
sliPriority->Enable();
} else {
sliPriority->Disable();
}
+
}
void frmContactEditorIM::ProcessAction( wxCommandEvent& event )
{
+ // Process the action.
+
long ListCtrlIndex;
// Check if IM type is empty and if it is then
// Add the address to the list (maps).
wxString strIMAddress;
- wxString strValue;
-
+
// Strip out the colons.
strIMAddress.Replace(wxT(":"), wxT(""), TRUE);
if (strIMTypeValue == wxT("AIM")){
- strIMAddress.Append(wxT("aim:"));
+ strIMAddress.Append(wxT("aim"));
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
- strIMAddress.Append(wxT("gg:"));
+ strIMAddress.Append(wxT("gg"));
} else if (strIMTypeValue == wxT("ICQ")){
- strIMAddress.Append(wxT("icq:"));
+ strIMAddress.Append(wxT("icq"));
} else if (strIMTypeValue == wxT("Skype")){
- strIMAddress.Append(wxT("skype:"));
+ strIMAddress.Append(wxT("skype"));
} else if (strIMTypeValue == wxT("XMPP")){
- strIMAddress.Append(wxT("xmpp:"));
+ strIMAddress.Append(wxT("xmpp"));
} else if (strIMTypeValue == wxT("Yahoo")){
- strIMAddress.Append(wxT("yahoo:"));
+ strIMAddress.Append(wxT("yahoo"));
} 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.
// Edit the address in the list.
wxString strIMAddress;
- wxString strValue;
long longSelected = -1;
- // Strip out the colons.
-
- strIMAddress.Replace(wxT(":"), wxT(""), TRUE);
-
// Specify the type.
strIMTypeValue = cmbIMType->GetString(cmbIMType->GetSelection());
-
+
if (strIMTypeValue == wxT("AIM")){
- strIMAddress.Append(wxT("aim:"));
+ strIMAddress.Append(wxT("aim"));
} else if (strIMTypeValue == wxT("Gadu-Gadu")){
- strIMAddress.Append(wxT("gg:"));
+ strIMAddress.Append(wxT("gg"));
} else if (strIMTypeValue == wxT("ICQ")){
- strIMAddress.Append(wxT("icq:"));
+ strIMAddress.Append(wxT("icq"));
} else if (strIMTypeValue == wxT("Skype")){
- strIMAddress.Append(wxT("skype:"));
+ strIMAddress.Append(wxT("skype"));
} else if (strIMTypeValue == wxT("XMPP")){
- strIMAddress.Append(wxT("xmpp:"));
+ strIMAddress.Append(wxT("xmpp"));
} else if (strIMTypeValue == wxT("Yahoo")){
- strIMAddress.Append(wxT("yahoo:"));
+ strIMAddress.Append(wxT("yahoo"));
} else {
- strIMAddress.Append(strIMTypeValue + wxT(":"));
+ strIMAddress.Append(strIMTypeValue);
}
-
- strIMAddress.Append(strValue);
- strIMAddress.Append(txtUsername->GetValue());
-
+
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.
void frmContactEditorIM::CloseWindow( wxCommandEvent& event )
{
+
+ // Close the window.
+
this->Close();
+
}
void frmContactEditorIM::SetEditorMode(bool EditMode, SectionType SectType)
{
+
+ // Set the editor mode.
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
wxString strValue;
wxString strIMType;
wxString strIMUser;
-
- // Setup the IM Type.
+
+ // Setup the IM Type.
striter = IMListPtr->find(IMListIndex);
strValue = striter->second;
- }
+ }
+
+ if (IMListPtr->find(IMListIndex) != IMListPtr->end()){
+
+ strIMUser = IMListPtr->find(IMListIndex)->second;
+
+ }
- wxStringTokenizer IMAddressToken(strValue, wxT(":"));
- strIMType = IMAddressToken.GetNextToken();
- strIMUser = IMAddressToken.GetNextToken();
+ if (IMListTypeInfoPtr->find(IMListIndex) != IMListTypeInfoPtr->end()){
+
+ strIMType = IMListTypeInfoPtr->find(IMListIndex)->second;
+
+ }
if (strIMType == wxT("aim")){
cmbIMType->SetValue(wxT("AIM"));
+ cmbIMType->SetSelection(0);
} else if (strIMType == wxT("gg")){
cmbIMType->SetValue(wxT("Gadu-Gadu"));
+ cmbIMType->SetSelection(1);
} else if (strIMType == wxT("icq")){
cmbIMType->SetValue(wxT("ICQ"));
+ cmbIMType->SetSelection(2);
} else if (strIMType == wxT("skype")){
cmbIMType->SetValue(wxT("Skype"));
+ cmbIMType->SetSelection(3);
} 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"));
+ cmbIMType->SetSelection(5);
} else {
cmbIMType->SetValue(strIMType);
+ cmbIMType->SetSelection(6);
}
intiter = IMListPrefPtr->find(IMListIndex);
- if (intiter->first == IMListIndex && intiter->second > 0){
+ if (intiter->first == IMListIndex && intiter->second > 0 &&
+ intiter != IMListPrefPtr->end()){
sliPriority->SetValue(intiter->second);
sliPriority->Enable();
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,
int IMIndex )
{
+ // Setup the pointers.
+
IMListPtr = IMList;
IMListAltIDPtr = IMListAltID;
IMListPIDPtr = IMListPID;
IMListTypePtr = IMListType;
+ IMListTypeInfoPtr = IMListTypeInfo;
IMListTokensPtr = IMListTokens;
IMListMediatypePtr = IMListMediatype;
IMListPrefPtr = IMListPref;