X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorPicture.cpp;h=d6ffcc3e497870625b9cd86535f7fda910ad4cc4;hb=bdb1cb146a16ae7f8e15aa9c9f084705a5249973;hp=d548c9adb7ab54031d4e8db1eecc208b0b9732d8;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index d548c9a..d6ffcc3 100644
--- a/source/contacteditor/frmContactEditorPicture.cpp
+++ b/source/contacteditor/frmContactEditorPicture.cpp
@@ -29,7 +29,6 @@
 #include "../common/base64.h"
 #include "../common/mime.h"
 
-
 frmContactEditorPicture::frmContactEditorPicture( wxWindow* parent )
 :
 frmContactEditorPictureADT( parent )
@@ -186,7 +185,17 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 		
 		coldata.SetId(PictureListIndex);
 		coldata.SetData(PictureListIndex);
-		coldata.SetText(_("Picture"));
+		
+		if (PictureLogo == TRUE){
+		
+			coldata.SetText(_("Picture"));
+		
+		} else {
+
+			coldata.SetText(_("Logo"));
+		
+		}
+		
 		ListCtrlIndex =	PictureListCtrlPtr->InsertItem(coldata);
 		
 		if (strValue == _("Home")) {
@@ -258,7 +267,15 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 			return;
 		}		
 		
-		PictureListCtrlPtr->SetItem(longSelected, 0, wxT("Picture"));
+		if (PictureLogo == TRUE){		
+			PictureListCtrlPtr->SetItem(longSelected, 0, _("Picture"));
+			
+		} else {
+		
+			PictureListCtrlPtr->SetItem(longSelected, 0, _("Logo"));
+		
+		}
+		
 		PictureListCtrlPtr->SetItem(longSelected, 1, strValue);
 		
 		if (chkUsePref->IsChecked()){
@@ -308,7 +325,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
 		
 		striter = PictureListTypePtr->find(PictureListIndex);
 		 
-		if (striter->first == PictureListIndex){
+		if (striter->first == PictureListIndex &&
+			striter != PictureListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -334,7 +352,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
 		
 		intiter = PictureListPrefPtr->find(PictureListIndex);
 		
-		if (intiter->first == PictureListIndex && intiter->second > 0){
+		if (intiter->first == PictureListIndex && intiter->second > 0 &&
+			intiter != PictureListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -356,7 +375,8 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
 	std::map<int, wxString> *PictureListMediatype,	
 	std::map<int, int> *PictureListPref,
 	wxListCtrl *PictureListCtrl,
-	int PictureIndex )
+	int PictureIndex,
+	bool PictureLogoIn )
 {
 
 	PictureListPtr = PictureList;
@@ -370,5 +390,6 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
 	PictureListPrefPtr = PictureListPref;
 	PictureListCtrlPtr = PictureListCtrl;
 	PictureListIndex = PictureIndex;
+	PictureLogo = PictureLogoIn;
 	
 }
\ No newline at end of file