Merge lp:~ted/ubuntu-system-settings/wifi-panel into lp:ubuntu-system-settings

[Ted Gould]

Add Wifi Panel

Adds the base of the Wifi panel. This works with the menu model exported by indicator-network, so you need a version of indicator network that includes this branch:

https://code.launchpad.net/~ted/indicator-network/phone-settings

For the most part this branch consists of code stolen from the Unity8 indicators and refactored so that it works in this context (and mostly removed stuff that we didn't need). Hopefully eventually most of it will find its way into System Components and then we can pull it from there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/327/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/327/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/327/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-system-settings/wifi-panel]

331. By Ted Gould on 2013-09-16

Build dep on qmenumodel

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/329

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/329/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-system-settings/wifi-panel]

332. By Ted Gould on 2013-09-17

Making sure we have an indicator-network version with the wifi settings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/339

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/339/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Wow, that's a lot of code! :-)

I didn't go through all of that, but here's just a few things I noticed:

- License: the other plugins are GPL3, not LGPL. Either is fine to me, but unless you have good reasons for having the code LGPL, it'd be easier if all the plugins use the same license.
- Do not submit code commented out (MenuItemFactory.qml)
- Coding style in C++ files: the "*" must have one space before it, and none after it; in classes declarations of the inheritance, put a space after the ":", but none before; last, the constructor should be indented like this:

UnityMenuModelStack::UnityMenuModelStack(QObject *parent):
    QObject(parent)
{
}

review: Needs Fixing

[lp:~ted/ubuntu-system-settings/wifi-panel]

333. By Ted Gould on 2013-09-18

These should be GPL'd not LGPL'd, fix that

334. By Ted Gould on 2013-09-18

Put the strength in

[Ted Gould (ted)]

On Wed, 2013-09-18 at 07:39 +0000, Alberto Mardegan wrote:

> - License: the other plugins are GPL3, not LGPL. Either is fine to me, but unless you have good reasons for having the code LGPL, it'd be easier if all the plugins use the same license.

Fixed.

> - Do not submit code commented out (MenuItemFactory.qml)

Fixed.

> - Coding style in C++ files: the "*" must have one space before it, and none after it; in classes declarations of the inheritance, put a space after the ":", but none before; last, the constructor should be indented like this:
>
> UnityMenuModelStack::UnityMenuModelStack(QObject *parent):
> QObject(parent)
> {
> }

Frankly, I'd rather keep this the same as the code that I cut-and-pasted
so that we can easily grab revisions from that code and understand the
diffs. For minor things like that I don't think divergence is a good
idea. Personally, I don't care either way on the style itself, but I'd
like to be able to diff them.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/352/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/352

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/352/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Given the urgency, I created another branch, which supersedes this request:
https://code.launchpad.net/~mardy/ubuntu-system-settings/wifi-panel/+merge/186492

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2013-09-03 19:59:09 +0000
+++ debian/control	2013-09-18 20:04:27 +0000
@@ -10,6 +10,7 @@
                libglib2.0-dev,
                libnm-glib-dev,
                libofono-qt-dev,
+               libqmenumodel-dev,
                libtimezonemap1-dev (>= 0.4.0.1),
                libupower-glib-dev,
                pkg-config,
@@ -31,6 +32,7 @@
          accountsservice,
          gsettings-desktop-schemas,
          gsettings-ubuntu-touch-schemas (>= 0.0.1+13.10.20130730),
+         indicator-network (>> 0.5.0+13.10.20130913),
          powerd | gnome-settings-daemon,
          qtdeclarative5-folderlistmodel-plugin,
          qtdeclarative5-qtmultimedia-plugin,
 
=== modified file 'plugins/time-date/plugin.cpp'
--- plugins/time-date/plugin.cpp	2013-07-24 13:43:20 +0000
+++ plugins/time-date/plugin.cpp	2013-09-18 20:04:27 +0000
@@ -27,7 +27,7 @@
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.TimeDate"));
-    
+
     qmlRegisterType<TimeDate>(uri, 1, 0, "UbuntuTimeDatePanel");
 }
 
 
