Merge lp:~nick-dedekind/unity8/indicators.menu-items-cleaning into lp:unity8

[Nick Dedekind]

Abstraction of indicator menu item properties prior to move into common components library.

Abstraction of indicator menu item properties prior to move into common components library.

Changes:
* Moved activate/changeState signals from BaseMenuItem to specific menu items. Now handled by MenuFactory components.
* Moved menu model related code (setup of menu item data [labels/icons/values/etc]) into MenuFactoryComponents.

MenuItems now only have properties and signals for updating visual/backend data. They do not directly access any implementation specific model data. The MenuFactory now holds the unityumenumodel specifc code.

[Nick Dedekind (nick-dedekind)]

436 +// property var strenthAction: QMenuModel.UnityMenuAction {
437 +// model: menuFactory.model ? menuFactory.model : null
438 +// name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
439 +// }

446 +// signalStrength: strenthAction.valid ? strenthAction.state : 0

Waiting for new code from qmenumodel.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity8-ci/730/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2496
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/731
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2502
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/156
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/146
    UNSTABLE: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/145

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity8-ci/740/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2533
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/741
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2539/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/186/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/163
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/162

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/unity8-ci/744/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2541
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/189
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/745
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2547/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/191
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/167
    UNSTABLE: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/166

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

We don't need
text: ""
in FramedMenuItem.qml, no?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> We don't need
> text: ""
> in FramedMenuItem.qml, no?

