1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From f7cea4877918fa35204f5be07ebb8b18fd53b202 Mon Sep 17 00:00:00 2001
From: Chris Adams <chris.adams@qinetic.com.au>
Date: Mon, 2 Nov 2020 12:46:27 +1000
Subject: [PATCH 23/32] Fix calendardemo example
Change-Id: I335707590afec9b39e7813c7a6acc2499fce22dd
Reviewed-by: Christopher Adams <chris.adams@jolla.com>
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
examples/organizer/calendardemo/src/calendardemo.cpp | 6 +++---
examples/organizer/calendardemo/src/monthpage.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp
index c5c66962..5b7958d5 100644
--- a/examples/organizer/calendardemo/src/calendardemo.cpp
+++ b/examples/organizer/calendardemo/src/calendardemo.cpp
@@ -265,7 +265,7 @@ void CalendarDemo::activatePreviousPage()
void CalendarDemo::addNewEvent()
{
QOrganizerEvent newEvent;
- QDateTime time(m_currentDate);
+ QDateTime time(m_currentDate.startOfDay());
newEvent.setStartDateTime(time);
time = time.addSecs(60*30); // add 30 minutes to end time
newEvent.setEndDateTime(time);
@@ -275,7 +275,7 @@ void CalendarDemo::addNewEvent()
void CalendarDemo::addNewTodo()
{
QOrganizerTodo newTodo;
- QDateTime time(m_currentDate);
+ QDateTime time(m_currentDate.startOfDay());
newTodo.setStartDateTime(time);
time = time.addSecs(60*30); // add 30 minutes to due time
newTodo.setDueDateTime(time);
@@ -285,7 +285,7 @@ void CalendarDemo::addNewTodo()
void CalendarDemo::addNewJournal()
{
QOrganizerJournal newJournal;
- QDateTime time(m_currentDate);
+ QDateTime time(m_currentDate.startOfDay());
newJournal.setDateTime(time);
activateEditPage(newJournal);
}
diff --git a/examples/organizer/calendardemo/src/monthpage.cpp b/examples/organizer/calendardemo/src/monthpage.cpp
index d53d6f60..1ff26824 100644
--- a/examples/organizer/calendardemo/src/monthpage.cpp
+++ b/examples/organizer/calendardemo/src/monthpage.cpp
@@ -48,6 +48,7 @@
**
****************************************************************************/
+#include <QLocale>
#include <QtWidgets>
#include <QtOrganizer/qorganizer.h>
#include <QtOrganizer/qorganizerabstractrequest.h>
@@ -285,12 +286,11 @@ void MonthPage::refreshDayItems()
m_itemList->addItem("(no entries)");
}
-
void MonthPage::currentMonthChanged()
{
int month = m_calendarWidget->monthShown();
int year = m_calendarWidget->yearShown();
- m_dateLabel->setText(QString("%1 %2").arg(QDate::longMonthName(month)).arg(year));
+ m_dateLabel->setText(QString("%1 %2").arg(QLocale().standaloneMonthName(month)).arg(year));
refresh();
m_ignoreShowDayPageOnceFlag = true;
}
--
2.30.2
|
