Merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 into lp:ubuntu-calendar-app

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
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
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://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/828/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1538/console

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
=== modified file 'AgendaView.qml'
--- AgendaView.qml 2015-12-06 20:06:50 +0000
+++ AgendaView.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.321import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
@@ -55,13 +55,21 @@
55 }55 }
56 }56 }
5757
58 head.actions: [58 header: PageHeader {
59 calendarTodayAction,59 id: pageHeader
60 commonHeaderActions.showCalendarAction,60
61 commonHeaderActions.reloadAction,61 title: i18n.tr("Agenda")
62 commonHeaderActions.syncCalendarAction,62 leadingActionBar.actions: tabs.tabsAction
63 commonHeaderActions.settingsAction63 trailingActionBar.actions: [
64 ]64 calendarTodayAction,
65 commonHeaderActions.newEventAction,
66 commonHeaderActions.showCalendarAction,
67 commonHeaderActions.reloadAction,
68 commonHeaderActions.syncCalendarAction,
69 commonHeaderActions.settingsAction
70 ]
71 flickable: eventList
72 }
6573
66 EventListModel {74 EventListModel {
67 id: eventListModel75 id: eventListModel
@@ -97,7 +105,7 @@
97105
98 return default_title;106 return default_title;
99 }107 }
100 visible: (!root.hasEnabledCalendars() || !eventListModel.itemCount) && !eventListModel.isLoading108 visible: (eventListModel.count === 0) && !eventListModel.isLoading
101 anchors.centerIn: parent109 anchors.centerIn: parent
102 }110 }
103111
104112
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml 2015-12-06 20:06:50 +0000
+++ AllDayEventComponent.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
2222
=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml 2015-10-31 19:56:40 +0000
+++ CalendarChoicePopup.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml 2015-10-31 19:56:40 +0000
+++ CalendarListButtonDelegate.qml 2016-02-02 01:55:03 +0000
@@ -14,7 +14,7 @@
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/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItem19import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121
=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml 2015-10-31 19:56:40 +0000
+++ ColorPickerDialog.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
2222
=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml 2015-12-06 20:06:50 +0000
+++ ContactChoicePopup.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.021import Ubuntu.Components.ListItems 1.0
2222
=== modified file 'DayHeaderBackground.qml'
--- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000
+++ DayHeaderBackground.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
1919
20Item {20Item {
21 width: parent.width21 width: parent.width
2222
=== modified file 'DayView.qml'
--- DayView.qml 2016-01-28 23:04:18 +0000
+++ DayView.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
@@ -43,22 +43,27 @@
43 }43 }
44 }44 }
4545
46 head {46 header: PageHeader {
47 actions: [47 id: pageHeader
48
49 leadingActionBar.actions: tabs.tabsAction
50 trailingActionBar.actions: [
48 calendarTodayAction,51 calendarTodayAction,
52 commonHeaderActions.newEventAction,
49 commonHeaderActions.showCalendarAction,53 commonHeaderActions.showCalendarAction,
50 commonHeaderActions.reloadAction,54 commonHeaderActions.reloadAction,
51 commonHeaderActions.syncCalendarAction,55 commonHeaderActions.syncCalendarAction,
52 commonHeaderActions.settingsAction56 commonHeaderActions.settingsAction
53 ]57 ]
5458
55 contents: Label {59 title: {
56 id:monthYear60 // TRANSLATORS: this is a time formatting string,
57 objectName:"monthYearLabel"61 // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
58 fontSize: "large"62 // It's used in the header of the month and week views
59 text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))63 var monthName = currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
60 font.capitalization: Font.Capitalize64 return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
61 }65 }
66
62 }67 }
6368
64 PathViewBase{69 PathViewBase{
@@ -69,7 +74,10 @@
69 //This is used to scroll all view together when currentItem scrolls74 //This is used to scroll all view together when currentItem scrolls
70 property var childContentY;75 property var childContentY;
7176
72 anchors.fill: parent77 anchors {
78 fill: parent
79 topMargin: header.height
80 }
7381
74 onNextItemHighlighted: {82 onNextItemHighlighted: {
75 //next day83 //next day
7684
=== modified file 'Defines.js'
--- Defines.js 2015-10-31 19:56:40 +0000
+++ Defines.js 2016-02-02 01:55:03 +0000
@@ -43,7 +43,7 @@
4343
44function getWeekLabels(){44function getWeekLabels(){
45 var object = Qt.createQmlObject('\45 var object = Qt.createQmlObject('\
46 import QtQuick 2.3;\46 import QtQuick 2.4;\
47 import Ubuntu.Components 1.3;\47 import Ubuntu.Components 1.3;\
48 QtObject {\48 QtObject {\
49 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\49 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
5050
=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml 2015-10-31 19:56:40 +0000
+++ DeleteConfirmationDialog.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
2222
=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml 2015-10-31 19:56:40 +0000
+++ EditEventConfirmationDialog.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
2121
2222
=== modified file 'EventActions.qml'
--- EventActions.qml 2015-12-06 20:06:50 +0000
+++ EventActions.qml 2016-02-02 01:55:03 +0000
@@ -16,16 +16,14 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.SyncMonitor 0.121import Ubuntu.SyncMonitor 0.1
2222
23Item {23Item {
24 id: actionPool24 id: actionPool
2525
26 //removing till following bug is resolved26 property alias newEventAction: _newEventAction
27 //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
28 //property alias newEventAction: _newEventAction
29 property alias showCalendarAction: _showCalendarAction27 property alias showCalendarAction: _showCalendarAction
30 property alias syncCalendarAction: _syncCalendarAction28 property alias syncCalendarAction: _syncCalendarAction
31 property alias settingsAction: _settingsAction29 property alias settingsAction: _settingsAction
@@ -49,6 +47,7 @@
49 Action {47 Action {
50 id: _newEventAction48 id: _newEventAction
51 objectName: "neweventbutton"49 objectName: "neweventbutton"
50 name: "neweventbutton"
52 iconName: "new-event"51 iconName: "new-event"
53 text: i18n.tr("New Event")52 text: i18n.tr("New Event")
54 onTriggered: {53 onTriggered: {
@@ -59,6 +58,7 @@
59 Action{58 Action{
60 id: _showCalendarAction59 id: _showCalendarAction
61 objectName: "calendarsbutton"60 objectName: "calendarsbutton"
61 name: "calendarsbutton"
62 iconName: "calendar"62 iconName: "calendar"
63 text: i18n.tr("Calendars")63 text: i18n.tr("Calendars")
64 onTriggered: {64 onTriggered: {
@@ -70,6 +70,7 @@
70 Action{70 Action{
71 id: _settingsAction71 id: _settingsAction
72 objectName: "settingsbutton"72 objectName: "settingsbutton"
73 name: "calendarsbutton"
73 iconName: "settings"74 iconName: "settings"
74 text: i18n.tr("Settings")75 text: i18n.tr("Settings")
75 onTriggered: {76 onTriggered: {
7677
=== modified file 'EventBubble.qml'
--- EventBubble.qml 2015-12-06 20:06:50 +0000
+++ EventBubble.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import QtOrganizer 5.021import QtOrganizer 5.0
2222
2323
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2016-01-28 23:04:18 +0000
+++ EventDetails.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.0 as ListItem20import Ubuntu.Components.ListItems 1.0 as ListItem
21import Ubuntu.Components.Themes.Ambiance 1.021import Ubuntu.Components.Themes.Ambiance 1.0
@@ -209,7 +209,7 @@
209 dialog.editEvent.connect( function(eventId){209 dialog.editEvent.connect( function(eventId){
210 if( eventId === event.parentId ) {210 if( eventId === event.parentId ) {
211 showEditEventPage(internal.parentEvent, model)211 showEditEventPage(internal.parentEvent, model)
212 } else { 212 } else {
213 showEditEventPage(event, model)213 showEditEventPage(event, model)
214 }214 }
215 });215 });
216216
=== modified file 'EventListModel.qml'
--- EventListModel.qml 2015-08-24 05:08:46 +0000
+++ EventListModel.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import QtOrganizer 5.019import QtOrganizer 5.0
2020
21OrganizerModel {21OrganizerModel {
@@ -41,7 +41,7 @@
41 }41 }
4242
43 function startLoadingTimer() {43 function startLoadingTimer() {
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;}",
45 eventModel, "EventListMode.qml");45 eventModel, "EventListMode.qml");
46 newObject.onTriggered.connect( function(){46 newObject.onTriggered.connect( function(){
47 var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);47 var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);
@@ -73,7 +73,7 @@
73 }73 }
74 }74 }
75 return cals;75 return cals;
76 }76 }
7777
78 function getWritableCollections(){78 function getWritableCollections(){
79 var cals = [];79 var cals = [];
8080
=== modified file 'EventReminder.qml'
--- EventReminder.qml 2015-10-31 19:56:40 +0000
+++ EventReminder.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
2323
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml 2015-10-31 19:56:40 +0000
+++ EventRepetition.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.321import Ubuntu.Components 1.3
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
=== modified file 'EventUtils.qml'
--- EventUtils.qml 2015-10-31 19:56:40 +0000
+++ EventUtils.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import QtOrganizer 5.021import QtOrganizer 5.0
22import "Defines.js" as Defines22import "Defines.js" as Defines
2323
=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml 2015-10-31 19:56:40 +0000
+++ HeaderDateComponent.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22Item {22Item {
2323
=== modified file 'KeyboardRectangle.qml'
--- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000
+++ KeyboardRectangle.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
2020
21Item {21Item {
22 id: keyboardRect22 id: keyboardRect
2323
=== modified file 'LimitLabelModel.qml'
--- LimitLabelModel.qml 2014-10-22 17:32:15 +0000
+++ LimitLabelModel.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.3;18import QtQuick 2.4
1919
20ListModel {20ListModel {
21 id:limitLables21 id:limitLables
2222
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml 2016-01-28 23:04:18 +0000
+++ MonthComponent.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import "dateExt.js" as DateExt20import "dateExt.js" as DateExt
21import "colorUtils.js" as Color21import "colorUtils.js" as Color
2222
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml 2015-10-31 19:56:40 +0000
+++ MonthComponentDateDelegate.qml 2016-02-02 01:55:03 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.32import Ubuntu.Components 1.3
33
4Item{4Item{
55
=== modified file 'MonthView.qml'
--- MonthView.qml 2016-01-28 23:04:18 +0000
+++ MonthView.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import "dateExt.js" as DateExt20import "dateExt.js" as DateExt
21import "colorUtils.js" as Color21import "colorUtils.js" as Color
@@ -42,24 +42,27 @@
42 }42 }
43 }43 }
4444
45 head {45 header: PageHeader {
46 actions: [46 id: pageHeader
47
48 leadingActionBar.actions: tabs.tabsAction
49 trailingActionBar.actions: [
47 calendarTodayAction,50 calendarTodayAction,
51 commonHeaderActions.newEventAction,
48 commonHeaderActions.showCalendarAction,52 commonHeaderActions.showCalendarAction,
49 commonHeaderActions.reloadAction,53 commonHeaderActions.reloadAction,
50 commonHeaderActions.syncCalendarAction,54 commonHeaderActions.syncCalendarAction,
51 commonHeaderActions.settingsAction55 commonHeaderActions.settingsAction
52 ]56 ]
5357 title: {
54 contents: Label {
55 objectName:"monthYearLabel"
56 fontSize: "large"
57 // TRANSLATORS: this is a time formatting string,58 // TRANSLATORS: this is a time formatting string,
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.
59 // It's used in the header of the month and week views60 // It's used in the header of the month and week views
60 text: currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))61 var monthName = currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
61 font.capitalization: Font.Capitalize62 return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
62 }63 }
64
65 flickable: null
63 }66 }
6467
65 PathViewBase{68 PathViewBase{
@@ -68,10 +71,10 @@
6871
69 property var startMonth: currentMonth;72 property var startMonth: currentMonth;
7073
71 anchors.top:parent.top74 anchors {
7275 fill: parent
73 width:parent.width76 topMargin: header.height
74 height: parent.height77 }
7578
76 onNextItemHighlighted: {79 onNextItemHighlighted: {
77 nextMonth();80 nextMonth();
7881
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2015-12-06 20:06:50 +0000
+++ NewEvent.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtOrganizer 5.020import QtOrganizer 5.0
21import Ubuntu.Components 1.321import Ubuntu.Components 1.3
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
2323
=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml 2015-10-31 19:56:40 +0000
+++ NewEventEntryField.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22Label {22Label {
2323
=== modified file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000
+++ NewEventTimePicker.qml 2016-02-02 01:55:03 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.31import QtQuick 2.4
2import Ubuntu.Components.ListItems 1.0 as ListItem2import Ubuntu.Components.ListItems 1.0 as ListItem
3import Ubuntu.Components.Themes.Ambiance 1.03import Ubuntu.Components.Themes.Ambiance 1.0
4import Ubuntu.Components.Pickers 1.04import Ubuntu.Components.Pickers 1.0
55
=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml 2015-10-31 19:56:40 +0000
+++ OnlineAccountsHelper.qml 2016-02-02 01:55:03 +0000
@@ -14,7 +14,7 @@
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/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.318import Ubuntu.Components 1.3
19import Ubuntu.OnlineAccounts 0.119import Ubuntu.OnlineAccounts 0.1
20import Ubuntu.OnlineAccounts.Client 0.120import Ubuntu.OnlineAccounts.Client 0.1
2121
=== modified file 'PathViewBase.qml'
--- PathViewBase.qml 2015-08-29 08:59:47 +0000
+++ PathViewBase.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
1919
20PathView {20PathView {
21 id: root21 id: root
2222
=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml 2015-10-31 19:56:40 +0000
+++ RecurrenceLabelDefines.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22QtObject {22QtObject {
2323
=== modified file 'RemindersModel.qml'
--- RemindersModel.qml 2014-10-17 05:42:34 +0000
+++ RemindersModel.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
2020
21ListModel {21ListModel {
22 id: reminderModel22 id: reminderModel
2323
=== modified file 'ScrollAnimation.qml'
--- ScrollAnimation.qml 2014-09-20 10:45:35 +0000
+++ ScrollAnimation.qml 2016-02-02 01:55:03 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.31import QtQuick 2.4
22
3PropertyAnimation {3PropertyAnimation {
4 duration: 5004 duration: 500
55
=== modified file 'Scroller.qml'
--- Scroller.qml 2015-10-31 19:56:40 +0000
+++ Scroller.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItems21import Ubuntu.Components.ListItems 1.0 as ListItems
2222
2323
=== modified file 'Settings.qml'
--- Settings.qml 2016-01-29 09:35:09 +0000
+++ Settings.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
=== modified file 'SimpleDivider.qml'
--- SimpleDivider.qml 2014-12-11 20:29:27 +0000
+++ SimpleDivider.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
2020
21Rectangle{21Rectangle{
22 height: units.gu(0.1)22 height: units.gu(0.1)
2323
=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml 2015-10-31 19:56:40 +0000
+++ TimeLineBackground.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22Column {22Column {
2323
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2015-10-31 19:56:40 +0000
+++ TimeLineBase.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import QtOrganizer 5.020import QtOrganizer 5.0
2121
2222
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml 2015-12-06 20:06:50 +0000
+++ TimeLineBaseComponent.qml 2016-02-02 01:55:03 +0000
@@ -16,8 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.320import Ubuntu.Components 1.3
22import Ubuntu.Components.Popups 1.021import Ubuntu.Components.Popups 1.0
23import QtOrganizer 5.022import QtOrganizer 5.0
2423
=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml 2015-10-31 19:56:40 +0000
+++ TimeLineHeader.qml 2016-02-02 01:55:03 +0000
@@ -16,9 +16,8 @@
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/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import QtQuick.Layouts 1.1
2221
23import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
2423
@@ -50,7 +49,7 @@
50 id: weekNumLabel49 id: weekNumLabel
51 objectName: "weeknumber"50 objectName: "weeknumber"
5251
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)
54 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))53 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))
55 fontSize: "small"54 fontSize: "small"
56 height: units.gu(5)55 height: units.gu(5)
5756
=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml 2015-10-31 19:56:40 +0000
+++ TimeLineHeaderComponent.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
2323
=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml 2015-10-31 19:56:40 +0000
+++ TimeLineTimeScale.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.019import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22Flickable{22Flickable{
2323
=== modified file 'TimeSeparator.qml'
--- TimeSeparator.qml 2014-09-20 10:45:35 +0000
+++ TimeSeparator.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
1919
20Rectangle {20Rectangle {
21 id: separator21 id: separator
2222
=== modified file 'ViewHeader.qml'
--- ViewHeader.qml 2016-01-28 23:04:18 +0000
+++ ViewHeader.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
2020
21Item{21Item{
2222
=== modified file 'WeekView.qml'
--- WeekView.qml 2016-01-28 23:04:18 +0000
+++ WeekView.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
21import "dateExt.js" as DateExt21import "dateExt.js" as DateExt
22import "ViewType.js" as ViewType22import "ViewType.js" as ViewType
@@ -47,29 +47,37 @@
47 }47 }
48 }48 }
4949
50 head {50 header: PageHeader {
51 actions: [51 id: pageHeader
52
53 leadingActionBar.actions: tabs.tabsAction
54 trailingActionBar.actions: [
52 calendarTodayAction,55 calendarTodayAction,
56 commonHeaderActions.newEventAction,
53 commonHeaderActions.showCalendarAction,57 commonHeaderActions.showCalendarAction,
54 commonHeaderActions.reloadAction,58 commonHeaderActions.reloadAction,
55 commonHeaderActions.syncCalendarAction,59 commonHeaderActions.syncCalendarAction,
56 commonHeaderActions.settingsAction60 commonHeaderActions.settingsAction
57 ]61 ]
5862
59 contents: Label {63 title: {
60 id:monthYear64 // TRANSLATORS: this is a time formatting string,
61 objectName:"monthYearLabel"65 // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
62 fontSize: "large"66 // It's used in the header of the month and week views
63 text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))67 var monthName = dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
64 font.capitalization: Font.Capitalize68 return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
65 }69 }
70 flickable: null
66 }71 }
6772
68 PathViewBase{73 PathViewBase{
69 id: weekViewPath74 id: weekViewPath
70 objectName: "weekviewpathbase"75 objectName: "weekviewpathbase"
7176
72 anchors.fill: parent77 anchors {
78 fill: parent
79 topMargin: header.height
80 }
7381
74 //This is used to scroll all view together when currentItem scrolls82 //This is used to scroll all view together when currentItem scrolls
75 property var childContentY;83 property var childContentY;
7684
=== modified file 'YearView.qml'
--- YearView.qml 2016-01-28 23:04:18 +0000
+++ YearView.qml 2016-02-02 01:55:03 +0000
@@ -16,7 +16,7 @@
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/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.320import Ubuntu.Components 1.3
2121
22import "dateExt.js" as DateExt22import "dateExt.js" as DateExt
@@ -45,27 +45,30 @@
45 }45 }
46 }46 }
4747
48 head {48 header: PageHeader {
49 actions: [49 id: pageHeader
50
51 leadingActionBar.actions: tabs.tabsAction
52 trailingActionBar.actions: [
50 calendarTodayAction,53 calendarTodayAction,
54 commonHeaderActions.newEventAction,
51 commonHeaderActions.showCalendarAction,55 commonHeaderActions.showCalendarAction,
52 commonHeaderActions.reloadAction,56 commonHeaderActions.reloadAction,
53 commonHeaderActions.syncCalendarAction,57 commonHeaderActions.syncCalendarAction,
54 commonHeaderActions.settingsAction58 commonHeaderActions.settingsAction
55 ]59 ]
56 contents: Label {60 title: i18n.tr("Year %1").arg(currentYear)
57 id:year61 flickable: null
58 objectName:"yearLabel"
59 fontSize: "large"
60 text: i18n.tr("Year %1").arg(currentYear)
61 }
62 }62 }
6363
64 PathViewBase {64 PathViewBase {
65 id: yearPathView65 id: yearPathView
66 objectName: "yearPathView"66 objectName: "yearPathView"
6767
68 anchors.fill: parent68 anchors {
69 fill: parent
70 topMargin: header.height
71 }
6972
70 onNextItemHighlighted: {73 onNextItemHighlighted: {
71 currentYear = currentYear + 1;74 currentYear = currentYear + 1;
7275
=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml 2015-12-06 20:06:50 +0000
+++ YearViewDelegate.qml 2016-02-02 01:55:03 +0000
@@ -1,4 +1,4 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.32import Ubuntu.Components 1.3
33
4GridView{4GridView{
55
=== modified file 'calendar.qml'
--- calendar.qml 2015-12-06 20:06:50 +0000
+++ calendar.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import QtOrganizer 5.021import QtOrganizer 5.0
@@ -210,6 +210,17 @@
210 }210 }
211 }211 }
212212
213
214 EventActions {
215 id: commonHeaderActions
216 }
217
218 Settings {
219 id: settings
220 property alias defaultViewIndex: tabs.selectedTabIndex
221 property alias showWeekNumber: mainView.displayWeekNumber
222 }
223
213 Tabs{224 Tabs{
214 id: tabs225 id: tabs
215 Keys.forwardTo: [tabs.currentPage]226 Keys.forwardTo: [tabs.currentPage]
@@ -222,6 +233,50 @@
222 property int starttime: -1;233 property int starttime: -1;
223 property int endtime: -1;234 property int endtime: -1;
224235
236 //WORKAROUND: The new header api does not work with tabs check bug: #1539759
237 property list<Action> tabsAction: [
238 Action {
239 objectName: "tab_yearTab"
240 name: "tab_yearTab"
241 text: i18n.tr("Year")
242 iconName: !enabled ? "tick" : ""
243 enabled: (tabs.selectedTabIndex != 0)
244 onTriggered: tabs.selectedTabIndex = 0
245 },
246 Action {
247 objectName: "tab_monthTab"
248 name: "tab_monthTab"
249 text: i18n.tr("Month")
250 iconName: !enabled ? "tick" : ""
251 enabled: (tabs.selectedTabIndex != 1)
252 onTriggered: tabs.selectedTabIndex = 1
253 },
254 Action {
255 objectName: "tab_weekTab"
256 name: "tab_weekTab"
257 text: i18n.tr("Week")
258 iconName: !enabled ? "tick" : ""
259 enabled: (tabs.selectedTabIndex != 2)
260 onTriggered: tabs.selectedTabIndex = 2
261 },
262 Action {
263 objectName: "tab_dayTab"
264 name: "tab_dayTab"
265 text: i18n.tr("Day")
266 iconName: !enabled ? "tick" : ""
267 enabled: (tabs.selectedTabIndex != 3)
268 onTriggered: tabs.selectedTabIndex = 3
269 },
270 Action {
271 objectName: "tab_agendaTab"
272 name: "tab_agendaTab"
273 text: i18n.tr("Agenda")
274 iconName: !enabled ? "tick" : ""
275 enabled: (tabs.selectedTabIndex != 4)
276 onTriggered: tabs.selectedTabIndex = 4
277 }
278 ]
279
225 function newEvent() {280 function newEvent() {
226 var startDate = new Date();281 var startDate = new Date();
227 var endDate = new Date();282 var endDate = new Date();
@@ -315,15 +370,6 @@
315 }370 }
316 } // End of Component.onCompleted:371 } // End of Component.onCompleted:
317372
318 EventActions {
319 id: commonHeaderActions
320 }
321
322 Settings {
323 id: settings
324 property alias defaultViewIndex: tabs.selectedTabIndex
325 property alias showWeekNumber: mainView.displayWeekNumber
326 }
327373
328 Keys.onTabPressed: {374 Keys.onTabPressed: {
329 if( event.modifiers & Qt.ControlModifier) {375 if( event.modifiers & Qt.ControlModifier) {
330376
=== modified file 'calendarTests.qml'
--- calendarTests.qml 2015-10-31 19:56:40 +0000
+++ calendarTests.qml 2016-02-02 01:55:03 +0000
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
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/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
2020
21MainView {21MainView {
2222
=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py 2015-06-27 17:52:44 +0000
+++ tests/autopilot/calendar_app/__init__.py 2016-02-02 01:55:03 +0000
@@ -62,6 +62,23 @@
62 self.visible.wait_for(True, 30)62 self.visible.wait_for(True, 30)
6363
64 @autopilot.logging.log_action(logger.info)64 @autopilot.logging.log_action(logger.info)
65 def switch_to_tab(self, tabName):
66 # open tab switcher menu
67 current_tab = self.select_single('Tab', visible=True)
68 overflow_tabs = current_tab.wait_select_single(objectName='overflow_action_button')
69 self.pointing_device.click_object(overflow_tabs)
70
71 # click on tab action
72 tab_button = self.wait_select_single(objectName='tab_%s_button'%tabName)
73 self.pointing_device.click_object(tab_button)
74
75 @autopilot.logging.log_action(logger.info)
76 def click_action_button(self, action):
77 current_tab = self.select_single('Tab', visible=True)
78 button = current_tab.wait_select_single(objectName='%s_button'%action)
79 self.pointing_device.click_object(button)
80
81 @autopilot.logging.log_action(logger.info)
65 def go_to_month_view(self):82 def go_to_month_view(self):
66 """Open the month view.83 """Open the month view.
6784
@@ -138,8 +155,7 @@
138 :return: The New Event page.155 :return: The New Event page.
139156
140 """157 """
141 header = self.get_header()158 self.click_action_button('neweventbutton')
142 header.click_action_button('neweventbutton')
143 return self.wait_select_single(NewEvent, objectName='newEventPage')159 return self.wait_select_single(NewEvent, objectName='newEventPage')
144160
145 @autopilot.logging.log_action(logger.info)161 @autopilot.logging.log_action(logger.info)
@@ -149,8 +165,7 @@
149 :return: CalendaChoicePopup.165 :return: CalendaChoicePopup.
150166
151 """167 """
152 header = self.get_header()168 self.click_action_button('calendarsbutton')
153 header.click_action_button('calendarsbutton')
154 return self.wait_select_single(169 return self.wait_select_single(
155 CalendarChoicePopup, objectName="calendarchoicepopup")170 CalendarChoicePopup, objectName="calendarchoicepopup")
156171
@@ -292,14 +307,8 @@
292 local = utc.astimezone(tz.tzlocal())307 local = utc.astimezone(tz.tzlocal())
293 return local308 return local
294309
295 @autopilot.logging.log_action(logger.info)
296 def get_header(self):
297 return self.wait_select_single(
298 "AppHeader", objectName="MainView_Header")
299
300 def press_header_todaybutton(self):310 def press_header_todaybutton(self):
301 header = self.get_header()311 self.click_action_button('todaybutton')
302 header.click_action_button('todaybutton')
303312
304 @autopilot.logging.log_action(logger.info)313 @autopilot.logging.log_action(logger.info)
305 def get_color_picker_dialog(self):314 def get_color_picker_dialog(self):
@@ -308,8 +317,7 @@
308317
309 @autopilot.logging.log_action(logger.info)318 @autopilot.logging.log_action(logger.info)
310 def press_header_custombackbutton(self):319 def press_header_custombackbutton(self):
311 header = self.get_header()320 self.click_custom_back_button()
312 header.click_custom_back_button()
313321
314322
315class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):323class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

Subscribers

People subscribed via source and target branches

to status/vote changes: