Merge lp:~abreu-alexandre/ubuntu-ui-toolkit/add-public-actionmanager-alias into lp:ubuntu-ui-toolkit

[Alexandre Abreu]

Add an actionmanager property that let clients be more flexible with their actions at runtime

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:701
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/537/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2448/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/394/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2454/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:702
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2453
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/397
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2083

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:702
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/398
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2461
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2461/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2085

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

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

20 + /*!
21 + The current ActionManager that supervises the global and local ActionContexts.
22 +
23 + \qmlproperty UnityActions.ActionManager actionManager
24 + */
25 + property alias actionManager: unityActionManager
26 +

I wouldn't say "current" because an app normally has just one ActionManager.

Please add a note with a reference to the actions property which should be used in most cases, and mention that the developers only need to use the actionManager for specific cases (list example). That will avoid developers creating complex code using the actionManager if it is not really needed.

[lp:~abreu-alexandre/ubuntu-ui-toolkit/add-public-actionmanager-alias]

703. By Alexandre Abreu on 2013-08-21

Fix the documentation

[Alexandre Abreu (abreu-alexandre)]

> 20 + /*!
> 21 + The current ActionManager that supervises the global and local
> ActionContexts.
> 22 +
> 23 + \qmlproperty UnityActions.ActionManager actionManager
> 24 + */
> 25 + property alias actionManager: unityActionManager
> 26 +
>
> I wouldn't say "current" because an app normally has just one ActionManager.
>
> Please add a note with a reference to the actions property which should be
> used in most cases, and mention that the developers only need to use the
> actionManager for specific cases (list example). That will avoid developers
> creating complex code using the actionManager if it is not really needed.

done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:703
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/547/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/404
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/404
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/404/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2477
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2100

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2013-08-16 10:16:48 +0000
+++ components.api	2013-08-21 19:13:25 +0000
@@ -85,6 +85,7 @@
     property bool automaticOrientation
     default property internal contentsItem
     property list<Action> actions
+    property UnityActions.ActionManager actionManager
     property ToolbarActions tools
     onToolsChanged
 modules/Ubuntu/Components/ModelSectionCounter.qml

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-08-08 19:44:09 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-08-21 19:13:25 +0000
@@ -289,6 +289,17 @@
      */
     property alias actions: unityActionManager.actions
 
+    /*!
+      The ActionManager that supervises the global and local ActionContexts.
+      The \l actions property should be used preferably since it covers most
+      use cases. The ActionManager is accessible to have a more refined control
+      over the actions, e.g. if one wants to add/remove actions dynamically, create
+      specific action contexts, etc.
+
+      \qmlproperty UnityActions.ActionManager actionManager
+     */
+    property alias actionManager: unityActionManager
+
     Object {
         id: internal
         UnityActions.ActionManager {