=== added file 'plugins/wifi/AccessPoint.qml'
--- plugins/wifi/AccessPoint.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/AccessPoint.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 Ubuntu.Components.ListItems 0.1 as ListItem
+
+FramedMenuItem {
+    id: accessPoint
+
+    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;
+    }
+
+    icon: {
+        var imageName = "nm-signal-100"
+
+        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 (secure) {
+            imageName += "-secure";
+        }
+        return "image://gicon/" + imageName;
+    }
+
+    iconFrame: false
+    control: CheckBox {
+        id: checkBoxActive
+        height: units.gu(4)
+        width: units.gu(4)
+        anchors.centerIn: parent
+
+        onClicked: {
+            accessPoint.activate();
+        }
+    }
+}
 
=== added file 'plugins/wifi/BaseMenuItem.qml'
--- plugins/wifi/BaseMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/BaseMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Standard {
+    id: baseMenu
+
+    property bool menuActivated: false
+
+    signal selectMenu()
+    signal deselectMenu()
+
+    showDivider: false
+
+    backgroundIndicator: RemoveBackground {
+        state: baseMenu.swipingState
+    }
+}
 
=== added file 'plugins/wifi/DivMenuItem.qml'
--- plugins/wifi/DivMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/DivMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    implicitHeight: units.gu(1)
+}
 
=== added file 'plugins/wifi/FramedMenuItem.qml'
--- plugins/wifi/FramedMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/FramedMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+BaseMenuItem {
+    implicitHeight: units.gu(7)
+
+    iconFrame: false
+
+    HLine {
+        anchors.top: parent.top
+    }
+
+    HLine {
+        anchors.bottom: parent.bottom
+    }
+}
 
=== added file 'plugins/wifi/HLine.qml'
--- plugins/wifi/HLine.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/HLine.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+
+Rectangle {
+    height: units.dp(1)
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+}
 
=== added file 'plugins/wifi/IndicatorBase.qml'
--- plugins/wifi/IndicatorBase.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/IndicatorBase.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 as QMenuModel
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+
+ItemPage {
+    id: indicatorItem
+
+    // FIXME : should be disabled until bus available when we have desktop indicators
+    // for now, disable when we dont habe the correct profile.
+    enabled: menuObjectPaths.hasOwnProperty(device)
+
+    //const
+    property string title
+    property string busName
+    property string actionsObjectPath
+    property var menuObjectPaths: undefined
+    readonly property string device: "phone_wifi_settings"
+    property string rootMenuType: "com.canonical.indicator.root"
+    property bool active: false
+
+    property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
+
+    signal actionGroupUpdated()
+    signal modelUpdated()
+}
 
=== added file 'plugins/wifi/MenuItemFactory.qml'
--- plugins/wifi/MenuItemFactory.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/MenuItemFactory.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 as QMenuModel
+
+Item {
+    id: menuFactory
+
+    property var model: null
+
+    property var _map:  {
+        "unity.widgets.systemsettings.tablet.switch"        : switchMenu,
+
+        "com.canonical.indicator.div"       : divMenu,
+        "com.canonical.indicator.section"   : sectionMenu,
+        "com.canonical.indicator.switch"    : switchMenu,
+
+        "com.canonical.unity.switch"    : switchMenu,
+
+        "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
+        "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
+    }
+
+    Component { id: divMenu; DivMenuItem {} }
+
+    Component {
+        id: sectionMenu;
+        SectionMenuItem {
+            property QtObject menu: null
+
+            text: menu && menu.label ? menu.label : ""
+        }
+    }
+
+    Component {
+        id: standardMenu;
+        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;
+        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;
+        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;
+        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-strength-action': 'string'});
+            }
+            onActivate: model.activate(modelIndex);
+        }
+    }
+
+    function load(modelData) {
+        if (modelData.type !== undefined) {
+            var component = _map[modelData.type];
+            if (component !== undefined) {
+                return component;
+            }
+        } else {
+            if (modelData.isSeparator) {
+                return divMenu;
+            }
+        }
+        return standardMenu;
+    }
+}
 
