Merge lp:~tpeeters/ubuntu-ui-toolkit/unity-action into lp:ubuntu-ui-toolkit

[Tim Peeters]

Use UnityActions to make Actions available to HUD:
- Action now inherits UnityActions.Action
- Added "actions" property to MainView to contain global actions that are available in HUD as long as the app is running.
- Added "actions" property to Page to contain local actions that are available in HUD when the Page is active.

Use UnityActions to make Actions available to HUD:
- Action now inherits UnityActions.Action
- Added "actions" property to MainView to contain global actions that are available in HUD as long as the app is running.
- Added "actions" property to Page to contain local actions that are available in HUD when the Page is active.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:584
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/299/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/935/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/939/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/299/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/943/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/947/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/301/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:591
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/323/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1002/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1006/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/323/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:593
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1020/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/187/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/187/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1024/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/330/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/334/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1038/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1042/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/334/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1048/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1052/console

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Jenkins fails until we have the unity-actions packages in saucy.

[lp:~tpeeters/ubuntu-ui-toolkit/unity-action]

595. By Tim Peeters on 2013-07-16

trigger rebuild

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1132/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/362/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/unity-action]

596. By Tim Peeters on 2013-07-16

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1144/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/364/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/unity-action]

597. By Tim Peeters on 2013-07-16

update dependency package name

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:597
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/367/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/224
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1157
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/983

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/367/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2013-07-12 05:22:28 +0000
+++ components.api	2013-07-16 16:15:40 +0000
@@ -7,12 +7,9 @@
     property bool __acceptEvents
     property internal __mouseArea
 modules/Ubuntu/Components/Action.qml
-QtObject
-    property string text
+UnityActions.Action
     property url iconSource
-    signal triggered(var caller)
     property bool visible
-    property bool enabled
     property Component itemHint
 modules/Ubuntu/Components/ActionItem.qml
 StyledItem
@@ -86,6 +83,7 @@
     property color footerColor
     property bool automaticOrientation
     default property internal contentsItem
+    property list<Action> actions
     property ToolbarActions tools
     onToolsChanged
 modules/Ubuntu/Components/ModelSectionCounter.qml
@@ -109,6 +107,7 @@
 PageTreeNode
     property string title
     property Flickable flickable
+    property list<Action> actions
 modules/Ubuntu/Components/PageStack.qml
 PageTreeNode
     property bool __showHeader

=== modified file 'debian/control'
--- debian/control	2013-07-10 12:09:37 +0000
+++ debian/control	2013-07-16 16:15:40 +0000
@@ -19,6 +19,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-window-plugin,
+               qtdeclarative5-unity-action-plugin,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging 
@@ -34,6 +35,7 @@
          libqt5svg5,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-window-plugin,
+         qtdeclarative5-unity-action-plugin,
          ubuntu-ui-toolkit-theme,
          ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'modules/Ubuntu/Components/Action.qml'
--- modules/Ubuntu/Components/Action.qml	2013-06-18 16:48:04 +0000
+++ modules/Ubuntu/Components/Action.qml	2013-07-16 16:15:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2013 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Unity.Action 1.0 as UnityActions
 
 /*!
     \qmltype Action
@@ -26,25 +27,29 @@
 
     Examples: See \l Page
 */