Nope. removed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/unity8-ci/746/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/747
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2553
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/171
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/170

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/unity8-ci/748/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/749
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/749/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2558
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/198
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/174
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/173

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/279/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2581
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/278
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/278/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2587
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2587/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/221/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/196

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/unity8-autolanding/285/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/284
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/284/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/285/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2606
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2199

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/301/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1341
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2645
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2645/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/268
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/243

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/Unity/Indicators/Network/qml/AccessPoint.qml'
--- plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/Network/qml/AccessPoint.qml	2013-08-23 11:34:24 +0000
@@ -25,29 +25,39 @@
 Indicators.FramedMenuItem {
     id: accessPoint
 
-    readonly property bool checked: menu ? menu.isToggled : false
+    property bool checked: false
+    property bool secure: false
+    property bool adHoc: false
+    property int signalStrength: 0
+
+    signal activate()
 
     onCheckedChanged: {
         // Can't rely on binding. Checked is assigned on click.
         checkBoxActive.checked = checked;
     }
 
-    // FIXME - we need to get the strength from menu.ext.xCanonicalWifiApStrengthAction
-    // but UnityMenuModel doesnt support fetching actions not attached to menu item.
-    function getNetworkIcon(data) {
+    icon: {
         var imageName = "nm-signal-100"
 
-        if (data.ext.xCanonicalWifiApIsAdhoc) {
+        if (adHoc) {
             imageName = "nm-adhoc";
+        } else if (signalStrength == 0) {
+            imageName = "nm-signal-00";
+        } else if (signalStrength <= 25) {
+            imageName = "nm-signal-25";
+        } else if (signalStrength <= 50) {
+            imageName = "nm-signal-50";
+        } else if (signalStrength <= 75) {
+            imageName = "nm-signal-75";
         }
-        if (data.ext.xCanonicalWifiApIsSecure) {
+
+        if (secure) {
             imageName += "-secure";
         }
-
         return "image://gicon/" + imageName;
     }
 
-    icon: menu ? getNetworkIcon(menu) : "image://gicon/wifi-none"
     iconFrame: false
     control: CheckBox {
         id: checkBoxActive

=== modified file 'plugins/Unity/Indicators/Network/qml/PasswordPage.qml'
--- plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/Network/qml/PasswordPage.qml	2013-08-23 11:34:24 +0000
@@ -38,7 +38,7 @@
         }
 
         Indicators.SectionMenuItem {
-            label: "Authentication"
+            text: "Authentication"
         }
 
         Indicators.FramedMenuItem {

=== removed file 'plugins/Unity/Indicators/Network/qml/WifiSection.qml'
--- plugins/Unity/Indicators/Network/qml/WifiSection.qml	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/Network/qml/WifiSection.qml	1970-01-01 00:00:00 +0000
@@ -1,28 +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:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Unity.Indicators 0.1 as Indicators
-
-Indicators.SectionMenuItem {
-    id: wifiSectionMenu
-
-    busy: menu ? menu.ext.xCanonicalBusyAction : false
-}

=== modified file 'plugins/Unity/Indicators/Network/qml/qmldir'
--- plugins/Unity/Indicators/Network/qml/qmldir	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/Network/qml/qmldir	2013-08-23 11:34:24 +0000
@@ -5,5 +5,4 @@
 NetworkPage 0.1 NetworkPage.qml
 AccessPoint 0.1 AccessPoint.qml
 PasswordPage 0.1 PasswordPage.qml
-PasswordTextField 0.1 PasswordTextField.qml
-WifiSection 0.1 WifiSection.qml
\ No newline at end of file
+PasswordTextField 0.1 PasswordTextField.qml
\ No newline at end of file

=== modified file 'plugins/Unity/Indicators/qml/BaseMenuItem.qml'
--- plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/BaseMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -25,14 +25,10 @@
     id: baseMenu
 
     property bool menuActivated: false
-    property QtObject menu
 
     signal selectMenu()
     signal deselectMenu()
 
-    signal activate()
-    signal changeState(var value)
-
     showDivider: false
     __foregroundColor: "#e8e1d0" // FIXME not in palette yet
 

=== modified file 'plugins/Unity/Indicators/qml/ButtonMenuItem.qml'
--- plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/ButtonMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -24,14 +24,14 @@
 
 BaseMenuItem {
     id: menuItem
-    objectName: menuAction.name
     implicitHeight: units.gu(7)
-    enabled: menuAction.active
+
+    property alias text: button.text
+
+    signal activate()
 
     Button {
         id: button
-        enabled: menuAction.enabled
-        text: menu ? menu.label : ""
         anchors.centerIn: parent
         height: units.gu(4)
         width: units.gu(16)
@@ -41,9 +41,4 @@
             menuItem.activate();
         }
     }
-
-    Indicators.MenuAction {
-        id: menuAction
-        menu: menuItem.menu
-    }
 }

=== modified file 'plugins/Unity/Indicators/qml/FramedMenuItem.qml'
--- plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/FramedMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -23,10 +23,8 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 BaseMenuItem {
-    text: menu && menu.label ? menu.label : ""
     implicitHeight: units.gu(7)
 
-    icon: menu ? menu.icon : ""
     iconFrame: false
 
     HLine {

=== modified file 'plugins/Unity/Indicators/qml/IndicatorPage.qml'
--- plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-08-23 11:34:24 +0000
@@ -96,18 +96,13 @@
                     }
                     if (item.hasOwnProperty("menu")) {
                         item.menu = Qt.binding(function() { return model; });
-
-                        item.activate.connect(onActivateMenu);
-                        item.changeState.connect(onChangeState);
                     }
                 }
 
-                function onActivateMenu(value) {
-                    mainMenu.model.activate(index, value);
-                }
-
-                function onChangeState(value) {
-                    mainMenu.model.changeState(index, value);
+                Binding {
+                    target: item ? item : null
+                    property: "objectName"
+                    value: model.action
                 }
             }
         }

=== removed file 'plugins/Unity/Indicators/qml/MenuAction.qml'
--- plugins/Unity/Indicators/qml/MenuAction.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/MenuAction.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +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:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- *      Nick Dedekind <[e-mail]>
- */
-
-import QtQuick 2.0
-
-/*!
-    \qmltype MenuAction
-    \inqmlmodule Indicators 0.1
-    \brief Helper class to connect to a qmenumodel action
-
-    Example:
-    \qml
-        BaseMenuItem {
-            id: menuItem
-
-            Switch {
-                checked: menuAction.state
-            }
-
-            Indicators.MenuAction {
-                id: menuAction
-                menu: menuItem.menu
-            }
-        }
-    \endqml
-*/
-
-Item {
-    id: menuAction
-
-    /*!
-      \preliminary
-      The dbus action group object
-     */
-    readonly property string name: menu ? menu.action : ""
-
-    property QtObject menu: null
-
-    readonly property var state: menu ? menu.actionState : undefined
-
-    readonly property bool active: menu ? menu.sensitive : false
-}

=== modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
--- plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-08-20 19:50:07 +0000
+++ plugins/Unity/Indicators/qml/MenuItemFactory.qml	2013-08-23 11:34:24 +0000
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import Unity.Indicators 0.1 as Indicators
 import Unity.Indicators.Network 0.1 as ICNetwork
+import QMenuModel 0.1 as QMenuModel
 
 Item {
     id: menuFactory
@@ -47,35 +48,151 @@
     Component {
         id: sliderMenu;
         Indicators.SliderMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            icon: menu ? menu.icon : ""
+            minIcon: menu.ext.minIcon
+            maxIcon: menu.ext.maxIcon
+
+            minimumValue: menu.ext.minValue ? menu.ext.minValue : 0.0
+            maximumValue: {
+                var maximum = menu.ext.maxValue ? menu.ext.maxValue : 1.0
+                if (maximum <= minimumValue) {
+                        return minimumValue + 1;
+                }
+                return maximum;
+            }
+            value: menu ? menu.actionState : 0.0
+            enabled: menu ? menu.sensitive : false
+
             Component.onCompleted: {
                 model.loadExtendedAttributes(modelIndex, {'min-value': 'double',
                                                           'max-value': 'double',
                                                           'min-icon': 'icon',
                                                           'max-icon': 'icon'});
             }
+
+            // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when
+            // reaching the boundaries (0.0 or 1.0), the value is converted
+            // to an integer when automatically wrapped in a variant when
+            // passed to QStateAction::updateState(…). The server chokes on
+            // those values, complaining that they’re not of the right type…
+            onChangeState: {
+                if (value == Math.round(value)) {
+                    if (value >= maximumValue) {
+                        model.changeState(modelIndex, maximumValue - 0.000001);
+                    } else if (value <= minimumValue) {
+                        model.changeState(modelIndex, minimumValue + 0.000001);
+                    } else {
+                        model.changeState(modelIndex, value * 1.000001);
+                    }
+                } else {
+                    model.changeState(modelIndex, value);
+                }
+            }
         }
     }
-    Component { id: buttonMenu; Indicators.ButtonMenuItem {} }
+
     Component { id: divMenu; Indicators.DivMenuItem {} }
-    Component { id: sectionMenu; Indicators.SectionMenuItem {} }
-    Component { id: progressMenu; Indicators.ProgressMenuItem {} }
-    Component { id: standardMenu; Indicators.StandardMenuItem {} }
-    Component { id: switchMenu; Indicators.SwitchMenuItem {} }
+
+    Component {
+        id: buttonMenu;
+        Indicators.ButtonMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            enabled: menu ? menu.sensitive : false
+
+            onActivate: model.activate(modelIndex);
+        }
+    }
+    Component {
+        id: sectionMenu;
+        Indicators.SectionMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+        }
+    }
+
+    Component {
+        id: progressMenu;
+        Indicators.ProgressMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            icon: menu ? menu.icon : ""
+            value : menu ? menu.actionState : 0.0
+        }
+    }
+
+    Component {
+        id: standardMenu;
+        Indicators.StandardMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            icon: menu ? menu.icon : ""
+            checkable: menu ? (menu.isCheck || menu.isRadio) : false
+            checked: checkable ? menu.isToggled : false
+            enabled: menu ? menu.sensitive : false
+
+            onActivate: model.activate(modelIndex);
+        }
+    }
+
+    Component {
+        id: switchMenu;
+        Indicators.SwitchMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            icon: menu ? menu.icon : ""
+            checked: menu ? menu.isToggled : false
+            enabled: menu ? menu.sensitive : false
+
+            onActivate: model.activate(modelIndex);
+        }
+    }
+
     Component {
         id: wifiSection;
-        ICNetwork.WifiSection {
+        Indicators.SectionMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+            busy: menu ? menu.ext.xCanonicalBusyAction : false
+
             Component.onCompleted: {
                 model.loadExtendedAttributes(modelIndex, {'x-canonical-busy-action': 'bool'});
             }
         }
     }
