From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 20:18:15 +0000 (+0000)
Subject: Updates description of picture object with either Picture or Logo in frmContactEditor... 
X-Git-Tag: release-0.09~80
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=77cdd6167df1f549e03d074166c7544a483bc89e;p=xestiaab%2F.git

Updates description of picture object with either Picture or Logo in frmContactEditorPicture
---

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index d548c9a..9a72372 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,16 @@ 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()){
@@ -356,7 +374,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 +389,6 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
 	PictureListPrefPtr = PictureListPref;
 	PictureListCtrlPtr = PictureListCtrl;
 	PictureListIndex = PictureIndex;
+	PictureLogo = PictureLogoIn;
 	
 }
\ No newline at end of file