=== added file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/PageComponent.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.Wifi 1.0
+import QMenuModel 0.1
+
+
+IndicatorBase {
+	id: wifibase
+    title: i18n.tr("Wi-Fi")
+	busName: "com.canonical.indicator.network"
+	actionsObjectPath: "/com/canonical/indicator/network"
+	menuObjectPaths: {"phone_wifi_settings": "/com/canonical/indicator/network/phone_wifi_settings"}
+	active: true
+
+	UnityMenuModel {
+		id: menuModel
+		busName: "com.canonical.indicator.network"
+		actions: { "indicator": "/com/canonical/indicator/network" }
+		menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
+		Component.onCompleted: {
+			menuStack.head = menuModel;
+		}
+	}
+
+    MenuItemFactory {
+        id: menuFactory
+		model: mainMenu.model
+    }
+
+    UnityMenuModelStack {
+        id: menuStack
+    }
+
+    ListView {
+        id: mainMenu
+        model: menuStack.tail ? menuStack.tail : null
+
+        anchors {
+            fill: parent
+            bottomMargin: Qt.inputMethod.visible ? (Qt.inputMethod.keyboardRectangle.height - main.anchors.bottomMargin) : 0
+
+            Behavior on bottomMargin {
+                NumberAnimation {
+                    duration: 175
+                    easing.type: Easing.OutQuad
+                }
+            }
+            // TODO - does ever frame.
+            onBottomMarginChanged: {
+                mainMenu.positionViewAtIndex(mainMenu.currentIndex, ListView.End)
+            }
+        }
+
+        // Ensure all delegates are cached in order to improve smoothness of scrolling
+        cacheBuffer: 10000
+
+        // Only allow flicking if the content doesn't fit on the page
+        interactive: contentHeight > height
+
+        currentIndex: -1
+        delegate: Item {
+            id: menuDelegate
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: loader.height
+            visible: height > 0
+
+            Loader {
+                id: loader
+                asynchronous: true
+
+                property int modelIndex: index
+
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                sourceComponent: menuFactory.load(model)
+
+                onLoaded: {
+                    if (model.type === rootMenuType) {
+                        menuStack.push(mainMenu.model.submenu(index));
+                    }
+
+                    if (item.hasOwnProperty("menuActivated")) {
+                        item.menuActivated = Qt.binding(function() { return ListView.isCurrentItem; });
+                        item.selectMenu.connect(function() { ListView.view.currentIndex = index });
+                        item.deselectMenu.connect(function() { ListView.view.currentIndex = -1 });
+                    }
+                    if (item.hasOwnProperty("menu")) {
+                        item.menu = Qt.binding(function() { return model; });
+                    }
+                }
+
+/*
+                Binding {
+                    target: item ? item : null
+                    property: "objectName"
+                    value: model.action
+                }
+				*/
+            }
+        }
+    }
+}
 
=== added file 'plugins/wifi/RemoveBackground.qml'
--- plugins/wifi/RemoveBackground.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/RemoveBackground.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    anchors.fill: parent
+    color: "#333130"
+    Label {
+        id: backgroundText
+
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        text: "Clear"
+        fontSize: "medium"
+        color: "#e8e1d0"
+        font.bold: true
+    }
+
+    states: [
+        State {
+            name: "SwipingRight"
+            PropertyChanges {
+                target: backgroundText
+                anchors.rightMargin: units.gu(3)
+                anchors.leftMargin: 0
+                horizontalAlignment: Text.AlignRight
+
+            }
+        },
+        State {
+            name: "SwipingLeft"
+            PropertyChanges {
+                target: backgroundText
+                anchors.rightMargin: 0
+                anchors.leftMargin: units.gu(3)
+                horizontalAlignment: Text.AlignLeft
+            }
+        }
+    ]
+}
 
=== added file 'plugins/wifi/SectionMenuItem.qml'
--- plugins/wifi/SectionMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/SectionMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 Ubuntu.Components.ListItems 0.1 as ListItem
+
+BaseMenuItem {
+    id: menuItem
+    property alias text: header.text
+    property bool busy: false
+
+    implicitHeight: text !== "" ? header.height : 0
+
+    ListItem.Header {
+        id: header
+
+        height: units.gu(4)
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+        visible: text != ""
+
+        ActivityIndicator {
+            id: indicator
+            running: busy
+            anchors {
+                margins: units.gu(0.5)
+                right: parent.right
+            }
+            height: parent.height - (anchors.margins * 2)
+            width: height
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }
+}
 
=== added file 'plugins/wifi/StandardMenuItem.qml'
--- plugins/wifi/StandardMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/StandardMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 0.1 as Components
+
+FramedMenuItem {
+    id: menuItem
+
+    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 (checkable) {
+            icon = checkComponent.createObject(menuItem);
+        }
+    }
+
+    onCheckedChanged: {
+        // Can't rely on binding. Checked is assigned on click.
+        if (icon) {
+            icon.checked = checked;
+        }
+    }
+
+    onClicked: {
+        if (checkable && icon) {
+            icon.clicked();
+        } else {
+            menuItem.activate();
+        }
+    }
+
+    property var checkComponent: Component {
+        Components.CheckBox {
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.left: parent.left
+
+            Component.onCompleted: {
+                checked = menuItem.checked;
+            }
+
+            // FIXME : should use Checkbox.toggled signal
+            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
+            onClicked: {
+                menuItem.activate();
+            }
+        }
+    }
+}
 
