Merge lp:~jonas-drange/ubuntu-system-settings/titles-uis-tweaks-2 into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular][phone] titles now using SettingsItemTitle

[cellular][phone] titles now using SettingsItemTitle

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1177
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1721/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4253/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/913
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5983/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15296
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3609/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4645
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4645/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, that looks mostly fine. Do we have a design for the SIM rename screen? Not sure if that one is supposed to be a title (I only have 1 SIM so I can't even look at the screen here)

review: Needs Information

[Jonas G. Drange (jonas-drange)]

@seb128, the design has not made it into the spec, but it is supposed to be a title.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1732/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/2
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/21
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15502
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/17/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/16
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/16/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine to me, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1741/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/81
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/81
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15616
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/49
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/49/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1746/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/91
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/87
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/91
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15630
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/57
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/57/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1753/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/121
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15691
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/84
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/84/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1756/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/135
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/91/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/26
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/135
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15710
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/83/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/95
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/95/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1179
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1761/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/150
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/150
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15739
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/103
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/103/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/cellular/Components/DataMultiSim.qml'
--- plugins/cellular/Components/DataMultiSim.qml	2014-11-04 12:08:12 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2014-11-12 11:43:26 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -33,10 +34,11 @@
 
     height: childrenRect.height
 
+    SettingsItemTitle { text: i18n.tr("Cellular data:") }
+
     ListItem.ItemSelector {
         id: use
         objectName: "data"
-        text: i18n.tr("Cellular data:")
         expanded: true
         model: {
             // create a model of 'off' and all sim paths

=== modified file 'plugins/cellular/Components/DefaultSim.qml'
--- plugins/cellular/Components/DefaultSim.qml	2014-09-24 14:46:26 +0000
+++ plugins/cellular/Components/DefaultSim.qml	2014-11-12 11:43:26 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -31,9 +32,10 @@
         return [i18n.tr("Ask me each time"), sims[0].title, sims[1].title][index];
     }
 
+    SettingsItemTitle { text: i18n.tr("For outgoing calls, use:") }
+
     ListItem.ItemSelector {
         id: callsDefaultSim
-        text: i18n.tr("For outgoing calls, use:")
         expanded: true
         model: m
         delegate: OptionSelectorDelegate {
@@ -52,9 +54,10 @@
 
     ListItem.Divider {}
 
+    SettingsItemTitle { text: i18n.tr("For messages, use:") }
+
     ListItem.ItemSelector {
         id: messagesDefaultSim
-        text: i18n.tr("For messages, use:")
         expanded: true
         model: m
         delegate: OptionSelectorDelegate {

=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-10-23 12:30:27 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-11-12 11:43:26 +0000
@@ -19,6 +19,7 @@
 */
 import QtQuick 2.0
 import GSettings 1.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -102,10 +103,11 @@
         }[tech]
     }
 
+    SettingsItemTitle { text: i18n.tr("Connection type:") }
+
     ListItem.ItemSelector {
         id: radio
         expanded: true
-        text: i18n.tr("Connection type:")
         model: poweredSim ? poweredSim.radioSettings.modemTechnologies : []
         delegate: OptionSelectorDelegate {
             objectName: poweredSim.path + "_radio_" + modelData

=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	2014-10-14 13:50:17 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2014-11-12 11:43:26 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -26,9 +27,10 @@
 
     property alias selector: selector
 
+    SettingsItemTitle { text: i18n.tr("Connection type:") }
+
     ListItem.ItemSelector {
         id: selector
-        text: i18n.tr("Connection type:")
         showDivider: false
         expanded: true
 

=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2014-10-22 21:41:38 +0000
+++ plugins/cellular/Components/SimEditor.qml	2014-11-12 11:43:26 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -84,10 +85,7 @@
         nameField.forceActiveFocus();
     }
 
-    ListItem.Standard {
-        id: std
-        text: i18n.tr("Edit SIM Name")
-    }
+    SettingsItemTitle { text: i18n.tr("Edit SIM Name") }
 
     ListItem.ExpandablesColumn {
         anchors {

=== modified file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	2014-11-05 19:59:25 +0000
+++ plugins/cellular/Components/SingleSim.qml	2014-11-12 11:43:26 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 

=== modified file 'plugins/cellular/PageChooseCarrier.qml'
--- plugins/cellular/PageChooseCarrier.qml	2014-10-14 13:54:10 +0000
+++ plugins/cellular/PageChooseCarrier.qml	2014-11-12 11:43:26 +0000
@@ -147,12 +147,13 @@
                 right: parent.right
             }
 
+            SettingsItemTitle { text: i18n.tr("Choose carrier:") }
+
             ListItem.ItemSelector {
                 id: chooseCarrier
                 objectName: "mode"
                 expanded: true
                 enabled: sim.netReg.mode !== "auto-only"
-                text: i18n.tr("Choose carrier:")
                 model: [i18n.tr("Automatically"), i18n.tr("Manually")]
 
                 delegate: OptionSelectorDelegate { showDivider: false }

=== modified file 'plugins/cellular/PageChooseCarriers.qml'
--- plugins/cellular/PageChooseCarriers.qml	2014-10-14 13:54:10 +0000
+++ plugins/cellular/PageChooseCarriers.qml	2014-11-12 11:43:26 +0000
@@ -40,12 +40,8 @@
             anchors.right: parent.right
 
             ListItem.Standard {
-                text: sims[0].title
-            }
-
-            ListItem.SingleValue {
                 objectName: sims[0].path + "_carriers"
-                value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
+                text: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
                 enabled: sims[0].netReg.status !== ""
                 progression: true
                 onClicked: {
@@ -57,12 +53,8 @@
             }
 
             ListItem.Standard {
-                text: sims[1].title
-            }
-
-            ListItem.SingleValue {
                 objectName: sims[1].path + "_carriers"
-                value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
+                text: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
                 enabled: sims[1].netReg.status !== ""
                 progression: true
                 onClicked: {

=== modified file 'plugins/phone/MultiSim.qml'
--- plugins/phone/MultiSim.qml	2014-08-19 15:59:18 +0000
+++ plugins/phone/MultiSim.qml	2014-11-12 11:43:26 +0000
@@ -20,6 +20,7 @@
 */
 import QtQuick 2.0
 import GSettings 1.0
+import SystemSettings 1.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -27,9 +28,7 @@
 
     property var sims
 
-    ListItem.Standard {
-        text: sims[0].title
-    }
+    SettingsItemTitle { text: sims[0].title }
 
     ListItem.Standard {
         objectName: "callFwdSim1"
@@ -65,9 +64,7 @@
 
     ListItem.Divider {}
 
-    ListItem.Standard {
-        text: sims[1].title
-    }
+    SettingsItemTitle { text: sims[1].title }
 
     ListItem.Standard {
         objectName: "callFwdSim2"