Merge lp:~larsu/ubuntu-system-settings/dont-use-statusicon into lp:ubuntu-system-settings

[Lars Karlitski]

Use Icon instead of StatusIcon

The latter is deprecated.

Use Icon instead of StatusIcon

Depends on lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup which has the updated icon provider. I've also already removed StatusIcon in lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack.

[Sebastien Bacher (seb128)]

Thanks, since it depends on a toolkit update we should update you depends on it (let's wait for an uitk update including the change so we know what version to use)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:962
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5440
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3463
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3463/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

The patch landed in ubuntu-ui-toolkit. I've bumped the dependency in this branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:963
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1418/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4597/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3403/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/610/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5849/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3705/console

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

The toolkit changes landed in https://launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/1.1.1239+14.10.20140908-0ubuntu1 , can you update the depends version to match that?

Note that the version you added the end of the line is wrong (it's after the "," and doesn't include ">="

review: Needs Fixing

[Sebastien Bacher (seb128)]

the icons are misplaced also, seems like you need to add "width: height" to the Icon {} section

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1472/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4782/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/664
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4547/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6034
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6034/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2904
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3811
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3811/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

thanks (CI failed but it doesn't seem to be due to the changes here, I retried it)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:964
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1481/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/673
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3830/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-09-11 19:31:43 +0000
+++ debian/control	2014-09-12 16:11:51 +0000
@@ -69,7 +69,7 @@
          qtdeclarative5-systeminfo-plugin,
          qtdeclarative5-ubuntu-content1,
          qtdeclarative5-ubuntu-settings-components (> 0.2),
-         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140502.6-0ubuntu1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
          suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),

=== modified file 'src/qml/EntryComponent.qml'
--- src/qml/EntryComponent.qml	2014-08-27 20:35:48 +0000
+++ src/qml/EntryComponent.qml	2014-09-12 16:11:51 +0000
@@ -44,9 +44,10 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            StatusIcon {
+            Icon {
                 id: icon
                 anchors.horizontalCenter: parent.horizontalCenter
+                width: height
                 height: units.gu(4)
                 source: model.icon
             }