More enhancements for IMPP and TEL in frmContactEditor and frmContactEditorTelephone.

diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp
index 1ddc62d..89175e7 100644 (file)
--- a/source/contacteditor/frmContactEditor-Business.cpp
+++ b/source/contacteditor/frmContactEditor-Business.cpp
@@ -269,6 +269,7 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event )
                              &ContactEditorData.BusinessIMListAltID,
                              &ContactEditorData.BusinessIMListPID,
                              &ContactEditorData.BusinessIMListType,
+                            &ContactEditorData.BusinessIMListTypeInfo,
                              &ContactEditorData.BusinessIMListTokens,
                              &ContactEditorData.BusinessIMListMediatype,
                              &ContactEditorData.BusinessIMListPref,
@@ -295,6 +296,7 @@ void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event )
                              &ContactEditorData.BusinessIMListAltID,
                              &ContactEditorData.BusinessIMListPID,
                              &ContactEditorData.BusinessIMListType,
+                            &ContactEditorData.BusinessIMListTypeInfo,
                              &ContactEditorData.BusinessIMListTokens,
                              &ContactEditorData.BusinessIMListMediatype,
                              &ContactEditorData.BusinessIMListPref,
@@ -321,8 +323,9 @@ void frmContactEditor::DeleteBusinessIM( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.BusinessIMList,
                   &ContactEditorData.BusinessIMListAltID, &ContactEditorData.BusinessIMListPID,
-                  &ContactEditorData.BusinessIMListType, &ContactEditorData.BusinessIMListTokens,
-                  &ContactEditorData.BusinessIMListMediatype, &ContactEditorData.BusinessIMListPref);
+                  &ContactEditorData.BusinessIMListType, &ContactEditorData.BusinessIMListTypeInfo,
+                 &ContactEditorData.BusinessIMListTokens, &ContactEditorData.BusinessIMListMediatype, 
+                 &ContactEditorData.BusinessIMListPref);
     
 }
 
@@ -337,6 +340,7 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event )
                               &ContactEditorData.BusinessTelephoneListAltID,
                               &ContactEditorData.BusinessTelephoneListPID,
                               &ContactEditorData.BusinessTelephoneListType,
+                              &ContactEditorData.BusinessTelephoneListTypeInfo,
                               &ContactEditorData.BusinessTelephoneListTokens,
                               &ContactEditorData.BusinessTelephoneListPref,
                               lboBusinessTelephone,
@@ -362,6 +366,7 @@ void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event )
                               &ContactEditorData.BusinessTelephoneListAltID,
                               &ContactEditorData.BusinessTelephoneListPID,
                               &ContactEditorData.BusinessTelephoneListType,
+                              &ContactEditorData.BusinessTelephoneListTypeInfo,
                               &ContactEditorData.BusinessTelephoneListTokens,
                               &ContactEditorData.BusinessTelephoneListPref,
                               lboBusinessTelephone,
@@ -387,8 +392,8 @@ void frmContactEditor::DeleteBusinessTelephone( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.BusinessTelephoneList,
                   &ContactEditorData.BusinessTelephoneListAltID, &ContactEditorData.BusinessTelephoneListPID,
-                  &ContactEditorData.BusinessTelephoneListType, &ContactEditorData.BusinessTelephoneListTokens,
-                  &ContactEditorData.BusinessTelephoneListPref);
+                  &ContactEditorData.BusinessTelephoneListType, &ContactEditorData.BusinessTelephoneListTypeInfo,
+                 &ContactEditorData.BusinessTelephoneListTokens, &ContactEditorData.BusinessTelephoneListPref);
     
 }
 

diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp
index 0d45448..82add88 100644 (file)
--- a/source/contacteditor/frmContactEditor-Home.cpp
+++ b/source/contacteditor/frmContactEditor-Home.cpp
@@ -274,6 +274,7 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event )
                              &ContactEditorData.HomeIMListAltID,
                              &ContactEditorData.HomeIMListPID,
                              &ContactEditorData.HomeIMListType,
+                             &ContactEditorData.HomeIMListTypeInfo,
                              &ContactEditorData.HomeIMListTokens,
                              &ContactEditorData.HomeIMListMediatype,
                              &ContactEditorData.HomeIMListPref,
@@ -300,6 +301,7 @@ void frmContactEditor::ModifyHomeIM( wxCommandEvent& event )
                              &ContactEditorData.HomeIMListAltID,
                              &ContactEditorData.HomeIMListPID,
                              &ContactEditorData.HomeIMListType,
+                             &ContactEditorData.HomeIMListTypeInfo,
                              &ContactEditorData.HomeIMListTokens,
                              &ContactEditorData.HomeIMListMediatype,
                              &ContactEditorData.HomeIMListPref,
@@ -326,8 +328,9 @@ void frmContactEditor::DeleteHomeIM( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.HomeIMList,
                   &ContactEditorData.HomeIMListAltID, &ContactEditorData.HomeIMListPID,
-                  &ContactEditorData.HomeIMListType, &ContactEditorData.HomeIMListTokens,
-                  &ContactEditorData.HomeIMListMediatype, &ContactEditorData.HomeIMListPref);
+                  &ContactEditorData.HomeIMListType, &ContactEditorData.HomeIMListTypeInfo,
+                 &ContactEditorData.HomeIMListTokens, &ContactEditorData.HomeIMListMediatype, 
+                 &ContactEditorData.HomeIMListPref);
     
 }
 
@@ -342,6 +345,7 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event )
                               &ContactEditorData.HomeTelephoneListAltID,
                               &ContactEditorData.HomeTelephoneListPID,
                               &ContactEditorData.HomeTelephoneListType,
+                              &ContactEditorData.HomeTelephoneListTypeInfo,
                               &ContactEditorData.HomeTelephoneListTokens,
                               &ContactEditorData.HomeTelephoneListPref,
                               lboHomeTelephone,
@@ -367,6 +371,7 @@ void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event )
                               &ContactEditorData.HomeTelephoneListAltID,
                               &ContactEditorData.HomeTelephoneListPID,
                               &ContactEditorData.HomeTelephoneListType,
+                              &ContactEditorData.HomeTelephoneListTypeInfo,
                               &ContactEditorData.HomeTelephoneListTokens,
                               &ContactEditorData.HomeTelephoneListPref,
                               lboHomeTelephone,
@@ -392,8 +397,8 @@ void frmContactEditor::DeleteHomeTelephone( wxCommandEvent& event )
     
     DeleteMapData(intSelectedData, &ContactEditorData.HomeTelephoneList,
                   &ContactEditorData.HomeTelephoneListAltID, &ContactEditorData.HomeTelephoneListPID,
-                  &ContactEditorData.HomeTelephoneListType, &ContactEditorData.HomeTelephoneListTokens,
-                  &ContactEditorData.HomeTelephoneListPref);
+                  &ContactEditorData.HomeTelephoneListType, &ContactEditorData.HomeTelephoneListTypeInfo,
+                 &ContactEditorData.HomeTelephoneListTokens, &ContactEditorData.HomeTelephoneListPref);
     
 }
 

diff --git a/source/contacteditor/frmContactEditorTelephone.cpp b/source/contacteditor/frmContactEditorTelephone.cpp
index 29da821..d6d8399 100644 (file)
--- a/source/contacteditor/frmContactEditorTelephone.cpp
+++ b/source/contacteditor/frmContactEditorTelephone.cpp
@@ -439,13 +439,19 @@ void frmContactEditorTelephone::SetEditorMode(bool EditMode, SectionType SectTyp
                
                // Get the phone types in.
                
-               striter = TelephoneListTypePtr->find(TelephoneListIndex);
+               
+               if (TelephoneListTypeInfoPtr->find(TelephoneListIndex) !=
+                       TelephoneListTypeInfoPtr->end()){
+               
+                       striter = TelephoneListTypeInfoPtr->find(TelephoneListIndex);
                 
-               if (striter->first == TelephoneListIndex){
+                       if (striter->first == TelephoneListIndex){
                
-                       strValue = striter->second;
+                               strValue = striter->second;
                
-               }               
+                       }       
+               
+               }       
                
                wxStringTokenizer TelephonePrefToken (strValue, wxT(","));
                
@@ -529,6 +535,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        std::map<int, wxString> *TelephoneListAltID,
        std::map<int, wxString> *TelephoneListPID,
        std::map<int, wxString> *TelephoneListType,
+       std::map<int, wxString> *TelephoneListTypeInfo,
        std::map<int, wxString> *TelephoneListTokens,
        std::map<int, int> *TelephoneListPref,
        wxListCtrl *TelephoneListCtrl,
@@ -539,6 +546,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        TelephoneListAltIDPtr = TelephoneListAltID;
        TelephoneListPIDPtr = TelephoneListPID;
        TelephoneListTypePtr = TelephoneListType;
+       TelephoneListTypeInfoPtr = TelephoneListTypeInfo;
        TelephoneListTokensPtr = TelephoneListTokens;
        TelephoneListPrefPtr = TelephoneListPref;
        TelephoneListCtrlPtr = TelephoneListCtrl;

diff --git a/source/contacteditor/frmContactEditorTelephone.h b/source/contacteditor/frmContactEditorTelephone.h
index 3db471e..4ec5d83 100644 (file)
--- a/source/contacteditor/frmContactEditorTelephone.h
+++ b/source/contacteditor/frmContactEditorTelephone.h
@@ -46,6 +46,7 @@ class frmContactEditorTelephone : public frmContactEditorTelephoneADT
                        std::map<int, wxString> *TelephoneListAltID,
                        std::map<int, wxString> *TelephoneListPID,
                        std::map<int, wxString> *TelephoneListType,
+                       std::map<int, wxString> *TelephoneListTypeInfo,
                        std::map<int, wxString> *TelephoneListTokens,
                        std::map<int, int> *TelephoneListPref,
                        wxListCtrl *TelephoneListCtrl,
@@ -59,6 +60,7 @@ class frmContactEditorTelephone : public frmContactEditorTelephoneADT
                std::map<int, wxString> *TelephoneListAltIDPtr;
                std::map<int, wxString> *TelephoneListPIDPtr;
                std::map<int, wxString> *TelephoneListTypePtr;
+               std::map<int, wxString> *TelephoneListTypeInfoPtr;
                std::map<int, wxString> *TelephoneListTokensPtr;
                std::map<int, int> *TelephoneListPrefPtr;
                wxListCtrl *TelephoneListCtrlPtr;