Merge lp:~attente/ubuntu-system-settings/1256017 into lp:ubuntu-system-settings

[William Hua]

[language] Use custom Base for keyboard layout delegate. (LP: #1256017)

[language] Use custom Base for keyboard layout delegate. (LP: #1256017)

[Sebastien Bacher (seb128)]

Thanks, that looks fine and works correctly with the current toolkit version!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/527/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/30

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

review: Approve (continuous-integration)

=== modified file 'plugins/language/CMakeLists.txt'
--- plugins/language/CMakeLists.txt	2013-10-31 18:44:14 +0000
+++ plugins/language/CMakeLists.txt	2013-11-28 16:49:30 +0000
@@ -3,6 +3,7 @@
 
 set(QML_SOURCES
     DisplayLanguage.qml
+    KeyboardLayoutItem.qml
     KeyboardLayouts.qml
     PageComponent.qml
     SpellChecking.qml

=== added file 'plugins/language/KeyboardLayoutItem.qml'
--- plugins/language/KeyboardLayoutItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/language/KeyboardLayoutItem.qml	2013-11-28 16:49:30 +0000
@@ -0,0 +1,70 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: William Hua <[e-mail]>
+ *
+ * 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Base {
+    property alias name: name.text
+    property alias checked: checkBox.checked
+    property alias shortName: shortName.text
+
+    Row {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        spacing: units.gu(1)
+
+        Rectangle {
+            width: units.gu(3.0)
+            height: units.gu(3.0)
+            radius: units.gu(0.5)
+
+            color: Theme.palette.normal.backgroundText
+
+            anchors.verticalCenter: parent.verticalCenter
+
+            Label {
+                id: shortName
+
+                color: Theme.palette.normal.background
+                fontSize: "small"
+
+                anchors.centerIn: parent
+            }
+        }
+
+        Label {
+            id: name
+
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }
+
+    CheckBox {
+        id: checkBox
+
+        anchors.right: parent.right
+        anchors.verticalCenter: parent.verticalCenter
+    }
+
+    onClicked: checked = !checked
+}

=== modified file 'plugins/language/KeyboardLayouts.qml'
--- plugins/language/KeyboardLayouts.qml	2013-10-31 18:44:14 +0000
+++ plugins/language/KeyboardLayouts.qml	2013-11-28 16:49:30 +0000
@@ -18,9 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
 import SystemSettings 1.0
-import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
 
@@ -42,40 +40,20 @@
         supersetLabel: i18n.tr("All layouts available:")
 
         model: plugin.keyboardLayoutsModel
-        delegate: ListItem.Standard {
+        delegate: KeyboardLayoutItem {
+            name: model.language
+            shortName: model.icon
+            checked: model.checked
             enabled: model.enabled
 
-            icon: Rectangle {
-                width: units.gu(3.0)
-                height: units.gu(3.0)
-                radius: units.gu(0.5)
-
-                color: Theme.palette.normal.backgroundText
-
-                Label {
-                    text: model.icon
-
-                    color: Theme.palette.normal.background
-                    fontSize: "small"
-
-                    anchors.centerIn: parent
-                }
-            }
-
-            text: model.language
-
-            control: CheckBox {
-                checked: model.checked
-
-                onCheckedChanged: {
-                    var element = index < subsetView.model.subset.length ?
-                                  subsetView.model.subset[index] :
-                                  index - subsetView.model.subset.length
-
-                    plugin.keyboardLayoutsModel.setChecked(element, checked, checked ? 0 : subsetView.delay)
-
-                    checked = Qt.binding(function() { return model.checked })
-                }
+            onCheckedChanged: {
+                var element = model.index < subsetView.model.subset.length ?
+                              subsetView.model.subset[model.index] :
+                              model.index - subsetView.model.subset.length
+
+                plugin.keyboardLayoutsModel.setChecked(element, checked, checked ? 0 : subsetView.delay)
+
+                checked = Qt.binding(function() { return model.checked })
             }
         }
     }