Merge lp:~seb128/ubuntu-system-settings/use-theme-icons into lp:ubuntu-system-settings

[Sebastien Bacher]

use the new icons from the suru theme

use the new icons from the suru theme

needs https://code.launchpad.net/~saviq/ubuntu-ui-toolkit/suru-switch/+merge/211328 to land first to be ready, since the ubuntu-ui-toolkit forces the theme

(workaround to test are to rename the directory on disk or update the ui toolkit)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:675
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/783/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/133
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4266
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5829
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4810
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4810/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'plugins/about/about.settings'
--- plugins/about/about.settings	2013-08-02 11:01:13 +0000
+++ plugins/about/about.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-about.svg",
+    "icon": "ubuntu-logo-symbolic",
     "name": "About this phone",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-bottom",

=== modified file 'plugins/accessibility/accessibility.settings'
--- plugins/accessibility/accessibility.settings	2013-08-02 11:01:13 +0000
+++ plugins/accessibility/accessibility.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-accessibility.svg",
+    "icon": "preferences-desktop-accessibility-symbolic",
     "name": "Accessibility",
     "translations": "ubuntu-system-settings",
     "category": "personal",

=== modified file 'plugins/background/background.settings'
--- plugins/background/background.settings	2013-08-02 11:01:13 +0000
+++ plugins/background/background.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-background.svg",
+    "icon": "preferences-desktop-wallpaper-symbolic",
     "translations": "ubuntu-system-settings",
     "name": "Background",
     "category": "personal",

