Merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 into lp:ubuntu-calendar-app
- sdk-1-3
- Merge into trunk
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Alan Pope πΊπ§π± π¦ |
Approved revision: | 756 |
Merged at revision: | 751 |
Proposed branch: | lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 |
Merge into: | lp:ubuntu-calendar-app |
Diff against target: |
1067 lines (+209/-126) 49 files modified
AgendaView.qml (+17/-9) AllDayEventComponent.qml (+1/-1) CalendarChoicePopup.qml (+1/-1) CalendarListButtonDelegate.qml (+1/-1) ColorPickerDialog.qml (+1/-1) ContactChoicePopup.qml (+1/-1) DayHeaderBackground.qml (+1/-1) DayView.qml (+18/-10) Defines.js (+1/-1) DeleteConfirmationDialog.qml (+1/-1) EditEventConfirmationDialog.qml (+1/-1) EventActions.qml (+5/-4) EventBubble.qml (+1/-1) EventDetails.qml (+2/-2) EventListModel.qml (+3/-3) EventReminder.qml (+1/-1) EventRepetition.qml (+1/-1) EventUtils.qml (+1/-1) HeaderDateComponent.qml (+1/-1) KeyboardRectangle.qml (+1/-1) LimitLabelModel.qml (+1/-1) MonthComponent.qml (+1/-1) MonthComponentDateDelegate.qml (+1/-1) MonthView.qml (+16/-13) NewEvent.qml (+1/-1) NewEventEntryField.qml (+1/-1) NewEventTimePicker.qml (+1/-1) OnlineAccountsHelper.qml (+1/-1) PathViewBase.qml (+1/-1) RecurrenceLabelDefines.qml (+1/-1) RemindersModel.qml (+1/-1) ScrollAnimation.qml (+1/-1) Scroller.qml (+1/-1) Settings.qml (+1/-1) SimpleDivider.qml (+1/-1) TimeLineBackground.qml (+1/-1) TimeLineBase.qml (+1/-1) TimeLineBaseComponent.qml (+1/-2) TimeLineHeader.qml (+2/-3) TimeLineHeaderComponent.qml (+1/-1) TimeLineTimeScale.qml (+1/-1) TimeSeparator.qml (+1/-1) ViewHeader.qml (+1/-1) WeekView.qml (+18/-10) YearView.qml (+13/-10) YearViewDelegate.qml (+1/-1) calendar.qml (+56/-10) calendarTests.qml (+1/-1) tests/autopilot/calendar_app/__init__.py (+21/-13) |
To merge this branch: | bzr merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Alan Pope πΊπ§π± π¦ (community) | Approve | ||
Review via email: mp+284686@code.launchpad.net |
This proposal supersedes a proposal from 2016-01-29.
Commit message
Update to qtquick 2.4
Description of the change
Update to qtquick 2.4
To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
Alan Pope πΊπ§π± π¦ (popey) wrote : Posted in a previous version of this proposal | # |
Perfect, thanks Renato!
review:
Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:750
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
review:
Approve
(continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : Posted in a previous version of this proposal | # |
review:
Approve
(continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
review:
Approve
(continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
FAILED: Autolanding.
Unapproved changes made after approval.
https:/
Executed test runs:
None: https:/
review:
Needs Fixing
(continuous-integration)
Revision history for this message
Alan Pope πΊπ§π± π¦ (popey) : | # |
review:
Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) : | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AgendaView.qml' | |||
2 | --- AgendaView.qml 2015-12-06 20:06:50 +0000 | |||
3 | +++ AgendaView.qml 2016-02-02 01:55:03 +0000 | |||
4 | @@ -16,7 +16,7 @@ | |||
5 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
6 | 17 | */ | 17 | */ |
7 | 18 | 18 | ||
9 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
10 | 20 | import QtOrganizer 5.0 | 20 | import QtOrganizer 5.0 |
11 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
12 | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem |
13 | @@ -55,13 +55,21 @@ | |||
14 | 55 | } | 55 | } |
15 | 56 | } | 56 | } |
16 | 57 | 57 | ||
24 | 58 | head.actions: [ | 58 | header: PageHeader { |
25 | 59 | calendarTodayAction, | 59 | id: pageHeader |
26 | 60 | commonHeaderActions.showCalendarAction, | 60 | |
27 | 61 | commonHeaderActions.reloadAction, | 61 | title: i18n.tr("Agenda") |
28 | 62 | commonHeaderActions.syncCalendarAction, | 62 | leadingActionBar.actions: tabs.tabsAction |
29 | 63 | commonHeaderActions.settingsAction | 63 | trailingActionBar.actions: [ |
30 | 64 | ] | 64 | calendarTodayAction, |
31 | 65 | commonHeaderActions.newEventAction, | ||
32 | 66 | commonHeaderActions.showCalendarAction, | ||
33 | 67 | commonHeaderActions.reloadAction, | ||
34 | 68 | commonHeaderActions.syncCalendarAction, | ||
35 | 69 | commonHeaderActions.settingsAction | ||
36 | 70 | ] | ||
37 | 71 | flickable: eventList | ||
38 | 72 | } | ||
39 | 65 | 73 | ||
40 | 66 | EventListModel { | 74 | EventListModel { |
41 | 67 | id: eventListModel | 75 | id: eventListModel |
42 | @@ -97,7 +105,7 @@ | |||
43 | 97 | 105 | ||
44 | 98 | return default_title; | 106 | return default_title; |
45 | 99 | } | 107 | } |
47 | 100 | visible: (!root.hasEnabledCalendars() || !eventListModel.itemCount) && !eventListModel.isLoading | 108 | visible: (eventListModel.count === 0) && !eventListModel.isLoading |
48 | 101 | anchors.centerIn: parent | 109 | anchors.centerIn: parent |
49 | 102 | } | 110 | } |
50 | 103 | 111 | ||
51 | 104 | 112 | ||
52 | === modified file 'AllDayEventComponent.qml' | |||
53 | --- AllDayEventComponent.qml 2015-12-06 20:06:50 +0000 | |||
54 | +++ AllDayEventComponent.qml 2016-02-02 01:55:03 +0000 | |||
55 | @@ -15,7 +15,7 @@ | |||
56 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
57 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
58 | 17 | */ | 17 | */ |
60 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
61 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
62 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
63 | 21 | import QtOrganizer 5.0 | 21 | import QtOrganizer 5.0 |
64 | 22 | 22 | ||
65 | === modified file 'CalendarChoicePopup.qml' | |||
66 | --- CalendarChoicePopup.qml 2015-10-31 19:56:40 +0000 | |||
67 | +++ CalendarChoicePopup.qml 2016-02-02 01:55:03 +0000 | |||
68 | @@ -15,7 +15,7 @@ | |||
69 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
70 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
71 | 17 | */ | 17 | */ |
73 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
74 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
75 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
76 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem |
77 | 22 | 22 | ||
78 | === modified file 'CalendarListButtonDelegate.qml' | |||
79 | --- CalendarListButtonDelegate.qml 2015-10-31 19:56:40 +0000 | |||
80 | +++ CalendarListButtonDelegate.qml 2016-02-02 01:55:03 +0000 | |||
81 | @@ -14,7 +14,7 @@ | |||
82 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
83 | 15 | */ | 15 | */ |
84 | 16 | 16 | ||
86 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.4 |
87 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
88 | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem |
89 | 20 | 20 | ||
90 | 21 | 21 | ||
91 | === modified file 'ColorPickerDialog.qml' | |||
92 | --- ColorPickerDialog.qml 2015-10-31 19:56:40 +0000 | |||
93 | +++ ColorPickerDialog.qml 2016-02-02 01:55:03 +0000 | |||
94 | @@ -15,7 +15,7 @@ | |||
95 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
96 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
97 | 17 | */ | 17 | */ |
99 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
100 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
101 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
102 | 21 | 21 | ||
103 | 22 | 22 | ||
104 | === modified file 'ContactChoicePopup.qml' | |||
105 | --- ContactChoicePopup.qml 2015-12-06 20:06:50 +0000 | |||
106 | +++ ContactChoicePopup.qml 2016-02-02 01:55:03 +0000 | |||
107 | @@ -15,7 +15,7 @@ | |||
108 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
109 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
110 | 17 | */ | 17 | */ |
112 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
113 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
114 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
115 | 21 | import Ubuntu.Components.ListItems 1.0 | 21 | import Ubuntu.Components.ListItems 1.0 |
116 | 22 | 22 | ||
117 | === modified file 'DayHeaderBackground.qml' | |||
118 | --- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000 | |||
119 | +++ DayHeaderBackground.qml 2016-02-02 01:55:03 +0000 | |||
120 | @@ -15,7 +15,7 @@ | |||
121 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
122 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
123 | 17 | */ | 17 | */ |
125 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
126 | 19 | 19 | ||
127 | 20 | Item { | 20 | Item { |
128 | 21 | width: parent.width | 21 | width: parent.width |
129 | 22 | 22 | ||
130 | === modified file 'DayView.qml' | |||
131 | --- DayView.qml 2016-01-28 23:04:18 +0000 | |||
132 | +++ DayView.qml 2016-02-02 01:55:03 +0000 | |||
133 | @@ -16,7 +16,7 @@ | |||
134 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
135 | 17 | */ | 17 | */ |
136 | 18 | 18 | ||
138 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
139 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
140 | 21 | import "dateExt.js" as DateExt | 21 | import "dateExt.js" as DateExt |
141 | 22 | import "ViewType.js" as ViewType | 22 | import "ViewType.js" as ViewType |
142 | @@ -43,22 +43,27 @@ | |||
143 | 43 | } | 43 | } |
144 | 44 | } | 44 | } |
145 | 45 | 45 | ||
148 | 46 | head { | 46 | header: PageHeader { |
149 | 47 | actions: [ | 47 | id: pageHeader |
150 | 48 | |||
151 | 49 | leadingActionBar.actions: tabs.tabsAction | ||
152 | 50 | trailingActionBar.actions: [ | ||
153 | 48 | calendarTodayAction, | 51 | calendarTodayAction, |
154 | 52 | commonHeaderActions.newEventAction, | ||
155 | 49 | commonHeaderActions.showCalendarAction, | 53 | commonHeaderActions.showCalendarAction, |
156 | 50 | commonHeaderActions.reloadAction, | 54 | commonHeaderActions.reloadAction, |
157 | 51 | commonHeaderActions.syncCalendarAction, | 55 | commonHeaderActions.syncCalendarAction, |
158 | 52 | commonHeaderActions.settingsAction | 56 | commonHeaderActions.settingsAction |
159 | 53 | ] | 57 | ] |
160 | 54 | 58 | ||
167 | 55 | contents: Label { | 59 | title: { |
168 | 56 | id:monthYear | 60 | // TRANSLATORS: this is a time formatting string, |
169 | 57 | objectName:"monthYearLabel" | 61 | // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
170 | 58 | fontSize: "large" | 62 | // It's used in the header of the month and week views |
171 | 59 | text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")) | 63 | var monthName = currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")) |
172 | 60 | font.capitalization: Font.Capitalize | 64 | return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1) |
173 | 61 | } | 65 | } |
174 | 66 | |||
175 | 62 | } | 67 | } |
176 | 63 | 68 | ||
177 | 64 | PathViewBase{ | 69 | PathViewBase{ |
178 | @@ -69,7 +74,10 @@ | |||
179 | 69 | //This is used to scroll all view together when currentItem scrolls | 74 | //This is used to scroll all view together when currentItem scrolls |
180 | 70 | property var childContentY; | 75 | property var childContentY; |
181 | 71 | 76 | ||
183 | 72 | anchors.fill: parent | 77 | anchors { |
184 | 78 | fill: parent | ||
185 | 79 | topMargin: header.height | ||
186 | 80 | } | ||
187 | 73 | 81 | ||
188 | 74 | onNextItemHighlighted: { | 82 | onNextItemHighlighted: { |
189 | 75 | //next day | 83 | //next day |
190 | 76 | 84 | ||
191 | === modified file 'Defines.js' | |||
192 | --- Defines.js 2015-10-31 19:56:40 +0000 | |||
193 | +++ Defines.js 2016-02-02 01:55:03 +0000 | |||
194 | @@ -43,7 +43,7 @@ | |||
195 | 43 | 43 | ||
196 | 44 | function getWeekLabels(){ | 44 | function getWeekLabels(){ |
197 | 45 | var object = Qt.createQmlObject('\ | 45 | var object = Qt.createQmlObject('\ |
199 | 46 | import QtQuick 2.3;\ | 46 | import QtQuick 2.4;\ |
200 | 47 | import Ubuntu.Components 1.3;\ | 47 | import Ubuntu.Components 1.3;\ |
201 | 48 | QtObject {\ | 48 | QtObject {\ |
202 | 49 | property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\ | 49 | property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\ |
203 | 50 | 50 | ||
204 | === modified file 'DeleteConfirmationDialog.qml' | |||
205 | --- DeleteConfirmationDialog.qml 2015-10-31 19:56:40 +0000 | |||
206 | +++ DeleteConfirmationDialog.qml 2016-02-02 01:55:03 +0000 | |||
207 | @@ -15,7 +15,7 @@ | |||
208 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
209 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
210 | 17 | */ | 17 | */ |
212 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
213 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
214 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
215 | 21 | 21 | ||
216 | 22 | 22 | ||
217 | === modified file 'EditEventConfirmationDialog.qml' | |||
218 | --- EditEventConfirmationDialog.qml 2015-10-31 19:56:40 +0000 | |||
219 | +++ EditEventConfirmationDialog.qml 2016-02-02 01:55:03 +0000 | |||
220 | @@ -15,7 +15,7 @@ | |||
221 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
222 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
223 | 17 | */ | 17 | */ |
225 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
226 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
227 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
228 | 21 | 21 | ||
229 | 22 | 22 | ||
230 | === modified file 'EventActions.qml' | |||
231 | --- EventActions.qml 2015-12-06 20:06:50 +0000 | |||
232 | +++ EventActions.qml 2016-02-02 01:55:03 +0000 | |||
233 | @@ -16,16 +16,14 @@ | |||
234 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
235 | 17 | */ | 17 | */ |
236 | 18 | 18 | ||
238 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
239 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
240 | 21 | import Ubuntu.SyncMonitor 0.1 | 21 | import Ubuntu.SyncMonitor 0.1 |
241 | 22 | 22 | ||
242 | 23 | Item { | 23 | Item { |
243 | 24 | id: actionPool | 24 | id: actionPool |
244 | 25 | 25 | ||
248 | 26 | //removing till following bug is resolved | 26 | property alias newEventAction: _newEventAction |
246 | 27 | //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178 | ||
247 | 28 | //property alias newEventAction: _newEventAction | ||
249 | 29 | property alias showCalendarAction: _showCalendarAction | 27 | property alias showCalendarAction: _showCalendarAction |
250 | 30 | property alias syncCalendarAction: _syncCalendarAction | 28 | property alias syncCalendarAction: _syncCalendarAction |
251 | 31 | property alias settingsAction: _settingsAction | 29 | property alias settingsAction: _settingsAction |
252 | @@ -49,6 +47,7 @@ | |||
253 | 49 | Action { | 47 | Action { |
254 | 50 | id: _newEventAction | 48 | id: _newEventAction |
255 | 51 | objectName: "neweventbutton" | 49 | objectName: "neweventbutton" |
256 | 50 | name: "neweventbutton" | ||
257 | 52 | iconName: "new-event" | 51 | iconName: "new-event" |
258 | 53 | text: i18n.tr("New Event") | 52 | text: i18n.tr("New Event") |
259 | 54 | onTriggered: { | 53 | onTriggered: { |
260 | @@ -59,6 +58,7 @@ | |||
261 | 59 | Action{ | 58 | Action{ |
262 | 60 | id: _showCalendarAction | 59 | id: _showCalendarAction |
263 | 61 | objectName: "calendarsbutton" | 60 | objectName: "calendarsbutton" |
264 | 61 | name: "calendarsbutton" | ||
265 | 62 | iconName: "calendar" | 62 | iconName: "calendar" |
266 | 63 | text: i18n.tr("Calendars") | 63 | text: i18n.tr("Calendars") |
267 | 64 | onTriggered: { | 64 | onTriggered: { |
268 | @@ -70,6 +70,7 @@ | |||
269 | 70 | Action{ | 70 | Action{ |
270 | 71 | id: _settingsAction | 71 | id: _settingsAction |
271 | 72 | objectName: "settingsbutton" | 72 | objectName: "settingsbutton" |
272 | 73 | name: "calendarsbutton" | ||
273 | 73 | iconName: "settings" | 74 | iconName: "settings" |
274 | 74 | text: i18n.tr("Settings") | 75 | text: i18n.tr("Settings") |
275 | 75 | onTriggered: { | 76 | onTriggered: { |
276 | 76 | 77 | ||
277 | === modified file 'EventBubble.qml' | |||
278 | --- EventBubble.qml 2015-12-06 20:06:50 +0000 | |||
279 | +++ EventBubble.qml 2016-02-02 01:55:03 +0000 | |||
280 | @@ -16,7 +16,7 @@ | |||
281 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
282 | 17 | */ | 17 | */ |
283 | 18 | 18 | ||
285 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
286 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
287 | 21 | import QtOrganizer 5.0 | 21 | import QtOrganizer 5.0 |
288 | 22 | 22 | ||
289 | 23 | 23 | ||
290 | === modified file 'EventDetails.qml' | |||
291 | --- EventDetails.qml 2016-01-28 23:04:18 +0000 | |||
292 | +++ EventDetails.qml 2016-02-02 01:55:03 +0000 | |||
293 | @@ -15,7 +15,7 @@ | |||
294 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
295 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
296 | 17 | */ | 17 | */ |
298 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
299 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
300 | 20 | import Ubuntu.Components.ListItems 1.0 as ListItem | 20 | import Ubuntu.Components.ListItems 1.0 as ListItem |
301 | 21 | import Ubuntu.Components.Themes.Ambiance 1.0 | 21 | import Ubuntu.Components.Themes.Ambiance 1.0 |
302 | @@ -209,7 +209,7 @@ | |||
303 | 209 | dialog.editEvent.connect( function(eventId){ | 209 | dialog.editEvent.connect( function(eventId){ |
304 | 210 | if( eventId === event.parentId ) { | 210 | if( eventId === event.parentId ) { |
305 | 211 | showEditEventPage(internal.parentEvent, model) | 211 | showEditEventPage(internal.parentEvent, model) |
307 | 212 | } else { | 212 | } else { |
308 | 213 | showEditEventPage(event, model) | 213 | showEditEventPage(event, model) |
309 | 214 | } | 214 | } |
310 | 215 | }); | 215 | }); |
311 | 216 | 216 | ||
312 | === modified file 'EventListModel.qml' | |||
313 | --- EventListModel.qml 2015-08-24 05:08:46 +0000 | |||
314 | +++ EventListModel.qml 2016-02-02 01:55:03 +0000 | |||
315 | @@ -15,7 +15,7 @@ | |||
316 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
317 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
318 | 17 | */ | 17 | */ |
320 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
321 | 19 | import QtOrganizer 5.0 | 19 | import QtOrganizer 5.0 |
322 | 20 | 20 | ||
323 | 21 | OrganizerModel { | 21 | OrganizerModel { |
324 | @@ -41,7 +41,7 @@ | |||
325 | 41 | } | 41 | } |
326 | 42 | 42 | ||
327 | 43 | function startLoadingTimer() { | 43 | function startLoadingTimer() { |
329 | 44 | var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}", | 44 | var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}", |
330 | 45 | eventModel, "EventListMode.qml"); | 45 | eventModel, "EventListMode.qml"); |
331 | 46 | newObject.onTriggered.connect( function(){ | 46 | newObject.onTriggered.connect( function(){ |
332 | 47 | var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod); | 47 | var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod); |
333 | @@ -73,7 +73,7 @@ | |||
334 | 73 | } | 73 | } |
335 | 74 | } | 74 | } |
336 | 75 | return cals; | 75 | return cals; |
338 | 76 | } | 76 | } |
339 | 77 | 77 | ||
340 | 78 | function getWritableCollections(){ | 78 | function getWritableCollections(){ |
341 | 79 | var cals = []; | 79 | var cals = []; |
342 | 80 | 80 | ||
343 | === modified file 'EventReminder.qml' | |||
344 | --- EventReminder.qml 2015-10-31 19:56:40 +0000 | |||
345 | +++ EventReminder.qml 2016-02-02 01:55:03 +0000 | |||
346 | @@ -16,7 +16,7 @@ | |||
347 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
348 | 17 | */ | 17 | */ |
349 | 18 | 18 | ||
351 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
352 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
353 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem |
354 | 22 | 22 | ||
355 | 23 | 23 | ||
356 | === modified file 'EventRepetition.qml' | |||
357 | --- EventRepetition.qml 2015-10-31 19:56:40 +0000 | |||
358 | +++ EventRepetition.qml 2016-02-02 01:55:03 +0000 | |||
359 | @@ -16,7 +16,7 @@ | |||
360 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
361 | 17 | */ | 17 | */ |
362 | 18 | 18 | ||
364 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
365 | 20 | import QtOrganizer 5.0 | 20 | import QtOrganizer 5.0 |
366 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
367 | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem |
368 | 23 | 23 | ||
369 | === modified file 'EventUtils.qml' | |||
370 | --- EventUtils.qml 2015-10-31 19:56:40 +0000 | |||
371 | +++ EventUtils.qml 2016-02-02 01:55:03 +0000 | |||
372 | @@ -16,7 +16,7 @@ | |||
373 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
374 | 17 | */ | 17 | */ |
375 | 18 | 18 | ||
377 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
378 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
379 | 21 | import QtOrganizer 5.0 | 21 | import QtOrganizer 5.0 |
380 | 22 | import "Defines.js" as Defines | 22 | import "Defines.js" as Defines |
381 | 23 | 23 | ||
382 | === modified file 'HeaderDateComponent.qml' | |||
383 | --- HeaderDateComponent.qml 2015-10-31 19:56:40 +0000 | |||
384 | +++ HeaderDateComponent.qml 2016-02-02 01:55:03 +0000 | |||
385 | @@ -16,7 +16,7 @@ | |||
386 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
387 | 17 | */ | 17 | */ |
388 | 18 | 18 | ||
390 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
391 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
392 | 21 | 21 | ||
393 | 22 | Item { | 22 | Item { |
394 | 23 | 23 | ||
395 | === modified file 'KeyboardRectangle.qml' | |||
396 | --- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000 | |||
397 | +++ KeyboardRectangle.qml 2016-02-02 01:55:03 +0000 | |||
398 | @@ -16,7 +16,7 @@ | |||
399 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
400 | 17 | */ | 17 | */ |
401 | 18 | 18 | ||
403 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
404 | 20 | 20 | ||
405 | 21 | Item { | 21 | Item { |
406 | 22 | id: keyboardRect | 22 | id: keyboardRect |
407 | 23 | 23 | ||
408 | === modified file 'LimitLabelModel.qml' | |||
409 | --- LimitLabelModel.qml 2014-10-22 17:32:15 +0000 | |||
410 | +++ LimitLabelModel.qml 2016-02-02 01:55:03 +0000 | |||
411 | @@ -15,7 +15,7 @@ | |||
412 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
413 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
414 | 17 | */ | 17 | */ |
416 | 18 | import QtQuick 2.3; | 18 | import QtQuick 2.4 |
417 | 19 | 19 | ||
418 | 20 | ListModel { | 20 | ListModel { |
419 | 21 | id:limitLables | 21 | id:limitLables |
420 | 22 | 22 | ||
421 | === modified file 'MonthComponent.qml' | |||
422 | --- MonthComponent.qml 2016-01-28 23:04:18 +0000 | |||
423 | +++ MonthComponent.qml 2016-02-02 01:55:03 +0000 | |||
424 | @@ -15,7 +15,7 @@ | |||
425 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
426 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
427 | 17 | */ | 17 | */ |
429 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
430 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
431 | 20 | import "dateExt.js" as DateExt | 20 | import "dateExt.js" as DateExt |
432 | 21 | import "colorUtils.js" as Color | 21 | import "colorUtils.js" as Color |
433 | 22 | 22 | ||
434 | === modified file 'MonthComponentDateDelegate.qml' | |||
435 | --- MonthComponentDateDelegate.qml 2015-10-31 19:56:40 +0000 | |||
436 | +++ MonthComponentDateDelegate.qml 2016-02-02 01:55:03 +0000 | |||
437 | @@ -1,4 +1,4 @@ | |||
439 | 1 | import QtQuick 2.0 | 1 | import QtQuick 2.4 |
440 | 2 | import Ubuntu.Components 1.3 | 2 | import Ubuntu.Components 1.3 |
441 | 3 | 3 | ||
442 | 4 | Item{ | 4 | Item{ |
443 | 5 | 5 | ||
444 | === modified file 'MonthView.qml' | |||
445 | --- MonthView.qml 2016-01-28 23:04:18 +0000 | |||
446 | +++ MonthView.qml 2016-02-02 01:55:03 +0000 | |||
447 | @@ -15,7 +15,7 @@ | |||
448 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
449 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
450 | 17 | */ | 17 | */ |
452 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
453 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
454 | 20 | import "dateExt.js" as DateExt | 20 | import "dateExt.js" as DateExt |
455 | 21 | import "colorUtils.js" as Color | 21 | import "colorUtils.js" as Color |
456 | @@ -42,24 +42,27 @@ | |||
457 | 42 | } | 42 | } |
458 | 43 | } | 43 | } |
459 | 44 | 44 | ||
462 | 45 | head { | 45 | header: PageHeader { |
463 | 46 | actions: [ | 46 | id: pageHeader |
464 | 47 | |||
465 | 48 | leadingActionBar.actions: tabs.tabsAction | ||
466 | 49 | trailingActionBar.actions: [ | ||
467 | 47 | calendarTodayAction, | 50 | calendarTodayAction, |
468 | 51 | commonHeaderActions.newEventAction, | ||
469 | 48 | commonHeaderActions.showCalendarAction, | 52 | commonHeaderActions.showCalendarAction, |
470 | 49 | commonHeaderActions.reloadAction, | 53 | commonHeaderActions.reloadAction, |
471 | 50 | commonHeaderActions.syncCalendarAction, | 54 | commonHeaderActions.syncCalendarAction, |
472 | 51 | commonHeaderActions.settingsAction | 55 | commonHeaderActions.settingsAction |
473 | 52 | ] | 56 | ] |
478 | 53 | 57 | title: { | |
475 | 54 | contents: Label { | ||
476 | 55 | objectName:"monthYearLabel" | ||
477 | 56 | fontSize: "large" | ||
479 | 57 | // TRANSLATORS: this is a time formatting string, | 58 | // TRANSLATORS: this is a time formatting string, |
480 | 58 | // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. | 59 | // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
481 | 59 | // It's used in the header of the month and week views | 60 | // It's used in the header of the month and week views |
484 | 60 | text: currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")) | 61 | var monthName = currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")) |
485 | 61 | font.capitalization: Font.Capitalize | 62 | return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1) |
486 | 62 | } | 63 | } |
487 | 64 | |||
488 | 65 | flickable: null | ||
489 | 63 | } | 66 | } |
490 | 64 | 67 | ||
491 | 65 | PathViewBase{ | 68 | PathViewBase{ |
492 | @@ -68,10 +71,10 @@ | |||
493 | 68 | 71 | ||
494 | 69 | property var startMonth: currentMonth; | 72 | property var startMonth: currentMonth; |
495 | 70 | 73 | ||
500 | 71 | anchors.top:parent.top | 74 | anchors { |
501 | 72 | 75 | fill: parent | |
502 | 73 | width:parent.width | 76 | topMargin: header.height |
503 | 74 | height: parent.height | 77 | } |
504 | 75 | 78 | ||
505 | 76 | onNextItemHighlighted: { | 79 | onNextItemHighlighted: { |
506 | 77 | nextMonth(); | 80 | nextMonth(); |
507 | 78 | 81 | ||
508 | === modified file 'NewEvent.qml' | |||
509 | --- NewEvent.qml 2015-12-06 20:06:50 +0000 | |||
510 | +++ NewEvent.qml 2016-02-02 01:55:03 +0000 | |||
511 | @@ -16,7 +16,7 @@ | |||
512 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
513 | 17 | */ | 17 | */ |
514 | 18 | 18 | ||
516 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
517 | 20 | import QtOrganizer 5.0 | 20 | import QtOrganizer 5.0 |
518 | 21 | import Ubuntu.Components 1.3 | 21 | import Ubuntu.Components 1.3 |
519 | 22 | import Ubuntu.Components.Popups 1.0 | 22 | import Ubuntu.Components.Popups 1.0 |
520 | 23 | 23 | ||
521 | === modified file 'NewEventEntryField.qml' | |||
522 | --- NewEventEntryField.qml 2015-10-31 19:56:40 +0000 | |||
523 | +++ NewEventEntryField.qml 2016-02-02 01:55:03 +0000 | |||
524 | @@ -16,7 +16,7 @@ | |||
525 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
526 | 17 | */ | 17 | */ |
527 | 18 | 18 | ||
529 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
530 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
531 | 21 | 21 | ||
532 | 22 | Label { | 22 | Label { |
533 | 23 | 23 | ||
534 | === modified file 'NewEventTimePicker.qml' | |||
535 | --- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000 | |||
536 | +++ NewEventTimePicker.qml 2016-02-02 01:55:03 +0000 | |||
537 | @@ -1,4 +1,4 @@ | |||
539 | 1 | import QtQuick 2.3 | 1 | import QtQuick 2.4 |
540 | 2 | import Ubuntu.Components.ListItems 1.0 as ListItem | 2 | import Ubuntu.Components.ListItems 1.0 as ListItem |
541 | 3 | import Ubuntu.Components.Themes.Ambiance 1.0 | 3 | import Ubuntu.Components.Themes.Ambiance 1.0 |
542 | 4 | import Ubuntu.Components.Pickers 1.0 | 4 | import Ubuntu.Components.Pickers 1.0 |
543 | 5 | 5 | ||
544 | === modified file 'OnlineAccountsHelper.qml' | |||
545 | --- OnlineAccountsHelper.qml 2015-10-31 19:56:40 +0000 | |||
546 | +++ OnlineAccountsHelper.qml 2016-02-02 01:55:03 +0000 | |||
547 | @@ -14,7 +14,7 @@ | |||
548 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
549 | 15 | */ | 15 | */ |
550 | 16 | 16 | ||
552 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.4 |
553 | 18 | import Ubuntu.Components 1.3 | 18 | import Ubuntu.Components 1.3 |
554 | 19 | import Ubuntu.OnlineAccounts 0.1 | 19 | import Ubuntu.OnlineAccounts 0.1 |
555 | 20 | import Ubuntu.OnlineAccounts.Client 0.1 | 20 | import Ubuntu.OnlineAccounts.Client 0.1 |
556 | 21 | 21 | ||
557 | === modified file 'PathViewBase.qml' | |||
558 | --- PathViewBase.qml 2015-08-29 08:59:47 +0000 | |||
559 | +++ PathViewBase.qml 2016-02-02 01:55:03 +0000 | |||
560 | @@ -15,7 +15,7 @@ | |||
561 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
562 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
563 | 17 | */ | 17 | */ |
565 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
566 | 19 | 19 | ||
567 | 20 | PathView { | 20 | PathView { |
568 | 21 | id: root | 21 | id: root |
569 | 22 | 22 | ||
570 | === modified file 'RecurrenceLabelDefines.qml' | |||
571 | --- RecurrenceLabelDefines.qml 2015-10-31 19:56:40 +0000 | |||
572 | +++ RecurrenceLabelDefines.qml 2016-02-02 01:55:03 +0000 | |||
573 | @@ -16,7 +16,7 @@ | |||
574 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
575 | 17 | */ | 17 | */ |
576 | 18 | 18 | ||
578 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
579 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
580 | 21 | 21 | ||
581 | 22 | QtObject { | 22 | QtObject { |
582 | 23 | 23 | ||
583 | === modified file 'RemindersModel.qml' | |||
584 | --- RemindersModel.qml 2014-10-17 05:42:34 +0000 | |||
585 | +++ RemindersModel.qml 2016-02-02 01:55:03 +0000 | |||
586 | @@ -16,7 +16,7 @@ | |||
587 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
588 | 17 | */ | 17 | */ |
589 | 18 | 18 | ||
591 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
592 | 20 | 20 | ||
593 | 21 | ListModel { | 21 | ListModel { |
594 | 22 | id: reminderModel | 22 | id: reminderModel |
595 | 23 | 23 | ||
596 | === modified file 'ScrollAnimation.qml' | |||
597 | --- ScrollAnimation.qml 2014-09-20 10:45:35 +0000 | |||
598 | +++ ScrollAnimation.qml 2016-02-02 01:55:03 +0000 | |||
599 | @@ -1,4 +1,4 @@ | |||
601 | 1 | import QtQuick 2.3 | 1 | import QtQuick 2.4 |
602 | 2 | 2 | ||
603 | 3 | PropertyAnimation { | 3 | PropertyAnimation { |
604 | 4 | duration: 500 | 4 | duration: 500 |
605 | 5 | 5 | ||
606 | === modified file 'Scroller.qml' | |||
607 | --- Scroller.qml 2015-10-31 19:56:40 +0000 | |||
608 | +++ Scroller.qml 2016-02-02 01:55:03 +0000 | |||
609 | @@ -16,7 +16,7 @@ | |||
610 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
611 | 17 | */ | 17 | */ |
612 | 18 | 18 | ||
614 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
615 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
616 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItems | 21 | import Ubuntu.Components.ListItems 1.0 as ListItems |
617 | 22 | 22 | ||
618 | 23 | 23 | ||
619 | === modified file 'Settings.qml' | |||
620 | --- Settings.qml 2016-01-29 09:35:09 +0000 | |||
621 | +++ Settings.qml 2016-02-02 01:55:03 +0000 | |||
622 | @@ -15,7 +15,7 @@ | |||
623 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
624 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
625 | 17 | */ | 17 | */ |
627 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
628 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
629 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
630 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem |
631 | 22 | 22 | ||
632 | === modified file 'SimpleDivider.qml' | |||
633 | --- SimpleDivider.qml 2014-12-11 20:29:27 +0000 | |||
634 | +++ SimpleDivider.qml 2016-02-02 01:55:03 +0000 | |||
635 | @@ -16,7 +16,7 @@ | |||
636 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
637 | 17 | */ | 17 | */ |
638 | 18 | 18 | ||
640 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
641 | 20 | 20 | ||
642 | 21 | Rectangle{ | 21 | Rectangle{ |
643 | 22 | height: units.gu(0.1) | 22 | height: units.gu(0.1) |
644 | 23 | 23 | ||
645 | === modified file 'TimeLineBackground.qml' | |||
646 | --- TimeLineBackground.qml 2015-10-31 19:56:40 +0000 | |||
647 | +++ TimeLineBackground.qml 2016-02-02 01:55:03 +0000 | |||
648 | @@ -16,7 +16,7 @@ | |||
649 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
650 | 17 | */ | 17 | */ |
651 | 18 | 18 | ||
653 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
654 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
655 | 21 | 21 | ||
656 | 22 | Column { | 22 | Column { |
657 | 23 | 23 | ||
658 | === modified file 'TimeLineBase.qml' | |||
659 | --- TimeLineBase.qml 2015-10-31 19:56:40 +0000 | |||
660 | +++ TimeLineBase.qml 2016-02-02 01:55:03 +0000 | |||
661 | @@ -15,7 +15,7 @@ | |||
662 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
663 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
664 | 17 | */ | 17 | */ |
666 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
667 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
668 | 20 | import QtOrganizer 5.0 | 20 | import QtOrganizer 5.0 |
669 | 21 | 21 | ||
670 | 22 | 22 | ||
671 | === modified file 'TimeLineBaseComponent.qml' | |||
672 | --- TimeLineBaseComponent.qml 2015-12-06 20:06:50 +0000 | |||
673 | +++ TimeLineBaseComponent.qml 2016-02-02 01:55:03 +0000 | |||
674 | @@ -16,8 +16,7 @@ | |||
675 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
676 | 17 | */ | 17 | */ |
677 | 18 | 18 | ||
680 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
679 | 20 | import QtQuick.Layouts 1.1 | ||
681 | 21 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
682 | 22 | import Ubuntu.Components.Popups 1.0 | 21 | import Ubuntu.Components.Popups 1.0 |
683 | 23 | import QtOrganizer 5.0 | 22 | import QtOrganizer 5.0 |
684 | 24 | 23 | ||
685 | === modified file 'TimeLineHeader.qml' | |||
686 | --- TimeLineHeader.qml 2015-10-31 19:56:40 +0000 | |||
687 | +++ TimeLineHeader.qml 2016-02-02 01:55:03 +0000 | |||
688 | @@ -16,9 +16,8 @@ | |||
689 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
690 | 17 | */ | 17 | */ |
691 | 18 | 18 | ||
693 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
694 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
695 | 21 | import QtQuick.Layouts 1.1 | ||
696 | 22 | 21 | ||
697 | 23 | import "ViewType.js" as ViewType | 22 | import "ViewType.js" as ViewType |
698 | 24 | 23 | ||
699 | @@ -50,7 +49,7 @@ | |||
700 | 50 | id: weekNumLabel | 49 | id: weekNumLabel |
701 | 51 | objectName: "weeknumber" | 50 | objectName: "weeknumber" |
702 | 52 | 51 | ||
704 | 53 | // TRANSLATORS: W refers to Week, followed by the actual week number (%1) | 52 | // TRANSLATORS: W refers to Week, followed by the actual week number (%1) |
705 | 54 | text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek)) | 53 | text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek)) |
706 | 55 | fontSize: "small" | 54 | fontSize: "small" |
707 | 56 | height: units.gu(5) | 55 | height: units.gu(5) |
708 | 57 | 56 | ||
709 | === modified file 'TimeLineHeaderComponent.qml' | |||
710 | --- TimeLineHeaderComponent.qml 2015-10-31 19:56:40 +0000 | |||
711 | +++ TimeLineHeaderComponent.qml 2016-02-02 01:55:03 +0000 | |||
712 | @@ -16,7 +16,7 @@ | |||
713 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
714 | 17 | */ | 17 | */ |
715 | 18 | 18 | ||
717 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
718 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
719 | 21 | import "dateExt.js" as DateExt | 21 | import "dateExt.js" as DateExt |
720 | 22 | import "ViewType.js" as ViewType | 22 | import "ViewType.js" as ViewType |
721 | 23 | 23 | ||
722 | === modified file 'TimeLineTimeScale.qml' | |||
723 | --- TimeLineTimeScale.qml 2015-10-31 19:56:40 +0000 | |||
724 | +++ TimeLineTimeScale.qml 2016-02-02 01:55:03 +0000 | |||
725 | @@ -16,7 +16,7 @@ | |||
726 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
727 | 17 | */ | 17 | */ |
728 | 18 | 18 | ||
730 | 19 | import QtQuick 2.0 | 19 | import QtQuick 2.4 |
731 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
732 | 21 | 21 | ||
733 | 22 | Flickable{ | 22 | Flickable{ |
734 | 23 | 23 | ||
735 | === modified file 'TimeSeparator.qml' | |||
736 | --- TimeSeparator.qml 2014-09-20 10:45:35 +0000 | |||
737 | +++ TimeSeparator.qml 2016-02-02 01:55:03 +0000 | |||
738 | @@ -15,7 +15,7 @@ | |||
739 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
740 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
741 | 17 | */ | 17 | */ |
743 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
744 | 19 | 19 | ||
745 | 20 | Rectangle { | 20 | Rectangle { |
746 | 21 | id: separator | 21 | id: separator |
747 | 22 | 22 | ||
748 | === modified file 'ViewHeader.qml' | |||
749 | --- ViewHeader.qml 2016-01-28 23:04:18 +0000 | |||
750 | +++ ViewHeader.qml 2016-02-02 01:55:03 +0000 | |||
751 | @@ -15,7 +15,7 @@ | |||
752 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
753 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
754 | 17 | */ | 17 | */ |
756 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
757 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
758 | 20 | 20 | ||
759 | 21 | Item{ | 21 | Item{ |
760 | 22 | 22 | ||
761 | === modified file 'WeekView.qml' | |||
762 | --- WeekView.qml 2016-01-28 23:04:18 +0000 | |||
763 | +++ WeekView.qml 2016-02-02 01:55:03 +0000 | |||
764 | @@ -16,7 +16,7 @@ | |||
765 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
766 | 17 | */ | 17 | */ |
767 | 18 | 18 | ||
769 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
770 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
771 | 21 | import "dateExt.js" as DateExt | 21 | import "dateExt.js" as DateExt |
772 | 22 | import "ViewType.js" as ViewType | 22 | import "ViewType.js" as ViewType |
773 | @@ -47,29 +47,37 @@ | |||
774 | 47 | } | 47 | } |
775 | 48 | } | 48 | } |
776 | 49 | 49 | ||
779 | 50 | head { | 50 | header: PageHeader { |
780 | 51 | actions: [ | 51 | id: pageHeader |
781 | 52 | |||
782 | 53 | leadingActionBar.actions: tabs.tabsAction | ||
783 | 54 | trailingActionBar.actions: [ | ||
784 | 52 | calendarTodayAction, | 55 | calendarTodayAction, |
785 | 56 | commonHeaderActions.newEventAction, | ||
786 | 53 | commonHeaderActions.showCalendarAction, | 57 | commonHeaderActions.showCalendarAction, |
787 | 54 | commonHeaderActions.reloadAction, | 58 | commonHeaderActions.reloadAction, |
788 | 55 | commonHeaderActions.syncCalendarAction, | 59 | commonHeaderActions.syncCalendarAction, |
789 | 56 | commonHeaderActions.settingsAction | 60 | commonHeaderActions.settingsAction |
790 | 57 | ] | 61 | ] |
791 | 58 | 62 | ||
798 | 59 | contents: Label { | 63 | title: { |
799 | 60 | id:monthYear | 64 | // TRANSLATORS: this is a time formatting string, |
800 | 61 | objectName:"monthYearLabel" | 65 | // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions. |
801 | 62 | fontSize: "large" | 66 | // It's used in the header of the month and week views |
802 | 63 | text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))) | 67 | var monthName = dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")) |
803 | 64 | font.capitalization: Font.Capitalize | 68 | return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1) |
804 | 65 | } | 69 | } |
805 | 70 | flickable: null | ||
806 | 66 | } | 71 | } |
807 | 67 | 72 | ||
808 | 68 | PathViewBase{ | 73 | PathViewBase{ |
809 | 69 | id: weekViewPath | 74 | id: weekViewPath |
810 | 70 | objectName: "weekviewpathbase" | 75 | objectName: "weekviewpathbase" |
811 | 71 | 76 | ||
813 | 72 | anchors.fill: parent | 77 | anchors { |
814 | 78 | fill: parent | ||
815 | 79 | topMargin: header.height | ||
816 | 80 | } | ||
817 | 73 | 81 | ||
818 | 74 | //This is used to scroll all view together when currentItem scrolls | 82 | //This is used to scroll all view together when currentItem scrolls |
819 | 75 | property var childContentY; | 83 | property var childContentY; |
820 | 76 | 84 | ||
821 | === modified file 'YearView.qml' | |||
822 | --- YearView.qml 2016-01-28 23:04:18 +0000 | |||
823 | +++ YearView.qml 2016-02-02 01:55:03 +0000 | |||
824 | @@ -16,7 +16,7 @@ | |||
825 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
826 | 17 | */ | 17 | */ |
827 | 18 | 18 | ||
829 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
830 | 20 | import Ubuntu.Components 1.3 | 20 | import Ubuntu.Components 1.3 |
831 | 21 | 21 | ||
832 | 22 | import "dateExt.js" as DateExt | 22 | import "dateExt.js" as DateExt |
833 | @@ -45,27 +45,30 @@ | |||
834 | 45 | } | 45 | } |
835 | 46 | } | 46 | } |
836 | 47 | 47 | ||
839 | 48 | head { | 48 | header: PageHeader { |
840 | 49 | actions: [ | 49 | id: pageHeader |
841 | 50 | |||
842 | 51 | leadingActionBar.actions: tabs.tabsAction | ||
843 | 52 | trailingActionBar.actions: [ | ||
844 | 50 | calendarTodayAction, | 53 | calendarTodayAction, |
845 | 54 | commonHeaderActions.newEventAction, | ||
846 | 51 | commonHeaderActions.showCalendarAction, | 55 | commonHeaderActions.showCalendarAction, |
847 | 52 | commonHeaderActions.reloadAction, | 56 | commonHeaderActions.reloadAction, |
848 | 53 | commonHeaderActions.syncCalendarAction, | 57 | commonHeaderActions.syncCalendarAction, |
849 | 54 | commonHeaderActions.settingsAction | 58 | commonHeaderActions.settingsAction |
850 | 55 | ] | 59 | ] |
857 | 56 | contents: Label { | 60 | title: i18n.tr("Year %1").arg(currentYear) |
858 | 57 | id:year | 61 | flickable: null |
853 | 58 | objectName:"yearLabel" | ||
854 | 59 | fontSize: "large" | ||
855 | 60 | text: i18n.tr("Year %1").arg(currentYear) | ||
856 | 61 | } | ||
859 | 62 | } | 62 | } |
860 | 63 | 63 | ||
861 | 64 | PathViewBase { | 64 | PathViewBase { |
862 | 65 | id: yearPathView | 65 | id: yearPathView |
863 | 66 | objectName: "yearPathView" | 66 | objectName: "yearPathView" |
864 | 67 | 67 | ||
866 | 68 | anchors.fill: parent | 68 | anchors { |
867 | 69 | fill: parent | ||
868 | 70 | topMargin: header.height | ||
869 | 71 | } | ||
870 | 69 | 72 | ||
871 | 70 | onNextItemHighlighted: { | 73 | onNextItemHighlighted: { |
872 | 71 | currentYear = currentYear + 1; | 74 | currentYear = currentYear + 1; |
873 | 72 | 75 | ||
874 | === modified file 'YearViewDelegate.qml' | |||
875 | --- YearViewDelegate.qml 2015-12-06 20:06:50 +0000 | |||
876 | +++ YearViewDelegate.qml 2016-02-02 01:55:03 +0000 | |||
877 | @@ -1,4 +1,4 @@ | |||
879 | 1 | import QtQuick 2.0 | 1 | import QtQuick 2.4 |
880 | 2 | import Ubuntu.Components 1.3 | 2 | import Ubuntu.Components 1.3 |
881 | 3 | 3 | ||
882 | 4 | GridView{ | 4 | GridView{ |
883 | 5 | 5 | ||
884 | === modified file 'calendar.qml' | |||
885 | --- calendar.qml 2015-12-06 20:06:50 +0000 | |||
886 | +++ calendar.qml 2016-02-02 01:55:03 +0000 | |||
887 | @@ -15,7 +15,7 @@ | |||
888 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
889 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
890 | 17 | */ | 17 | */ |
892 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
893 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
894 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.0 |
895 | 21 | import QtOrganizer 5.0 | 21 | import QtOrganizer 5.0 |
896 | @@ -210,6 +210,17 @@ | |||
897 | 210 | } | 210 | } |
898 | 211 | } | 211 | } |
899 | 212 | 212 | ||
900 | 213 | |||
901 | 214 | EventActions { | ||
902 | 215 | id: commonHeaderActions | ||
903 | 216 | } | ||
904 | 217 | |||
905 | 218 | Settings { | ||
906 | 219 | id: settings | ||
907 | 220 | property alias defaultViewIndex: tabs.selectedTabIndex | ||
908 | 221 | property alias showWeekNumber: mainView.displayWeekNumber | ||
909 | 222 | } | ||
910 | 223 | |||
911 | 213 | Tabs{ | 224 | Tabs{ |
912 | 214 | id: tabs | 225 | id: tabs |
913 | 215 | Keys.forwardTo: [tabs.currentPage] | 226 | Keys.forwardTo: [tabs.currentPage] |
914 | @@ -222,6 +233,50 @@ | |||
915 | 222 | property int starttime: -1; | 233 | property int starttime: -1; |
916 | 223 | property int endtime: -1; | 234 | property int endtime: -1; |
917 | 224 | 235 | ||
918 | 236 | //WORKAROUND: The new header api does not work with tabs check bug: #1539759 | ||
919 | 237 | property list<Action> tabsAction: [ | ||
920 | 238 | Action { | ||
921 | 239 | objectName: "tab_yearTab" | ||
922 | 240 | name: "tab_yearTab" | ||
923 | 241 | text: i18n.tr("Year") | ||
924 | 242 | iconName: !enabled ? "tick" : "" | ||
925 | 243 | enabled: (tabs.selectedTabIndex != 0) | ||
926 | 244 | onTriggered: tabs.selectedTabIndex = 0 | ||
927 | 245 | }, | ||
928 | 246 | Action { | ||
929 | 247 | objectName: "tab_monthTab" | ||
930 | 248 | name: "tab_monthTab" | ||
931 | 249 | text: i18n.tr("Month") | ||
932 | 250 | iconName: !enabled ? "tick" : "" | ||
933 | 251 | enabled: (tabs.selectedTabIndex != 1) | ||
934 | 252 | onTriggered: tabs.selectedTabIndex = 1 | ||
935 | 253 | }, | ||
936 | 254 | Action { | ||
937 | 255 | objectName: "tab_weekTab" | ||
938 | 256 | name: "tab_weekTab" | ||
939 | 257 | text: i18n.tr("Week") | ||
940 | 258 | iconName: !enabled ? "tick" : "" | ||
941 | 259 | enabled: (tabs.selectedTabIndex != 2) | ||
942 | 260 | onTriggered: tabs.selectedTabIndex = 2 | ||
943 | 261 | }, | ||
944 | 262 | Action { | ||
945 | 263 | objectName: "tab_dayTab" | ||
946 | 264 | name: "tab_dayTab" | ||
947 | 265 | text: i18n.tr("Day") | ||
948 | 266 | iconName: !enabled ? "tick" : "" | ||
949 | 267 | enabled: (tabs.selectedTabIndex != 3) | ||
950 | 268 | onTriggered: tabs.selectedTabIndex = 3 | ||
951 | 269 | }, | ||
952 | 270 | Action { | ||
953 | 271 | objectName: "tab_agendaTab" | ||
954 | 272 | name: "tab_agendaTab" | ||
955 | 273 | text: i18n.tr("Agenda") | ||
956 | 274 | iconName: !enabled ? "tick" : "" | ||
957 | 275 | enabled: (tabs.selectedTabIndex != 4) | ||
958 | 276 | onTriggered: tabs.selectedTabIndex = 4 | ||
959 | 277 | } | ||
960 | 278 | ] | ||
961 | 279 | |||
962 | 225 | function newEvent() { | 280 | function newEvent() { |
963 | 226 | var startDate = new Date(); | 281 | var startDate = new Date(); |
964 | 227 | var endDate = new Date(); | 282 | var endDate = new Date(); |
965 | @@ -315,15 +370,6 @@ | |||
966 | 315 | } | 370 | } |
967 | 316 | } // End of Component.onCompleted: | 371 | } // End of Component.onCompleted: |
968 | 317 | 372 | ||
969 | 318 | EventActions { | ||
970 | 319 | id: commonHeaderActions | ||
971 | 320 | } | ||
972 | 321 | |||
973 | 322 | Settings { | ||
974 | 323 | id: settings | ||
975 | 324 | property alias defaultViewIndex: tabs.selectedTabIndex | ||
976 | 325 | property alias showWeekNumber: mainView.displayWeekNumber | ||
977 | 326 | } | ||
978 | 327 | 373 | ||
979 | 328 | Keys.onTabPressed: { | 374 | Keys.onTabPressed: { |
980 | 329 | if( event.modifiers & Qt.ControlModifier) { | 375 | if( event.modifiers & Qt.ControlModifier) { |
981 | 330 | 376 | ||
982 | === modified file 'calendarTests.qml' | |||
983 | --- calendarTests.qml 2015-10-31 19:56:40 +0000 | |||
984 | +++ calendarTests.qml 2016-02-02 01:55:03 +0000 | |||
985 | @@ -15,7 +15,7 @@ | |||
986 | 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
987 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
988 | 17 | */ | 17 | */ |
990 | 18 | import QtQuick 2.3 | 18 | import QtQuick 2.4 |
991 | 19 | import Ubuntu.Components 1.3 | 19 | import Ubuntu.Components 1.3 |
992 | 20 | 20 | ||
993 | 21 | MainView { | 21 | MainView { |
994 | 22 | 22 | ||
995 | === modified file 'tests/autopilot/calendar_app/__init__.py' | |||
996 | --- tests/autopilot/calendar_app/__init__.py 2015-06-27 17:52:44 +0000 | |||
997 | +++ tests/autopilot/calendar_app/__init__.py 2016-02-02 01:55:03 +0000 | |||
998 | @@ -62,6 +62,23 @@ | |||
999 | 62 | self.visible.wait_for(True, 30) | 62 | self.visible.wait_for(True, 30) |
1000 | 63 | 63 | ||
1001 | 64 | @autopilot.logging.log_action(logger.info) | 64 | @autopilot.logging.log_action(logger.info) |
1002 | 65 | def switch_to_tab(self, tabName): | ||
1003 | 66 | # open tab switcher menu | ||
1004 | 67 | current_tab = self.select_single('Tab', visible=True) | ||
1005 | 68 | overflow_tabs = current_tab.wait_select_single(objectName='overflow_action_button') | ||
1006 | 69 | self.pointing_device.click_object(overflow_tabs) | ||
1007 | 70 | |||
1008 | 71 | # click on tab action | ||
1009 | 72 | tab_button = self.wait_select_single(objectName='tab_%s_button'%tabName) | ||
1010 | 73 | self.pointing_device.click_object(tab_button) | ||
1011 | 74 | |||
1012 | 75 | @autopilot.logging.log_action(logger.info) | ||
1013 | 76 | def click_action_button(self, action): | ||
1014 | 77 | current_tab = self.select_single('Tab', visible=True) | ||
1015 | 78 | button = current_tab.wait_select_single(objectName='%s_button'%action) | ||
1016 | 79 | self.pointing_device.click_object(button) | ||
1017 | 80 | |||
1018 | 81 | @autopilot.logging.log_action(logger.info) | ||
1019 | 65 | def go_to_month_view(self): | 82 | def go_to_month_view(self): |
1020 | 66 | """Open the month view. | 83 | """Open the month view. |
1021 | 67 | 84 | ||
1022 | @@ -138,8 +155,7 @@ | |||
1023 | 138 | :return: The New Event page. | 155 | :return: The New Event page. |
1024 | 139 | 156 | ||
1025 | 140 | """ | 157 | """ |
1028 | 141 | header = self.get_header() | 158 | self.click_action_button('neweventbutton') |
1027 | 142 | header.click_action_button('neweventbutton') | ||
1029 | 143 | return self.wait_select_single(NewEvent, objectName='newEventPage') | 159 | return self.wait_select_single(NewEvent, objectName='newEventPage') |
1030 | 144 | 160 | ||
1031 | 145 | @autopilot.logging.log_action(logger.info) | 161 | @autopilot.logging.log_action(logger.info) |
1032 | @@ -149,8 +165,7 @@ | |||
1033 | 149 | :return: CalendaChoicePopup. | 165 | :return: CalendaChoicePopup. |
1034 | 150 | 166 | ||
1035 | 151 | """ | 167 | """ |
1038 | 152 | header = self.get_header() | 168 | self.click_action_button('calendarsbutton') |
1037 | 153 | header.click_action_button('calendarsbutton') | ||
1039 | 154 | return self.wait_select_single( | 169 | return self.wait_select_single( |
1040 | 155 | CalendarChoicePopup, objectName="calendarchoicepopup") | 170 | CalendarChoicePopup, objectName="calendarchoicepopup") |
1041 | 156 | 171 | ||
1042 | @@ -292,14 +307,8 @@ | |||
1043 | 292 | local = utc.astimezone(tz.tzlocal()) | 307 | local = utc.astimezone(tz.tzlocal()) |
1044 | 293 | return local | 308 | return local |
1045 | 294 | 309 | ||
1046 | 295 | @autopilot.logging.log_action(logger.info) | ||
1047 | 296 | def get_header(self): | ||
1048 | 297 | return self.wait_select_single( | ||
1049 | 298 | "AppHeader", objectName="MainView_Header") | ||
1050 | 299 | |||
1051 | 300 | def press_header_todaybutton(self): | 310 | def press_header_todaybutton(self): |
1054 | 301 | header = self.get_header() | 311 | self.click_action_button('todaybutton') |
1053 | 302 | header.click_action_button('todaybutton') | ||
1055 | 303 | 312 | ||
1056 | 304 | @autopilot.logging.log_action(logger.info) | 313 | @autopilot.logging.log_action(logger.info) |
1057 | 305 | def get_color_picker_dialog(self): | 314 | def get_color_picker_dialog(self): |
1058 | @@ -308,8 +317,7 @@ | |||
1059 | 308 | 317 | ||
1060 | 309 | @autopilot.logging.log_action(logger.info) | 318 | @autopilot.logging.log_action(logger.info) |
1061 | 310 | def press_header_custombackbutton(self): | 319 | def press_header_custombackbutton(self): |
1064 | 311 | header = self.get_header() | 320 | self.click_custom_back_button() |
1063 | 312 | header.click_custom_back_button() | ||
1065 | 313 | 321 | ||
1066 | 314 | 322 | ||
1067 | 315 | class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase): | 323 | class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase): |
FAILED: Continuous integration, rev:748 /core-apps- jenkins. ubuntu. com/job/ run-ap- tests-ci/ 208/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/494/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ run-ap- tests-ci/ 208/rebuild
https:/