-QtObject {
+UnityActions.Action {
     id: action
 
+    // FIXME: the properties that are not defined here, but only documented using qmlproperty
+    //  do not show up in the documentation. Best is to replace these docs by a reference
+    //  to UnityActions.Action when they become available online.
+
     /*!
-      \preliminary
       The title of the action.
+      \qmlproperty string Ubuntu.Components.Action::text
      */
-    property string text
 
     /*!
-      \preliminary
       The image associated with the action.
+      \qmlproperty url iconSource
      */
+    // TODO: Move iconSource to unity action if possible
     property url iconSource
 
     /*!
       Called when the action is triggered.
+      \qmlsignal Ubuntu.Components.Action::triggered(var property)
      */
-    signal triggered(var caller)
 
     /*!
       \deprecated
@@ -57,19 +62,15 @@
 
     /*!
       Enable the action. It may be visible, but disabled.
+      \qmlproperty bool enabled
      */
-    property bool enabled: true
 
     /*!
       \deprecated
       \b {itemHint is DEPRECATED. Use \l ActionItem to specify
       the representation of an \l Action.}
-      Proposed Component to use as a representation for this action.
-      Depending on the component that displays the action, the Component
-      given here can replace the default representation of the action.
      */
     property Component itemHint
-
     /*! \internal */
     onItemHintChanged: print("Action.itemHint is a DEPRECATED property. Use ActionItems to specify the representation of an Action.")
 }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-07-15 10:45:50 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-07-16 16:15:40 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Unity.Action 1.0 as UnityActions
 
 /*!
     \qmltype MainView
@@ -254,6 +255,22 @@
         }
     }
 
+    /*!
+      A global list of actions that will be available to the system (including HUD)
+      as long as the application is running. For actions that are not always available to the
+      system, but only when a certain \l Page is active, see the actions property of \l Page.
+
+      \qmlproperty list<Action> actions
+     */
+    property alias actions: unityActionManager.actions
+
+    Object {
+        id: internal
+        UnityActions.ActionManager {
+            id: unityActionManager
+        }
+    }
+
     __propagated: QtObject {
         /*!
           \internal
@@ -268,6 +285,13 @@
           It will be used by the active \l Page to set the toolbar actions.
          */
         property Toolbar toolbar: toolbarItem
+
+        /*!
+          \internal
+          The action manager that has the global context for the MainView's actions,
+          and to which a local context can be added for each Page that has actions.actions.
+         */
+        property var actionManager: unityActionManager
     }
 
     /*!

=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2013-07-15 15:55:04 +0000
+++ modules/Ubuntu/Components/Page.qml	2013-07-16 16:15:40 +0000
@@ -15,6 +15,8 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Unity.Action 1.0 as UnityActions
+
 /*!
     \qmltype Page
     \inqmlmodule Ubuntu.Components 0.1
@@ -121,7 +123,10 @@
     property Flickable flickable: internal.getFlickableChild(page)
 
     /*! \internal */
-    onActiveChanged: internal.updateHeaderAndToolbar()
+    onActiveChanged: {
+        internal.updateHeaderAndToolbar();
+        internal.updateActions();
+    }
     /*! \internal */
     onTitleChanged: internal.updateHeaderAndToolbar()
     /*! \internal */
@@ -131,8 +136,31 @@
     /*! \internal */
     onFlickableChanged: internal.updateHeaderAndToolbar()
 
-    Item {
+    /*!
+      Local actions. These actions will be made available outside the application
+      (for example, to HUD) when the Page is active. For actions that are always available
+      when the application is running, use the actions property of \l MainView.
+
+      \qmlproperty list<Action> actions
+      */
+    property alias actions: actionContext.actions
+
+    Object {
         id: internal
+
+        UnityActions.ActionContext {
+            id: actionContext
+
+            Component.onCompleted: {
+                var manager = page.__propagated.actionManager;
+                if (manager) manager.addLocalContext(actionContext);
+            }
+        }
+
+        function updateActions() {
+            actionContext.active = page.active;
+        }
+
         property Header header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
         property Toolbar toolbar: page.__propagated && page.__propagated.toolbar ? page.__propagated.toolbar : null
 

=== modified file 'tests/unit/tst_components/tst_mainview.qml'
--- tests/unit/tst_components/tst_mainview.qml	2013-07-10 16:58:55 +0000
+++ tests/unit/tst_components/tst_mainview.qml	2013-07-16 16:15:40 +0000
@@ -25,10 +25,15 @@
         id: mainView
     }
 
+    Action {
+        id: action0
+    }
+
     function initTestCase() {
         compare(mainView.active, true, "MainView always active.");
         compare(mainView.automaticOrientation, false, "Automatic orientation off by default.");
         compare(mainView.applicationName, "", "Application name is empty string by default.");
+        compare(mainView.actions.length, 0, "No actions defined by default")
     }
 
     function test_automaticOrientation() {
@@ -45,4 +50,14 @@
         mainView.applicationName = "";
         compare(mainView.applicationName, "", "Application name can be unset.");
     }
+
+    function test_actions() {
+        // FIXME: Check the contents of mainView.actions. This is currently not
+        //  possible because UnityActions.ActionContext.actions does not support it,
+        //  so changes to UnityActions are needed.
+        mainView.actions = [action0];
+        compare(mainView.actions.length, 1, "Actions can be added to page actions");
+        mainView.actions = [];
+        compare(mainView.actions.length, 0, "Page action list can be cleared");
+    }
 }

=== modified file 'tests/unit/tst_components/tst_page.qml'
--- tests/unit/tst_components/tst_page.qml	2013-07-12 15:28:38 +0000
+++ tests/unit/tst_components/tst_page.qml	2013-07-16 16:15:40 +0000
@@ -22,6 +22,10 @@
     width: 200
     height: 200
 
+    Action {
+        id: action0
+    }
+
     Flickable {
         id: testFlickable
     }
@@ -59,6 +63,7 @@
             compare(page.__propagated.header, mainView.__propagated.header, "page header equals mainView header")
             compare(page.__propagated.header.title, page.title, "header title is same as page title")
             compare(page.__propagated.header.visible, false, "header is not visible initially because there is no title")
+            compare(page.actions.length, 0, "page actions list empty by default")
         }
 
         function test_0_noHeader_bug1162028_bug1161910() {
@@ -97,6 +102,15 @@
             compare(page.pageStack, null, "is not set by default")
         }
 
