Merge lp:~pete-woods/unity-action-api/automatic-quit-action into lp:unity-action-api

[Pete Woods]

Add automatic quit action to HUD toolbar

Add automatic quit action to HUD toolbar

[lp:~pete-woods/unity-action-api/automatic-quit-action]

34. By Pete Woods on 2014-01-22

Increment minor version number for QML action manager

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/46/rebuild

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/unity-action-api/automatic-quit-action]

35. By Pete Woods on 2014-01-22

Add extra check target that prints the log on fail

36. By Pete Woods on 2014-01-22

Make the CPP tests pass

37. By Pete Woods on 2014-01-22

Make the QML tests pass

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/47/rebuild

review: Approve (continuous-integration)

[lp:~pete-woods/unity-action-api/automatic-quit-action]

38. By Pete Woods on 2014-01-23

Handle global actions with specialisation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/48/rebuild

review: Approve (continuous-integration)

[lp:~pete-woods/unity-action-api/automatic-quit-action]

39. By Pete Woods on 2014-01-30

Rename the _quit() signal to quit()

40. By Pete Woods on 2014-01-30

Missed the test case!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/49/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/49/rebuild

review: Needs Fixing (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/unity-action-api-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-action-api-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-action-api-ci/50/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-11 23:17:56 +0000
+++ CMakeLists.txt	2014-01-30 13:56:31 +0000
@@ -130,6 +130,11 @@
 if(${ENABLE_TESTING})
   enable_testing()
   add_subdirectory(test)
+  
+  ADD_CUSTOM_TARGET(
+    check
+    ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
+  )
 endif()
 
 include(EnableCoverageReport)

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 08:42:31 +0000
+++ debian/changelog	2014-01-30 13:56:31 +0000
@@ -1,3 +1,10 @@
+unity-action-api (1.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pete Woods ]
+  * Add automatic quit action to HUD toolbar.
+
+ -- Pete Woods <[e-mail]>  Wed, 22 Jan 2014 10:50:34 +0000
+
 unity-action-api (1.0.0+13.10.20130716-0ubuntu1) saucy; urgency=low
 
   [ Antti Kaijanmäki ]

=== modified file 'include/unity/action/unity-action-manager.h'
--- include/unity/action/unity-action-manager.h	2013-07-11 13:57:36 +0000
+++ include/unity/action/unity-action-manager.h	2014-01-30 13:56:31 +0000
@@ -57,6 +57,8 @@
     void localContextsChanged();
     void actionsChanged();
 
+    Q_REVISION(1) void quit();
+
 private:
         class Private;
         QScopedPointer<Private> d;

=== modified file 'qml/Ubuntu/Unity/Action/plugin.cpp'
--- qml/Ubuntu/Unity/Action/plugin.cpp	2013-07-12 12:55:39 +0000
+++ qml/Ubuntu/Unity/Action/plugin.cpp	2014-01-30 13:56:31 +0000
@@ -34,19 +34,25 @@
 
     qmlRegisterType<unity::action::Action>                     ();
     qmlRegisterType<unity::action::qml::Action>                (uri, 1, 0, "Action");
+    qmlRegisterType<unity::action::qml::Action>                (uri, 1, 1, "Action");
     qmlRegisterType<unity::action::PreviewAction>              ();
     qmlRegisterType<unity::action::qml::PreviewAction>         (uri, 1, 0, "PreviewAction");
+    qmlRegisterType<unity::action::qml::PreviewAction>         (uri, 1, 1, "PreviewAction");
 
     qmlRegisterType<unity::action::PreviewParameter>      ();
     qmlRegisterType<unity::action::PreviewRangeParameter> (uri, 1, 0, "PreviewRangeParameter");
+    qmlRegisterType<unity::action::PreviewRangeParameter> (uri, 1, 1, "PreviewRangeParameter");
 
     // Don't provide menu item just yet.
     //qmlRegisterType<unity::action::MenuItem> (uri, 1, 0, "MenuItem");
 
     qmlRegisterType<unity::action::ActionContext>      ();
     qmlRegisterType<unity::action::qml::ActionContext> (uri, 1, 0, "ActionContext");
-    qmlRegisterType<unity::action::ActionManager>      ();
+    qmlRegisterType<unity::action::qml::ActionContext> (uri, 1, 1, "ActionContext");
+    qmlRegisterType<unity::action::ActionManager> (uri, 1, 0, "");
+    qmlRegisterType<unity::action::ActionManager, 1> (uri, 1, 1, "");
     qmlRegisterType<unity::action::qml::ActionManager> (uri, 1, 0, "ActionManager");
+    qmlRegisterType<unity::action::qml::ActionManager, 1> (uri, 1, 1, "ActionManager");
 
 }
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-07-15 15:24:36 +0000
+++ src/CMakeLists.txt	2014-01-30 13:56:31 +0000
@@ -47,7 +47,7 @@
 
 
 set(API_VERSION_MAJOR 1)
