Unity 8

Merge lp:~cimi/unity8/fix-1363400 into lp:unity8

fix-1363400
Merge into trunk

Proposed by Andrea Cimitan on 2015-01-21

Status:

Merged

Approved by:

Albert Astals Cid on 2015-02-04

Approved revision:

1567

Merged at revision:

1589

Proposed branch:

lp:~cimi/unity8/fix-1363400

Merge into:

lp:unity8

Diff against target:

94 lines (+29/-9)

2 files modified

debian/control (+2/-0)
qml/Wizard/Pages/40-wifi.qml (+27/-9)

To merge this branch:

bzr merge lp:~cimi/unity8/fix-1363400

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-01-21	Approve on 2015-02-04
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-02-03
Review via email: mp+247129@code.launchpad.net

Commit Message

Fix continue button in wifi wizard page, adds qml-module-qtsysteminfo as unity8 dep

Description of the Change

The RTM part of this lives at https://code.launchpad.net/~cimi/ubuntu-system-settings/fix-1363400/+merge/247131

* 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?
Sure
* 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?
I will
* If you changed the UI, has there been a design review?
n/a

lp:~cimi/unity8/fix-1363400 updated on 2015-01-21

1562. By Andrea Cimitan on 2015-01-21: minor
1563. By Andrea Cimitan on 2015-01-21: This proved to be more reliable on krillin

PS Jenkins bot (ps-jenkins) wrote on 2015-01-21:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-21:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-01-22:

I'm a bit confused by how the code has

property string accessPointName: getAccessPointName()

but then in the getAccessPointName function you do accessPointName = "" which basically breaks the above binding and the you also have
onNetworkNameChanged: getAccessPointName()
and
onNetworkStatusChanged: if (status !== NetworkInfo.HomeNetwork) accessPointName = ""
which seems like they are trying to make up for the broken binding.

Wouldn't it be better to just have the getAccessPointName() function be the binding itself for accessPointName? Then we wouldn't need those onChanged since QML would do the re-evaluation for us when needed, no?

Albert Astals Cid (aacid) wrote on 2015-01-22:

Ok, ignore my comment since
networkStatus(NetworkInfo.WlanMode, 0)
actually needs to be a function call so we need the onChanged stuff.

This NetworkInfo for QML seems like it's not very QML-friednly to be honest :/

lp:~cimi/unity8/fix-1363400 updated on 2015-01-22

1564. By Andrea Cimitan on 2015-01-22: fix for jenkins
1565. By Andrea Cimitan on 2015-01-22: let's add also for runtime

PS Jenkins bot (ps-jenkins) wrote on 2015-01-22:

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

review: Needs Fixing (continuous-integration)

lp:~cimi/unity8/fix-1363400 updated on 2015-01-23

1566. By Andrea Cimitan on 2015-01-23: Some testers reported currentNetworkMode being sometimes set after the networkName changes (on RTM), let's add a signal, won't hurt

PS Jenkins bot (ps-jenkins) wrote on 2015-01-23:

FAILED: Continuous integration, rev:1566
http://jenkins.qa.ubuntu.com/job/unity8-ci/5183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/953/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/348
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/843/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/951
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17385

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-23:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) on 2015-01-26:

lp:~cimi/unity8/fix-1363400 updated on 2015-02-03

1567. By Andrea Cimitan on 2015-02-03: As review

PS Jenkins bot (ps-jenkins) wrote on 2015-02-03:

FAILED: Continuous integration, rev:1567
http://jenkins.qa.ubuntu.com/job/unity8-ci/5224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1134/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/389
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1132/console

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-02-04:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, also the system settings guys approved and landed the counterpart to this

* Did CI run pass? If not, please explain why.
Not much, our CI is kind of broken, but we don't have tests over this as far as i can see

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2015-01-22 10:09:11 +0000
 +++ debian/control	2015-02-03 15:00:49 +0000
@@ -39,6 +39,7 @@
                 qml-module-qtquick-layouts,
                 qml-module-qtquick-xmllistmodel,
                 qml-module-qtquick2,
++               qml-module-qtsysteminfo,
                 qml-module-qttest,
                 qt5-default,
                 qtbase5-dev (>= 5.2.1),
@@ -90,6 +91,7 @@
           qmenumodel-qml (>= 0.2.9),
           qml-module-qt-labs-folderlistmodel,
           qml-module-qtquick-xmllistmodel,
++         qml-module-qtsysteminfo,
           qtdeclarative5-gsettings1.0,
           qtdeclarative5-qtmir-plugin (>= 0.4.4),
           qtdeclarative5-ubuntu-telephony0.1,
 === modified file 'qml/Wizard/Pages/40-wifi.qml'
 --- qml/Wizard/Pages/40-wifi.qml	2014-11-21 19:28:16 +0000
 +++ qml/Wizard/Pages/40-wifi.qml	2015-02-03 15:00:49 +0000
@@ -16,6 +16,7 @@
  import QtQuick 2.0
  import QMenuModel 0.1 as QMenuModel
++import QtSystemInfo 5.0
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Settings.Menus 0.1 as Menus
@@ -28,7 +29,7 @@
      title: i18n.tr("Connect to Wi‑Fi")
      forwardButtonSourceComponent: forwardButton
--    readonly property bool connected: mainMenu.connectedAPs === 1
++    readonly property bool connected: networkInfo.accessPointName
      function getExtendedProperty(object, propertyName, defaultValue) {
          if (object && object.hasOwnProperty(propertyName)) {
@@ -44,6 +45,31 @@
          menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
+     }
++    NetworkInfo {
++        id: networkInfo
++
++        property string accessPointName
++
++        monitorCurrentNetworkMode: true
++        monitorNetworkName: true
++        monitorNetworkStatus: true
++
++        onCurrentNetworkModeChanged: getAccessPointName()
++        onNetworkNameChanged: getAccessPointName()
++        onNetworkStatusChanged: if (status !== NetworkInfo.HomeNetwork) accessPointName = ""
++
++        Component.onCompleted: getAccessPointName()
++
++        function getAccessPointName() {
++            // 0 is the interface
++            if (currentNetworkMode === NetworkInfo.WlanMode &&
++                networkStatus(NetworkInfo.WlanMode, 0) === NetworkInfo.HomeNetwork)
++                accessPointName = networkName(NetworkInfo.WlanMode, 0);
++            else
++                accessPointName = "";
++        }
++    }
++
      Component {
          id: accessPointComponent
          ListItem.Standard {
@@ -119,11 +145,6 @@
              onCheckedChanged: {
                  // Can't rely on binding. Checked is assigned on click.
                  checkBoxActive.checked = checked;
--                if (checked) {
--                    mainMenu.connectedAPs++
--                } else {
--                    mainMenu.connectedAPs--
--                }
+             }
              onActivate: unityMenuModel.activate(menuIndex);
+         }
@@ -165,9 +186,6 @@
                  Repeater {
                      id: mainMenu
--                    // FIXME Check connection better https://bugs.launchpad.net/indicator-network/+bug/1349371
--                    property int connectedAPs: 0
--
                      model: menuModel
                      delegate: Loader {