X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor.h;h=38f0de3dda5416dc305f901660653d5e47bb7513;hb=72333f7096a54d703f6d5e7a2489bf7a3a4126e1;hp=787d01a9a5551b5541117e73c1722660dba5a51d;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor.h b/source/contacteditor/frmContactEditor.h
index 787d01a..38f0de3 100644
--- a/source/contacteditor/frmContactEditor.h
+++ b/source/contacteditor/frmContactEditor.h
@@ -37,9 +37,11 @@ Subclass of frmContactEditorADT, which is generated by wxFormBuilder.
 #include "../common/etag.h"
 #include "../common/timers.h"
 
-#include "../frmActivityMgr.h"
+#include "../actmgr/frmActivityMgr.h"
 #include "../frmMain.h"
 
+#include "cdo/ContactDataObject.h"
+
 #define CE_NICKNAME wxT("Nickname")
 #define CE_ADDRESS wxT("Address")
 #define CE_EMAIL wxT("Email")
@@ -84,63 +86,6 @@ public:
    void OnMusicEnd() { }
    bool GetPlayingStatus(){ return FilePlaying; }   
 
-
-/*
-    void load(const sf::SoundBuffer& buffer)
-    {
-        // extract the audio samples from the sound buffer to our own container
-        m_samples.assign(buffer.getSamples(), buffer.getSamples() + buffer.getSampleCount());
-
-        // reset the current playing position 
-        m_currentSample = 0;
-
-        // initialize the base class
-        initialize(buffer.getChannelCount(), buffer.getSampleRate());
-    }
-    
-    bool GetPlayingStatus(){ return FilePlaying; }
-
-private:
-
-    virtual bool onGetData(Chunk& data)
-    {
-        // number of samples to stream every time the function is called;
-        // in a more robust implementation, it would rather be a fixed
-        // amount of time rather than an arbitrary number of samples
-        const int samplesToStream = 50000;
-
-        // set the pointer to the next audio samples to be played
-        data.samples = &m_samples[m_currentSample];
-
-        // have we reached the end of the sound?
-        if (m_currentSample + samplesToStream <= m_samples.size())
-        {
-            // end not reached: stream the samples and continue
-            data.sampleCount = samplesToStream;
-            m_currentSample += samplesToStream;
-	    FilePlaying = TRUE;
-            return true;
-	    }
-        else
-        {
-            // end of stream reached: stream the remaining samples and stop playback
-            data.sampleCount = m_samples.size() - m_currentSample;
-            m_currentSample = m_samples.size();
-	    FilePlaying = FALSE;
-	        return false;
-        }
-    }
-
-    virtual void onSeek(sf::Time TimeOffset)
-    {
-        // compute the corresponding sample index according to the sample rate and channel count
-        m_currentSample = static_cast<std::size_t>(TimeOffset.asSeconds() * getSampleRate() * getChannelCount());
-    }
-
-    std::vector<sf::Int16> m_samples;
-    std::size_t m_currentSample;
-    
-    */
     bool FilePlaying = TRUE;
 };
 
@@ -311,13 +256,16 @@ class frmContactEditor : public frmContactEditorADT
 		void ModifyPicture( wxCommandEvent& event );
 		void DeletePicture( wxCommandEvent& event );
 		void LoadPicture( wxListEvent& event );
+		void SavePicture( wxCommandEvent& event);
 		void AddLogo( wxCommandEvent& event );
 		void ModifyLogo( wxCommandEvent& event );
 		void DeleteLogo( wxCommandEvent& event );		
-		void LoadLogo( wxListEvent& event );		
+		void LoadLogo( wxListEvent& event );
+		void SaveLogo( wxCommandEvent& event);	
 		void AddSound( wxCommandEvent& event );
 		void ModifySound( wxCommandEvent& event );
 		void DeleteSound( wxCommandEvent& event );
+		void SaveSound( wxCommandEvent& event);	
 		void PlaySoundDetach();
 		void PlaySound( wxCommandEvent& event );
 		void StopSound( wxCommandEvent& event );
@@ -690,12 +638,23 @@ class frmContactEditor : public frmContactEditorADT
 		void LoadCalAdrURI(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *CalReqAdrCount);
 		void LoadCalFreeBusy(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *FreeBusyCount);
 		void LoadKey(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *KeyCount);
+		
+		void LoadGender(wxString *GenderComponent, wxString *GenderIdentity);
+		void LoadBirthday(wxString *BirthdayData, bool *BirthdayText);
+		void LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText);
+		void LoadKind(ContactKindType *KindType);
+		void LoadName(wxString *NameTitle, wxString *NameForename,
+			wxString *NameSurname, wxString *NameOtherNames, 
+			wxString *NameSuffix);
+		void LoadMember(std::map<int,wxString> *GroupsList);
 	
 		int intValueSeek = 1;
 		bool IsGroup = FALSE;
 	
 		/* Items on General Tab */
 	
+		ContactDataObject ContactEditorData;
+	
 		wxString NameTitle;
 		wxString NameForename;
 		wxString NameSurname;