-set(API_VERSION_MINOR 0)
+set(API_VERSION_MINOR 1)
 
 set(SO_VERSION ${API_VERSION_MAJOR})
 

=== modified file 'src/unity-action-manager.cpp'
--- src/unity-action-manager.cpp	2013-07-15 18:06:26 +0000
+++ src/unity-action-manager.cpp	2014-01-30 13:56:31 +0000
@@ -22,6 +22,9 @@
 
 #include <QSet>
 #include <QDebug>
+#include <QCoreApplication>
+
+#include <libintl.h>
 
 // needed for gio includes.
 #undef signals
@@ -198,6 +201,33 @@
            a.desc    == b.desc;
 }
 
+namespace {
+class QuitAction: public Action {
+    Q_OBJECT
+};
+
+class GlobalActionContext: public ActionContext {
+public:
+    GlobalActionContext(QObject *parent = 0) :
+            ActionContext(parent) {
+    }
+
+    void addBuiltInAction(Action *action) {
+        built_in_actions << action;
+    }
+
+    QSet<Action *> allActions() {
+        return actions() + built_in_actions;
+    }
+private:
+    QSet<Action *> built_in_actions;
+};
+
+static inline char * _(const char *__msgid) {
+        return gettext(__msgid);
+}
+}
+
 //! \private
 class Q_DECL_HIDDEN unity::action::ActionManager::Private : public QObject
 {
@@ -208,9 +238,11 @@
 
     QSet<Action *> actions;
 
-    ActionContext *globalContext;
+    GlobalActionContext *globalContext;
     QSet<ActionContext *> localContexts;
 
+    QScopedPointer<Action> quitAction;
+
     ActionContext *activeLocalContext;
 
     QHash<ActionContext *, ContextData> contextData;
@@ -225,7 +257,7 @@
     Private(ActionManager *mgr)
         : q(mgr)
     {
-        globalContext = new ActionContext();
+        globalContext = new GlobalActionContext();
         hudManager = 0;
     }
     ~Private() {
@@ -337,7 +369,14 @@
 
     d->actionGroup = g_simple_action_group_new();
 
+    d->quitAction.reset(new QuitAction());
+    d->quitAction->setText(_("Quit"));
+    d->quitAction->setDescription(_("Quit the application"));
+    d->quitAction->setKeywords(_("Exit;Close"));
+    connect(d->quitAction.data(), SIGNAL(triggered(QVariant)), this, SIGNAL(quit()));
+
     d->createContext(d->globalContext);
+    d->globalContext->addBuiltInAction(d->quitAction.data());
     d->updateContext(d->globalContext);
     hud_manager_switch_window_context(d->hudManager,
                                       d->contextData[d->globalContext].publisher);
@@ -631,7 +670,7 @@
     // current actions in global context and
     // in the active local context
 
-    QSet<Action *> globalActions = globalContext->actions();
+    QSet<Action *> globalActions = globalContext->allActions();
     QSet<Action *> localActions;
     if (activeLocalContext)
         localActions = activeLocalContext->actions();
@@ -704,7 +743,12 @@
     ContextData &cdata = contextData[context];
 
     QSet<Action *> oldActions = cdata.actions;
-    QSet<Action *> currentActions = context->actions();
+    QSet<Action *> currentActions;
+    if(context == globalContext) {
+        currentActions = globalContext->allActions();
+    } else {
+        currentActions = context->actions();
+    }
     QSet<Action *> removedActions = oldActions - currentActions;
 
     foreach (Action *action, currentActions) {
@@ -774,7 +818,7 @@
     const ContextData &cdata = contextData[context];
 
 
-    QSet<Action *> currentActions = context->actions() + globalContext->actions();
+    QSet<Action *> currentActions = context->actions() + globalContext->allActions();
     QSet<Action *> newActions     = currentActions - oldActions;
     QSet<Action *> removedActions = oldActions - currentActions;
 
@@ -821,8 +865,9 @@
                     << "\tin the client code. ";
         globalContext->disconnect(this);
         destroyContext(globalContext);
-        globalContext = new ActionContext();
+        globalContext = new GlobalActionContext();
         createContext(globalContext);
+        globalContext->addBuiltInAction(quitAction.data());
         updateContext(globalContext);
         connect(globalContext, SIGNAL(actionsChanged()), this, SLOT(contextActionsChanged()));
         connect(globalContext, SIGNAL(activeChanged(bool)), this, SLOT(contextActiveChanged(bool)));
@@ -1022,6 +1067,13 @@
                                                    "commitLabel",
                                                    g_variant_new_string(qPrintable(previewAction->commitLabel())));
     }
+
+    QuitAction *quitAction = qobject_cast<QuitAction *>(action);
+    if (quitAction != 0) {
+        hud_action_description_set_attribute_value(desc,
+                                                   "hud-toolbar-item",
+                                                   g_variant_new_string("quit"));
+    }
 }
 
 void
