Merge lp:~pkunal-parmar/ubuntu-calendar-app/SettingToAccountSetup into lp:ubuntu-calendar-app

[Kunal Parmar]

Resolves Bug #1437031 [
The app should allow the user to create a online account without go to system settings]

Resolves Bug #1437031 [
The app should allow the user to create a online account without go to system settings]

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:618
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1115/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2443
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/586
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/112

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1115/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Was this visuals specified by the Designers? I would prefer to have a "add new" button on the header. What do you think?

[Kunal Parmar (pkunal-parmar)]

> Was this visuals specified by the Designers? I would prefer to have a "add
> new" button on the header. What do you think?

We were requested to put button below the list, so yes. But using google's icon was not part of it.
If using google's icon is not preferable then I can remove it.

[Renato Araujo Oliveira Filho (renatofilho)]

Could you try to make the list item at least the same size as the
others account items. And the google icon the same size as the
calendar color rectangle.

On Thu, Apr 23, 2015 at 10:11 PM, Kunal Parmar <email address hidden> wrote:
>> Was this visuals specified by the Designers? I would prefer to have a "add
>> new" button on the header. What do you think?
>
> We were requested to put button below the list, so yes. But using google's icon was not part of it.
> If using google's icon is not preferable then I can remove it.
> --
> https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/SettingToAccountSetup/+merge/254478
> You are requested to review the proposed merge of lp:~pkunal-parmar/ubuntu-calendar-app/SettingToAccountSetup into lp:ubuntu-calendar-app.

[lp:~pkunal-parmar/ubuntu-calendar-app/SettingToAccountSetup]

619. By Kunal Parmar on 2015-05-28

review comment

[Kunal Parmar (pkunal-parmar)]

> Could you try to make the list item at least the same size as the
> others account items. And the google icon the same size as the
> calendar color rectangle.
>

Hi, I tried to address your comment, can you have another look

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:619
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1177/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2835/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/648/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/174/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1177/rebuild

review: Needs Fixing (continuous-integration)

[lp:~pkunal-parmar/ubuntu-calendar-app/SettingToAccountSetup]

620. By Kunal Parmar on 2015-05-28

merge from trunk

621. By Kunal Parmar on 2015-05-28

label color changed

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:621
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2847
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/649
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/175

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1178/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2015-04-27 19:40:30 +0000
+++ CalendarChoicePopup.qml	2015-05-30 00:30:28 +0000
@@ -61,23 +61,18 @@
     ListView {
         id: calendarsList
         anchors.fill: parent
-        footer: Item {
-            id: footer
-            anchors.horizontalCenter: parent.horizontalCenter
-            width: aadCalendar.width
-            Button {
-                id:aadCalendar
-                objectName: "aadCalendar"
-                text: i18n.tr("Add new Calendar")
-                anchors.top :parent.top
-                anchors.topMargin:units.gu(2)
-                color: UbuntuColors.green
-                onClicked: {
-                    Qt.openUrlExternally("settings:///system/online-accounts")
-                }
-
+
+        footer: CalendarListButtonDelegate {
+            id: importFromGoogleButton
+
+            visible: (onlineAccountHelper.status === Loader.Ready)
+            iconSource: "image://theme/google"
+            labelText: i18n.tr("Add online Calendar")
+            onClicked: {
+                onlineAccountHelper.item.setupExec()
             }
         }
+
         model : root.model.getCollections();
         delegate: ListItem.Standard {
             id: delegateComp
@@ -142,5 +137,15 @@
         }
     }
 
+    Loader {
+        id: onlineAccountHelper
+
+        // if running on test mode does not load online account modules
+        property string sourceFile: Qt.resolvedUrl("OnlineAccountsHelper.qml")
+
+        anchors.fill: parent
+        asynchronous: true
+        source: sourceFile
+    }
 }
 

=== added file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml	1970-01-01 00:00:00 +0000
+++ CalendarListButtonDelegate.qml	2015-05-30 00:30:28 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2012-2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ListItem.Standard {
+   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
+   }
+}

=== added file 'OnlineAccountsDummy.qml'
--- OnlineAccountsDummy.qml	1970-01-01 00:00:00 +0000
+++ OnlineAccountsDummy.qml	2015-05-30 00:30:28 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.2
+
+Item {
+    id: root
+
+    property bool running: false
+
+    function setupExec() {
+        root.running = true
+    }
+}

=== added file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml	1970-01-01 00:00:00 +0000
+++ OnlineAccountsHelper.qml	2015-05-30 00:30:28 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.2
+import Ubuntu.Components 1.1
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+
+Item {
+    id: root
+
+    property bool running: false
+
+    function setupExec(){
+        if (!root.running) {
+            root.running = true
+            setup.exec()
+        }
+    }
+
+    Setup {
+        id: setup
+        applicationId: "com.ubuntu.calendar_calendar"
+        providerId: "google"
+        onFinished: {
+            root.running = false
+        }
+    }
+}

=== modified file 'click/calendar.apparmor'
--- click/calendar.apparmor	2014-09-25 15:05:45 +0000
+++ click/calendar.apparmor	2015-05-30 00:30:28 +0000
@@ -2,7 +2,8 @@
     "policy_groups": [
         "calendar",
         "networking",
-        "contacts"
+        "contacts",
+        "accounts"
     ],
     "policy_version": 1.2
-}
\ No newline at end of file
+}