X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Fcontacteditor%2FfrmContactEditorTelephone.cpp;h=974151cb6f8f98f308247e34b92db363758c0c26;hb=ea191b2c0728f4ed18b3665efe00403dcca926cb;hp=d3ac34530f4dfac1ccb491d56943b7193eb3f72e;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorTelephone.cpp b/source/contacteditor/frmContactEditorTelephone.cpp
index d3ac345..974151c 100644
--- a/source/contacteditor/frmContactEditorTelephone.cpp
+++ b/source/contacteditor/frmContactEditorTelephone.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorTelephone.cpp - frmContactEditorTelephone form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include "frmContactEditorTelephone.h"
#include "../common/textprocessing.h"
#include
@@ -157,7 +175,9 @@ void frmContactEditorTelephone::ProcessAction( wxCommandEvent& event )
}
- TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
+ TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
+
+ TelephoneListTypeInfoPtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
// Add Telephone Priority.
@@ -333,6 +353,9 @@ void frmContactEditorTelephone::ProcessAction( wxCommandEvent& event )
TelephoneListTypePtr->erase(TelephoneListIndex);
TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
+ TelephoneListTypeInfoPtr->erase(TelephoneListIndex);
+ TelephoneListTypeInfoPtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
+
// Edit the Telephone Priority.
TelephoneListPrefPtr->erase(TelephoneListIndex);
@@ -421,13 +444,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(","));
@@ -493,7 +522,8 @@ void frmContactEditorTelephone::SetEditorMode(bool EditMode, SectionType SectTyp
intiter = TelephoneListPrefPtr->find(TelephoneListIndex);
- if (intiter->first == TelephoneListIndex && intiter->second > 0){
+ if (intiter->first == TelephoneListIndex && intiter->second > 0 &&
+ intiter != TelephoneListPrefPtr->end()){
sliPriority->SetValue(intiter->second);
sliPriority->Enable();
@@ -511,6 +541,7 @@ void frmContactEditorTelephone::SetupPointers(std::map *Telephone
std::map *TelephoneListAltID,
std::map *TelephoneListPID,
std::map *TelephoneListType,
+ std::map *TelephoneListTypeInfo,
std::map *TelephoneListTokens,
std::map *TelephoneListPref,
wxListCtrl *TelephoneListCtrl,
@@ -521,6 +552,7 @@ void frmContactEditorTelephone::SetupPointers(std::map *Telephone
TelephoneListAltIDPtr = TelephoneListAltID;
TelephoneListPIDPtr = TelephoneListPID;
TelephoneListTypePtr = TelephoneListType;
+ TelephoneListTypeInfoPtr = TelephoneListTypeInfo;
TelephoneListTokensPtr = TelephoneListTokens;
TelephoneListPrefPtr = TelephoneListPref;
TelephoneListCtrlPtr = TelephoneListCtrl;