Merge lp:~nick-dedekind/unity8/move-indicator-qml into lp:unity8

[Nick Dedekind]

Moved [Message]MenuItemFacotory from Unity.Indicators plugin to qml folder.

Moved [Message]MenuItemFacotory from Unity.Indicators plugin to qml folder.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/unity8-ci/3186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1072
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/280
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8678

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3186/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/move-indicator-qml]

979. By Nick Dedekind on 2014-06-26

moved qml to root plugin dir. moved IndicatoBase to Panel/Indicators

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:979
http://jenkins.qa.ubuntu.com/job/unity8-ci/3232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1241
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/326
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/326/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2126
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8888

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3232/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Unexpected test failures:
qmltestrunner.DefaultIndicatorPage::test_empty
qmltestrunner.DefaultIndicatorPage::test_reloadData
qmltestrunner.DefaultIndicatorPage::test_traverse_rootMenuType
qmltestrunner.tst_DefaultIndicatorWidget::compile
testDash.xml.<init>

review: Needs Fixing

[lp:~nick-dedekind/unity8/move-indicator-qml]

980. By Nick Dedekind on 2014-06-27

fixed tests

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes. Everything still good.

 * Did CI run pass? If not, please explain why.
Not yet, expecting testShell failure.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/unity8-ci/3244/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2179/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3244/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:980
http://jenkins.qa.ubuntu.com/job/unity8-ci/3247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1290
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/341
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2191
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8940

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3247/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/move-indicator-qml]

981. By Nick Dedekind on 2014-07-03

merged with trunk

=== modified file 'plugins/Unity/Indicators/CMakeLists.txt'
--- plugins/Unity/Indicators/CMakeLists.txt	2014-05-02 22:57:00 +0000
+++ plugins/Unity/Indicators/CMakeLists.txt	2014-07-03 13:48:00 +0000
@@ -51,7 +51,4 @@
 
 qt5_use_modules(IndicatorsQml Core Qml Quick)
 
-add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators
-    SEARCH_PATH qml
-    TARGETS IndicatorsQml
-)
+add_unity8_plugin(Unity.Indicators 0.1 Unity/Indicators TARGETS IndicatorsQml)
 
=== renamed file 'plugins/Unity/Indicators/qml/CachedUnityMenuModel.qml' => 'plugins/Unity/Indicators/CachedUnityMenuModel.qml'
=== removed directory 'plugins/Unity/Indicators/qml'
=== renamed file 'plugins/Unity/Indicators/qml/qmldir' => 'plugins/Unity/Indicators/qmldir'
--- plugins/Unity/Indicators/qml/qmldir	2014-05-02 22:57:00 +0000
+++ plugins/Unity/Indicators/qmldir	2014-07-03 13:48:00 +0000
@@ -4,7 +4,3 @@
 
 CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
 IndicatorBase 0.1 IndicatorBase.qml
-MenuItemFactory 0.1 MenuItemFactory.qml
-MessageMenuItemFactory 0.1 MessageMenuItemFactory.qml
-
-internal RemoveBackground RemoveBackground.qml
 
=== modified file 'qml/Panel/Indicators/DefaultIndicatorPage.qml'
--- qml/Panel/Indicators/DefaultIndicatorPage.qml	2013-12-13 14:59:04 +0000
+++ qml/Panel/Indicators/DefaultIndicatorPage.qml	2014-07-03 13:48:00 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components 0.1 as Components
 import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     id: main
 
     //const
@@ -174,7 +174,7 @@
         }
     }
 
-    Indicators.MenuItemFactory {
+    MenuItemFactory {
         id: factory
         menuModel: mainMenu.model ? mainMenu.model : null
     }
 
=== modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
--- qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-07-01 13:56:53 +0000
+++ qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-07-03 13:48:00 +0000
@@ -20,9 +20,8 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Settings.Components 0.1
-import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     id: indicatorWidget
 
     property int iconSize: units.gu(2)
 
=== renamed file 'plugins/Unity/Indicators/qml/IndicatorBase.qml' => 'qml/Panel/Indicators/IndicatorBase.qml'
--- plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-11-24 02:23:56 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2014-07-03 13:48:00 +0000
@@ -18,8 +18,7 @@
  */
 
 import QtQuick 2.0
-import QMenuModel 0.1 as QMenuModel
-import Unity.Indicators 0.1 as Indicators
+import Unity.Indicators 0.1
 
 Item {
     id: indicatorItem
@@ -43,7 +42,7 @@
         menuObjectPath: indicatorItem.deviceMenuObjectPath
     }
 
-    property var rootActionState: Indicators.RootActionState {
+    property RootActionState rootActionState: RootActionState {
         menu: menuModel
         onUpdated: indicatorItem.rootActionStateChanged()
     }
 
=== modified file 'qml/Panel/Indicators/IndicatorDelegate.qml'
--- qml/Panel/Indicators/IndicatorDelegate.qml	2014-01-14 15:35:57 +0000
+++ qml/Panel/Indicators/IndicatorDelegate.qml	2014-07-03 13:48:00 +0000
@@ -18,9 +18,8 @@
  */
 
 import QtQuick 2.0
-import Unity.Indicators 0.1 as Indicators
 
-Indicators.IndicatorBase {
+IndicatorBase {
     enabled: false
 
     onRootActionStateChanged: {
 
=== renamed file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml' => 'qml/Panel/Indicators/MenuItemFactory.qml'
=== renamed file 'plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml' => 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
=== renamed file 'plugins/Unity/Indicators/qml/RemoveBackground.qml' => 'qml/Panel/Indicators/RemoveBackground.qml'
=== removed file 'tests/mocks/Unity/Indicators/IndicatorBase.qml'
--- tests/mocks/Unity/Indicators/IndicatorBase.qml	2013-12-13 11:18:03 +0000
+++ tests/mocks/Unity/Indicators/IndicatorBase.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * 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
- * 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 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/>.
- *
- * Authors:
- *      Nick Dedekind <[e-mail]>
- */
-
-import QtQuick 2.0
-import QMenuModel 0.1
-
-Item {
-    id: indicatorBase
-
-    //const
-    property string busName
-    property string actionsObjectPath
-    property string menuObjectPath
-    property string rootMenuType: "com.canonical.indicator.root"
-    property string deviceMenuObjectPath: menuObjectPath
-
-    property var menuModel: UnityMenuModel {}
-
-    property RootActionState rootActionState: RootActionState {
-        onUpdated: indicatorBase.rootActionStateChanged()
-    }
-}
 
=== removed file 'tests/mocks/Unity/Indicators/MenuItemFactory.qml'
--- tests/mocks/Unity/Indicators/MenuItemFactory.qml	2013-12-13 13:12:40 +0000
+++ tests/mocks/Unity/Indicators/MenuItemFactory.qml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * 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
- * 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 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/>.
- *
- * Authors:
- *      Nick Dedekind <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Item {
-    id: menuFactory
-
-    property var menuModel: null
-
-    Component {
-        id: standardMenu;
-        ListItem.Standard {
-            objectName: "standardMenu"
-        }
-    }
-
-    function load(modelData) {
-        return standardMenu;
-    }
-}
 
=== modified file 'tests/mocks/Unity/Indicators/qmldir'
--- tests/mocks/Unity/Indicators/qmldir	2014-05-02 22:57:21 +0000
+++ tests/mocks/Unity/Indicators/qmldir	2014-07-03 13:48:00 +0000
@@ -3,8 +3,6 @@
 typeinfo Indicators.qmltypes
 
 CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
-IndicatorBase 0.1 IndicatorBase.qml
 IndicatorsModel 0.1 IndicatorsModel.qml
 FakeMenuPage 0.1 FakeMenuPage.qml
-MenuItemFactory 0.1 MenuItemFactory.qml
 RootActionState 0.1 RootActionState.qml
 
=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml'
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-01-15 12:34:00 +0000
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml	2014-07-03 13:48:00 +0000
@@ -31,6 +31,7 @@
         anchors.fill: parent
         contentActive: true
 
+        menuModel: UnityMenuModel {}
         busName: "test"
         actionsObjectPath: "test"
         menuObjectPath: "test"
 
=== modified file 'tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml'
--- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml	2014-07-01 12:15:35 +0000
+++ tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml	2014-07-03 13:48:00 +0000
@@ -33,6 +33,7 @@
             top: parent.top
         }
 
+        menuModel: UnityMenuModel {}
         busName: "test"
         actionsObjectPath: "test"
         deviceMenuObjectPath: "test"
 
=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-05-01 14:25:18 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2014-07-03 13:48:00 +0000
@@ -18,15 +18,16 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
 import Utils 0.1 as Utils
+import "../../../../qml/Panel/Indicators"
+
 
 Item {
     id: testView
     width: units.gu(40)
     height: units.gu(70)
 
-    Indicators.MenuItemFactory {
+    MenuItemFactory {
         id: factory
         menuModel: UnityMenuModel {}
     }
 
=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-04-14 17:26:06 +0000
+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-07-03 13:48:00 +0000
@@ -18,15 +18,15 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import QMenuModel 0.1
-import Unity.Indicators 0.1 as Indicators
 import Utils 0.1 as Utils
+import "../../../../qml/Panel/Indicators"
 
 Item {
     id: testView
     width: units.gu(40)
     height: units.gu(70)
 
-    Indicators.MessageMenuItemFactory {
+    MessageMenuItemFactory {
         id: factory
         menuModel: UnityMenuModel {}
         menuIndex: 0