Merge lp:~jonas-drange/ubuntu-system-settings/cellular-insertsim into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular] better ux for no sims

[cellular] better ux for no sims

[lp:~jonas-drange/ubuntu-system-settings/cellular-insertsim]

1292. By Jonas G. Drange on 2015-02-05

update cellular panel design for no sims

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1292
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1961/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1201
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17825

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

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Small issue

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

@iain, I thought so too, but the spec does not say that a full stop should
follow. The punctuation mark is a grid dot.

[Iain Lane (laney)]

On Sat, Feb 07, 2015 at 02:24:30AM -0000, Jonas G. Drange wrote:
> @iain, I thought so too, but the spec does not say that a full stop should
> follow. The punctuation mark is a grid dot.

I was looking at the synopsis in the bug - but you could confirm if
you're in doubt

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[lp:~jonas-drange/ubuntu-system-settings/cellular-insertsim]

1293. By Jonas G. Drange on 2015-02-13

add fullstop

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1293
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1970/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18047

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1293
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1974/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/244
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18088

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

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Looks good, thanks.

p.s. wouldn't it be even better to use dynamic visibility and hide the panel altogether when there's no sim? Now you say "restart the phone" on my desktop.

review: Approve

[Matthew Paul Thomas (mpt)]

Iain, this is a difference between a phone and a PC. A PC (at least in 2015) seldom has a SIM, and if it does it's typically something you plug in, so an always-present top-level "Cellular" screen would be an annoying stump. On a phone, though, you may not realize (for example, you may have forgotten) that it doesn't have a SIM, so the in-place explanation is useful.

Hopefully by the time we adapt this design to the PC we'll have a way of telling whether the device has a SIM slot, not just whether it has a SIM.

=== modified file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	2014-10-29 20:04:49 +0000
+++ plugins/cellular/Components/NoSim.qml	2015-02-13 09:50:31 +0000
@@ -18,27 +18,33 @@
  *
 */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.1
 
 Column {
 
-    objectName: "noSim"
-
-    ListItem.Standard {
-        text: i18n.tr("Cellular data:")
-        enabled: false
-        control: Switch {
-            checked: false
-        }
-    }
-
-    ListItem.Standard {
-        text: i18n.tr("Data roaming")
-        enabled: false
-        showDivider: false
-        control: Switch {
-            checked: false
-        }
+    anchors {
+        top: parent.top
+        left: parent.left
+        right: parent.right
+        margins: units.gu(8)
+    }
+
+    spacing: units.gu(2)
+
+    Label {
+        anchors { left: parent.left; right: parent.right; }
+        text: i18n.tr("No SIM detected")
+        fontSize: "large"
+        horizontalAlignment: Text.AlignHCenter
+        color: UbuntuColors.lightGrey
+        wrapMode: Text.WordWrap
+    }
+
+    Label {
+        anchors { left: parent.left; right: parent.right; }
+        text: i18n.tr("Insert a SIM, then restart the phone.")
+        horizontalAlignment: Text.AlignHCenter
+        color: UbuntuColors.lightGrey
+        wrapMode: Text.WordWrap
     }
 }