X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarDayEntry.cpp;h=136d5c64ea950f6451f112d9c7b525d128d05192;hp=7ec8de0017343aaa4023dadded50dd108ab0874a;hb=401fd2eee6047f72fdaf811bbcc3924409a4fb9d;hpb=6028a1fc2134c5d1fe9c0147381cf81c4a0ef126 diff --git a/source/widgets/XCCalendarDayEntry.cpp b/source/widgets/XCCalendarDayEntry.cpp index 7ec8de0..136d5c6 100644 --- a/source/widgets/XCCalendarDayEntry.cpp +++ b/source/widgets/XCCalendarDayEntry.cpp @@ -30,44 +30,44 @@ using namespace std; XCCalendarDayEntry::XCCalendarDayEntry(wxWindow* parent, const wxString& title, const wxPoint& pos, const wxSize& size, const int id) : wxPanel(parent, wxID_ANY, pos, size, wxTAB_TRAVERSAL, title){ - DayPanel = parent->GetParent(); + dayPanel = parent->GetParent(); eventID = id; this->SetMinSize(wxSize(65, 30)); - EventTextData = title.mb_str(); - EventText = new wxStaticText(this, wxID_ANY, title, wxPoint(49, 14), wxDefaultSize, wxST_ELLIPSIZE_END); - EventTime = new wxStaticText(this, wxID_ANY, wxT("Time"), wxPoint(49,3), wxDefaultSize, 0); + eventTextData = title.mb_str(); + eventText = new wxStaticText(this, wxID_ANY, title, wxPoint(49, 14), wxDefaultSize, wxST_ELLIPSIZE_END); + eventTime = new wxStaticText(this, wxID_ANY, wxT("Time"), wxPoint(49,3), wxDefaultSize, 0); - wxFont eventTimeFont = EventTime->GetFont(); + wxFont eventTimeFont = eventTime->GetFont(); eventTimeFont.MakeBold(); - EventTime->SetFont(eventTimeFont); + eventTime->SetFont(eventTimeFont); wxMemoryInputStream alerticon(icons_alert_png, sizeof(icons_alert_png)); wxMemoryInputStream priorityicon(icons_priority_png, sizeof(icons_priority_png)); wxImage icons_alert_png(alerticon, wxBITMAP_TYPE_PNG); - AlarmIconBitmap = wxBitmap(icons_alert_png, -1); + alarmIconBitmap = wxBitmap(icons_alert_png, -1); wxImage icons_priority_png(priorityicon, wxBITMAP_TYPE_PNG); - PriorityIconBitmap = wxBitmap(icons_priority_png, -1); + priorityIconBitmap = wxBitmap(icons_priority_png, -1); - AlarmIcon->SetBitmap(AlarmIconBitmap); - HighPriorityIcon->SetBitmap(PriorityIconBitmap); + alarmIcon->SetBitmap(alarmIconBitmap); + highPriorityIcon->SetBitmap(priorityIconBitmap); Connect(ID_ENTRYDESELECT, XCCALENDARDAYENTRY_DESELECT, wxCommandEventHandler(XCCalendarDayEntry::Deselect)); - AlarmIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); - HighPriorityIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); - EventText->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); - EventTime->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); - DayPanel->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + alarmIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + highPriorityIcon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + eventText->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + eventTime->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); + dayPanel->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(XCCalendarDayEntry::LeftClick), NULL, this); - AlarmIcon->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); - HighPriorityIcon->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); - EventText->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); - EventTime->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); - DayPanel->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); + alarmIcon->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); + highPriorityIcon->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); + eventText->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); + eventTime->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); + dayPanel->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(XCCalendarDayEntry::RightClick), NULL, this); UpdateInformation(); @@ -101,97 +101,97 @@ void XCCalendarDayEntry::Repaint(){ // Draw the calendar colour. dc.SetPen(wxPen(wxColor(255,255,255), 0, wxPENSTYLE_TRANSPARENT)); - dc.SetBrush(wxBrush(wxColor(EntryColour.red, - EntryColour.green, - EntryColour.blue), wxBRUSHSTYLE_SOLID)); + dc.SetBrush(wxBrush(wxColor(entryColour.red, + entryColour.green, + entryColour.blue), wxBRUSHSTYLE_SOLID)); dc.DrawRectangle(wxRect(1,1,10,28)); } void XCCalendarDayEntry::UpdateInformation(){ - PositionMode = 0; + positionMode = 0; // Check if the high priority icon needs to be displayed. - if (HasHighPriority == true){ + if (hasHighPriority == true){ - HighPriorityIcon->SetPosition(wxPoint(FirstPosition,7)); + highPriorityIcon->SetPosition(wxPoint(firstPosition,7)); - HighPriorityIcon->Show(true); + highPriorityIcon->Show(true); - PositionMode++; + positionMode++; } else { - HighPriorityIcon->Show(false); + highPriorityIcon->Show(false); } // Check if the alarm icon needs to be displayed. - if (HasAlarm == true){ + if (hasAlarm == true){ - switch(PositionMode){ + switch(positionMode){ case 0: - AlarmIcon->SetPosition(wxPoint(FirstPosition,7)); + alarmIcon->SetPosition(wxPoint(firstPosition,7)); break; case 1: - AlarmIcon->SetPosition(wxPoint(SecondPosition,7)); + alarmIcon->SetPosition(wxPoint(secondPosition,7)); break; } - AlarmIcon->Show(true); + alarmIcon->Show(true); - PositionMode++; + positionMode++; } else { - AlarmIcon->Show(false); + alarmIcon->Show(false); } // Now set the text. - switch(PositionMode){ + switch(positionMode){ case 0: - EventText->SetPosition(wxPoint(FirstPosition,14)); - EventTime->SetPosition(wxPoint(FirstPosition,3)); + eventText->SetPosition(wxPoint(firstPosition,14)); + eventTime->SetPosition(wxPoint(firstPosition,3)); break; case 1: - EventText->SetPosition(wxPoint(SecondPosition,14)); - EventTime->SetPosition(wxPoint(FirstPosition,3)); + eventText->SetPosition(wxPoint(secondPosition,14)); + eventTime->SetPosition(wxPoint(firstPosition,3)); break; case 2: - EventText->SetPosition(wxPoint(ThirdPosition,14)); - EventTime->SetPosition(wxPoint(FirstPosition,3)); + eventText->SetPosition(wxPoint(thirdPosition,14)); + eventTime->SetPosition(wxPoint(firstPosition,3)); break; } } -void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &PaintEvent){ +void XCCalendarDayEntry::PaintFrameEvent(wxPaintEvent &paintEvent){ Repaint(); } -void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent){ +void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &sizeEvent){ // Adjust the Event text so it is displayed properly. - switch(PositionMode){ + switch(positionMode){ case 0: - EventText->SetSize(wxSize((this->GetClientRect().width - FirstPosition - 5),15)); - EventTime->SetSize(wxSize((this->GetClientRect().width - FirstPosition - 5),15)); + eventText->SetSize(wxSize((this->GetClientRect().width - firstPosition - 5),15)); + eventTime->SetSize(wxSize((this->GetClientRect().width - firstPosition - 5),15)); break; case 1: - EventText->SetSize(wxSize((this->GetClientRect().width - SecondPosition - 5),15)); - EventTime->SetSize(wxSize((this->GetClientRect().width - SecondPosition - 5),15)); + eventText->SetSize(wxSize((this->GetClientRect().width - secondPosition - 5),15)); + eventTime->SetSize(wxSize((this->GetClientRect().width - secondPosition - 5),15)); break; case 2: - EventText->SetSize(wxSize((this->GetClientRect().width - ThirdPosition - 5),14)); - EventTime->SetSize(wxSize((this->GetClientRect().width - ThirdPosition - 5),15)); + eventText->SetSize(wxSize((this->GetClientRect().width - thirdPosition - 5),14)); + eventTime->SetSize(wxSize((this->GetClientRect().width - thirdPosition - 5),15)); break; } @@ -201,16 +201,16 @@ void XCCalendarDayEntry::ResizeFrameEvent(wxSizeEvent &SizeEvent){ } -void XCCalendarDayEntry::LeftClick(wxMouseEvent &MouseEvent){ +void XCCalendarDayEntry::LeftClick(wxMouseEvent &mouseEvent){ // Change the background of the widget to mark // the entry as selected. this->SetBackgroundColour(wxColor(255,215,0)); - wxCommandEvent DeselectOthersEvent(XCCALENDARDAY_DESELECTOTHERENTRIES); - DeselectOthersEvent.SetInt(eventID); - DeselectOthersEvent.SetId(ID_DESELECTOTHERENTRIES); - wxPostEvent(DayPanel, DeselectOthersEvent); + wxCommandEvent deselectOthersEvent(XCCALENDARDAY_DESELECTOTHERENTRIES); + deselectOthersEvent.SetInt(eventID); + deselectOthersEvent.SetId(ID_DESELECTOTHERENTRIES); + wxPostEvent(dayPanel, deselectOthersEvent); } @@ -242,40 +242,40 @@ void XCCalendarDayEntry::SetTime(int timeHour, int timeMinute, int timeSecond){ this->timeSecond = timeSecond; string timeOutput = BuildEventTime(timeHour, timeMinute); - EventTime->SetLabel(timeOutput); + eventTime->SetLabel(timeOutput); } void XCCalendarDayEntry::SetColour(Colour *ColourIn){ - EntryColour = *ColourIn; + entryColour = *colourIn; Repaint(); } void XCCalendarDayEntry::SetDisplayAlarm(bool DisplayValue){ - HasAlarm = DisplayValue; + hasAlarm = displayValue; UpdateInformation(); } void XCCalendarDayEntry::SetDisplayHighPriority(bool DisplayValue){ - HasHighPriority = DisplayValue; + hasHighPriority = displayValue; UpdateInformation(); } bool XCCalendarDayEntry::GetDisplayAlarm(){ - return HasAlarm; + return hasAlarm; } bool XCCalendarDayEntry::GetDisplayHighPriority(){ - return HasHighPriority; + return hasHighPriority; } @@ -355,7 +355,7 @@ void XCCalendarDayEntry::SetAfterSpacer(wxSizerItem *afterSpacer){ void XCCalendarDayEntry::SetEventName(string eventName){ - EventText->SetLabel((wxString)eventName); + eventText->SetLabel((wxString)eventName); }