+
     Component {
         id: accessPoint;
         ICNetwork.AccessPoint {
+            property QtObject menu: null
+//            property var strenthAction: QMenuModel.UnityMenuAction {
+//                model: menuFactory.model ? menuFactory.model : null
+//                name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
+//            }
+
+            text: menu && menu.label ? menu.label : ""
+            icon: menu ? menu.icon : ""
+            secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false
+            adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false
+            checked: menu ? menu.isToggled : false
+//            signalStrength: strenthAction.valid ? strenthAction.state : 0
+            enabled: menu ? menu.sensitive : false
+
             Component.onCompleted: {
                 model.loadExtendedAttributes(modelIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
-                                                          'x-canonical-wifi-ap-is-secure': 'bool'});
+                                                          'x-canonical-wifi-ap-is-secure': 'bool',
+                                                          'x-canonical-wifi-ap-strength-action': 'string'});
             }
+            onActivate: model.activate(modelIndex);
         }
     }
 

=== modified file 'plugins/Unity/Indicators/qml/ProgressMenuItem.qml'
--- plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/ProgressMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -23,10 +23,8 @@
 
 FramedMenuItem {
     id: menuItem
-    objectName: menuAction.name
-    enabled: menuAction.active
 
-    property int value : menuAction.state
+    property int value : 0.0
 
     control: Label {
         id: progress
@@ -37,9 +35,4 @@
         fontSize: "medium"
         color: "#e8e1d0"
     }
-
-    Indicators.MenuAction {
-        id: menuAction
-        menu: menuItem.menu
-    }
 }

