Set tab on opening of the Contact Editor to be the first tab.

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

diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index 34711b0..3d2cc28 100644 (file)
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -107,6 +107,8 @@ frmContactEditorADT( parent )
     //wxIcon contacticon;
     //contacticon.CopyFromBitmap(contacticonbmp);
     
+    nbkContact->SetSelection(0);
+    
 }
 
 void frmContactEditor::AddGeneralNickname( wxCommandEvent& event )
@@ -3113,22 +3115,46 @@ void frmContactEditor::LoadPicture( wxListEvent& event )
     std::string base64dec;
     
     std::map<int,std::string>::iterator initier;
+    std::map<int,wxString>::iterator pictypeiter;
     
     initier = PicturesList.find(intSelectedData);
+    pictypeiter = PicturesListPictureType.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;
+    
+    }
     
     PictureImage = (wxBitmap)photo;
     imgPicture->SetBitmap(PictureImage);
@@ -6046,6 +6072,10 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
             FMTimer.SetFilename(FilenameFinal);
             FMTimer.UpdateTimestamp();
             FMTimer.Start(10000, FALSE);
+           
+           wxCommandEvent reloadevent(RELOADCONTACTLIST);
+           reloadevent.SetString(wxSContactAccount);
+           wxPostEvent(this->GetParent(), reloadevent);
             
         }
         else {
@@ -7717,7 +7747,7 @@ void frmContactEditor::UpdateDisplayAs( wxCommandEvent &event ){
         
     }
     if (!txtTitle->GetValue().IsEmpty()){
-        cmbDisplayAs->Append(txtTitle->GetValue() + wxT(" ") + txtSurname->GetValue() + wxT(" ") + txtForename->GetValue());
+        cmbDisplayAs->Append(txtTitle->GetValue() + wxT(" ") + txtForename->GetValue() + wxT(" ") + txtSurname->GetValue());
     }
     
     cmbDisplayAs->SetValue(SetValue);