Merge lp:~nick-dedekind/ubuntu-settings-components/access-point-init into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Fixed issue with Access Point checkbox not fetching initial value.

* 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

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

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

[lp:~nick-dedekind/ubuntu-settings-components/access-point-init]

67. By Nick Dedekind on 2014-03-26

Added comment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-trusty/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-trusty-armhf-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/37/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

is there a chance we're clearing enableCheckConnection value? (something setting this before the Component.onCompleted) do we need the oldValue here as well?

review: Needs Information

[Nick Dedekind (nick-dedekind)]

> is there a chance we're clearing enableCheckConnection value? (something
> setting this before the Component.onCompleted) do we need the oldValue here as
> well?

Nope. Component.onCompleted cannot be called as a result of any other function calls in this component. As enableCheckConnection is always returned to it's previous value, this will always be true at the start of Component.onCompleted

[Andrea Cimitan (cimi)]

After long private discussion, it's fine for now :) Thank you

review: Approve

=== modified file 'Ubuntu/Settings/Menus/AccessPointMenu.qml'
--- Ubuntu/Settings/Menus/AccessPointMenu.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Menus/AccessPointMenu.qml	2014-03-26 17:58:58 +0000
@@ -47,6 +47,14 @@
             verticalCenter: parent.verticalCenter
         }
 
+        // need onCompleted to set the initial value
+        // can't use binding otherwise we will get feedback from connections.
+        Component.onCompleted: {
+            enableCheckConnection = false;
+            checked = menu.checked;
+            enableCheckConnection = true;
+        }
+
         // FIXME : should use Checkbox.toggled signal
         // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
         onCheckedChanged: {

=== modified file 'tests/qmltests/Menus/tst_AccessPointMenu.qml'
--- tests/qmltests/Menus/tst_AccessPointMenu.qml	2013-10-04 13:57:24 +0000
+++ tests/qmltests/Menus/tst_AccessPointMenu.qml	2014-03-26 17:58:58 +0000
@@ -135,5 +135,12 @@
             accessPoint.checked = false;
             compare(checkBox.checked, false, "Checkbox should not be checked when access point is not checked");
         }
+
+        function test_checkBox_on_default_checked() {
+            var checkBox = UtilsJS.findChild(accessPoint2, "checkBox");
+            verify(checkBox !== undefined);
+
+            compare(checkBox.checked, true, "Check box should be checked if default to checked")
+        }
     }
 }