=== modified file 'plugins/Unity/Indicators/qml/SectionMenuItem.qml'
--- plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/SectionMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -22,15 +22,15 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 BaseMenuItem {
-    property string label: menu && menu.label ? menu.label : ""
+    id: menuItem
+    property alias text: header.text
     property bool busy: false
 
-    implicitHeight: label !== "" ? header.height : 0
+    implicitHeight: text !== "" ? header.height : 0
 
     ListItem.Header {
         id: header
 
-        text: label
         height: units.gu(4)
         anchors {
             left: parent.left

=== modified file 'plugins/Unity/Indicators/qml/SliderMenuItem.qml'
--- plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/SliderMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -24,17 +24,20 @@
 
 FramedMenuItem {
     id: menuItem
-    objectName: menuAction.name
-    enabled: menuAction.active
 
     property alias minimumValue: slider.minimumValue
     property alias maximumValue: slider.maximumValue
-    readonly property double value: menu ? menuAction.state : 0.0
+    property double value: 0.0
+
+    property alias minIcon: leftImage.source
+    property alias maxIcon: rightImage.source
 
     property QtObject d: QtObject {
         property bool enableValueConnection: true
     }
 
+    signal changeState(real value)
+
     onValueChanged: {
         // TODO: look into adding a component to manage bi-directional bindings.
         var oldEnable = d.enableValueConnection
@@ -58,7 +61,6 @@
             anchors.verticalCenter: row.verticalCenter
             height: units.gu(4)
             width: height
-            source: menu.ext.minIcon
         }
 
         Components.Slider {
@@ -75,19 +77,8 @@
                 value = menuItem.value
             }
 
-            // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when
-            // reaching the boundaries (0.0 or 1.0), the value is converted
-            // to an integer when automatically wrapped in a variant when
-            // passed to QStateAction::updateState(…). The server chokes on
-            // those values, complaining that they’re not of the right type…
-            minimumValue: menu.ext.minValue ? menu.ext.minValue * 1.000001 : 0.0000001
-            maximumValue: {
-                var maximum = menu.ext.maxValue ? menu.ext.maxValue * 1.000001 : 0.9999999
-                if (maximum <= minimumValue) {
-                        return minimumValue + 1;
-                }
-                return maximum;
-            }
+            minimumValue: 0.0
+            maximumValue: 0.1
 
             // FIXME - to be deprecated in Ubuntu.Components.
             // Use this to disable the label, since there is not way to do it on the component.
@@ -109,12 +100,6 @@
             anchors.verticalCenter: row.verticalCenter
             height: units.gu(4)
             width: height
-            source: menu.ext.maxIcon
         }
     }
-
-    Indicators.MenuAction {
-        id: menuAction
-        menu: menuItem.menu
-    }
 }

=== modified file 'plugins/Unity/Indicators/qml/StandardMenuItem.qml'
--- plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/StandardMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -23,16 +23,16 @@
 
 FramedMenuItem {
     id: menuItem
-    objectName: menuAction.name
-    enabled: menuAction.active
-
-    readonly property bool checkable: menu ? (menu.isCheck || menu.isRadio) : false
-    readonly property bool checked: checkable ? menu.isToggled : false
+
+    property bool checkable: false
+    property bool checked: false
+
+    signal activate()
 
     // FIXME : need a radio button from sdk
     // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866
     onCheckableChanged: {
-        if (menu && checkable) {
+        if (checkable) {
             icon = checkComponent.createObject(menuItem);
         }
     }
@@ -68,9 +68,4 @@
             }
         }
     }
-
-    Indicators.MenuAction {
-        id: menuAction
-        menu: menuItem.menu
-    }
 }

=== modified file 'plugins/Unity/Indicators/qml/SwitchMenuItem.qml'
--- plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/SwitchMenuItem.qml	2013-08-23 11:34:24 +0000
@@ -24,10 +24,10 @@
 
 FramedMenuItem {
     id: menuItem
-    objectName: menuAction.name
-    enabled: menuAction.enabled
-
-    readonly property bool checked: menu ? menu.isToggled : false
+
+    property bool checked: false
+
+    signal activate()
 
     onCheckedChanged: {
         // Can't rely on binding. Checked is assigned on click.
@@ -50,9 +50,4 @@
             menuItem.activate();
         }
     }
-
-    Indicators.MenuAction {
-        id: menuAction
-        menu: menuItem.menu
-    }
 }

=== modified file 'plugins/Unity/Indicators/qml/qmldir'
--- plugins/Unity/Indicators/qml/qmldir	2013-08-14 09:07:45 +0000
+++ plugins/Unity/Indicators/qml/qmldir	2013-08-23 11:34:24 +0000
@@ -11,7 +11,6 @@
 IndicatorBase 0.1 IndicatorBase.qml
 IndicatorPage 0.1 IndicatorPage.qml
 IndicatorWidget 0.1 IndicatorWidget.qml
-MenuAction 0.1 MenuAction.qml
 MenuActionBinding 0.1 MenuActionBinding.qml
 MenuItemFactory 0.1 MenuItemFactory.qml
 ProgressMenuItem 0.1 ProgressMenuItem.qml