Merge lp:~tpeeters/ubuntu-ui-toolkit/icon-disabled into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Set the opacity of disabled icons to 0.3.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1903
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/520/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1882/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/520/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1903
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/300/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1883/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/300/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1903
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/274/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1884/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/274/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1903
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/531/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1885/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/531/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1903
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/170/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/520
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/531
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/531/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/300
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/274
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1886/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1882
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1885
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1883
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1884

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/170/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Please add a unit test. It might be as simple as checking that the opacity is not 1 when enabled is false.

review: Needs Fixing

[Tim Peeters (tpeeters)]

We stopped adding 'silly' unit tests that check that components have the exact color that we define in the component or its style because they only cause overhead when changing a color, and don't catch any real bugs. I consider a unit test to check the opacity to be similarly useless.

[Tim Peeters (tpeeters)]

After discussing, we decided that I will add a test to verify that the opacity is reduced for a disabled icon.

[lp:~tpeeters/ubuntu-ui-toolkit/icon-disabled]

1904. By Tim Peeters on 2016-03-23

sync trunk

1905. By Tim Peeters on 2016-03-23

add unit test

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1905
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/567/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2054/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/567/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1905
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/555/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2056/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/555/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1905
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/335/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2059/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/335/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1905
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/309/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2060/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/309/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1905
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/196/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/555/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/567/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/335/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/309/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2061/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2056
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2054
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2059
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2060

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/196/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Fixed with the new palette. See the discussion on https://bugs.launchpad.net/ubuntu-ux/+bug/1393485

For the header, the palette takes care of it. If other components need to update their opacity, probably they need to use the new palette properly, or set the opacity in the component itself while the Icon keeps its default opacity of 1.

review: Disapprove

Unmerged revisions

1905. By Tim Peeters on 2016-03-23

add unit test

1904. By Tim Peeters on 2016-03-23

sync trunk

1903. By Tim Peeters on 2016-03-16

set icon opacity to 0.3 when disabled

1902. By Tim Peeters on 2016-03-16

sync gallery-export-fix

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2015-08-06 10:26:25 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Icons.qml	2016-03-23 17:23:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2016 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Qt.labs.folderlistmodel 2.1
@@ -76,6 +76,34 @@
         }
 
         TemplateRow {
+            title: i18n.tr("Disabled")
+            spacing: units.gu(2)
+
+            Icon {
+                name: "stock_alarm-clock"
+                width: units.gu(3)
+                height: width
+                enabled: false
+            }
+
+            Icon {
+                name: "stock_alarm-clock"
+                color: UbuntuColors.orange
+                width: units.gu(3)
+                height: width
+                enabled: false
+            }
+
+            Icon {
+                name: "stock_alarm-clock"
+                color: UbuntuColors.lightAubergine
+                width: units.gu(3)
+                height: width
+                enabled: false
+            }
+        }
+
+        TemplateRow {
             title: i18n.tr("Theme")
             spacing: units.gu(2)
             height: iconFlow.height

=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	2016-02-11 08:56:13 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-03-23 17:23:36 +0000
@@ -59,6 +59,7 @@
 
 Item {
     id: icon
+    opacity: enabled ? 1.0 : 0.3
 
     /*!
        The name of the icon to display.

=== modified file 'tests/unit_x11/tst_components/tst_icon13.qml'
--- tests/unit_x11/tst_components/tst_icon13.qml	2016-03-15 13:26:55 +0000
+++ tests/unit_x11/tst_components/tst_icon13.qml	2016-03-23 17:23:36 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Test 1.3
 
 Item {
-    width: units.gu(50)
+    width: units.gu(60)
     height: units.gu(50)
 
     Row {
@@ -29,6 +29,7 @@
         width: childrenRect.width
 
         Icon {
+            id: icon0
             // Fails to load the icon when suru-icon-theme or libqt5svg5 are
             // not installed. This causes a warning and rejection
             // by jenkins continuous integration.
@@ -58,6 +59,13 @@
             height: width
             source: Qt.resolvedUrl("tst_icon-select.png")
         }
+        Icon {
+            id: disabledIcon
+            enabled: false
+            width: units.gu(10)
+            height: width
+            name: "account"
+        }
     }
 
     UbuntuTestCase {
@@ -103,6 +111,11 @@
                     "Source of the image should equal icon2.source.");
         }
 
+        function test_opacity_bug1393485() {
+            compare(icon0.opacity, 1.0, "Enabled icon does not have opacity of 1.");
+            verify(disabledIcon.opacity < 0.2, "Disabled icon is not semi-transparent.");
+        }
+
         function test_keyColor() {
             icon.visible = true;
             var image = findChild(icon, "image");