@@ -1038,7 +1090,7 @@
     g_signal_handlers_disconnect_by_data(G_OBJECT(adata.gaction), action);
     g_clear_object(&adata.gaction);
     adata.gaction = (GSimpleAction *)g_object_ref(tmpdata.gaction);
-    if (globalContext->actions().contains(action) ||
+    if (globalContext->allActions().contains(action) ||
         (activeLocalContext != 0 && activeLocalContext->actions().contains(action))) {
         updateActionGroup();
     }

=== modified file 'test/cpp/tst_actionmanager.cpp'
--- test/cpp/tst_actionmanager.cpp	2013-07-09 10:38:33 +0000
+++ test/cpp/tst_actionmanager.cpp	2014-01-30 13:56:31 +0000
@@ -59,8 +59,8 @@
 TestActionManager::cleanup()
 {
     // after each test make sure the manager is left in a clean state
-    Q_ASSERT(manager->actions().isEmpty());
-    Q_ASSERT(manager->localContexts().isEmpty());
+    QVERIFY(manager->actions().count() == 1);
+    QVERIFY(manager->localContexts().isEmpty());
 }
 
 
@@ -168,7 +168,7 @@
     manager->removeLocalContext(ctx1);
     manager->removeLocalContext(ctx2);
     manager->removeLocalContext(ctx3);
-    QVERIFY(manager->actions().count() == 0);
+    QVERIFY(manager->actions().count() == 1);
 }
 
 void
@@ -345,27 +345,27 @@
     manager->addLocalContext(ctx2);
 
     QSignalSpy spy(manager, SIGNAL(actionsChanged()));
-    QCOMPARE(manager->actions().count(), 5);
+    QCOMPARE(manager->actions().count(), 6);
 
     // delete action1 directly from globalContext
     delete action1;
     QCOMPARE(spy.count(), 1);
     QVERIFY(!manager->actions().contains(action1));
-    QCOMPARE(manager->actions().count(), 4);
+    QCOMPARE(manager->actions().count(), 5);
     action1 = 0;
 
     // delete action2 directly from ctx1
     delete action2;
     QCOMPARE(spy.count(), 2);
     QVERIFY(!manager->actions().contains(action2));
-    QCOMPARE(manager->actions().count(), 3);
+    QCOMPARE(manager->actions().count(), 4);
     action2 = 0;
 
     // remove action3 indirectly by destroying ctx1
     delete ctx1;
     QCOMPARE(spy.count(), 3);
     QVERIFY(!manager->actions().contains(action3));
-    QCOMPARE(manager->actions().count(), 2);
+    QCOMPARE(manager->actions().count(), 3);
     ctx1 = 0;
     action3 = 0;
 
@@ -374,7 +374,7 @@
     QCOMPARE(spy.count(), 5); // actionsChanged() gets called multiple times (once per each action in a context)
     QVERIFY(!manager->actions().contains(action4));
     QVERIFY(!manager->actions().contains(action5));
-    QCOMPARE(manager->actions().count(), 0);
+    QCOMPARE(manager->actions().count(), 1);
     QVERIFY(manager->localContexts().isEmpty());
     ctx2 = 0;
     action4 = 0;
@@ -413,32 +413,32 @@
 
     // 3 actions have been added in total
     QCOMPARE(spy.count(), 3);
-    QCOMPARE(manager->actions().count(), 3);
+    QCOMPARE(manager->actions().count(), 4);
 
     spy.clear();
     manager->removeLocalContext(ctx2); // removes only action3, action1 is shared.
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(manager->actions().count(), 2);
+    QCOMPARE(manager->actions().count(), 3);
     // and now add it back
     manager->addLocalContext(ctx2);
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(manager->actions().count(), 3);
+    QCOMPARE(manager->actions().count(), 4);
 
     spy.clear();
     gctx->removeAction(action1);
     QCOMPARE(spy.count(), 0);
