Added Save buttons in the pictures, logos and sounds tabs of the contact editor.

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index 0755c34..b6a4de7 100644 (file)
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -1771,7 +1771,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        tabGeneral->SetSizer( bSizer18 );\r
        tabGeneral->Layout();\r
        bSizer18->Fit( tabGeneral );\r
-       nbkContact->AddPage( tabGeneral, wxT("General"), false );\r
+       nbkContact->AddPage( tabGeneral, wxT("General"), true );\r
        tabHome = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );\r
        tabHome->SetScrollRate( 5, 5 );\r
        wxBoxSizer* bSizer181;\r
@@ -2959,20 +2959,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        wxBoxSizer* bSizer212;\r
        bSizer212 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       wxBoxSizer* bSizer213;\r
-       bSizer213 = new wxBoxSizer( wxHORIZONTAL );\r
+       wxFlexGridSizer* fgSizer46;\r
+       fgSizer46 = new wxFlexGridSizer( 2, 3, 0, 0 );\r
+       fgSizer46->SetFlexibleDirection( wxBOTH );\r
+       fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
        \r
        btnAddPicture = new wxButton( tabPictures, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnAddPicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnAddPicture, 0, wxALL, 5 );\r
        \r
        btnModifyPicture = new wxButton( tabPictures, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnModifyPicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnModifyPicture, 0, wxALL, 5 );\r
        \r
        btnDeletePicture = new wxButton( tabPictures, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnDeletePicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnDeletePicture, 0, wxALL, 5 );\r
        \r
+       btnSavePicture = new wxButton( tabPictures, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       fgSizer46->Add( btnSavePicture, 0, wxALL, 5 );\r
        \r
-       bSizer212->Add( bSizer213, 1, wxEXPAND, 5 );\r
+       \r
+       bSizer212->Add( fgSizer46, 1, wxEXPAND, 5 );\r
        \r
        \r
        bSizer211->Add( bSizer212, 0, wxEXPAND, 5 );\r
@@ -3002,20 +3007,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        wxBoxSizer* bSizer2121;\r
        bSizer2121 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       wxBoxSizer* bSizer2131;\r
-       bSizer2131 = new wxBoxSizer( wxHORIZONTAL );\r
+       wxFlexGridSizer* fgSizer47;\r
+       fgSizer47 = new wxFlexGridSizer( 2, 3, 0, 0 );\r
+       fgSizer47->SetFlexibleDirection( wxBOTH );\r
+       fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
        \r
        btnAddLogo = new wxButton( tabLogo, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnAddLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnAddLogo, 0, wxALL, 5 );\r
        \r
        btnModifyLogo = new wxButton( tabLogo, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnModifyLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnModifyLogo, 0, wxALL, 5 );\r
        \r
        btnDeleteLogo = new wxButton( tabLogo, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnDeleteLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnDeleteLogo, 0, wxALL, 5 );\r
+       \r
+       btnSaveLogo = new wxButton( tabLogo, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       fgSizer47->Add( btnSaveLogo, 0, wxALL, 5 );\r
        \r
        \r
-       bSizer2121->Add( bSizer2131, 1, wxEXPAND, 5 );\r
+       bSizer2121->Add( fgSizer47, 1, wxEXPAND, 5 );\r
        \r
        \r
        bSizer2111->Add( bSizer2121, 0, wxEXPAND, 5 );\r
@@ -3054,6 +3064,9 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        btnDeleteSound = new wxButton( tabSounds, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer472111->Add( btnDeleteSound, 0, wxALL, 5 );\r
        \r
+       btnSaveSound = new wxButton( tabSounds, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer472111->Add( btnSaveSound, 0, wxALL, 5 );\r
+       \r
        m_staticline1 = new wxStaticLine( tabSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );\r
        bSizer472111->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );\r
        \r
@@ -3086,7 +3099,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        tabSounds->SetSizer( szrAddresses1111 );\r
        tabSounds->Layout();\r
        szrAddresses1111->Fit( tabSounds );\r
-       nbkContact->AddPage( tabSounds, wxT("Sounds"), true );\r
+       nbkContact->AddPage( tabSounds, wxT("Sounds"), false );\r
        tabCalendaring = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );\r
        tabCalendaring->SetScrollRate( 5, 5 );\r
        wxBoxSizer* bSizer1821;\r
@@ -3543,13 +3556,16 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        btnAddPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );\r
        btnModifyPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );\r
        btnDeletePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );\r
