frmContactEditor: Fix issue with intValueSeek not being incremented properly

[xestiaab/.git] / source / contacteditor / frmContactEditor-Logo.cpp

diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp
index 5f0eba8..e4f7c96 100644 (file)
--- a/source/contacteditor/frmContactEditor-Logo.cpp
+++ b/source/contacteditor/frmContactEditor-Logo.cpp
@@ -1,6 +1,6 @@
 // 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.
 //
@@ -23,124 +23,163 @@
 void frmContactEditor::LoadLogo( wxListEvent& event )
 {
     
-    long longSelected = -1;
-    int intSelectedData = 0;
-    
-    if (!GetSelectedItem(lboLogos,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    std::string base64dec;
+       // Load the logo.
+       
+       long longSelected = -1;
+       int intSelectedData = 0;
     
-    std::map<int,std::string>::iterator initier;
+       if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos,
+               &longSelected,
+                &intSelectedData)){
+               return;
+       }
     
-    initier = LogosList.find(intSelectedData);
+       std::string base64dec;
     
-    base64dec = base64_decode(initier->second);
+       std::map<int,std::string>::iterator initier;
+       std::map<int,wxString>::iterator pictypeiter;
     
+       initier = ContactEditorData.LogosList.find(intSelectedData);
+       pictypeiter = ContactEditorData.LogosListPictureType.find(intSelectedData);
     
-    wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
-    wxImage photo;
-    //wxMemoryInputStream istream(base64dec, (size_t)base64dec.size());
+       base64dec = base64_decode(initier->second);
     
-    if (!photo.LoadFile(istream, wxBITMAP_TYPE_ANY)){
+       wxMemoryInputStream istream(base64dec.c_str(), (size_t)base64dec.size());
+       wxImage photo;
+
+       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);
+       }
+    
+       LogoImage = (wxBitmap)photo;
+       imgLogo->SetBitmap(LogoImage);
     
 }
 
 void frmContactEditor::AddLogo( wxCommandEvent& event )
 {
-    int intResult = 0;
-    
-    frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
-    frameCELogo->SetEditorMode(FALSE);
-    intResult = GetLastInt(&LogosList);
-    frameCELogo->SetupPointers(&LogosList,
-                               &LogosListAltID,
-                               &LogosListPID,
-                               &LogosListType,
-                               &LogosListPicEncType,
-                               &LogosListPictureType,
-                               &LogosListTokens,
-                               &LogosListMediatype,
-                               &LogosListPref,
-                               lboLogos,
-                               (intValueSeek));
-    frameCELogo->ShowModal();
-    delete frameCELogo;
-    frameCELogo = NULL;
+       
+       // Bring up the window to add a logo.
+           
+       frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
+       frameCELogo->SetEditorMode(FALSE);
+       frameCELogo->SetupPointers(&ContactEditorData.LogosList,
+               &ContactEditorData.LogosListAltID,
+               &ContactEditorData.LogosListPID,
+               &ContactEditorData.LogosListType,
+               &ContactEditorData.LogosListPicEncType,
+                &ContactEditorData.LogosListPictureType,
+               &ContactEditorData.LogosListTokens,
+               &ContactEditorData.LogosListMediatype,
+               &ContactEditorData.LogosListPref,
+               lboLogos,
+               (intValueSeek),
+               FALSE);
+       frameCELogo->ShowModal();
+       delete frameCELogo;
+       frameCELogo = NULL;
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyLogo( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+       
+       // Bring up the window to modify a logo.
+       
+       long longSelected = -1;
+       int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboLogos,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
-    
-    frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
-    frameCELogo->SetupPointers(&LogosList,
-                               &LogosListAltID,
-                               &LogosListPID,
-                               &LogosListType,
-                               &LogosListPicEncType,
-                               &LogosListPictureType,
-                               &LogosListTokens,
-                               &LogosListMediatype,
-                               &LogosListPref,
-                               lboLogos,
-                               intSelectedData);
-    frameCELogo->SetEditorMode(TRUE);
-    frameCELogo->ShowModal();
-    delete frameCELogo;
-    frameCELogo = NULL;
+       if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos,
+               &longSelected,
+               &intSelectedData)){
+               return;
+       }
+    
+       frmContactEditorPicture *frameCELogo = new frmContactEditorPicture ( this );
+       frameCELogo->SetupPointers(&ContactEditorData.LogosList,
+               &ContactEditorData.LogosListAltID,
+                &ContactEditorData.LogosListPID,
+                &ContactEditorData.LogosListType,
+                &ContactEditorData.LogosListPicEncType,
+                &ContactEditorData.LogosListPictureType,
+                &ContactEditorData.LogosListTokens,
+                &ContactEditorData.LogosListMediatype,
+                &ContactEditorData.LogosListPref,
+                lboLogos,
+                intSelectedData,
+               FALSE);
+       frameCELogo->SetEditorMode(TRUE);
+       frameCELogo->ShowModal();
+       delete frameCELogo;
+       frameCELogo = NULL;
+       
 }
 
 void frmContactEditor::DeleteLogo( wxCommandEvent& event )
 {
-    long longSelected = -1;
-    int intSelectedData = 0;
+       
+       // Bring up a window to delete a logo.
+       
+       long longSelected = -1;
+       int intSelectedData = 0;
     
-    if (!GetSelectedItem(lboLogos,
-                         &longSelected,
-                         &intSelectedData)){
-        return;
-    }
+       if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos,
+               &longSelected,
+                &intSelectedData)){
+               return;
+       }
     
-    lboLogos->DeleteItem(longSelected);
+       lboLogos->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData,
-                  &LogosList, &LogosListAltID, &LogosListPID, &LogosListType,
-                  &LogosListPicEncType, &LogosListPictureType, &LogosListTokens,
-                  &LogosListMediatype, &LogosListPref);
+       DeleteMapData(intSelectedData,
+               &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);
-    LogoImage = (wxBitmap)misc_emptyimage_png;
+       wxMemoryInputStream istream(misc_emptyimage_png, sizeof(misc_emptyimage_png));
+       wxImage misc_emptyimage_png(istream, wxBITMAP_TYPE_PNG);
+       LogoImage = (wxBitmap)misc_emptyimage_png;
     
-    imgLogo->SetBitmap(LogoImage);
+       imgLogo->SetBitmap(LogoImage);
+       
 }
 
 void frmContactEditor::SaveLogo( wxCommandEvent &event )
 {
        
+       // Save the logo to a file.
+       
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboLogos,
+       if (lboLogos->GetItemCount() == 0 || !GetSelectedItem(lboLogos,
                          &longSelected,
                          &intSelectedData)){
                
@@ -155,8 +194,8 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event )
        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")){
     
@@ -196,7 +235,7 @@ void frmContactEditor::SaveLogo( wxCommandEvent &event )
        
                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());