// frmContactEditor-Logo.cpp - frmContactEditor Logo tab subroutines.
//
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
//
// This file is part of Xestia Address Book.
//
std::string base64dec;
std::map<int,std::string>::iterator initier;
+ std::map<int,wxString>::iterator pictypeiter;
- initier = LogosList.find(intSelectedData);
+ initier = ContactEditorData.LogosList.find(intSelectedData);
+ pictypeiter = ContactEditorData.LogosListPictureType.find(intSelectedData);
base64dec = base64_decode(initier->second);
-
wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
wxImage photo;
//wxMemoryInputStream istream(base64dec, (size_t)base64dec.size());
- if (!photo.LoadFile(istream, wxBITMAP_TYPE_ANY)){
+ if (pictypeiter->second == wxT("image/jpeg")){
- return;
+ if (!photo.LoadFile(istream, wxBITMAP_TYPE_JPEG)){
- }
+ return;
+
+ }
+
+ } else if (pictypeiter->second == wxT("image/png")){
+
+ if (!photo.LoadFile(istream, wxBITMAP_TYPE_PNG)){
+
+ return;
+
+ }
+
+ } else if (pictypeiter->second == wxT("image/gif")){
+
+ if (!photo.LoadFile(istream, wxBITMAP_TYPE_GIF)){
+
+ return;
+
+ }
+
+ } else {
+ return;
+
+ }
LogoImage = (wxBitmap)photo;
imgLogo->SetBitmap(LogoImage);
frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
frameCELogo->SetEditorMode(FALSE);
- intResult = GetLastInt(&LogosList);
- frameCELogo->SetupPointers(&LogosList,
- &LogosListAltID,
- &LogosListPID,
- &LogosListType,
- &LogosListPicEncType,
- &LogosListPictureType,
- &LogosListTokens,
- &LogosListMediatype,
- &LogosListPref,
+ intResult = GetLastInt(&ContactEditorData.LogosList);
+ frameCELogo->SetupPointers(&ContactEditorData.LogosList,
+ &ContactEditorData.LogosListAltID,
+ &ContactEditorData.LogosListPID,
+ &ContactEditorData.LogosListType,
+ &ContactEditorData.LogosListPicEncType,
+ &ContactEditorData.LogosListPictureType,
+ &ContactEditorData.LogosListTokens,
+ &ContactEditorData.LogosListMediatype,
+ &ContactEditorData.LogosListPref,
lboLogos,
- (intValueSeek));
+ (intValueSeek),
+ FALSE);
frameCELogo->ShowModal();
delete frameCELogo;
frameCELogo = NULL;
}
frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
- frameCELogo->SetupPointers(&LogosList,
- &LogosListAltID,
- &LogosListPID,
- &LogosListType,
- &LogosListPicEncType,
- &LogosListPictureType,
- &LogosListTokens,
- &LogosListMediatype,
- &LogosListPref,
+ frameCELogo->SetupPointers(&ContactEditorData.LogosList,
+ &ContactEditorData.LogosListAltID,
+ &ContactEditorData.LogosListPID,
+ &ContactEditorData.LogosListType,
+ &ContactEditorData.LogosListPicEncType,
+ &ContactEditorData.LogosListPictureType,
+ &ContactEditorData.LogosListTokens,
+ &ContactEditorData.LogosListMediatype,
+ &ContactEditorData.LogosListPref,
lboLogos,
- intSelectedData);
+ intSelectedData,
+ FALSE);
frameCELogo->SetEditorMode(TRUE);
frameCELogo->ShowModal();
delete frameCELogo;
lboLogos->DeleteItem(longSelected);
DeleteMapData(intSelectedData,
- &LogosList, &LogosListAltID, &LogosListPID, &LogosListType,
- &LogosListPicEncType, &LogosListPictureType, &LogosListTokens,
- &LogosListMediatype, &LogosListPref);
+ &ContactEditorData.LogosList, &ContactEditorData.LogosListAltID, &ContactEditorData.LogosListPID, &ContactEditorData.LogosListType,
+ &ContactEditorData.LogosListPicEncType, &ContactEditorData.LogosListPictureType, &ContactEditorData.LogosListTokens,
+ &ContactEditorData.LogosListMediatype, &ContactEditorData.LogosListPref);
wxMemoryInputStream istream(misc_emptyimage_png, sizeof(misc_emptyimage_png));
wxImage misc_emptyimage_png(istream, wxBITMAP_TYPE_PNG);
std::map<int,std::string>::iterator initier;
std::map<int,wxString>::iterator logotypeiter;
- initier = LogosList.find(intSelectedData);
- logotypeiter = LogosListPictureType.find(intSelectedData);
+ initier = ContactEditorData.LogosList.find(intSelectedData);
+ logotypeiter = ContactEditorData.LogosListPictureType.find(intSelectedData);
if (logotypeiter->second == wxT("image/jpeg")){
std::string base64dec;
- initier = LogosList.find(intSelectedData);
+ initier = ContactEditorData.LogosList.find(intSelectedData);
base64dec = base64_decode(initier->second);
LogoFile.Write(base64dec.c_str(), (size_t)base64dec.size());