-    QCOMPARE(manager->actions().count(), 3);
+    QCOMPARE(manager->actions().count(), 4);
     QVERIFY(manager->actions().contains(action1));
 
     ctx1->removeAction(action1);
     QCOMPARE(spy.count(), 0);
-    QCOMPARE(manager->actions().count(), 3);
+    QCOMPARE(manager->actions().count(), 4);
     QVERIFY(manager->actions().contains(action1));
 
     // remove the action from the last context
     ctx2->removeAction(action1);
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(manager->actions().count(), 2);
+    QCOMPARE(manager->actions().count(), 3);
     QVERIFY(!manager->actions().contains(action1));
 
     manager->removeLocalContext(ctx1);

=== modified file 'test/qml/CMakeLists.txt'
--- test/qml/CMakeLists.txt	2013-06-18 09:48:41 +0000
+++ test/qml/CMakeLists.txt	2014-01-30 13:56:31 +0000
@@ -1,4 +1,5 @@
 add_custom_target(qmlunittests)
+add_custom_target(qmlunittests_1_1)
 
 find_program(qmltestrunner_exe qmltestrunner)
 
@@ -16,4 +17,16 @@
 
 add_custom_target(qmltest_api ${qmltest_command})
 add_dependencies(qmlunittests qmltest_api)
-add_test(qmlunittests ${qmltest_command})
\ No newline at end of file
+add_test(qmlunittests ${qmltest_command})
+
+set(qmltest1_1_command
+  dbus-test-runner -t env -p "QT_QPA_PLATFORM=minimal"
+  -p ${qmltestrunner_exe} -p -input -p ${CMAKE_CURRENT_SOURCE_DIR}/tst_api1.1.qml
+  -p -import -p ${CMAKE_CURRENT_BINARY_DIR}/../../qml
+  -p -o -p ${CMAKE_BINARY_DIR}/testapi.xml,xunitxml
+  -p -o -p -,txt
+)
+
+add_custom_target(qmltest_1_1_api ${qmltest1_1_command})
+add_dependencies(qmlunittests_1_1 qmltest_1_1_api)
+add_test(qmlunittests_1_1 ${qmltest1_1_command})

=== added file 'test/qml/tst_api1.1.qml'
--- test/qml/tst_api1.1.qml	1970-01-01 00:00:00 +0000
+++ test/qml/tst_api1.1.qml	2014-01-30 13:56:31 +0000
@@ -0,0 +1,108 @@
+/* This file is part of unity-action-api
+ * Copyright 2013 Canonical Ltd.
+ *
+ * unity-action-api is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * unity-action-api is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Unity.Action 1.1
+import QtQuick 2.0
+import QtTest 1.0
+
+/* This test will make sure there are no unintentional changes to the
+ * schemantics of the API (default properties work as expected, etc)
+ * so that any files written to the prior release of the library
+ * will not bail out when loaded resulting in client applications failing
+ * to start.
+ */
+Item {
+
+    ActionManager {
+        id: manager
+
+        localContexts: [ctx1, ctx2]
+        
+        onQuit: {}
+
+        Action {
+            id: globalaction
+            name: "NewMessage"
+            text: "Write New Message"
+            iconName: "email-new-message"
+            description: "Write a new Message"
+            keywords: "Compose;Send"
+            enabled: true
+            parameterType: Action.String
+            onTriggered: {}
+        }
+    }
+
+    ActionContext {
+        id: ctx1
+
+        Action {
+            id: myaction1
+            text: "Foo"
+            onTriggered: {}
+        }
+    }
+
+    ActionContext {
+        id: ctx2
+
+        PreviewAction {
+            id: previewaction
+            text: "Color Balance"
+            commitLabel: "Apply"
+
+            onStarted: {}
+            onResetted: {}
+            onCancelled: {}
+            onTriggered: {}
+
+            PreviewRangeParameter {
+                text: "lorem ipsum"
+                value: 0
+                minimumValue: -100
+                maximumValue: 100
+                onValueChanged: {}
+            }
+        }
+    }
+
+
+/*
+    MenuItem {
+        action: myaction1
+        text: "New Message"
+        iconName: "menu-new-message"
+        target: "[e-mail]"
+        visible: true
+        enabled: false
+    }
+*/
+
+    Component.onCompleted: {
+        ctx2.active = true
+    }
+
+
+    TestCase {
+        name: "API Test"
+        id: test_api
+
+        function test_api() {
+            // just make sure this file can be loaded properly by the QmlEngine.
+            verify(1)
+        }
+    }
+}