Merge lp:~jonas-drange/ubuntu-system-settings/default-sims into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular] uis for default SIM settings

Hi,

new UI bits for selecting default SIM for calls and messages.

Thanks

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1188/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3305/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2586/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/380/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4550/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2860/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/391
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4592
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4592/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2893
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2893/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good and works well on a dual SIM device

review: Approve

=== modified file 'plugins/cellular/Components/CMakeLists.txt'
--- plugins/cellular/Components/CMakeLists.txt	2014-07-24 16:04:51 +0000
+++ plugins/cellular/Components/CMakeLists.txt	2014-08-11 12:04:48 +0000
@@ -1,7 +1,8 @@
 set(QML_SOURCES
     CellularSingleSim.qml
+    CellularDualSim.qml
     data-helpers.js
-    CellularDualSim.qml
+    DefaultSim.qml
     Sim.qml
     SimEditor.qml
 )

=== added file 'plugins/cellular/Components/DefaultSim.qml'
--- plugins/cellular/Components/DefaultSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/DefaultSim.qml	2014-08-11 12:04:48 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+
+    property var m: ["ask", sim1.path, sim2.path]
+
+    function getNameFromIndex (index) {
+        return [i18n.tr("Ask me each time"), sim1.title, sim2.title][index];
+    }
+
+    ListItem.ItemSelector {
+        id: callsDefaultSim
+        text: i18n.tr("For outgoing calls, use:")
+        expanded: true
+        model: m
+        delegate: OptionSelectorDelegate {
+            objectName: "defaultForCalls" + modelData
+            text: getNameFromIndex(index);
+        }
+        selectedIndex: m.indexOf(phoneSettings.defaultSimForCalls)
+        onDelegateClicked: {
+            phoneSettings.defaultSimForCalls = m[index];
+        }
+    }
+
+    ListItem.Caption {
+        text: i18n.tr("You can change the SIM for individual calls, or for contacts in the address book.")
+    }
+
+    ListItem.Divider {}
+
+    ListItem.ItemSelector {
+        id: messagesDefaultSim
+        text: i18n.tr("For messages, use:")
+        expanded: true
+        model: m
+        delegate: OptionSelectorDelegate {
+            objectName: "defaultForMessages" + modelData
+            text: getNameFromIndex(index);
+        }
+        selectedIndex: m.indexOf(phoneSettings.defaultSimForMessages)
+        onDelegateClicked: {
+            phoneSettings.defaultSimForMessages = m[index];
+
+        }
+    }
+}
+

=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-07-31 15:35:41 +0000
+++ plugins/cellular/PageComponent.qml	2014-08-11 12:04:48 +0000
@@ -60,6 +60,7 @@
                     simTwoLoader.setSource("Components/Sim.qml", {
                         path: p
                     });
+                    defaultSimLoader.source = "Components/DefaultSim.qml";
                 }
             }
         }
@@ -182,10 +183,20 @@
                 visible: showAllUI
             }
 
+            ListItem.Divider {}
+
             SimEditor {
                 visible: root.state === "dualSim"
                 objectName: "simEditor"
             }
+
+            ListItem.Divider {}
+
+            Loader {
+                id: defaultSimLoader
+                anchors.left: parent.left
+                anchors.right: parent.right
+            }
         }
     }
 

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-07 09:52:19 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-11 12:04:48 +0000
@@ -265,6 +265,26 @@
 
         super(UbuntuSystemSettingsOfonoTestCase, self).setUp(panel)
 
+    def set_default_for_calls(self, gsettings, default):
+        gsettings.set_value('default-sim-for-calls', default)
+        # wait for gsettings
+        sleep(1)
+
+    def set_default_for_messages(self, gsettings, default):
+        gsettings.set_value('default-sim-for-messages', default)
+        # wait for gsettings
+        sleep(1)
+
+    def get_default_sim_for_calls_selector(self, text):
+        return self.system_settings.main_view.cellular_page.select_single(
+            objectName="defaultForCalls" + text
+        )
+
+    def get_default_sim_for_messages_selector(self, text):
+        return self.system_settings.main_view.cellular_page.select_single(
+            objectName="defaultForMessages" + text
+        )
+
 
 class CellularBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
     def setUp(self):

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-31 14:16:23 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-11 12:04:48 +0000
@@ -562,3 +562,40 @@
             gsettings.set_value('sim-names', old_names)
             # wait for gsettings
             sleep(1)
+
+    def test_changing_default_sim_for_calls(self):
+        gsettings = Gio.Settings.new('com.ubuntu.phone')
+        default = gsettings.get_value('default-sim-for-calls')
+
+        self.addCleanup(
+            self.set_default_for_calls, gsettings, default)
+
+        # click ask
+        self.system_settings.main_view.scroll_to_and_click(
+            self.get_default_sim_for_calls_selector('ask'))
+        # click first sim
+        self.system_settings.main_view.scroll_to_and_click(
+            self.get_default_sim_for_calls_selector('/ril_0'))
+        # wait for gsettings
+        sleep(1)
+        self.assertEqual(
+            gsettings.get_value('default-sim-for-calls').get_string(),
+            '/ril_0')
+
+    def test_changing_default_sim_for_messages(self):
+        gsettings = Gio.Settings.new('com.ubuntu.phone')
+        default = gsettings.get_value('default-sim-for-messages')
+        self.addCleanup(
+            self.set_default_for_messages, gsettings, default)
+
+        # click ask
+        self.system_settings.main_view.scroll_to_and_click(
+            self.get_default_sim_for_messages_selector('ask'))
+        # click second sim
+        self.system_settings.main_view.scroll_to_and_click(
+            self.get_default_sim_for_messages_selector('/ril_1'))
+        # wait for gsettings
+        sleep(1)
+        self.assertEqual(
+            gsettings.get_value('default-sim-for-messages').get_string(),
+            '/ril_1')