Dan Chapman has proposed merging lp:~dpniel/ubuntu-calendar-app/uitk-1.3 into lp:ubuntu-calendar-app.
Requested reviews: Ubuntu Calendar Developers (ubuntu-calendar-dev) Related bugs: Bug #1508363 in Ubuntu Calendar App: "Coordinated migration to UITK 1.3" https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1508363 For more details, see: https://code.launchpad.net/~dpniel/ubuntu-calendar-app/uitk-1.3/+merge/283591 Update Calendar to Ubuntu.Components 1.3 All imports have been changed to reflect newer uitk, also switched all ListItems to use the new ListItem & ListItemLayouts Not sure if the autopilot tests are working or not. I can't seem to get the environment setup correctly on xenial :-/ -- Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~dpniel/ubuntu-calendar-app/uitk-1.3 into lp:ubuntu-calendar-app.
=== modified file 'AgendaView.qml' --- AgendaView.qml 2015-07-11 02:18:03 +0000 +++ AgendaView.qml 2016-01-22 10:25:36 +0000 @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 import QtOrganizer 5.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 as ListItem import "dateExt.js" as DateExt === modified file 'AllDayEventComponent.qml' --- AllDayEventComponent.qml 2015-08-07 06:20:23 +0000 +++ AllDayEventComponent.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import QtOrganizer 5.0 === modified file 'CalendarChoicePopup.qml' --- CalendarChoicePopup.qml 2015-05-28 13:56:12 +0000 +++ CalendarChoicePopup.qml 2016-01-22 10:25:36 +0000 @@ -15,10 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 -import Ubuntu.Components.ListItems 1.0 as ListItem +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.1 import QtOrganizer 5.0 import Ubuntu.SyncMonitor 0.1 @@ -74,72 +73,69 @@ } model : root.model.getCollections(); - delegate: ListItem.Standard { + delegate: ListItem { id: delegateComp objectName: "calendarItem" - - Rectangle { - id: calendarColorCode - objectName: "calendarColorCode" - - width: parent.height - units.gu(2) - height: width - - anchors { - left: parent.left - leftMargin: units.gu(2) - verticalCenter: parent.verticalCenter - } - - color: modelData.color - opacity: checkBox.checked ? 1.0 : 0.8 - - MouseArea{ - anchors.fill: parent - onClicked: { - //popup dialog - var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root); - dialog.accepted.connect(function(color) { - var collection = root.model.collection(modelData.collectionId); - collection.color = color; - root.model.saveCollection(collection); - }) - } - } - } - - Label{ - objectName: "calendarName" - text: modelData.name - elide: Text.ElideRight - opacity: checkBox.checked ? 1.0 : 0.8 - color: UbuntuColors.midAubergine - width: parent.width - calendarColorCode.width - checkBox.width - units.gu(6) /*margins*/ - anchors { - left: calendarColorCode.right - margins: units.gu(2) - verticalCenter: parent.verticalCenter - } - } - - control: CheckBox { - id: checkBox - objectName: "checkBox" - checked: modelData.extendedMetaData("collection-selected") - enabled: !root.isInEditMode - onCheckedChanged: { - modelData.setExtendedMetaData("collection-selected",checkBox.checked) + height: layout.implicitHeight + + ListItemLayout { + id: layout + title.text: modelData.name + title.wrapMode: Text.WrapAnywhere + title.color: UbuntuColors.midAubergine + + UbuntuShape { + id: calendarColorCode + objectName: "calendarColorCode" + height: units.gu(3) + width: height + aspect: UbuntuShape.Flat + radius: "small" + backgroundColor: modelData.color + opacity: checkBox.checked ? 1.0 : 0.8 + + SlotsLayout.position: SlotsLayout.Leading + + MouseArea{ + anchors.fill: parent + onClicked: { + //popup dialog + var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root); + dialog.accepted.connect(function(color) { + var collection = root.model.collection(modelData.collectionId); + collection.color = color; + root.model.saveCollection(collection); + }) + } + } + } + + CheckBox { + id: checkBox + objectName: "checkBox" + checked: modelData.extendedMetaData("collection-selected") + enabled: !root.isInEditMode + onCheckedChanged: { + modelData.setExtendedMetaData("collection-selected",checkBox.checked) + var collection = root.model.collection(modelData.collectionId); + root.model.saveCollection(collection); + } + } + } + onClicked: { + //popup dialog + var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root); + dialog.accepted.connect(function(color) { var collection = root.model.collection(modelData.collectionId); + collection.color = color; root.model.saveCollection(collection); - } + }) } - } } Loader { id: onlineAccountHelper - // if running on test mode does not load online account modules property string sourceFile: Qt.resolvedUrl("OnlineAccountsHelper.qml") === modified file 'CalendarListButtonDelegate.qml' --- CalendarListButtonDelegate.qml 2015-05-28 13:58:30 +0000 +++ CalendarListButtonDelegate.qml 2016-01-22 10:25:36 +0000 @@ -14,38 +14,36 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem +import QtQuick 2.4 +import Ubuntu.Components 1.3 -ListItem.Standard { +ListItem { id: root - property alias iconSource: uShape.source - property alias labelText: name.text - - Image { - id: uShape - - width: parent.height - units.gu(2) - height: width - - anchors { - left: parent.left - leftMargin: units.gu(2) - verticalCenter: parent.verticalCenter - } - } - - Label { - id: name - - anchors { - left: uShape.right - margins: units.gu(2) - verticalCenter: parent.verticalCenter - } - color: UbuntuColors.midAubergine - elide: Text.ElideRight + property alias iconSource: inner_image.source + property string labelText: "" + + height: layout.implicitHeight + + ListItemLayout { + id: layout + title.text: labelText + title.wrapMode: Text.NoWrap + title.color: UbuntuColors.midAubergine + + UbuntuShape { + aspect: UbuntuShape.Flat + width: units.gu(5) + height: width + source: Image { + id: inner_image + anchors.fill: parent + smooth: true + visible: false + asynchronous: true + } + + SlotsLayout.position: SlotsLayout.Leading + } } } === modified file 'ColorPickerDialog.qml' --- ColorPickerDialog.qml 2015-04-14 19:52:04 +0000 +++ ColorPickerDialog.qml 2016-01-22 10:25:36 +0000 @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.1 Dialog { id: root === modified file 'ContactChoicePopup.qml' --- ContactChoicePopup.qml 2015-05-14 03:36:22 +0000 +++ ContactChoicePopup.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import Ubuntu.Components.ListItems 1.0 import Ubuntu.Components.Themes.Ambiance 1.0 === modified file 'DayHeaderBackground.qml' --- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000 +++ DayHeaderBackground.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 Item { width: parent.width === modified file 'DayView.qml' --- DayView.qml 2015-11-23 07:15:20 +0000 +++ DayView.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt import "ViewType.js" as ViewType === modified file 'DeleteConfirmationDialog.qml' --- DeleteConfirmationDialog.qml 2014-10-14 17:20:13 +0000 +++ DeleteConfirmationDialog.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 Dialog { === modified file 'EditEventConfirmationDialog.qml' --- EditEventConfirmationDialog.qml 2014-10-14 17:20:13 +0000 +++ EditEventConfirmationDialog.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 Dialog { === modified file 'EventActions.qml' --- EventActions.qml 2015-07-11 02:18:03 +0000 +++ EventActions.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.SyncMonitor 0.1 Item { === modified file 'EventBubble.qml' --- EventBubble.qml 2015-11-29 03:17:30 +0000 +++ EventBubble.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import QtOrganizer 5.0 Item{ === modified file 'EventDetails.qml' --- EventDetails.qml 2015-08-03 04:47:59 +0000 +++ EventDetails.qml 2016-01-22 10:25:36 +0000 @@ -15,9 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.Themes.Ambiance 1.0 import Ubuntu.Components.Popups 1.0 import QtOrganizer 5.0 @@ -350,9 +349,23 @@ margins: units.gu(-2) } - ListItem.Header { - text: i18n.tr("Guests") - visible: contactModel.count !== 0 + ListItem { + height: sectionLabel.height + Label { + id: sectionLabel + text: i18n.tr("Guests") + visible: contactModel.count !== 0 + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: units.gu(4) + fontSize: "medium" + font.weight: Font.DemiBold + verticalAlignment: Text.AlignVCenter + } } //Guest Entery Model starts @@ -371,30 +384,35 @@ Repeater{ model: contactModel - delegate: ListItem.Standard { - Label { - text: name - objectName: "eventGuest%1".arg(index) - color: UbuntuColors.midAubergine - anchors { - left: parent.left - leftMargin: units.gu(2) - verticalCenter: parent.verticalCenter + delegate: ListItem { + objectName: "eventGuest%1".arg(index) + height: layout.implicitHeight + ListItemLayout { + id: layout + title.text: name + title.color: UbuntuColors.midAubergine + title.wrapMode: Text.NoWrap + CheckBox { + enabled: false + checked: participationStatus } } - - control: CheckBox { - enabled: false - checked: participationStatus - } } } } //Guest Entries ends - - ListItem.Subtitled { + ListItem { id: reminderHeader - text: i18n.tr("Reminder") + height: layout2.implicitHeight + ListItemLayout { + id: layout2 + title.text: i18n.tr("Reminder") + title.wrapMode: Text.NoWrap + CheckBox { + enabled: false + checked: participationStatus + } + } } } } === modified file 'EventListModel.qml' --- EventListModel.qml 2015-08-24 05:08:46 +0000 +++ EventListModel.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 import QtOrganizer 5.0 OrganizerModel { @@ -41,7 +41,7 @@ } function startLoadingTimer() { - var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}", + var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}", eventModel, "EventListMode.qml"); newObject.onTriggered.connect( function(){ var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod); === modified file 'EventReminder.qml' --- EventReminder.qml 2015-07-12 03:39:07 +0000 +++ EventReminder.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 as ListItem Page{ === modified file 'EventRepetition.qml' --- EventRepetition.qml 2015-07-11 11:33:00 +0000 +++ EventRepetition.qml 2016-01-22 10:25:36 +0000 @@ -16,11 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 import QtOrganizer 5.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 as ListItem -import Ubuntu.Components.Pickers 1.0 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Pickers 1.1 import QtOrganizer 5.0 import "Defines.js" as Defines import "Recurrence.js" as Recurrence @@ -151,7 +150,7 @@ anchors.fill: parent spacing: units.gu(1) - ListItem.Header{ + SectionHeader{ text: i18n.tr("Repeat") } @@ -170,7 +169,7 @@ onExpandedChanged: Qt.inputMethod.hide(); } - ListItem.Header{ + SectionHeader{ text: i18n.tr("Repeats On:") visible: recurrenceOption.selectedIndex == 5 } @@ -215,7 +214,7 @@ } } - ListItem.Header { + SectionHeader { text: i18n.tr("Recurring event ends") visible: recurrenceOption.selectedIndex != 0 } @@ -235,7 +234,7 @@ onExpandedChanged: Qt.inputMethod.hide() } - ListItem.Header{ + SectionHeader{ // TRANSLATORS: this refers to how often a recurrent event repeats // and it is shown as the header of the option selector to choose // its repetition @@ -263,7 +262,7 @@ } } - ListItem.Header{ + SectionHeader{ text:i18n.tr("Date") visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2 } === modified file 'EventUtils.qml' --- EventUtils.qml 2014-10-04 04:37:34 +0000 +++ EventUtils.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import QtOrganizer 5.0 import "Defines.js" as Defines import "Recurrence.js" as Recurrence === modified file 'HeaderDateComponent.qml' --- HeaderDateComponent.qml 2015-05-14 13:03:02 +0000 +++ HeaderDateComponent.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Item { id: root === modified file 'KeyboardRectangle.qml' --- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000 +++ KeyboardRectangle.qml 2016-01-22 10:25:36 +0000 @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 Item { id: keyboardRect === modified file 'LimitLabelModel.qml' --- LimitLabelModel.qml 2014-10-22 17:32:15 +0000 +++ LimitLabelModel.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3; +import QtQuick 2.4; ListModel { id:limitLables === modified file 'MonthComponent.qml' --- MonthComponent.qml 2015-11-23 07:15:20 +0000 +++ MonthComponent.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt import "colorUtils.js" as Color === modified file 'MonthComponentDateDelegate.qml' --- MonthComponentDateDelegate.qml 2015-09-05 05:30:23 +0000 +++ MonthComponentDateDelegate.qml 2016-01-22 10:25:36 +0000 @@ -1,5 +1,5 @@ import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Item{ id: dateRootItem === modified file 'MonthView.qml' --- MonthView.qml 2015-11-23 07:15:20 +0000 +++ MonthView.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt import "colorUtils.js" as Color === modified file 'NewEvent.qml' --- NewEvent.qml 2015-08-24 05:08:46 +0000 +++ NewEvent.qml 2016-01-22 10:25:36 +0000 @@ -16,13 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 import QtOrganizer 5.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 -import Ubuntu.Components.ListItems 1.0 as ListItem +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.1 import Ubuntu.Components.Themes.Ambiance 1.0 -import Ubuntu.Components.Pickers 1.0 +import Ubuntu.Components.Pickers 1.1 import QtOrganizer 5.0 import "Defines.js" as Defines @@ -410,29 +409,24 @@ endDate = dateTime; } } - - ListItem.Standard { - anchors { - left: parent.left - right: parent.right - } - - text: i18n.tr("All day event") - showDivider: false - control: CheckBox { - objectName: "allDayEventCheckbox" - id: allDayEventCheckbox - checked: false + ListItem { + height: layout1.implicitHeight + ListItemLayout { + id: layout1 + title.text: i18n.tr("All day event") + CheckBox { + objectName: "allDayEventCheckbox" + id: allDayEventCheckbox + checked: false + } } } - ListItem.ThinDivider {} - Column { width: parent.width spacing: units.gu(1) - ListItem.Header{ + SectionHeader{ text: i18n.tr("Event Details") } @@ -496,7 +490,7 @@ width: parent.width spacing: units.gu(1) - ListItem.Header { + SectionHeader { text: i18n.tr("Calendar") } @@ -534,7 +528,7 @@ width: parent.width spacing: units.gu(1) - ListItem.Header { + SectionHeader { text: i18n.tr("Guests") } @@ -585,82 +579,100 @@ Repeater{ model: contactModel - delegate: ListItem.Standard { + delegate: ListItem { objectName: "eventGuest%1".arg(index) - height: units.gu(4) - text: name - removable: true - onItemRemoved: { - contactList.array.splice(index, 1) - contactModel.remove(index) + height: layout.implicitHeight + ListItemLayout { + id: layout2 + title.text: name + } + leadingActions: ListItemActions { + actions: [ + Action { + iconName: "delete" + onTriggered: { + contactList.array.splice(index, 1) + contactModel.remove(index) + } + } + ] } } } } } - - ListItem.ThinDivider { - visible: event.itemType === Type.Event - } - } - ListItem.Subtitled{ + ListItem { id:thisHappens objectName :"thisHappens" - anchors { - left: parent.left + height: layout3.height + divider.visible: event.itemType === Type.Event + visible: event.itemType === Type.Event + ListItemLayout { + id: layout3 + title.text: i18n.tr("Repeats") + subtitle.text: event.itemType === Type.Event ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : "" + Item { + height: units.gu(4) + width: height + Icon { + name: "next" + height: units.gu(2.5) + width: height + anchors.centerIn: parent + } + } } - - showDivider: false - progression: true - visible: event.itemType === Type.Event - text: i18n.tr("Repeats") - subText: event.itemType === Type.Event ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : "" onClicked: pageStack.push(Qt.resolvedUrl("EventRepetition.qml"),{"eventRoot": root,"isEdit":isEdit}); } - ListItem.ThinDivider { - visible: event.itemType === Type.Event - } - - ListItem.Subtitled{ + ListItem { id:eventReminder - objectName : "eventReminder" - - anchors.left:parent.left - showDivider: false - progression: true - text: i18n.tr("Reminder") + objectName :"eventReminder" + height: layout4.height + divider.visible: true + visible: event.itemType === Type.Event RemindersModel { id: reminderModel } - subText:{ - if(visualReminder.secondsBeforeStart !== -1) { - for( var i=0; i<reminderModel.count; i++ ) { - if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) { - return reminderModel.get(i).label + ListItemLayout { + id: layout4 + title.text: i18n.tr("Reminder") + subtitle.text: { + if(visualReminder.secondsBeforeStart !== -1) { + for( var i=0; i<reminderModel.count; i++ ) { + if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) { + return reminderModel.get(i).label + } } - } - } else { - return reminderModel.get(0).label - } - + } else { + return reminderModel.get(0).label + } + } + Item { + height: units.gu(4) + width: height + Icon { + name: "next" + height: units.gu(2.5) + width: height + anchors.centerIn: parent + } + } } - onClicked: pageStack.push(Qt.resolvedUrl("EventReminder.qml"), {"visualReminder": visualReminder, "audibleReminder": audibleReminder, "reminderModel": reminderModel, "eventTitle": titleEdit.text}) } - - ListItem.ThinDivider {} } } + // used to keep the field visible when the keyboard appear or dismiss KeyboardRectangle { id: keyboard === modified file 'NewEventEntryField.qml' --- NewEventEntryField.qml 2015-02-17 05:53:42 +0000 +++ NewEventEntryField.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Label { id: root === modified file 'NewEventTimePicker.qml' --- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000 +++ NewEventTimePicker.qml 2016-01-22 10:25:36 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.3 +import QtQuick 2.4 import Ubuntu.Components.ListItems 1.0 as ListItem import Ubuntu.Components.Themes.Ambiance 1.0 import Ubuntu.Components.Pickers 1.0 @@ -29,7 +29,7 @@ timeInput.text = Qt.formatTime(dateTime); } - ListItem.Header { + SectionHeader { id: listHeader } === modified file 'OnlineAccountsHelper.qml' --- OnlineAccountsHelper.qml 2015-03-28 11:31:47 +0000 +++ OnlineAccountsHelper.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ */ import QtQuick 2.2 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.OnlineAccounts 0.1 import Ubuntu.OnlineAccounts.Client 0.1 === modified file 'PathViewBase.qml' --- PathViewBase.qml 2015-08-29 08:59:47 +0000 +++ PathViewBase.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 PathView { id: root === modified file 'RecurrenceLabelDefines.qml' --- RecurrenceLabelDefines.qml 2014-10-17 05:42:34 +0000 +++ RecurrenceLabelDefines.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 QtObject { property var recurrenceLabel:[i18n.tr("Once"), === modified file 'RemindersModel.qml' --- RemindersModel.qml 2014-10-17 05:42:34 +0000 +++ RemindersModel.qml 2016-01-22 10:25:36 +0000 @@ -16,7 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 ListModel { id: reminderModel === modified file 'ScrollAnimation.qml' --- ScrollAnimation.qml 2014-09-20 10:45:35 +0000 +++ ScrollAnimation.qml 2016-01-22 10:25:36 +0000 @@ -1,4 +1,4 @@ -import QtQuick 2.3 +import QtQuick 2.4 PropertyAnimation { duration: 500 === modified file 'Scroller.qml' --- Scroller.qml 2014-09-20 10:45:35 +0000 +++ Scroller.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.0 as ListItems Item { === added file 'SectionHeader.qml' --- SectionHeader.qml 1970-01-01 00:00:00 +0000 +++ SectionHeader.qml 2016-01-22 10:25:36 +0000 @@ -0,0 +1,23 @@ +import QtQuick 2.4 +import Ubuntu.Components 1.3 + +ListItem { + + property alias text: sectionLabel.text + + height: sectionLabel.height + Label { + id: sectionLabel + anchors { + left: parent.left + leftMargin: units.gu(2) + right: parent.right + rightMargin: units.gu(2) + } + height: units.gu(4) + fontSize: "medium" + font.weight: Font.DemiBold + verticalAlignment: Text.AlignVCenter + } +} + === modified file 'Settings.qml' --- Settings.qml 2015-11-23 07:15:20 +0000 +++ Settings.qml 2016-01-22 10:25:36 +0000 @@ -15,10 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 -import Ubuntu.Components.ListItems 1.0 as ListItem +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.1 Page { id: root @@ -46,40 +45,30 @@ objectName: "settingsColumn" spacing: units.gu(0.5) anchors { - margins: units.gu(2) fill: parent } - Item{ + ListItem{ + id: weekNumber; + objectName: "weekNumber" width: parent.width; - height: Math.max(weekNumber.height, weekCheckBox.height) - - Label{ - id: weekNumber; - objectName: "weekNumber" - text: i18n.tr("Show week numbers"); - elide: Text.ElideRight - opacity: weekCheckBox.checked ? 1.0 : 0.8 - color: UbuntuColors.midAubergine - anchors { - left: parent.left - right: weekCheckBox.left; - margins: units.gu(2) - verticalCenter: parent.verticalCenter - } - } - - CheckBox { - id: weekCheckBox - objectName: "weekCheckBox" - anchors.right:parent.right; - onCheckedChanged: { - mainView.displayWeekNumber = weekCheckBox.checked; + height: layout.implicitHeight + opacity: weekCheckBox.checked ? 1.0 : 0.8 + + ListItemLayout { + id: layout + title.text: i18n.tr("Show week numbers"); + title.elide: Text.ElideRight + title.color: UbuntuColors.midAubergine + CheckBox { + id: weekCheckBox + objectName: "weekCheckBox" + onCheckedChanged: { + mainView.displayWeekNumber = weekCheckBox.checked; + } } } } - - ListItem.ThinDivider {} } Component.onCompleted: { === modified file 'TimeLineBackground.qml' --- TimeLineBackground.qml 2014-11-29 05:15:13 +0000 +++ TimeLineBackground.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Column { width: parent.width === modified file 'TimeLineBase.qml' --- TimeLineBase.qml 2015-08-20 12:27:59 +0000 +++ TimeLineBase.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import QtOrganizer 5.0 import "dateExt.js" as DateExt === modified file 'TimeLineBaseComponent.qml' --- TimeLineBaseComponent.qml 2015-10-31 18:47:23 +0000 +++ TimeLineBaseComponent.qml 2016-01-22 10:25:36 +0000 @@ -16,9 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 import QtQuick.Layouts 1.1 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.0 import QtOrganizer 5.0 @@ -112,11 +112,11 @@ } Timer{ - interval: 200; running: true; repeat: false - onTriggered: { - mainModel = modelComponent.createObject(); - activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;}); - } + interval: 200; running: true; repeat: false + onTriggered: { + mainModel = modelComponent.createObject(); + activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;}); + } } Component { @@ -177,6 +177,7 @@ id: timeLineView objectName: "timelineview" + height: parent.height width: parent.width - units.gu(6) @@ -242,7 +243,7 @@ objectName: "mouseArea" anchors.fill: parent - function modifyEventForDrag(drag) { + function modifyEventForDrag(drag) { var event = drag.source.event; var diff = event.endDateTime.getTime() - event.startDateTime.getTime(); @@ -252,7 +253,7 @@ event.startDateTime = startDate; event.endDateTime = endDate; - return event; + return event; } onDropped: { === modified file 'TimeLineHeader.qml' --- TimeLineHeader.qml 2015-09-05 05:30:23 +0000 +++ TimeLineHeader.qml 2016-01-22 10:25:36 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 import QtQuick.Layouts 1.1 import "ViewType.js" as ViewType === modified file 'TimeLineHeaderComponent.qml' --- TimeLineHeaderComponent.qml 2015-09-05 05:30:23 +0000 +++ TimeLineHeaderComponent.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt import "ViewType.js" as ViewType === modified file 'TimeLineTimeScale.qml' --- TimeLineTimeScale.qml 2014-12-11 20:29:27 +0000 +++ TimeLineTimeScale.qml 2016-01-22 10:25:36 +0000 @@ -17,7 +17,7 @@ */ import QtQuick 2.0 -import Ubuntu.Components 1.1 +import Ubuntu.Components 1.3 Flickable{ id: timeFlickble === modified file 'TimeSeparator.qml' --- TimeSeparator.qml 2014-09-20 10:45:35 +0000 +++ TimeSeparator.qml 2016-01-22 10:25:36 +0000 @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 +import QtQuick 2.4 Rectangle { id: separator === modified file 'ViewHeader.qml' --- ViewHeader.qml 2014-11-29 09:40:53 +0000 +++ ViewHeader.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Item{ id: header === modified file 'WeekView.qml' --- WeekView.qml 2015-10-28 02:12:50 +0000 +++ WeekView.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt import "ViewType.js" as ViewType === modified file 'YearView.qml' --- YearView.qml 2015-11-23 07:15:20 +0000 +++ YearView.qml 2016-01-22 10:25:36 +0000 @@ -16,8 +16,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import "dateExt.js" as DateExt Page { @@ -86,7 +86,6 @@ Component{ id: delegateComponent - YearViewDelegate{ focus: index == yearPathView.currentIndex === modified file 'YearViewDelegate.qml' --- YearViewDelegate.qml 2015-11-23 07:15:20 +0000 +++ YearViewDelegate.qml 2016-01-22 10:25:36 +0000 @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 GridView{ id: yearView === modified file 'calendar.qml' --- calendar.qml 2015-11-23 07:15:20 +0000 +++ calendar.qml 2016-01-22 10:25:36 +0000 @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.Popups 1.0 +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.Popups 1.1 import QtOrganizer 5.0 import Qt.labs.settings 1.0 import "dateExt.js" as DateExt @@ -27,7 +27,7 @@ property bool displayWeekNumber: false; - useDeprecatedToolbar: false +// useDeprecatedToolbar: false // Work-around until this branch lands: // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496 === modified file 'calendarTests.qml' --- calendarTests.qml 2014-09-20 10:45:35 +0000 +++ calendarTests.qml 2016-01-22 10:25:36 +0000 @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 MainView { width: units.gu(20) === modified file 'click/manifest.json.in' --- click/manifest.json.in 2014-12-28 23:12:44 +0000 +++ click/manifest.json.in 2016-01-22 10:25:36 +0000 @@ -1,7 +1,7 @@ { "architecture": "all", "description": "A calendar for Ubuntu which syncs with online accounts", - "framework": "ubuntu-sdk-14.10-qml", + "framework": "ubuntu-sdk-15.04.2-qml", "hooks": { "calendar": { "account-application": "@PROJECT_NAME@_@APP_NAME@.application", === modified file 'po/com.ubuntu.calendar.pot' --- po/com.ubuntu.calendar.pot 2015-11-23 07:15:20 +0000 +++ po/com.ubuntu.calendar.pot 2016-01-22 10:25:36 +0000 @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Canonical Ltd. -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-23 15:14+0800\n" +"POT-Creation-Date: 2016-01-22 09:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -59,25 +59,25 @@ msgstr[0] "" msgstr[1] "" -#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61 +#: ../CalendarChoicePopup.qml:32 ../EventActions.qml:61 msgid "Calendars" msgstr "" -#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32 +#: ../CalendarChoicePopup.qml:36 ../Settings.qml:31 msgid "Back" msgstr "" #. TRANSLATORS: Please translate this string to 15 characters only. #. Currently ,there is no way we can increase width of action menu currently. -#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37 +#: ../CalendarChoicePopup.qml:50 ../EventActions.qml:37 msgid "Sync" msgstr "" -#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37 +#: ../CalendarChoicePopup.qml:50 ../EventActions.qml:37 msgid "Syncing" msgstr "" -#: ../CalendarChoicePopup.qml:70 +#: ../CalendarChoicePopup.qml:69 msgid "Add online Calendar" msgstr "" @@ -132,11 +132,11 @@ msgid "Delete this" msgstr "" -#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:68 +#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:67 msgid "Delete" msgstr "" -#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325 +#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324 msgid "Edit Event" msgstr "" @@ -154,11 +154,11 @@ msgid "Edit this" msgstr "" -#: ../EventActions.qml:51 ../NewEvent.qml:325 +#: ../EventActions.qml:51 ../NewEvent.qml:324 msgid "New Event" msgstr "" -#: ../EventActions.qml:72 ../Settings.qml:28 +#: ../EventActions.qml:72 ../Settings.qml:27 msgid "Settings" msgstr "" @@ -169,35 +169,35 @@ msgid "%1 <b>%2</b>" msgstr "" -#: ../EventDetails.qml:43 ../NewEvent.qml:436 +#: ../EventDetails.qml:42 ../NewEvent.qml:430 msgid "Event Details" msgstr "" #. TRANSLATORS: the first parameter refers to the name of event calendar. -#: ../EventDetails.qml:68 +#: ../EventDetails.qml:67 #, qt-format msgid "%1 Calendar" msgstr "" -#: ../EventDetails.qml:129 +#: ../EventDetails.qml:128 #, qt-format msgid "%1 - %2 (All Day)" msgstr "" -#: ../EventDetails.qml:133 +#: ../EventDetails.qml:132 #, qt-format msgid "%1 (All Day)" msgstr "" -#: ../EventDetails.qml:203 +#: ../EventDetails.qml:202 msgid "Edit" msgstr "" -#: ../EventDetails.qml:354 ../NewEvent.qml:538 +#: ../EventDetails.qml:356 ../NewEvent.qml:532 msgid "Guests" msgstr "" -#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635 +#: ../EventDetails.qml:409 ../EventReminder.qml:35 ../NewEvent.qml:644 msgid "Reminder" msgstr "" @@ -205,26 +205,26 @@ #. and it is shown as the header of the page to choose repetition #. and as the header of the list item that shows the repetition #. summary in the page that displays the event details -#: ../EventRepetition.qml:40 ../EventRepetition.qml:155 +#: ../EventRepetition.qml:39 ../EventRepetition.qml:154 msgid "Repeat" msgstr "" -#: ../EventRepetition.qml:174 +#: ../EventRepetition.qml:173 msgid "Repeats On:" msgstr "" -#: ../EventRepetition.qml:219 +#: ../EventRepetition.qml:218 msgid "Recurring event ends" msgstr "" #. TRANSLATORS: this refers to how often a recurrent event repeats #. and it is shown as the header of the option selector to choose #. its repetition -#: ../EventRepetition.qml:242 ../NewEvent.qml:619 +#: ../EventRepetition.qml:241 ../NewEvent.qml:615 msgid "Repeats" msgstr "" -#: ../EventRepetition.qml:267 +#: ../EventRepetition.qml:266 msgid "Date" msgstr "" @@ -267,51 +267,51 @@ msgid "Wk" msgstr "" -#: ../NewEvent.qml:84 +#: ../NewEvent.qml:83 msgid "Save" msgstr "" -#: ../NewEvent.qml:192 +#: ../NewEvent.qml:191 msgid "End time can't be before start time" msgstr "" -#: ../NewEvent.qml:335 +#: ../NewEvent.qml:334 msgid "Error" msgstr "" -#: ../NewEvent.qml:337 +#: ../NewEvent.qml:336 msgid "OK" msgstr "" -#: ../NewEvent.qml:390 +#: ../NewEvent.qml:389 msgid "From" msgstr "" -#: ../NewEvent.qml:403 +#: ../NewEvent.qml:402 msgid "To" msgstr "" -#: ../NewEvent.qml:420 +#: ../NewEvent.qml:416 msgid "All day event" msgstr "" -#: ../NewEvent.qml:449 +#: ../NewEvent.qml:443 msgid "Event Name" msgstr "" -#: ../NewEvent.qml:467 +#: ../NewEvent.qml:461 msgid "Description" msgstr "" -#: ../NewEvent.qml:485 +#: ../NewEvent.qml:479 msgid "Location" msgstr "" -#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1 +#: ../NewEvent.qml:494 com.ubuntu.calendar_calendar.desktop.in.in.h:1 msgid "Calendar" msgstr "" -#: ../NewEvent.qml:542 +#: ../NewEvent.qml:536 msgid "Add Guest" msgstr ""
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp