X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDayEntry.h;h=6daf755e51e01b00dbaa55ad1db5016c477a6b2d;hb=401fd2eee6047f72fdaf811bbcc3924409a4fb9d;hp=4a74af721e18439a416135b1590e3b06e6b5859a;hpb=baa27c175ee6111fd4b88a3c53614a9b6be3541e;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarDayEntry.h b/source/widgets/XCCalendarDayEntry.h
index 4a74af7..6daf755 100644
--- a/source/widgets/XCCalendarDayEntry.h
+++ b/source/widgets/XCCalendarDayEntry.h
@@ -1,14 +1,14 @@
 // XCCalendarDayEntry.h - Xestia Calendar XCCalendarDayEntry widget class.
 //
-// (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.
@@ -27,6 +27,8 @@
 #include "../common/events.h"
 #include "../bitmaps.h"
 
+#include "structs.h"
+
 enum XCCalendarDayEntryMode {
 	XCCALENDARDAYENTRY_NORMAL,
 	XCCALENDARDAYENTRY_SMALL,
@@ -36,35 +38,35 @@ class XCCalendarDayEntry: public wxPanel
 {
 	
 	private:
-		wxWindow *DayPanel = nullptr;
-		string EventTextData = "";
-		wxStaticText *EventTime = nullptr;
-		wxStaticText *EventText = nullptr;
-		wxStaticBitmap *HighPriorityIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(14,7), wxDefaultSize, 0 );
-		wxStaticBitmap *AlarmIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(30,7), wxDefaultSize, 0 );
+		wxWindow *dayPanel = nullptr;
+		string eventTextData = "";
+		wxStaticText *eventTime = nullptr;
+		wxStaticText *eventText = nullptr;
+		wxStaticBitmap *highPriorityIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(14,7), wxDefaultSize, 0 );
+		wxStaticBitmap *alarmIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxPoint(30,7), wxDefaultSize, 0 );
 		wxSizerItem *afterSpacer = nullptr;
-		wxBitmap AlarmIconBitmap;
-		wxBitmap PriorityIconBitmap;
+		wxBitmap alarmIconBitmap;
+		wxBitmap priorityIconBitmap;
 	
-		Colour EntryColour;
+		Colour entryColour;
 	
 		int timeHour = 0;
 		int timeMinute = 0;
 		int timeSecond = 0;
 	
-		bool HasAlarm = false;
-		bool HasHighPriority = false;
-		int PositionMode = 0;
+		bool hasAlarm = false;
+		bool hasHighPriority = false;
+		int positionMode = 0;
 	
-		int entryID = 0;
+		int eventID = 0;
 		int accountID = 0;
 		int calendarID =0;
 		bool showAccount = true;
 		bool showCalendar = true;
 	
-		const int FirstPosition = 14;
-		const int SecondPosition = 30;
-		const int ThirdPosition = 49;
+		const int firstPosition = 14;
+		const int secondPosition = 30;
+		const int thirdPosition = 49;
 	
 		void Repaint();
 		void RepaintSelected();
@@ -74,24 +76,27 @@ class XCCalendarDayEntry: public wxPanel
 		string BuildEventTime(int timeHour, int timeMinute);
 	
 	protected:
+		void LeftClick(wxMouseEvent &MouseEvent);
+		void RightClick(wxMouseEvent &MouseEvent);
 	
 	public:
 		XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id);
 		~XCCalendarDayEntry();
 	
-		void PaintFrameEvent(wxPaintEvent &PaintEvent);
-		void ResizeFrameEvent(wxSizeEvent &SizeEvent);
-		void LeftClick(wxMouseEvent &MouseEvent);
-		void Deselect(wxCommandEvent &DeselectEvent);
+		void PaintFrameEvent(wxPaintEvent &paintEvent);
+		void ResizeFrameEvent(wxSizeEvent &sizeEvent);
+		void Deselect(wxCommandEvent &deselectEvent);
 	
 		void SetTime(int timeHour, int timeMinute, int timeSecond);
-		void SetColour(Colour *ColourIn);
-		void SetDisplayAlarm(bool DisplayValue);
-		void SetDisplayHighPriority(bool DisplayValue);
-		void SetEntryIDs(int accountID, int calendarID, int entryID);
+		void SetColour(Colour *colourIn);
+		void SetDisplayAlarm(bool displayValue);
+		void SetDisplayHighPriority(bool displayValue);
+		void SetEntryIDs(int accountID, int calendarID, int eventID);
 		void SetAfterSpacer(wxSizerItem *afterSpacer);
+		void SetEventName(std::string eventName);
 		int GetID();
 		int GetCalendarID();
+		int GetEventID();
 		int GetAccountID();
 		wxSizerItem* GetAfterSpacer();
 		bool GetDisplayAlarm();