+       btnSavePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );\r
        lboLogos->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );\r
        btnAddLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );\r
        btnModifyLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );\r
        btnDeleteLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );\r
+       btnSaveLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );\r
        btnAddSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );\r
        btnModifySound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );\r
        btnDeleteSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );\r
+       btnSaveSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );\r
        btnPlay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );\r
        btnStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );\r
        btnAddCalendarAddress->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );\r
@@ -3720,13 +3736,16 @@ frmContactEditorADT::~frmContactEditorADT()
        btnAddPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );\r
        btnModifyPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );\r
        btnDeletePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );\r
+       btnSavePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );\r
        lboLogos->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );\r
        btnAddLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );\r
        btnModifyLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );\r
        btnDeleteLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );\r
+       btnSaveLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );\r
        btnAddSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );\r
        btnModifySound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );\r
        btnDeleteSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );\r
+       btnSaveSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );\r
        btnPlay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );\r
        btnStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );\r
        btnAddCalendarAddress->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );\r

diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h
index 72fe433..aeecee4 100644 (file)
--- a/source/AppXestiaAddrBk.h
+++ b/source/AppXestiaAddrBk.h
@@ -640,17 +640,20 @@ class frmContactEditorADT : public wxFrame
                wxButton* btnAddPicture;\r
                wxButton* btnModifyPicture;\r
                wxButton* btnDeletePicture;\r
+               wxButton* btnSavePicture;\r
                wxScrolledWindow* tabLogo;\r
                wxStaticBitmap* imgLogo;\r
                wxListCtrl* lboLogos;\r
                wxButton* btnAddLogo;\r
                wxButton* btnModifyLogo;\r
                wxButton* btnDeleteLogo;\r
+               wxButton* btnSaveLogo;\r
                wxScrolledWindow* tabSounds;\r
                wxListCtrl* lboSounds;\r
                wxButton* btnAddSound;\r
                wxButton* btnModifySound;\r
                wxButton* btnDeleteSound;\r
+               wxButton* btnSaveSound;\r
                wxStaticLine* m_staticline1;\r
                wxBitmapButton* btnPlay;\r
                wxBitmapButton* btnStop;\r
@@ -825,13 +828,16 @@ class frmContactEditorADT : public wxFrame
                virtual void AddPicture( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void ModifyPicture( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void DeletePicture( wxCommandEvent& event ) { event.Skip(); }\r
+               virtual void SavePicture( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void LoadLogo( wxListEvent& event ) { event.Skip(); }\r
                virtual void AddLogo( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void ModifyLogo( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void DeleteLogo( wxCommandEvent& event ) { event.Skip(); }\r
+               virtual void SaveLogo( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void AddSound( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void ModifySound( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void DeleteSound( wxCommandEvent& event ) { event.Skip(); }\r
+               virtual void SaveSound( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void PlaySound( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void StopSound( wxCommandEvent& event ) { event.Skip(); }\r
                virtual void AddCalendarAddress( wxCommandEvent& event ) { event.Skip(); }\r
@@ -861,7 +867,7 @@ class frmContactEditorADT : public wxFrame
        \r
        public:\r
                \r
-               frmContactEditorADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Contact Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 769,517 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );\r
+               frmContactEditorADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Contact Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 765,517 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );\r
                \r
                ~frmContactEditorADT();\r
        \r