X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.h;h=e00379b8d45642606976338f410e70198f59f3d9;hb=0c16b6458c0fdc03b94288c17d7a685b95f122fc;hp=5bdf7ed84170efd7ea61482200ffb1330cf2db02;hpb=ed4644cc1c246d7c7ccc20f09cc7d587f6654668;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDay.h b/source/widgets/XCCalendarDay.h
index 5bdf7ed..e00379b 100644
--- a/source/widgets/XCCalendarDay.h
+++ b/source/widgets/XCCalendarDay.h
@@ -1,14 +1,14 @@
 // XCCalendarDay.h - Xestia Calendar XCCalendarDay widget class header file.
 //
-// (c) 2016 Xestia Software Development.
+// (c) 2016-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
 // Free Software Foundation, version 3 of the license.
 //
-// Xestia Address Book is distributed in the hope that it will be useful,
+// Xestia Calendar is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
@@ -23,6 +23,7 @@
 #include <wx/dcbuffer.h>
 #include <wx/mstream.h>
 #include <vector>
+#include <memory>
 
 #include "XCCalendarDayEntry.h"
 #include "XCCalendarMonthView.h"
@@ -30,41 +31,56 @@
 #include "../bitmaps.h"
 
 #include "../libraries/CalendarDataStorage/CalendarDataStorage.h"
+
 class XCCalendarMonthView;
 
 class XCCalendarDay: public wxPanel
 {
 	private:
-		XCCalendarMonthView *MonthViewPointer = nullptr;
-		wxFlexGridSizer *WindowSizer = new wxFlexGridSizer(2, 1, 0, 0);
-		wxBoxSizer *TopSectionSizer = new wxBoxSizer(wxHORIZONTAL);
-		wxBoxSizer *MainSectionSizer = new wxBoxSizer(wxVERTICAL);
-		wxBoxSizer *EventListFrameSizer = new wxBoxSizer(wxVERTICAL);
-		wxStaticBitmap *HighPriorityIcon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(32,32), 0);
-		wxStaticBitmap *AlertIcon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(32,32), 0);
-		wxBitmap AlertIconBitmap;
-		wxBitmap PriorityIconBitmap;
-		wxStaticText *NumberText = nullptr;
-		wxScrolledWindow *EventListFrame = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
-		int CalendarEntrySeekNumber = 0;
+		XCCalendarMonthView *monthViewPointer = nullptr;
+		wxPanel *topPanel = nullptr;
+		wxPanel *mainPanel = nullptr;
+		wxBoxSizer *windowSizer = new wxBoxSizer(wxVERTICAL);
+		wxBoxSizer *topSectionSizer = new wxBoxSizer(wxHORIZONTAL);
+		wxBoxSizer *mainSectionSizer = new wxBoxSizer(wxVERTICAL);
+		wxBoxSizer *eventListFrameSizer = new wxBoxSizer(wxVERTICAL);
+		wxStaticBitmap *highPriorityIcon = nullptr;
+		wxStaticBitmap *alertIcon = nullptr;
+		CalendarDataStorage *dataStorage = nullptr;
+		wxBitmap alertIconBitmap;
+		wxBitmap priorityIconBitmap;
+		wxStaticText *numberText = nullptr;
+		wxScrolledWindow *eventListFrame = nullptr;
+		int calendarEntrySeekNumber = 0;
 		int calendarDay = 0;
 		int calendarMonth = 0;
 		int calendarYear = 0;
-		bool IsInMonth = false;
+		bool isInMonth = false;
 	
-		vector<XCCalendarDayEntry*> CalendarEntryList;
+		vector<XCCalendarDayEntry*> calendarEntryList;
 	
-		void Repaint();
+	protected:
+		void HideAccountEntries(wxCommandEvent &accountData);
+		void ShowAccountEntries(wxCommandEvent &accountData);
+		void HideCalendarEntries(wxCommandEvent &calendarData);
+		void ShowCalendarEntries(wxCommandEvent &calendarData);
+		void DeleteCalendarEntries(wxCommandEvent &calendarData);
+		void DeleteCalendarEntry(wxCommandEvent &eventData);
+		void AddCalendarEntry(wxCommandEvent &eventData);
+		void UpdateCalendarEntry(wxCommandEvent &eventData);
+		void UpdateCalendarColour(wxCommandEvent &colourData);
 	
 	public:
 		XCCalendarDay(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size);
 		~XCCalendarDay();
-		void PaintFrameEvent(wxPaintEvent &PaintEvent);
-		void ResizeFrameEvent(wxSizeEvent &SizeEvent);
-		void DeselectOthersEvent(wxCommandEvent &DeselectEvent);
-		void DeselectAllEvent(wxCommandEvent &DeselectEvent);
+		void ResizeFrameEvent(wxSizeEvent &sizeEvent);
+		void DeselectOthersEvent(wxCommandEvent &deselectEvent);
+		void DeselectAllEvent(wxCommandEvent &deselectEvent);
 		void UpdateTopIcons();
-		void SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer, CalendarDataStorage *dataStorage);
+		void SetupControl(int setupDay, int setupMonth, int setupYear, bool setupIsInMonth, XCCalendarMonthView *monthViewPointer, CalendarDataStorage *dataStorage, std::vector<int> *hideAccounts, std::vector<int> *hideCalendars);
+		int GetCalendarDay();
+		int GetCalendarMonth();
+		int GetCalendarYear();
 	
 	DECLARE_EVENT_TABLE()