=== added file 'plugins/wifi/SwitchMenuItem.qml'
--- plugins/wifi/SwitchMenuItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/wifi/SwitchMenuItem.qml	2013-09-18 20:04:27 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+import Ubuntu.Components 0.1
+
+FramedMenuItem {
+    id: menuItem
+
+    property bool checked: false
+
+    signal activate()
+
+    onCheckedChanged: {
+        // Can't rely on binding. Checked is assigned on click.
+        switcher.checked = checked;
+    }
+
+    control: Switch {
+        id: switcher
+
+        Component.onCompleted: {
+            checked = menuItem.checked;
+        }
+
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+
+        // FIXME : should use Checkbox.toggled signal
+        // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
+        onClicked: {
+            menuItem.activate();
+        }
+    }
+}
 
=== added file 'plugins/wifi/plugin.cpp'
--- plugins/wifi/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/plugin.cpp	2013-09-18 20:04:27 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include "plugin.h"
+#include "unitymenumodelstack.h"
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Wifi"));
+    qmlRegisterType<UnityMenuModelStack>(uri, 1, 0, "UnityMenuModelStack");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}
 
=== added file 'plugins/wifi/plugin.h'
--- plugins/wifi/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/plugin.h	2013-09-18 20:04:27 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+*/
+
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+    
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+#endif // PLUGIN_H
 
=== added file 'plugins/wifi/qmldir'
--- plugins/wifi/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/wifi/qmldir	2013-09-18 20:04:27 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.SystemSettings.Wifi
+plugin UbuntuWifiPanel
 
=== added file 'plugins/wifi/unitymenumodelstack.cpp'
--- plugins/wifi/unitymenumodelstack.cpp	1970-01-01 00:00:00 +0000
+++ plugins/wifi/unitymenumodelstack.cpp	2013-09-18 20:04:27 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#include "unitymenumodelstack.h"
+
+UnityMenuModelStack::UnityMenuModelStack(QObject* parent)
+    : QObject(parent)
+{
+}
+
+UnityMenuModelStack::~UnityMenuModelStack()
+{
+}
+
+UnityMenuModel* UnityMenuModelStack::head() const
+{
+    return !m_menuModels.isEmpty() ? m_menuModels.first() : NULL;
+}
+
+void UnityMenuModelStack::setHead(UnityMenuModel* model)
+{
+    if (head() != model) {
+        m_menuModels.clear();
+        push(model);
+        Q_EMIT headChanged(model);
+    }
+}
+
+UnityMenuModel* UnityMenuModelStack::tail() const
+{
+    return !m_menuModels.isEmpty() ? m_menuModels.last() : NULL;
+}
+
+void UnityMenuModelStack::push(UnityMenuModel* model)
+{
+    m_menuModels << model;
+    Q_EMIT tailChanged(model);
+}
+
+UnityMenuModel* UnityMenuModelStack::pop()
+{
+    if (m_menuModels.isEmpty()) {
+        return NULL;
+    }
+    UnityMenuModel* model = m_menuModels.takeLast();
+
+    Q_EMIT tailChanged(tail());
+    if (m_menuModels.isEmpty()) {
+        Q_EMIT headChanged(NULL);
+    }
+
+    return model;
+}
 