=== modified file 'plugins/battery/battery.settings'
--- plugins/battery/battery.settings	2013-08-20 12:12:07 +0000
+++ plugins/battery/battery.settings	2014-04-09 13:42:21 +0000
@@ -1,6 +1,6 @@
 {
     "plugin": "battery-plugin",
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-battery.svg",
+    "icon": "battery-080-charging",
     "name": "Battery",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/bluetooth/bluetooth.settings'
--- plugins/bluetooth/bluetooth.settings	2013-09-23 02:50:33 +0000
+++ plugins/bluetooth/bluetooth.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-bluetooth.svg",
+    "icon": "bluetooth-active",
     "name": "Bluetooth",
     "translations": "ubuntu-system-settings",
     "category": "network",

=== modified file 'plugins/brightness/brightness.settings'
--- plugins/brightness/brightness.settings	2014-01-27 13:01:26 +0000
+++ plugins/brightness/brightness.settings	2014-04-09 13:42:21 +0000
@@ -1,6 +1,6 @@
 {
     "plugin": "brightness-plugin",
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-brightness.svg",
+    "icon": "display-brightness-symbolic",
     "name": "Brightness",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/cellular/cellular.settings'
--- plugins/cellular/cellular.settings	2013-08-02 11:01:13 +0000
+++ plugins/cellular/cellular.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-cellular.svg",
+    "icon": "gsm-3g-high",
     "name": "Cellular",
     "translations": "ubuntu-system-settings",
     "category": "network",

=== modified file 'plugins/flight-mode/flight-mode.settings'
--- plugins/flight-mode/flight-mode.settings	2014-01-23 09:47:35 +0000
+++ plugins/flight-mode/flight-mode.settings	2014-04-09 13:42:21 +0000
@@ -1,6 +1,6 @@
 {
     "name": "Flight Mode",
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-flight-mode.svg",
+    "icon": "airplane-mode",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-top",
     "priority": 1,

=== modified file 'plugins/language/language.settings'
--- plugins/language/language.settings	2013-08-05 16:12:24 +0000
+++ plugins/language/language.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-language.svg",
+    "icon": "preferences-desktop-locale-symbolic",
     "name": "Language & Text",
     "translations": "ubuntu-system-settings",
     "category": "personal",

=== modified file 'plugins/orientation-lock/EntryComponent.qml'
--- plugins/orientation-lock/EntryComponent.qml	2013-11-28 15:09:15 +0000
+++ plugins/orientation-lock/EntryComponent.qml	2014-04-09 13:42:21 +0000
@@ -26,7 +26,7 @@
 ListItem.Standard {
     id: root
     iconSource: model.icon
-    iconFrame: false
+    iconFrame: true
     text: i18n.tr(model.displayName)
     control: Switch {
         id: control

=== modified file 'plugins/orientation-lock/orientation-lock.settings'
--- plugins/orientation-lock/orientation-lock.settings	2014-01-23 09:47:35 +0000
+++ plugins/orientation-lock/orientation-lock.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-orientation-lock.svg",
+    "icon": "orientation-lock",
     "name": "Orientation Lock",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-top",

=== modified file 'plugins/phone/phone.settings'
--- plugins/phone/phone.settings	2013-09-25 16:34:21 +0000
+++ plugins/phone/phone.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-phone.svg",
+    "icon": "preferences-system-phone-symbolic",
     "name": "Phone",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/reset/reset.settings'
--- plugins/reset/reset.settings	2013-09-25 16:36:16 +0000
+++ plugins/reset/reset.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-reset.svg",
+    "icon": "reset",
     "name": "Reset phone",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-bottom",

=== modified file 'plugins/security-privacy/security-privacy.settings'
--- plugins/security-privacy/security-privacy.settings	2013-08-02 12:08:52 +0000
+++ plugins/security-privacy/security-privacy.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-security-privacy.svg",
+    "icon": "preferences-system-privacy-symbolic",
     "name": "Security & Privacy",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/sound/sound.settings'
--- plugins/sound/sound.settings	2013-08-02 11:01:13 +0000
+++ plugins/sound/sound.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-sounds.svg",
+    "icon": "preferences-desktop-sounds-symbolic",
     "name": "Sound",
     "translations": "ubuntu-system-settings",
     "category": "personal",

=== modified file 'plugins/system-update/system-update.settings'
--- plugins/system-update/system-update.settings	2013-08-02 12:08:52 +0000
+++ plugins/system-update/system-update.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-system-update.svg",
+    "icon": "preferences-system-updates-symbolic",
     "name": "Updates",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/system-update/update-notification.settings'
--- plugins/system-update/update-notification.settings	2014-02-04 21:05:28 +0000
+++ plugins/system-update/update-notification.settings	2014-04-09 13:42:21 +0000
@@ -1,6 +1,6 @@
 {
     "plugin": "update-plugin",
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-about.svg",
+    "icon": "ubuntu-logo-symbolic",
     "name": "Updates available",
     "translations": "ubuntu-system-settings",
     "category": "uncategorized-top",

=== modified file 'plugins/time-date/time-date.settings'
--- plugins/time-date/time-date.settings	2013-08-02 11:01:13 +0000
+++ plugins/time-date/time-date.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-time-date.svg",
+    "icon": "preferences-system-time-symbolic",
     "name": "Time & Date",
     "translations": "ubuntu-system-settings",
     "category": "system",

=== modified file 'plugins/wifi/wifi.settings'
--- plugins/wifi/wifi.settings	2013-09-19 09:45:16 +0000
+++ plugins/wifi/wifi.settings	2014-04-09 13:42:21 +0000
@@ -1,5 +1,5 @@
 {
-    "icon": "/usr/share/ubuntu/settings/system/icons/settings-wifi.svg",
+    "icon": "wifi-high",
     "name": "Wi-Fi",
     "translations": "ubuntu-system-settings",
     "category": "network",

=== modified file 'src/qml/EntryComponent.qml'
--- src/qml/EntryComponent.qml	2013-11-13 15:12:36 +0000
+++ src/qml/EntryComponent.qml	2014-04-09 13:42:21 +0000
@@ -38,7 +38,7 @@
         Image {
             id: icon
             anchors.horizontalCenter: parent.horizontalCenter
-            width: units.gu(6)
+            width: units.gu(5)
             height: width
             source: model.icon
         }