X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDay.cpp;h=5d484726b36ef371dccbebfe735d7b1a0e549d16;hb=1fe6e43892e5c572949a293a9e19704b5debadad;hp=bde350409c26ea3a3e10a1f02dc22f80e9c9f7d3;hpb=baa27c175ee6111fd4b88a3c53614a9b6be3541e;p=xestiacalendar%2F.git diff --git a/source/widgets/XCCalendarDay.cpp b/source/widgets/XCCalendarDay.cpp index bde3504..5d48472 100644 --- a/source/widgets/XCCalendarDay.cpp +++ b/source/widgets/XCCalendarDay.cpp @@ -41,43 +41,43 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo wxImage icons_priority_png(priorityicon, wxBITMAP_TYPE_PNG); wxBitmap imgPriorityIcon(icons_priority_png, -1); - AlertIcon->SetBitmap(imgAlertIcon); - HighPriorityIcon->SetBitmap(imgPriorityIcon); + alertIcon->SetBitmap(imgAlertIcon); + highPriorityIcon->SetBitmap(imgPriorityIcon); - WindowSizer->AddGrowableCol(0); - WindowSizer->AddGrowableRow(1); - WindowSizer->SetFlexibleDirection( wxBOTH ); - WindowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + windowSizer->AddGrowableCol(0); + windowSizer->AddGrowableRow(1); + windowSizer->SetFlexibleDirection( wxBOTH ); + windowSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - NumberText = new wxStaticText(this, wxID_ANY, wxT("09"), wxDefaultPosition, wxDefaultSize, 0); - NumberText->SetFont(wxFont(24, 70, 90, 92, false, wxEmptyString)); + numberText = new wxStaticText(this, wxID_ANY, wxT("09"), wxDefaultPosition, wxDefaultSize, 0); + numberText->SetFont(wxFont(24, 70, 90, 92, false, wxEmptyString)); - TopSectionSizer->Add(HighPriorityIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); - TopSectionSizer->Add(AlertIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); - TopSectionSizer->Add(0, 0, 1, wxEXPAND, 5); - TopSectionSizer->Add(NumberText, 0, wxALL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5); + topSectionSizer->Add(highPriorityIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); + topSectionSizer->Add(alertIcon, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0); + topSectionSizer->Add(0, 0, 1, wxEXPAND, 5); + topSectionSizer->Add(numberText, 0, wxALL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5); // Setup the scrollable section. - Colour EventColour; - EventColour.red = 40; EventColour.green = 80; EventColour.blue = 80; + Colour eventColour; + eventColour.red = 40; eventColour.green = 80; eventColour.blue = 80; - EventListFrame->SetSizer(EventListFrameSizer); + eventListFrame->SetSizer(eventListFrameSizer); - EventListFrame->SetScrollRate(0,1); + eventListFrame->SetScrollRate(0,1); //EventListFrameSizer->FitInside(EventListFrame); - EventListFrameSizer->Fit(EventListFrame); - EventListFrameSizer->Layout(); - WindowSizer->Fit(this); + eventListFrameSizer->Fit(eventListFrame); + eventListFrameSizer->Layout(); + windowSizer->Fit(this); // Setup the scroll window. - MainSectionSizer->Add(EventListFrame, 1, wxGROW | wxALL, 10); + mainSectionSizer->Add(eventListFrame, 1, wxGROW | wxALL, 10); - WindowSizer->Add(TopSectionSizer, 1, wxEXPAND, 5); - WindowSizer->Add(MainSectionSizer, 1, wxEXPAND, 5); + windowSizer->Add(topSectionSizer, 1, wxEXPAND, 5); + windowSizer->Add(mainSectionSizer, 1, wxEXPAND, 5); - this->SetSizer(WindowSizer); + this->SetSizer(windowSizer); this->SetSize(size); this->Layout(); this->SetBackgroundStyle(wxBG_STYLE_PAINT); @@ -91,21 +91,26 @@ XCCalendarDay::XCCalendarDay(wxWindow *parent, const wxString& title, const wxPo Connect(ID_SHOWENTRIES, XCCALENDARDAY_SHOWACCOUNTENTRIES, wxCommandEventHandler(XCCalendarDay::ShowAccountEntries)); Connect(ID_HIDECALENDARENTRIES, XCCALENDARDAY_HIDECALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::HideCalendarEntries)); Connect(ID_SHOWCALENDARENTRIES, XCCALENDARDAY_SHOWCALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::ShowCalendarEntries)); - + Connect(ID_DELETECALENDARENTRIES, XCCALENDARDAY_DELETECALENDARENTRIES, wxCommandEventHandler(XCCalendarDay::DeleteCalendarEntries)); + Connect(ID_DELETEENTRY, XCCALENDARDAY_DELETEENTRY, wxCommandEventHandler(XCCalendarDay::DeleteCalendarEntry)); + Connect(ID_ADDENTRY, XCCALENDARDAY_ADDENTRY, wxCommandEventHandler(XCCalendarDay::AddCalendarEntry)); + Connect(ID_UPDATEENTRY, XCCALENDARDAY_UPDATEENTRY, wxCommandEventHandler(XCCalendarDay::UpdateCalendarEntry)); + Connect(ID_UPDATECOLOUR, XCCALENDARDAY_UPDATECALENDARCOLOUR, wxCommandEventHandler(XCCalendarDay::UpdateCalendarColour)); + } XCCalendarDay::~XCCalendarDay(){ // Destory the controls from the widget. - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - delete((*CalendarEntryIter)); + delete((*calendarEntryIter)); } - CalendarEntryList.clear(); + calendarEntryList.clear(); this->Refresh(); @@ -114,35 +119,35 @@ XCCalendarDay::~XCCalendarDay(){ void XCCalendarDay::Repaint(){ wxPaintDC dc(this); - wxPaintDC EventListFrameDC(EventListFrame); + wxPaintDC eventListFrameDC(eventListFrame); // Get the wxSizerItem for the top date and the entries part. - wxSizerItem *TopSectionSizerItem = WindowSizer->GetItem((size_t)0); - wxSizerItem *MainSectionSizerItem = WindowSizer->GetItem((size_t)1); - wxRect TopSizer = wxRect(WindowSizer->GetPosition(), WindowSizer->GetSize()); + wxSizerItem *topSectionSizerItem = windowSizer->GetItem((size_t)0); + wxSizerItem *mainSectionSizerItem = windowSizer->GetItem((size_t)1); + wxRect topSizer = wxRect(windowSizer->GetPosition(), windowSizer->GetSize()); - if (IsInMonth == true){ + if (isInMonth == true){ dc.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); dc.SetBrush(wxBrush(wxColor(255,255,255))); - dc.DrawRectangle(TopSectionSizerItem->GetRect()); + dc.DrawRectangle(topSectionSizerItem->GetRect()); dc.SetBrush(wxBrush(wxColor(225,225,225))); - dc.DrawRectangle(MainSectionSizerItem->GetRect()); - EventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); - EventListFrameDC.SetBrush(wxBrush(wxColor(225,225,225))); - EventListFrameDC.DrawRectangle(EventListFrame->GetClientRect()); + dc.DrawRectangle(mainSectionSizerItem->GetRect()); + eventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); + eventListFrameDC.SetBrush(wxBrush(wxColor(225,225,225))); + eventListFrameDC.DrawRectangle(eventListFrame->GetClientRect()); } else { dc.SetPen(wxPen(wxColor(185,185,185), 0, wxPENSTYLE_TRANSPARENT)); dc.SetBrush(wxBrush(wxColor(185,185,185))); - dc.DrawRectangle(TopSectionSizerItem->GetRect()); + dc.DrawRectangle(topSectionSizerItem->GetRect()); dc.SetBrush(wxBrush(wxColor(155,155,155))); - dc.DrawRectangle(MainSectionSizerItem->GetRect()); - EventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); - EventListFrameDC.SetBrush(wxBrush(wxColor(155,155,155))); - EventListFrameDC.DrawRectangle(EventListFrame->GetClientRect()); + dc.DrawRectangle(mainSectionSizerItem->GetRect()); + eventListFrameDC.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); + eventListFrameDC.SetBrush(wxBrush(wxColor(155,155,155))); + eventListFrameDC.DrawRectangle(eventListFrame->GetClientRect()); } @@ -156,25 +161,25 @@ void XCCalendarDay::Repaint(){ void XCCalendarDay::UpdateTopIcons(){ - bool AlarmFound = false; - bool HighPriorityFound = false; + bool alarmFound = false; + bool highPriorityFound = false; - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); entryIter++){ - if ((*EntryIter)->GetDisplayAlarm() == true){ + if ((*entryIter)->GetDisplayAlarm() == true){ - AlarmFound = true; + alarmFound = true; } - if ((*EntryIter)->GetDisplayHighPriority() == true){ + if ((*entryIter)->GetDisplayHighPriority() == true){ - HighPriorityFound = true; + highPriorityFound = true; } - if (AlarmFound == true && HighPriorityFound == true){ + if (alarmFound == true && highPriorityFound == true){ break; @@ -182,19 +187,19 @@ void XCCalendarDay::UpdateTopIcons(){ } - AlertIcon->Show(AlarmFound); - HighPriorityIcon->Show(HighPriorityFound); + alertIcon->Show(alarmFound); + highPriorityIcon->Show(highPriorityFound); } -void XCCalendarDay::PaintFrameEvent(wxPaintEvent &PaintEvent) +void XCCalendarDay::PaintFrameEvent(wxPaintEvent &paintEvent) { Repaint(); } -void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &SizeEvent) +void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &sizeEvent) { // TODO: Check if window size is less than 120 pixels and if it is, @@ -206,20 +211,20 @@ void XCCalendarDay::ResizeFrameEvent(wxSizeEvent &SizeEvent) } -void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &DeselectEvent) +void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &deselectEvent) { - int SelectedEntryID = DeselectEvent.GetInt(); + int selectedEntryID = deselectEvent.GetInt(); - wxCommandEvent DeselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); - DeselectEntryEvent.SetId(ID_ENTRYDESELECT); + wxCommandEvent deselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); + deselectEntryEvent.SetId(ID_ENTRYDESELECT); - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); entryIter++){ - if ((*EntryIter)->GetID() != SelectedEntryID){ + if ((*entryIter)->GetID() != selectedEntryID){ - wxPostEvent((*EntryIter), DeselectEntryEvent); + wxPostEvent((*entryIter), deselectEntryEvent); } @@ -227,61 +232,63 @@ void XCCalendarDay::DeselectOthersEvent(wxCommandEvent &DeselectEvent) // Send event notification to deselect the other calendar entries. - if (this->MonthViewPointer != nullptr){ + if (this->monthViewPointer != nullptr){ - wxCommandEvent DeselectEvent(XCCALENDARMONTH_DESELECTOTHERENTRIES); - DeselectEvent.SetClientData(this); - DeselectEvent.SetId(ID_MONTHVIEWCLEARSELECTION); - wxPostEvent(this->MonthViewPointer, DeselectEvent); + wxCommandEvent deselectEvent(XCCALENDARMONTH_DESELECTOTHERENTRIES); + deselectEvent.SetClientData(this); + deselectEvent.SetId(ID_MONTHVIEWCLEARSELECTION); + wxPostEvent(this->monthViewPointer, deselectEvent); } } -void XCCalendarDay::DeselectAllEvent(wxCommandEvent &DeselectEvent) +void XCCalendarDay::DeselectAllEvent(wxCommandEvent &deselectEvent) { - int SelectedEntryID = DeselectEvent.GetInt(); + int selectedEntryID = deselectEvent.GetInt(); - wxCommandEvent DeselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); - DeselectEntryEvent.SetId(ID_ENTRYDESELECT); + wxCommandEvent deselectEntryEvent(XCCALENDARDAYENTRY_DESELECT); + deselectEntryEvent.SetId(ID_ENTRYDESELECT); - for (vector::iterator EntryIter = CalendarEntryList.begin(); - EntryIter != CalendarEntryList.end(); EntryIter++){ + for (vector::iterator entryIter = calendarEntryList.begin(); + entryIter != calendarEntryList.end(); entryIter++){ - wxPostEvent((*EntryIter), DeselectEntryEvent); + wxPostEvent((*entryIter), deselectEntryEvent); } } -void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bool SetupIsInMonth, XCCalendarMonthView *MonthViewPointer, CalendarDataStorage *dataStorage, vector *hideAccounts, vector *hideCalendars) +void XCCalendarDay::SetupControl(int setupDay, int setupMonth, int setupYear, bool setupIsInMonth, XCCalendarMonthView *monthViewPointer, CalendarDataStorage *dataStorage, vector *hideAccounts, vector *hideCalendars) { + this->dataStorage = dataStorage; + // Set the day - NumberText->SetLabel(wxString::Format("%02i", SetupDay)); - calendarDay = SetupDay; + numberText->SetLabel(wxString::Format("%02i", setupDay)); + calendarDay = setupDay; // Set the month - calendarMonth = SetupMonth; + calendarMonth = setupMonth; // Set the year. - calendarYear = SetupYear; + calendarYear = setupYear; // Setup the Is In Month value. - IsInMonth = SetupIsInMonth; + isInMonth = setupIsInMonth; // Setup the month view pointer. - this->MonthViewPointer = MonthViewPointer; + this->monthViewPointer = monthViewPointer; // Setup the calendar items. - CDSEntryList calendarItems = dataStorage->GetEventListByDate(SetupYear, SetupMonth, SetupDay); + CDSEntryList calendarItems = dataStorage->GetEventListByDate(setupYear, setupMonth, setupDay); for (int entrySeek = 0; entrySeek < calendarItems.entryList.size(); entrySeek++){ @@ -292,14 +299,14 @@ void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bo // Setup the calendar entry. - XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(EventListFrame, newEntryInfo.entryName, wxDefaultPosition, wxDefaultSize, calendarItems.entryList[entrySeek]); + XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(eventListFrame, newEntryInfo.entryName, wxDefaultPosition, wxDefaultSize, calendarItems.entryList[entrySeek]); newEntry->SetColour(&newEntryCalendarInfo.calendarColour); newEntry->SetTime(newEntryInfo.entryStartHour, newEntryInfo.entryStartMinute, newEntryInfo.entryStartSecond); newEntry->SetEntryIDs(newEntryCalendarInfo.accountID, newEntryInfo.calendarID, newEntryInfo.calendarEntryID); - EventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); - wxSizerItem *afterSpacer = EventListFrameSizer->Add(0, 5, 0, 0, 5); + eventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); + wxSizerItem *afterSpacer = eventListFrameSizer->Add(0, 5, 0, 0, 5); newEntry->SetAfterSpacer(afterSpacer); @@ -308,7 +315,7 @@ void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bo for (vector::iterator hideAccountsItem = hideAccounts->begin(); hideAccountsItem != hideAccounts->end(); hideAccountsItem++){ - if (*hideAccountsItem = newEntryCalendarInfo.accountID){ + if (*hideAccountsItem == newEntryCalendarInfo.accountID){ newEntry->Show(false); newEntry->GetAfterSpacer()->Show(false); } @@ -323,11 +330,11 @@ void XCCalendarDay::SetupControl(int SetupDay, int SetupMonth, int SetupYear, bo if (*hideCalendarsItem == newEntryInfo.calendarID){ newEntry->Show(false); newEntry->GetAfterSpacer()->Show(false); - } + } } - CalendarEntryList.push_back(newEntry); + calendarEntryList.push_back(newEntry); } } @@ -339,19 +346,19 @@ void XCCalendarDay::HideAccountEntries(wxCommandEvent &accountData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - (*CalendarEntryIter)->SetShowAccountStatus(false); + (*calendarEntryIter)->SetShowAccountStatus(false); - if ((*CalendarEntryIter)->GetAccountID() == accountData.GetInt()){ + if ((*calendarEntryIter)->GetAccountID() == accountData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); } @@ -370,27 +377,27 @@ void XCCalendarDay::ShowAccountEntries(wxCommandEvent &accountData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - (*CalendarEntryIter)->SetShowAccountStatus(true); + (*calendarEntryIter)->SetShowAccountStatus(true); - if ((*CalendarEntryIter)->GetShowCalendarStatus() == false){ + if ((*calendarEntryIter)->GetShowCalendarStatus() == false){ continue; } - if ((*CalendarEntryIter)->GetAccountID() == accountData.GetInt()){ + if ((*calendarEntryIter)->GetAccountID() == accountData.GetInt()){ - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(true); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(true); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(true); } - + } this->Refresh(); @@ -405,19 +412,19 @@ void XCCalendarDay::HideCalendarEntries(wxCommandEvent &calendarData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ - (*CalendarEntryIter)->SetShowCalendarStatus(false); + (*calendarEntryIter)->SetShowCalendarStatus(false); - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(false); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(false); } @@ -436,14 +443,14 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ int sizerPosition = 0; - for (vector::iterator CalendarEntryIter = CalendarEntryList.begin(); - CalendarEntryIter != CalendarEntryList.end(); CalendarEntryIter++){ + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ - if ((*CalendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ - (*CalendarEntryIter)->SetShowCalendarStatus(true); + (*calendarEntryIter)->SetShowCalendarStatus(true); - if ((*CalendarEntryIter)->GetShowAccountStatus() == false){ + if ((*calendarEntryIter)->GetShowAccountStatus() == false){ // Don't show the calendar entry because the account status // is set to hidden. Continue to the next one. @@ -452,12 +459,12 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ } - wxSizerItem *calendarItem = EventListFrameSizer->GetItem((*CalendarEntryIter)); - (*CalendarEntryIter)->Show(true); + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(true); // Get the spacing and hide it as well. - wxSizerItem *afterSpacer = (*CalendarEntryIter)->GetAfterSpacer(); + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); afterSpacer->Show(true); } @@ -467,4 +474,189 @@ void XCCalendarDay::ShowCalendarEntries(wxCommandEvent &calendarData){ this->Refresh(); Repaint(); +} + +void XCCalendarDay::DeleteCalendarEntries(wxCommandEvent &calendarData){ + + vector::iterator> deleteEntriesList; + + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ + + if ((*calendarEntryIter)->GetCalendarID() == calendarData.GetInt()){ + + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); + + // Get the spacing and hide it as well. + + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); + afterSpacer->Show(false); + afterSpacer->DetachSizer(); + + delete afterSpacer; + afterSpacer = nullptr; + + delete (*calendarEntryIter); + deleteEntriesList.push_back(calendarEntryIter); + + } + + } + + this->Refresh(); + Repaint(); + + for (auto deleteIter : deleteEntriesList){ + calendarEntryList.erase(deleteIter); + } + +} + +void XCCalendarDay::DeleteCalendarEntry(wxCommandEvent &eventData){ + + vector::iterator> deleteEntriesList; + + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ + + if ((*calendarEntryIter)->GetEventID() == eventData.GetInt()){ + + wxSizerItem *calendarItem = eventListFrameSizer->GetItem((*calendarEntryIter)); + (*calendarEntryIter)->Show(false); + + // Get the spacing and hide it as well. + + wxSizerItem *afterSpacer = (*calendarEntryIter)->GetAfterSpacer(); + afterSpacer->Show(false); + afterSpacer->DetachSizer(); + + delete afterSpacer; + afterSpacer = nullptr; + + delete (*calendarEntryIter); + deleteEntriesList.push_back(calendarEntryIter); + + } + + } + + for (auto deleteIter : deleteEntriesList){ + calendarEntryList.erase(deleteIter); + } + + this->Refresh(); + Repaint(); + +} + +void XCCalendarDay::AddCalendarEntry(wxCommandEvent &eventData){ + + EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); + + XCCalendarDayEntry *newEntry = new XCCalendarDayEntry(eventListFrame, eventInfo->eventName, wxDefaultPosition, wxDefaultSize, eventInfo->eventID); + + CDSGetCalendarInfo calendarInfo = dataStorage->GetCalendar(eventInfo->calendarID); + + newEntry->SetColour(&calendarInfo.calendarColour); + newEntry->SetTime(eventInfo->eventHour, eventInfo->eventMinute, eventInfo->eventSecond); + newEntry->SetEntryIDs(calendarInfo.accountID, eventInfo->calendarID, eventInfo->eventID); + + eventListFrameSizer->Add(newEntry, 0, wxEXPAND, 5); + wxSizerItem *afterSpacer = eventListFrameSizer->Add(0, 5, 0, 0, 5); + + newEntry->SetAfterSpacer(afterSpacer); + + // Go through the list of calendar entries to hide by account. + + for (vector::iterator hideAccountsItem = eventInfo->hideAccountsList.begin(); + hideAccountsItem != eventInfo->hideAccountsList.end(); hideAccountsItem++){ + + if (*hideAccountsItem = calendarInfo.accountID){ + newEntry->Show(false); + newEntry->GetAfterSpacer()->Show(false); + } + + } + + // Go through the list of calendar entries to hide by calendar. + + for (vector::iterator hideCalendarsItem = eventInfo->hideCalendarsList.begin(); + hideCalendarsItem != eventInfo->hideCalendarsList.end(); hideCalendarsItem++){ + + if (*hideCalendarsItem == eventInfo->calendarID){ + newEntry->Show(false); + newEntry->GetAfterSpacer()->Show(false); + } + + } + + calendarEntryList.push_back(newEntry); + + this->Refresh(); + Repaint(); + +} + +void XCCalendarDay::UpdateCalendarEntry(wxCommandEvent &eventData){ + + // Go thorugh each of the entries in the day and + // then update it. + + EventProperties *eventInfo = (EventProperties*)eventData.GetClientData(); + + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ + + if ((*calendarEntryIter)->GetEventID() == eventInfo->eventID){ + + (*calendarEntryIter)->SetEventName(eventInfo->eventName); + (*calendarEntryIter)->SetTime(eventInfo->eventHour, eventInfo->eventMinute, eventInfo->eventSecond); + + + } + + } + + delete eventInfo; + eventInfo = nullptr; + +} + +void XCCalendarDay::UpdateCalendarColour(wxCommandEvent &colourData){ + + // Go thorugh each of the entries in the day and + // then update it. + + ColourUpdateProperties *colourInfo = (ColourUpdateProperties*)colourData.GetClientData(); + + for (vector::iterator calendarEntryIter = calendarEntryList.begin(); + calendarEntryIter != calendarEntryList.end(); calendarEntryIter++){ + + if ((*calendarEntryIter)->GetCalendarID() == colourInfo->calendarID){ + + (*calendarEntryIter)->SetColour(&colourInfo->newColour); + + } + + } + +} + +int XCCalendarDay::GetCalendarDay(){ + + return calendarDay; + +} + +int XCCalendarDay::GetCalendarMonth(){ + + return calendarMonth; + +} + +int XCCalendarDay::GetCalendarYear(){ + + return calendarYear; + } \ No newline at end of file