=== added file 'plugins/wifi/unitymenumodelstack.h'
--- plugins/wifi/unitymenumodelstack.h	1970-01-01 00:00:00 +0000
+++ plugins/wifi/unitymenumodelstack.h	2013-09-18 20:04:27 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#ifndef UNITYMENUMODELSTACK_H
+#define UNITYMENUMODELSTACK_H
+
+#include <QObject>
+#include <QList>
+
+class UnityMenuModel;
+
+// A LIFO queue for storing the current submenu of a UnityMenuModel.
+// The root menu model is set as the head, and each subsiquent submenu that is
+// opened can be pushed onto the queue.
+// The tail is set to the last item on the queue
+// Popping the queue will remove the last entry, and the tail be updated to the last item.
+class UnityMenuModelStack : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(UnityMenuModel* head READ head WRITE setHead NOTIFY headChanged)
+    Q_PROPERTY(UnityMenuModel* tail READ tail NOTIFY tailChanged)
+public:
+    UnityMenuModelStack(QObject*parent=NULL);
+    ~UnityMenuModelStack();
+
+    UnityMenuModel* head() const;
+    void setHead(UnityMenuModel* model);
+
+    UnityMenuModel* tail() const;
+
+    Q_INVOKABLE void push(UnityMenuModel* model);
+    Q_INVOKABLE UnityMenuModel* pop();
+
+Q_SIGNALS:
+    void headChanged(UnityMenuModel* head);
+    void tailChanged(UnityMenuModel* tail);
+
+private:
+    QList<UnityMenuModel*> m_menuModels;
+};
+
+#endif // UNITYMENUMODELSTACK_H
 
=== modified file 'plugins/wifi/wifi.pro'
--- plugins/wifi/wifi.pro	2013-08-02 06:18:29 +0000
+++ plugins/wifi/wifi.pro	2013-09-18 20:04:27 +0000
@@ -4,6 +4,39 @@
 TEMPLATE = lib
 TARGET = wifi
 
+QML_SOURCES = \
+    AccessPoint.qml \
+    BaseMenuItem.qml \
+    DivMenuItem.qml \
+    FramedMenuItem.qml \
+    HLine.qml \
+    IndicatorBase.qml \
+    MenuItemFactory.qml \
+    PageComponent.qml \
+    RemoveBackground.qml \
+    SectionMenuItem.qml \
+    StandardMenuItem.qml \
+    SwitchMenuItem.qml
+
+OTHER_FILES += \
+    $${QML_SOURCES} \
+    AccessPoint.qml \
+    BaseMenuItem.qml \
+    DivMenuItem.qml \
+    FramedMenuItem.qml \
+    HLine.qml \
+    IndicatorBase.qml \
+    MenuItemFactory.qml \
+    PageComponent.qml \
+    RemoveBackground.qml \
+    SectionMenuItem.qml \
+    StandardMenuItem.qml \
+    SwitchMenuItem.qml
+
+qml.files = $${QML_SOURCES}
+qml.path = $${PLUGIN_QML_DIR}/$${TARGET}
+INSTALLS += qml
+
 settings.files = $${TARGET}.settings
 settings.path = $${PLUGIN_MANIFEST_DIR}
 INSTALLS += settings
@@ -11,3 +44,39 @@
 image.files = settings-wifi.svg
 image.path = $${PLUGIN_MANIFEST_DIR}/icons
 INSTALLS += image
+
+# C++ bits
+TARGET = UbuntuWifiPanel
+QT += qml quick dbus
+CONFIG += qt plugin no_keywords
+
+TARGET = $$qtLibraryTarget($$TARGET)
+uri = Ubuntu.SystemSettings.Wifi
+
+SOURCES += \
+    plugin.cpp \
+    unitymenumodelstack.cpp
+
+HEADERS += \
+    plugin.h \
+    unitymenumodelstack.h
+
+unix: CONFIG += link_pkgconfig
+unix: PKGCONFIG += qmenumodel
+
+# Install path for the plugin
+installPath = $${PLUGIN_PRIVATE_MODULE_DIR}/$$replace(uri, \\., /)
+target.path = $$installPath
+INSTALLS += target
+
+# find files
+QMLDIR_FILE = qmldir
+
+# make visible to qt creator
+OTHER_FILES += $$QMLDIR_FILE
+
+# create install targets for files
+qmldir.path = $$installPath
+qmldir.files = $$QMLDIR_FILE
+
+INSTALLS += qmldir
 
=== modified file 'plugins/wifi/wifi.settings'
--- plugins/wifi/wifi.settings	2013-08-02 11:01:13 +0000
+++ plugins/wifi/wifi.settings	2013-09-18 20:04:27 +0000
@@ -4,6 +4,9 @@
     "translations": "ubuntu-system-settings",
     "category": "network",
     "priority": 0,
+    "form-factors": [
+        "phone"
+    ],
     "keywords": [
         "network",
         "wireless",
@@ -12,5 +15,7 @@
         "settings"
     ],
     "has-dynamic-keywords": false,
-    "has-dynamic-visibility": false
+    "has-dynamic-visibility": false,
+    "page-component": "PageComponent.qml",
+    "plugin": "UbuntuWifiPanel"
 }