+        function test_actions() {
+            // FIXME: Check the contents of page.actions. This is currently not
+            //  possible because UnityActions.ActionContext.actions does not support it,
+            //  so changes to UnityActions are needed.
+            page.actions = [action0];
+            compare(page.actions.length, 1, "Actions can be added to page actions");
+            page.actions = [];
+            compare(page.actions.length, 0, "Page action list can be cleared");
+        }
         function test_flickable_bug1200642_bug1192591() {
             compare(page.flickable, pageFlickable, "page flickable is correctly detected");
             compare(page.__propagated.header.flickable, pageFlickable, "header flickable is correctly detected"); // bug 1200642 FAIL

=== modified file 'tests/unit/tst_components/tst_tabs.qml'
--- tests/unit/tst_components/tst_tabs.qml	2013-06-21 12:36:51 +0000
+++ tests/unit/tst_components/tst_tabs.qml	2013-07-16 16:15:40 +0000
@@ -52,28 +52,28 @@
 
     function test_flickable() {
         // ensure that the flickable of the header is set to the flickable of the selected tab.
-        tabsFlick.selectedTabIndex = 0;
-        compare(mainViewFlick.__propagated.header.flickable, flickable1, "Header flickable correctly initialized");
-        tabsFlick.selectedTabIndex = 1;
-        compare(mainViewFlick.__propagated.header.flickable, flickable2, "Header flickable correctly updated");
-        tabsFlick.selectedTabIndex = 0;
+        tabs.selectedTabIndex = 3;
+        compare(mainView.__propagated.header.flickable, flickable1, "Header flickable correctly initialized");
+        tabs.selectedTabIndex = 4;
+        compare(mainView.__propagated.header.flickable, flickable2, "Header flickable correctly updated");
+        tabs.selectedTabIndex = 0;
     }
 
     function test_pageLoader() {
-        tabsFlick.selectedTabIndex = 0;
+        tabs.selectedTabIndex = 0;
         compare(loader.item, null, "Page not loaded when tab is not selected");
-        tabsFlick.selectedTabIndex = 2;
-        compare(tabsFlick.currentPage, loader, "Selected loader for current page");
+        tabs.selectedTabIndex = 5;
+        compare(tabs.currentPage, loader, "Selected loader for current page");
         compare(loader.item.title, "Loaded page", "Loaded item is a page");
-        tabsFlick.selectedTabIndex = 0;
+        tabs.selectedTabIndex = 0;
         compare(loader.item, null, "Loaded page was properly unloaded");
     }
 
     function test_bug1088740() {
-        tabsFlick.selectedTabIndex = 2;
-        compare(mainViewFlick.__propagated.header.flickable, loader.item.flick, "Header flickable correctly updated with Loader");
+        tabs.selectedTabIndex = 5;
+        compare(mainView.__propagated.header.flickable, loader.item.flick, "Header flickable correctly updated with Loader");
         compare(loader.item.flick.contentHeight, 1000, "Header flickable is correct flickable");
-        tabsFlick.selectedTabIndex = 0;
+        tabs.selectedTabIndex = 0;
     }
 
     Tabs {
@@ -101,15 +101,7 @@
                 page: Page {
                     id: page3
                 }
-            }
-        }
-    }
-
-    MainView {
-        id: mainViewFlick
-
-        Tabs {
-            id: tabsFlick
+            } 
             Tab {
                 id: tabFlick1
                 page: Page {
@@ -132,11 +124,10 @@
                 id: tabFlickLoader
                 page: Loader {
                     id: loader
-                    sourceComponent: tabsFlick.selectedTabIndex != 2 ? null : pageComponent
+                    sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent
                 }
             }
         }
-
         Component {
             id: pageComponent
             Page {