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

[William Hua]

Hook up language panel to some maliit settings.

Hook up language panel to some maliit settings.

This depends on https://code.launchpad.net/~attente/ubuntu-keyboard/gsettings-schema/+merge/185121.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/255/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/255/console

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

review: Needs Fixing (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

295. By William Hua on 2013-08-28

Build depend on libqt5xmlpatterns5-dev.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/256/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/256

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

296. By William Hua on 2013-08-30

Subset model.

297. By William Hua on 2013-08-30

Simplify SubsetModel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/263

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

298. By William Hua on 2013-08-30

Hook up signals and save enabled plugins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:298
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/264

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

299. By William Hua on 2013-09-09

Animate subset changes.

300. By William Hua on 2013-09-09

[ Sebastien Bacher ]
* use the theme provider for themed icons.
[ Ubuntu daily release ]
* Automatic snapshot from revision 315
[ Sebastien Bacher ]
* sound: use the new ItemSelector list widget.
* battery: use the new ItemSelector list widget. Depends on the new
  toolkit version for that. If the configuration value is zero, than
  select the "never" entry as well.
[ Ubuntu daily release ]
* Automatic snapshot from revision 312
[ Sebastien Bacher ]
* stop using the deprecated gicon provider, use the new themed icon
  instead. Change the plugin icon code to support themed icons, as
  well as urls to file locations on disk.
[ Iain Lane ]
* UI (without backend) for setting/changing the unlock
  password/passphrase.
[ Ubuntu daily release ]
* Automatic snapshot from revision 309
[ Sebastien Bacher ]
* drop the gps control from the main screen.
[ Iain Lane ]
* Make the Automatic / Manual selector in Time & Date toggle
  timedated's NTP property.
[ Ubuntu daily release ]
* Automatic snapshot from revision 306
[ Guenter Schwann ]
* Use content hub for picking a background from the gallery.
[ Ubuntu daily release ]
* Automatic snapshot from revision 302
[ Iain Lane ]
* Add a custom AccountsService schema and set up two examples.
[ Ubuntu daily release ]
* Automatic snapshot from revision 296
[ Sebastien Bacher ]
* use a better icon, since the mobile theme provides one.
* battery: 100% is fully charged Since upower seems to not always
  consider 100% as fully charged, check for the charge, as well as for
  the status.
[ Ubuntu daily release ]
* Automatic snapshot from revision 294
[ Iain Lane ]
* Use battery's SleepValues panel for lock/sleep when idle timeout.
[ Ubuntu daily release ]
* Automatic snapshot from revision 290

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/300/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/300

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

301. By William Hua on 2013-09-09

Fix opacity issue.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/304/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/304

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

Sorry for not looking sooner.

I've done a quick review from the diff without building. I've only got one
style comment and one question at this point. :-)

Not sure why this wasn't picked up before, but our style is to use

  if (brackets_like_this) {
    // do stuff
  }

rather than

  if (brackets_like_this)
  {
    //do stuff
  }

What's the idea behind the SubsetModel stuff?

review: Needs Fixing

[lp:~attente/ubuntu-system-settings/maliit-settings]

302. By William Hua on 2013-09-11

Fix braces style.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/310/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/310/console

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

review: Needs Fixing (continuous-integration)

[William Hua (attente)]

Iain, thanks for the review. The brace style is fixed.

The SubsetModel is an attempt to implement the behaviour in:

1. https://wiki.ubuntu.com/LanguageAndText#Phone:_.2BIBw-Keyboard_layouts.2BIB0_settings
2. https://wiki.ubuntu.com/LanguageAndText#Spell-checking [*]

using the available ListView component.

Particularly: "Unchecking a layout should, after a two-second delay in case you want to change your mind, remove it from the “Current layouts:” list."

But there's still a serious bug I'm running into that suggests it might be better to write a new SubsetView component instead, however...

[*] may be removed in the future

[lp:~attente/ubuntu-system-settings/maliit-settings]

303. By William Hua on 2013-09-11

[ Sebastien Bacher ]
* background: use the new OptionSelector, tweak the UI to be closer
  from the visuals (move the labels at the bottom of the images, use
  smaller text, use correct spacing).
* battery: set current value on the graph.
* reset: implement backend to reset the unity launcher settings.
* storage: display the clicks' list rather than the fake datas.
* updates: use the new ItemSelector widget, updated the download
  option to match the current design as well, moving the selector in
  its own subpage.
* orientation: replace "Rotation lock" by "Orientation lock".
* language: use new ItemSelector widget.
* storage: use new ItemSelector widget.
* battery: on the desktop use idle-delay's key, which is not
  deprecated.
[ Iain Lane ]
* Make the panels display "Lock on idle" or "Sleep on idle" as
  appropriate.
* Add UI and backend for setting the time manually.
* Make the "Change passphrase" / "Change passcode" button work.
* Implement filtering in the main window.
* Typo fix "Septemper" → "September". (LP: #1221400)
* Set the unlock type in a QSettings file (~/.unity8-greeter-demo).
  (LP: #1218010)
* security-privacy: Implement changing password and validation of
  input.
[ Charles Kerr ]
* Fix NMClient leak, take battery capacity into account when
  determining the last time a discharging battery was full.
[ Ken VanDine ]
* Don't start the transfer from the importer, the hub now handles that
  when dispatching the transfer.
[ William Hua ]
* Replace page stack with sheet in display languages. (LP: #1222728)
[ Adolfo Jayme Barrientos ]
* Trivial typo fix: Conrifm → Confirm.
[ Ubuntu daily release ]
* Automatic snapshot from revision 341

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/311

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

304. By William Hua on 2013-09-12

Use GSettings instead of QSettings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/319/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/319

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

305. By William Hua on 2013-09-12

Fix incorrect key name.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:305
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/322

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

review: Approve (continuous-integration)

[William Hua (attente)]

This MP now depends on https://code.launchpad.net/~attente/ubuntu-keyboard/gsettings-schema/+merge/185121.

[lp:~attente/ubuntu-system-settings/maliit-settings]

306. By William Hua on 2013-09-13

Don't watch for click, watch for checkEntry changes.

307. By William Hua on 2013-09-13

Rename keyboard plugins to keyboard layouts.

308. By William Hua on 2013-09-13

Debugging output.

309. By William Hua on 2013-09-13

Remove section role, replace with subset and superset roles.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/323

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

310. By William Hua on 2013-09-13

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/324/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/324

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

311. By William Hua on 2013-09-13

Reset checkStatus binding.

312. By William Hua on 2013-09-13

Disable debug output.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/325

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

313. By William Hua on 2013-09-13

Implement spell checking front end.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/326

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

314. By William Hua on 2013-09-16

Disallow empty subsets.

315. By William Hua on 2013-09-16

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/328

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:315
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/330/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/330

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

316. By William Hua on 2013-09-18

Add dummy icons.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:316
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/340

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

317. By William Hua on 2013-09-18

subset-model: support custom roles.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/351

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

318. By William Hua on 2013-09-23

[ Sebastien Bacher ]
* timedate: use the new itemselector widget.
* security: use the new ItemSelector widget.
* [storage] Add a C++ backend for reading the Click package metadata
  and turning it into a proper table model, allowing the QML side to
  be made far cleaner.
[ Iain Lane ]
* Update pot.
* Add the ability to hide deferred/unfinished panels or elements. Pass
  USS_SHOW_ALL_UI=1 to re-enable them.
* Hide the deferred brightness panel.
* Hide "messages on the welcome screen" toggle which is deferred.
* Flight mode is deferred. Hide it.
* Don't do anything when clicking on uncategorised items which have no
  pageComponent. They should handle this themselves in their entry
  component.
* [storage] Add a C++ backend for reading the Click package metadata
  and turning it into a proper table model, allowing the QML side to
  be made far cleaner.
[ Guenter Schwann ]
* Use start() to actually start the content picking transfer.
[ Ubuntu daily release ]
* Automatic snapshot from revision 358

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/373

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

319. By William Hua on 2013-09-24

Disable spell checking.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/380

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

review: Approve (continuous-integration)

[lp:~attente/ubuntu-system-settings/maliit-settings]

320. By William Hua on 2013-09-25

Revert deletion of Spell Checking item.

321. By William Hua on 2013-09-25

Conditionally disable non-working components.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/385/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/385

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, that looks mostly good, some small review comments:

* could you version the ubuntu-keyboard-data depends to one adding the schemas?

* KeyboardLayoutItem

would it make sense to use a UbuntuShape widget rather for a custom Rectangle?

* > text: i18n.tr("Predictive text")

The title doesn't seem to match the spec (https://wiki.ubuntu.com/LanguageAndText#Phone), where did you get it?

* > text: i18n.tr("Key press feedback")

same

(I guess there has been some design changes there, if that's the case could you point to the update version/ask mpt to update the wiki?)

* Could you perhaps do a summary of the status of the osk side/what options are working/going to be supported this cycle (seems that most are going to be for next cycle which is ok)

If somebody else wants to give another look to the changes that would be welcome (especially the backend, there is quite some code there), otherwise I think we should just get that in and deal with issues (if there are some) in further updates.

review: Needs Fixing

[William Hua (attente)]

Thanks for the review, Seb. About the UbuntuShape vs Rectangle, UbuntuShape adds some highlights that make it resemble the checkbox, so I think we should stick with the Rectangle in this case.

What I know so far is that Spell Checking is definitely not in this cycle, and we are waiting for another MP to ubuntu-keyboard that switches to using the GSettings schema there.

[lp:~attente/ubuntu-system-settings/maliit-settings]

322. By William Hua on 2013-09-27

Use Theme for colours.

323. By William Hua on 2013-09-27

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/415/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/415

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

review: Approve (continuous-integration)

[William Hua (attente)]

I haven't tested this branch, and it's not yet reviewed, but this is the MP we're depending on: https://code.launchpad.net/~schwann/ubuntu-keyboard/keyboard-gsettings/+merge/187722.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/416/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/416

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the updates, the ubuntu-keyboard landed in saucy today so we can get your changes in as well!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-09-27 11:09:46 +0000
+++ debian/control	2013-09-27 21:32:49 +0000
@@ -11,6 +11,7 @@
                libnm-glib-dev,
                libofono-qt-dev,
                libqmenumodel-dev,
+               libqt5xmlpatterns5-dev,
                libtimezonemap1-dev (>= 0.4.0.1),
                libupower-glib-dev,
                pkg-config,
@@ -45,6 +46,7 @@
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
          system-image-dbus (>= 0.9),
+         ubuntu-keyboard-data,
 Recommends: ubuntu-mobile-icons,
             ubuntu-system-settings-online-accounts,
 Conflicts: ubuntu-system-settings-example

=== added file 'plugins/language/KeyboardLayoutItem.qml'
--- plugins/language/KeyboardLayoutItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/language/KeyboardLayoutItem.qml	2013-09-27 21:32:49 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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.bottom: parent.bottom
+        spacing: units.gu(2)
+
+        CheckBox {
+            id: checkBox
+
+            anchors.verticalCenter: parent.verticalCenter
+        }
+
+        Row {
+            anchors.top: parent.top
+            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
+            }
+        }
+    }
+
+    onClicked: checked = !checked
+}

=== modified file 'plugins/language/KeyboardLayouts.qml'
--- plugins/language/KeyboardLayouts.qml	2013-07-25 18:50:51 +0000
+++ plugins/language/KeyboardLayouts.qml	2013-09-27 21:32:49 +0000
@@ -18,54 +18,42 @@
  * 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
 
 ItemPage {
-    id: root
-
     title: i18n.tr("Keyboard layouts")
-    flickable: scrollWidget
-
-    Flickable {
-        id: scrollWidget
+
+    UbuntuLanguagePlugin {
+        id: plugin
+    }
+
+    SubsetView {
+        id: subsetView
+
+        clip: true
+
         anchors.fill: parent
-        contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-
-        Column {
-            anchors.fill: parent
-
-            ListItem.Standard {
-                text: i18n.tr("Current layouts:")
-            }
-
-            /* TODO: Get actual installed layouts. */
-
-            SettingsCheckEntry {
-                textEntry: "English (US)"
-                checkStatus: true
-            }
-
-            SettingsCheckEntry {
-                textEntry: "French"
-                checkStatus: true
-            }
-
-            ListItem.Standard {
-                text: i18n.tr("All layouts available:")
-            }
-
-            /* TODO: Get actual layouts. */
-
-            SettingsCheckEntry {
-                textEntry: "Afghani"
-            }
-
-            SettingsCheckEntry {
-                textEntry: "Akan"
+
+        subsetLabel: i18n.tr("Current layouts:")
+        supersetLabel: i18n.tr("All layouts available:")
+
+        model: plugin.keyboardLayoutsModel
+        delegate: KeyboardLayoutItem {
+            name: model.language
+            shortName: model.icon
+            checked: model.checked
+            enabled: model.enabled
+
+            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 })
             }
         }
     }

=== modified file 'plugins/language/PageComponent.qml'
--- plugins/language/PageComponent.qml	2013-09-20 13:24:41 +0000
+++ plugins/language/PageComponent.qml	2013-09-27 21:32:49 +0000
@@ -29,7 +29,6 @@
     id: root
 
     title: i18n.tr("Language & Text")
-    flickable: scrollWidget
 
     UbuntuLanguagePlugin {
         id: plugin
@@ -42,10 +41,11 @@
     }
 
     Flickable {
-        id: scrollWidget
         anchors.fill: parent
         contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+        boundsBehavior: contentHeight > root.height ?
+                        Flickable.DragAndOvershootBounds :
+                        Flickable.StopAtBounds
 
         Column {
             anchors.fill: parent
@@ -55,67 +55,108 @@
                 text: i18n.tr("Display language")
                 value: plugin.languages[plugin.currentLanguage]
                 progression: true
+
                 onClicked: PopupUtils.open(displayLanguage)
             }
 
-            ListItem.Divider {}
+            ListItem.Divider {
+                visible: showAllUI
+            }
 
             ListItem.SingleValue {
+                visible: showAllUI
+
                 text: i18n.tr("Keyboard layouts")
-                /* TODO: Get number of keyboard layouts */
-                value: "1"
+                value: plugin.keyboardLayoutsModel.subset.length == 1 ?
+                       plugin.keyboardLayoutsModel.superset[plugin.keyboardLayoutsModel.subset[0]][0] :
+                       plugin.keyboardLayoutsModel.subset.length
                 progression: true
+
                 onClicked: pageStack.push(Qt.resolvedUrl("KeyboardLayouts.qml"))
             }
 
-            ListItem.Divider {}
+            ListItem.Divider {
+                visible: showAllUI
+            }
 
             ListItem.SingleValue {
+                visible: showAllUI
+
                 text: i18n.tr("Spell checking")
-                /* TODO: Get spell checking setting */
-                value: "UK English"
+                value: plugin.spellCheckingModel.subset.length == 1 ?
+                       plugin.spellCheckingModel.superset[plugin.spellCheckingModel.subset[0]][0] :
+                       plugin.spellCheckingModel.subset.length
                 progression: true
+
                 onClicked: pageStack.push(Qt.resolvedUrl("SpellChecking.qml"))
             }
 
             ListItem.Standard {
-                text: i18n.tr("Auto correction")
-                control: Switch {
-                    enabled: false /* TODO: enable when there is a backend */
-                }
-            }
+                visible: showAllUI
 
-            ListItem.Standard {
                 text: i18n.tr("Auto completion")
-                control: Switch {
-                    enabled: false /* TODO: enable when there is a backend */
-                }
-            }
-
-            ListItem.Divider {}
-
-            ListItem.Standard {
+
+                control: Switch {
+                    checked: plugin.autoCompletion
+
+                    onClicked: plugin.autoCompletion = checked
+                }
+            }
+
+            ListItem.Standard {
+                visible: showAllUI
+
+                text: i18n.tr("Predictive text")
+
+                control: Switch {
+                    checked: plugin.predictiveText
+
+                    onClicked: plugin.predictiveText = checked
+                }
+            }
+
+            ListItem.Divider {
+                visible: showAllUI
+            }
+
+            ListItem.Standard {
+                visible: showAllUI
+
                 text: i18n.tr("Auto capitalization")
+
                 control: Switch {
-                    enabled: false /* TODO: enable when there is a backend */
+                    checked: plugin.autoCapitalization
+
+                    onClicked: plugin.autoCapitalization = checked
                 }
             }
 
             ListItem.Caption {
+                visible: showAllUI
+
                 text: i18n.tr("Turns on Shift to capitalize the first letter of each sentence.")
             }
 
-            ListItem.Divider {}
+            ListItem.Divider {
+                visible: showAllUI
+            }
 
             ListItem.Standard {
-                text: i18n.tr("Auto punctuation")
+                visible: showAllUI
+
+                text: i18n.tr("Key press feedback")
+
                 control: Switch {
-                    enabled: false /* TODO: enable when there is a backend */
+                    checked: plugin.keyPressFeedback
+
+                    onClicked: plugin.keyPressFeedback = checked
                 }
             }
 
             ListItem.Caption {
-                text: i18n.tr("Adds a period, and any missing quotes or brackets, when you tap Space twice.")
+                visible: showAllUI
+
+                text: i18n.tr("Vibrate or emit a sound whenever a key is pressed.")
             }
         }
     }

=== modified file 'plugins/language/SpellChecking.qml'
--- plugins/language/SpellChecking.qml	2013-08-27 09:03:26 +0000
+++ plugins/language/SpellChecking.qml	2013-09-27 21:32:49 +0000
@@ -18,61 +18,41 @@
  * 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
 
 ItemPage {
-    id: root
-
     title: i18n.tr("Spell checking")
-    flickable: scrollWidget
-
-    Flickable {
-        id: scrollWidget
-        anchors.fill: parent
-        contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-
-        Column {
-            anchors.fill: parent
-
-            ListItem.Standard {
-                text: i18n.tr("Spell checking")
-                control: Switch {
-                    enabled: false /* TODO: enable when there is a backend */
-                }
-            }
-
-            ListItem.Divider {}
-
-            ListItem.Standard {
-                text: i18n.tr("Current spelling languages:")
-            }
-
-            /* TODO: Get real spelling language */
-
-            SettingsCheckEntry {
-                textEntry: "English (US)"
-                checkStatus: true
-            }
-
-            ListItem.Divider {}
-
-            ListItem.Standard {
-                text: i18n.tr("All languages available:")
-            }
-
-            /* TODO: Get real available languages */
-
-            SettingsCheckEntry {
-                textEntry: "Afar"
-            }
-
-            SettingsCheckEntry {
-                textEntry: "Afrikaans"
-            }
+
+    UbuntuLanguagePlugin {
+        id: plugin
+    }
+
+    ListItem.Standard {
+        id: item
+
+        text: i18n.tr("Spell checking")
+
+        control: Switch {
+            checked: plugin.spellChecking
+
+            onClicked: plugin.spellChecking = checked
         }
     }
+
+    SubsetView {
+        clip: true
+
+        anchors.top: item.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
+        subsetLabel: i18n.tr("Current spelling languages:")
+        supersetLabel: i18n.tr("All languages available:")
+
+        model: plugin.spellCheckingModel
+    }
 }

=== added file 'plugins/language/SubsetView.qml'
--- plugins/language/SubsetView.qml	1970-01-01 00:00:00 +0000
+++ plugins/language/SubsetView.qml	2013-09-27 21:32:49 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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 SystemSettings 1.0
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListView {
+    id: root
+
+    property int delay: 2000
+    property int duration: 100
+
+    property string subsetLabel
+    property string supersetLabel
+
+    contentHeight: contentItem.childrenRect.height
+    boundsBehavior: contentHeight > height ?
+                    Flickable.DragAndOvershootBounds :
+                    Flickable.StopAtBounds
+
+    section.property: "subset"
+    section.delegate: ListItem.Standard {
+        text: section == "true" ? subsetLabel : supersetLabel
+    }
+
+    delegate: SettingsCheckEntry {
+        textEntry: model.display
+        checkStatus: model.checked
+        enabled: model.enabled
+
+        onCheckStatusChanged: {
+            var element = model.index < root.model.subset.length ?
+                          root.model.subset[model.index] :
+                          model.index - root.model.subset.length
+
+            root.model.setChecked(element, checkStatus, checkStatus ? 0 : delay)
+
+            checkStatus = Qt.binding(function() { return model.checked })
+        }
+    }
+
+    add: Transition {
+        NumberAnimation {
+            property: "opacity"
+            duration: duration
+            from: 0
+            to: 1
+        }
+    }
+
+    displaced: Transition {
+        NumberAnimation {
+            property: "y"
+            duration: duration
+        }
+    }
+
+    remove: Transition {
+        ParallelAnimation {
+            NumberAnimation {
+                property: "opacity"
+                duration: duration
+                to: 0
+            }
+
+            NumberAnimation {
+                property: "y"
+                duration: duration
+            }
+        }
+    }
+}

=== added file 'plugins/language/keyboard-layout.cpp'
--- plugins/language/keyboard-layout.cpp	1970-01-01 00:00:00 +0000
+++ plugins/language/keyboard-layout.cpp	2013-09-27 21:32:49 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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/>.
+ */
+
+#include "keyboard-layout.h"
+#include <QtXmlPatterns>
+
+KeyboardLayout::KeyboardLayout(const QString &name,
+                               const QString &language,
+                               const QString &displayName,
+                               const QString &shortName,
+                               QObject       *parent) :
+    QObject(parent),
+    _name(name),
+    _language(language),
+    _displayName(displayName),
+    _shortName(shortName)
+{
+}
+
+KeyboardLayout::KeyboardLayout(const QFileInfo &fileInfo,
+                               QObject         *parent) :
+    QObject(parent),
+    _name(fileInfo.completeBaseName())
+{
+    QVariant path(fileInfo.canonicalFilePath());
+
+    QXmlQuery languageQuery;
+    languageQuery.bindVariable("path", path);
+    languageQuery.setQuery("xs:string(doc($path)/keyboard/@language)");
+
+    QStringList languageResults;
+
+    if (languageQuery.evaluateTo(&languageResults) && !languageResults.isEmpty())
+        _language = languageResults.first();
+
+    QXmlQuery titleQuery;
+    titleQuery.bindVariable("path", path);
+    titleQuery.setQuery("xs:string(doc($path)/keyboard/@title)");
+
+    QStringList titleResults;
+
+    if (titleQuery.evaluateTo(&titleResults) && !titleResults.isEmpty())
+        _displayName = titleResults.first();
+
+    _shortName = _language.left(2);
+    _shortName[0] = _shortName[0].toUpper();
+}
+
+const QString &
+KeyboardLayout::name() const
+{
+    return _name;
+}
+
+const QString &
+KeyboardLayout::language() const
+{
+    return _language;
+}
+
+const QString &
+KeyboardLayout::displayName() const
+{
+    return _displayName;
+}
+
+const QString &
+KeyboardLayout::shortName() const
+{
+    return _shortName;
+}

=== added file 'plugins/language/keyboard-layout.h'
--- plugins/language/keyboard-layout.h	1970-01-01 00:00:00 +0000
+++ plugins/language/keyboard-layout.h	2013-09-27 21:32:49 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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/>.
+ */
+
+#ifndef KEYBOARD_LAYOUT_H
+#define KEYBOARD_LAYOUT_H
+
+#include <QtCore>
+
+class KeyboardLayout : public QObject
+{
+private:
+
+    Q_OBJECT
+
+    Q_PROPERTY(QString name
+               READ name
+               CONSTANT)
+
+    Q_PROPERTY(QString language
+               READ language
+               CONSTANT)
+
+    Q_PROPERTY(QString displayName
+               READ displayName
+               CONSTANT)
+
+public:
+
+    explicit KeyboardLayout(const QString &name        = QString(),
+                            const QString &language    = QString(),
+                            const QString &displayName = QString(),
+                            const QString &shortName   = QString(),
+                            QObject       *parent      = NULL);
+
+    explicit KeyboardLayout(const QFileInfo &fileInfo,
+                            QObject         *parent   = NULL);
+
+    const QString &name() const;
+    const QString &language() const;
+    const QString &displayName() const;
+    const QString &shortName() const;
+
+private:
+
+    QString _name;
+    QString _language;
+    QString _displayName;
+    QString _shortName;
+};
+
+#endif // KEYBOARD_LAYOUT_H

=== modified file 'plugins/language/language-plugin.cpp'
--- plugins/language/language-plugin.cpp	2013-09-20 13:24:41 +0000
+++ plugins/language/language-plugin.cpp	2013-09-27 21:32:49 +0000
@@ -20,12 +20,29 @@
 
 #include "language-plugin.h"
 #include <act/act.h>
-
-static QList<QLocale> *locales;
+#include "keyboard-layout.h"
+
+#define UBUNTU_KEYBOARD_SCHEMA_ID "com.canonical.keyboard.maliit"
+
+#define KEY_ENABLED_LAYOUTS     "enabled-languages"
+#define KEY_AUTO_CAPITALIZATION "auto-capitalization"
+#define KEY_AUTO_COMPLETION     "auto-completion"
+#define KEY_PREDICTIVE_TEXT     "predictive-text"
+#define KEY_KEY_PRESS_FEEDBACK  "key-press-feedback"
+
+#define LAYOUTS_DIR "/usr/share/maliit/plugins/com/ubuntu/languages"
+
+static QList<QLocale> *languageLocales;
 static QHash<QLocale::Language, unsigned int> *languageIndices;
-static QStringList *localeNames;
+static QStringList *languageNames;
 static QStringList *languageCodes;
 
+static GSettings *maliitSettings;
+static QList<KeyboardLayout *> *keyboardLayouts;
+static SubsetModel *keyboardLayoutsModel;
+
+static SubsetModel *spellCheckingModel;
+
 static bool
 compareLocales(const QLocale &locale0,
                const QLocale &locale1)
@@ -36,63 +53,74 @@
     return name0 < name1;
 }
 
+static bool
+compareLayouts(const KeyboardLayout *layout0,
+               const KeyboardLayout *layout1)
+{
+    const QString &displayName0(layout0->displayName());
+    const QString &displayName1(layout1->displayName());
+    const QString &language0(layout0->language());
+    const QString &language1(layout1->language());
+    const QString &name0(layout0->name());
+    const QString &name1(layout1->name());
+
+    return displayName0 < displayName1 || (displayName0 == displayName1 && (language0 < language1 || (language0 == language1 && name0 < name1)));
+}
+
 static QList<QLocale> *
-getLocales()
+getLanguageLocales()
 {
-    if (locales == NULL)
-    {
-        locales = new QList<QLocale>;
+    if (languageLocales == NULL) {
+        languageLocales = new QList<QLocale>;
 
         QSet<QLocale::Language> allLanguages;
-        QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage,
-                                                             QLocale::AnyScript,
-                                                             QLocale::AnyCountry);
-
-        for (QList<QLocale>::const_iterator i = allLocales.begin(); i != allLocales.end(); ++i)
-        {
-            QLocale::Language language = i->language();
-
-            if (language != QLocale::AnyLanguage &&
-                !i->nativeLanguageName().trimmed().toCaseFolded().isEmpty() &&
-                !allLanguages.contains(language))
-            {
-                *locales += QLocale(language);
+        QList<QLocale> allLocales(QLocale::matchingLocales(QLocale::AnyLanguage,
+                                                           QLocale::AnyScript,
+                                                           QLocale::AnyCountry));
+
+        for (QList<QLocale>::const_iterator i(allLocales.begin()); i != allLocales.end(); ++i) {
+            QLocale::Language language(i->language());
+
+            bool uniqueLanguage(language != QLocale::AnyLanguage &&
+                                !i->nativeLanguageName().trimmed().toCaseFolded().isEmpty() &&
+                                !allLanguages.contains(language));
+
+            if (uniqueLanguage) {
+                *languageLocales += QLocale(language);
                 allLanguages += language;
             }
         }
 
-        qSort(locales->begin(), locales->end(), compareLocales);
+        qSort(languageLocales->begin(), languageLocales->end(), compareLocales);
     }
 
-    return locales;
+    return languageLocales;
 }
 
 static QHash<QLocale::Language, unsigned int> *
 getLanguageIndices()
 {
-    if (languageIndices == NULL)
-    {
+    if (languageIndices == NULL) {
         languageIndices = new QHash<QLocale::Language, unsigned int>;
 
-        for (int i = 0; i < getLocales()->length(); i++)
-            (*languageIndices)[(*getLocales())[i].language()] = i;
+        for (int i(0); i < getLanguageLocales()->length(); i++)
+            (*languageIndices)[(*getLanguageLocales())[i].language()] = i;
     }
 
     return languageIndices;
 }
 
 static QStringList *
-getLocaleNames()
+getLanguageNames()
 {
-    if (localeNames == NULL)
-    {
-        localeNames = new QStringList;
+    if (languageNames == NULL) {
+        languageNames = new QStringList;
 
-        for (QList<QLocale>::const_iterator i = getLocales()->begin(); i != getLocales()->end(); ++i)
-            *localeNames += i->nativeLanguageName().trimmed();
+        for (QList<QLocale>::const_iterator i(getLanguageLocales()->begin()); i != getLanguageLocales()->end(); ++i)
+            *languageNames += i->nativeLanguageName().trimmed();
     }
 
-    return localeNames;
+    return languageNames;
 }
 
 static QStringList *
@@ -101,21 +129,132 @@
     if (languageCodes == NULL) {
         languageCodes = new QStringList;
 
-        for (QList<QLocale>::const_iterator i(getLocales()->begin()); i != getLocales()->end(); ++i)
+        for (QList<QLocale>::const_iterator i(getLanguageLocales()->begin()); i != getLanguageLocales()->end(); ++i)
             *languageCodes += i->name().trimmed();
     }
 
     return languageCodes;
 }
 
-LanguagePlugin::LanguagePlugin(QObject *parent) : QObject(parent)
+static GSettings *
+getMaliitSettings()
+{
+    if (maliitSettings == NULL)
+        maliitSettings = g_settings_new(UBUNTU_KEYBOARD_SCHEMA_ID);
+
+    return maliitSettings;
+}
+
+static QList<KeyboardLayout *> *
+getKeyboardLayouts()
+{
+    if (keyboardLayouts == NULL) {
+        keyboardLayouts = new QList<KeyboardLayout *>;
+
+        QDir layoutsDir(LAYOUTS_DIR);
+
+        layoutsDir.setFilter(QDir::Files);
+        layoutsDir.setNameFilters(QStringList("*.xml"));
+        layoutsDir.setSorting(QDir::Name);
+
+        QFileInfoList fileInfoList(layoutsDir.entryInfoList());
+
+        for (QFileInfoList::const_iterator i(fileInfoList.begin()); i != fileInfoList.end(); ++i) {
+            KeyboardLayout *layout(new KeyboardLayout(*i));
+
+            if (!layout->language().isEmpty())
+                *keyboardLayouts += layout;
+        }
+
+        qSort(keyboardLayouts->begin(), keyboardLayouts->end(), compareLayouts);
+    }
+
+    return keyboardLayouts;
+}
+
+static SubsetModel *
+getKeyboardLayoutsModel()
+{
+    if (keyboardLayoutsModel == NULL) {
+        QVariantList superset;
+
+        for (QList<KeyboardLayout *>::const_iterator i(getKeyboardLayouts()->begin()); i != getKeyboardLayouts()->end(); ++i) {
+            QVariantList element;
+
+            if (!(*i)->displayName().isEmpty())
+                element += (*i)->displayName();
+            else
+                element += (*i)->name();
+
+            element += (*i)->shortName();
+            superset += QVariant(element);
+        }
+
+        GVariantIter *iter;
+        const gchar *language;
+        QList<int> subset;
+
+        g_settings_get(getMaliitSettings(), KEY_ENABLED_LAYOUTS, "as", &iter);
+
+        while (g_variant_iter_next(iter, "&s", &language)) {
+            for (int i(0); i < getKeyboardLayouts()->length(); i++) {
+                if ((*getKeyboardLayouts())[i]->name() == language) {
+                    subset += i;
+                    break;
+                }
+            }
+        }
+
+        g_variant_iter_free(iter);
+
+        QStringList customRoles;
+        customRoles += "language";
+        customRoles += "icon";
+
+        keyboardLayoutsModel = new SubsetModel();
+        keyboardLayoutsModel->setCustomRoles(customRoles);
+        keyboardLayoutsModel->setSuperset(superset);
+        keyboardLayoutsModel->setSubset(subset);
+        keyboardLayoutsModel->setAllowEmpty(false);
+    }
+
+    return keyboardLayoutsModel;
+}
+
+static SubsetModel *
+getSpellCheckingModel()
+{
+    if (spellCheckingModel == NULL) {
+        // TODO: populate spell checking model
+        QVariantList superset;
+
+        for (QStringList::const_iterator i(getLanguageNames()->begin()); i != getLanguageNames()->end(); ++i) {
+            QVariantList element;
+            element += *i;
+            superset += QVariant(element);
+        }
+
+        spellCheckingModel = new SubsetModel();
+        spellCheckingModel->setCustomRoles(QStringList("language"));
+        spellCheckingModel->setSuperset(superset);
+        spellCheckingModel->setSubset(QList<int>());
+        spellCheckingModel->setAllowEmpty(false);
+    }
+
+    return spellCheckingModel;
+}
+
+LanguagePlugin::LanguagePlugin(QObject *parent) :
+    QObject(parent),
+    _updateKeyboardLayoutsConnected(false),
+    _updateSpellCheckingConnected(false)
 {
 }
 
 const QStringList &
 LanguagePlugin::languages() const
 {
-    return *getLocaleNames();
+    return *getLanguageNames();
 }
 
 const QStringList &
@@ -127,9 +266,9 @@
 int
 LanguagePlugin::currentLanguage() const
 {
-    QLocale::Language language = QLocale::system().language();
-    QHash<QLocale::Language, unsigned int> *indices = getLanguageIndices();
-    QHash<QLocale::Language, unsigned int>::const_iterator i = indices->find(language);
+    QLocale::Language language(QLocale::system().language());
+    QHash<QLocale::Language, unsigned int> *indices(getLanguageIndices());
+    QHash<QLocale::Language, unsigned int>::const_iterator i(indices->find(language));
 
     return i != indices->end() ? *i : -1;
 }
@@ -141,14 +280,13 @@
 {
     Q_UNUSED(pspec);
 
-    ActUser *user = ACT_USER(object);
-    gint index = GPOINTER_TO_INT(user_data);
+    ActUser *user(ACT_USER(object));
+    gint index(GPOINTER_TO_INT(user_data));
 
-    if (act_user_is_loaded(user))
-    {
+    if (act_user_is_loaded(user)) {
         g_signal_handlers_disconnect_by_data(user, user_data);
 
-        act_user_set_language(user, qPrintable((*getLocales())[index].name()));
+        act_user_set_language(user, qPrintable((*getLanguageLocales())[index].name()));
     }
 }
 
@@ -159,23 +297,20 @@
 {
     Q_UNUSED(pspec);
 
-    ActUserManager *manager = ACT_USER_MANAGER(object);
+    ActUserManager *manager(ACT_USER_MANAGER(object));
 
     gboolean loaded;
     g_object_get(manager, "is-loaded", &loaded, NULL);
 
-    if (loaded)
-    {
+    if (loaded) {
         g_signal_handlers_disconnect_by_data(manager, user_data);
 
-        const char *name = qgetenv("USER").constData();
-
-        if (name != NULL && name[0] != '\0')
-        {
-            ActUser *user = act_user_manager_get_user(manager, name);
-
-            if (user != NULL)
-            {
+        const char *name(qPrintable(qgetenv("USER")));
+
+        if (name != NULL && name[0] != '\0') {
+            ActUser *user(act_user_manager_get_user(manager, name));
+
+            if (user != NULL) {
                 if (act_user_is_loaded(user))
                     setLanguageWithUser(G_OBJECT(user), NULL, user_data);
                 else
@@ -188,12 +323,10 @@
 void
 LanguagePlugin::setCurrentLanguage(int index)
 {
-    if (index >= 0 && index < getLocales()->length())
-    {
-        ActUserManager *manager = act_user_manager_get_default();
+    if (index >= 0 && index < getLanguageLocales()->length()) {
+        ActUserManager *manager(act_user_manager_get_default());
 
-        if (manager != NULL)
-        {
+        if (manager != NULL) {
             gboolean loaded;
             g_object_get(manager, "is-loaded", &loaded, NULL);
 
@@ -201,6 +334,128 @@
                 setLanguageWithManager(G_OBJECT(manager), NULL, GINT_TO_POINTER(index));
             else
                 g_signal_connect(manager, "notify::is-loaded", G_CALLBACK(setLanguageWithManager), GINT_TO_POINTER(index));
+
+            Q_EMIT currentLanguageChanged();
         }
     }
 }
+
+SubsetModel *
+LanguagePlugin::keyboardLayoutsModel()
+{
+    if (!_updateKeyboardLayoutsConnected) {
+        connect(getKeyboardLayoutsModel(), SIGNAL(subsetChanged()), SLOT(updateKeyboardLayouts()));
+
+        _updateKeyboardLayoutsConnected = true;
+    }
+
+    return getKeyboardLayoutsModel();
+}
+
+void
+LanguagePlugin::updateKeyboardLayouts()
+{
+    GVariantBuilder builder;
+    GVariant *currentLayouts;
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
+
+    for (QList<int>::const_iterator i(keyboardLayoutsModel()->subset().begin()); i != keyboardLayoutsModel()->subset().end(); ++i)
+        g_variant_builder_add(&builder, "s", qPrintable((*getKeyboardLayouts())[*i]->name()));
+
+    currentLayouts = g_variant_ref_sink(g_variant_builder_end(&builder));
+    g_settings_set_value(getMaliitSettings(), KEY_ENABLED_LAYOUTS, currentLayouts);
+    g_variant_unref(currentLayouts);
+}
+
+bool
+LanguagePlugin::spellChecking() const
+{
+    // TODO: get spell checking setting
+    return true;
+}
+
+void
+LanguagePlugin::setSpellChecking(bool value)
+{
+    // TODO: set spell checking setting
+    Q_UNUSED(value);
+}
+
+SubsetModel *
+LanguagePlugin::spellCheckingModel()
+{
+    if (!_updateSpellCheckingConnected) {
+        connect(getSpellCheckingModel(), SIGNAL(subsetChanged()), SLOT(updateSpellChecking()));
+
+        _updateSpellCheckingConnected = true;
+    }
+
+    return getSpellCheckingModel();
+}
+
+void
+LanguagePlugin::updateSpellChecking()
+{
+    // TODO: update spell checking
+}
+
+bool
+LanguagePlugin::autoCapitalization() const
+{
+    return g_settings_get_boolean(getMaliitSettings(), KEY_AUTO_CAPITALIZATION);
+}
+
+void
+LanguagePlugin::setAutoCapitalization(bool value)
+{
+    if (value != autoCapitalization()) {
+        g_settings_set_boolean(getMaliitSettings(), KEY_AUTO_CAPITALIZATION, value);
+        Q_EMIT autoCapitalizationChanged();
+    }
+}
+
+bool
+LanguagePlugin::autoCompletion() const
+{
+    return g_settings_get_boolean(getMaliitSettings(), KEY_AUTO_COMPLETION);
+}
+
+void
+LanguagePlugin::setAutoCompletion(bool value)
+{
+    if (value != autoCompletion()) {
+        g_settings_set_boolean(getMaliitSettings(), KEY_AUTO_COMPLETION, value);
+        Q_EMIT autoCompletionChanged();
+    }
+}
+
+bool
+LanguagePlugin::predictiveText() const
+{
+    return g_settings_get_boolean(getMaliitSettings(), KEY_PREDICTIVE_TEXT);
+}
+
+void
+LanguagePlugin::setPredictiveText(bool value)
+{
+    if (value != predictiveText()) {
+        g_settings_set_boolean(getMaliitSettings(), KEY_PREDICTIVE_TEXT, value);
+        Q_EMIT predictiveTextChanged();
+    }
+}
+
+bool
+LanguagePlugin::keyPressFeedback() const
+{
+    return g_settings_get_boolean(getMaliitSettings(), KEY_KEY_PRESS_FEEDBACK);
+}
+
+void
+LanguagePlugin::setKeyPressFeedback(bool value)
+{
+    if (value != keyPressFeedback()) {
+        g_settings_set_boolean(getMaliitSettings(), KEY_KEY_PRESS_FEEDBACK, value);
+        Q_EMIT keyPressFeedbackChanged();
+    }
+}

=== modified file 'plugins/language/language-plugin.h'
--- plugins/language/language-plugin.h	2013-09-20 13:24:41 +0000
+++ plugins/language/language-plugin.h	2013-09-27 21:32:49 +0000
@@ -22,6 +22,7 @@
 #define LANGUAGE_PLUGIN_H
 
 #include <QtCore>
+#include "subset-model.h"
 
 class LanguagePlugin : public QObject
 {
@@ -39,7 +40,41 @@
 
     Q_PROPERTY(int currentLanguage
                READ currentLanguage
-               WRITE setCurrentLanguage)
+               WRITE setCurrentLanguage
+               NOTIFY currentLanguageChanged)
+
+    Q_PROPERTY(SubsetModel *keyboardLayoutsModel
+               READ keyboardLayoutsModel
+               CONSTANT)
+
+    Q_PROPERTY(bool spellChecking
+               READ spellChecking
+               WRITE setSpellChecking
+               NOTIFY spellCheckingChanged)
+
+    Q_PROPERTY(SubsetModel *spellCheckingModel
+               READ spellCheckingModel
+               CONSTANT)
+
+    Q_PROPERTY(bool autoCapitalization
+               READ autoCapitalization
+               WRITE setAutoCapitalization
+               NOTIFY autoCapitalizationChanged)
+
+    Q_PROPERTY(bool autoCompletion
+               READ autoCompletion
+               WRITE setAutoCompletion
+               NOTIFY autoCompletionChanged)
+
+    Q_PROPERTY(bool predictiveText
+               READ predictiveText
+               WRITE setPredictiveText
+               NOTIFY predictiveTextChanged)
+
+    Q_PROPERTY(bool keyPressFeedback
+               READ keyPressFeedback
+               WRITE setKeyPressFeedback
+               NOTIFY keyPressFeedbackChanged)
 
 public:
 
@@ -51,6 +86,38 @@
 
     int currentLanguage() const;
     void setCurrentLanguage(int index);
+    Q_SIGNAL void currentLanguageChanged() const;
+
+    SubsetModel *keyboardLayoutsModel();
+    Q_SLOT void updateKeyboardLayouts();
+
+    bool spellChecking() const;
+    void setSpellChecking(bool value);
+    Q_SIGNAL void spellCheckingChanged() const;
+
+    SubsetModel *spellCheckingModel();
+    Q_SLOT void updateSpellChecking();
+
+    bool autoCapitalization() const;
+    void setAutoCapitalization(bool value);
+    Q_SIGNAL void autoCapitalizationChanged() const;
+
+    bool autoCompletion() const;
+    void setAutoCompletion(bool value);
+    Q_SIGNAL void autoCompletionChanged() const;
+
+    bool predictiveText() const;
+    void setPredictiveText(bool value);
+    Q_SIGNAL void predictiveTextChanged() const;
+
+    bool keyPressFeedback() const;
+    void setKeyPressFeedback(bool value);
+    Q_SIGNAL void keyPressFeedbackChanged() const;
+
+private:
+
+    bool _updateKeyboardLayoutsConnected;
+    bool _updateSpellCheckingConnected;
 };
 
 #endif // LANGUAGE_PLUGIN_H

=== modified file 'plugins/language/language.pro'
--- plugins/language/language.pro	2013-08-02 12:08:52 +0000
+++ plugins/language/language.pro	2013-09-27 21:32:49 +0000
@@ -4,11 +4,12 @@
 TEMPLATE = lib
 TARGET = language
 
-QML_SOURCES = DisplayLanguage.qml \
-              KeyboardLayouts.qml \
-              PageComponent.qml   \
-              SpellChecking.qml
-
+QML_SOURCES = DisplayLanguage.qml    \
+              KeyboardLayoutItem.qml \
+              KeyboardLayouts.qml    \
+              PageComponent.qml      \
+              SpellChecking.qml      \
+              SubsetView.qml
 OTHER_FILES += $${QML_SOURCES}
 
 settings.files = $${TARGET}.settings
@@ -25,7 +26,7 @@
 
 # C++ bits
 TARGET = UbuntuLanguagePlugin
-QT += qml quick dbus
+QT += qml quick dbus xmlpatterns
 CONFIG += qt link_pkgconfig plugin no_keywords
 
 #comment in the following line to enable traces
@@ -38,8 +39,8 @@
 PKGCONFIG += accountsservice glib-2.0
 
 # Input
-HEADERS += language-plugin.h plugin.h
-SOURCES += language-plugin.cpp plugin.cpp
+HEADERS += keyboard-layout.h language-plugin.h plugin.h subset-model.h
+SOURCES += keyboard-layout.cpp language-plugin.cpp plugin.cpp subset-model.cpp
 
 # Install path for the plugin
 installPath = $${PLUGIN_PRIVATE_MODULE_DIR}/$$replace(uri, \\., /)

=== modified file 'plugins/language/plugin.cpp'
--- plugins/language/plugin.cpp	2013-07-16 14:40:55 +0000
+++ plugins/language/plugin.cpp	2013-09-27 21:32:49 +0000
@@ -20,14 +20,15 @@
  */
 
 #include <QtQml>
-#include <QtQml/QQmlContext>
 #include "plugin.h"
+#include "subset-model.h"
 #include "language-plugin.h"
 
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.LanguagePlugin"));
 
+    qmlRegisterType<SubsetModel>(uri, 1, 0, "SubsetModel");
     qmlRegisterType<LanguagePlugin>(uri, 1, 0, "UbuntuLanguagePlugin");
 }
 

=== added file 'plugins/language/subset-model.cpp'
--- plugins/language/subset-model.cpp	1970-01-01 00:00:00 +0000
+++ plugins/language/subset-model.cpp	2013-09-27 21:32:49 +0000
@@ -0,0 +1,403 @@
+/*
+ * 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/>.
+ */
+
+#include "subset-model.h"
+
+#define CHECKED_ROLE  (Qt::CheckStateRole)
+#define ENABLED_ROLE  (Qt::UserRole + 0)
+#define SUBSET_ROLE   (Qt::UserRole + 1)
+#define SUPERSET_ROLE (Qt::UserRole + 2)
+#define DISPLAY_ROLE  (Qt::UserRole + 3)
+#define CUSTOM_ROLE   (Qt::UserRole + 4)
+
+bool
+changeLessThan(const SubsetModel::Change *change0,
+               const SubsetModel::Change *change1)
+{
+    return change0->finish < change1->finish;
+}
+
+SubsetModel::SubsetModel(QObject *parent) :
+    QAbstractListModel(parent),
+    _allowEmpty(true),
+    _checked(0),
+    _ignore(QDateTime::currentMSecsSinceEpoch())
+{
+}
+
+const QStringList &
+SubsetModel::customRoles() const
+{
+    return _customRoles;
+}
+
+void
+SubsetModel::setCustomRoles(const QStringList &customRoles)
+{
+    if (customRoles != _customRoles) {
+        _customRoles = customRoles;
+
+        Q_EMIT customRolesChanged();
+    }
+}
+
+const QVariantList &
+SubsetModel::superset() const
+{
+    return _superset;
+}
+
+void
+SubsetModel::setSuperset(const QVariantList &superset)
+{
+    if (superset != _superset) {
+        beginResetModel();
+
+        for (QList<State *>::iterator i(_state.begin()); i != _state.end(); ++i)
+            delete *i;
+
+        _ignore = QDateTime::currentMSecsSinceEpoch();
+        _superset = superset;
+        _subset.clear();
+        _state.clear();
+        _checked = 0;
+
+        for (int i(0); i < _superset.length(); i++) {
+            State *state(new State);
+            state->checked = false;
+            state->check = _ignore;
+            state->uncheck = _ignore;
+
+            _state += state;
+        }
+
+        if (!_allowEmpty && !_superset.isEmpty()) {
+            _subset += 0;
+            _state[0]->checked = true;
+            _checked = 1;
+        }
+
+        endResetModel();
+
+        Q_EMIT subsetChanged();
+        Q_EMIT supersetChanged();
+    }
+}
+
+const QList<int> &
+SubsetModel::subset() const
+{
+    return _subset;
+}
+
+void
+SubsetModel::setSubset(const QList<int> &subset)
+{
+    if (subset != _subset) {
+        beginResetModel();
+
+        _ignore = QDateTime::currentMSecsSinceEpoch();
+        _subset.clear();
+        _checked = 0;
+
+        for (QList<State *>::iterator i(_state.begin()); i != _state.end(); ++i) {
+            (*i)->checked = false;
+            (*i)->check = _ignore;
+            (*i)->uncheck = _ignore;
+        }
+
+        for (QList<int>::const_iterator i(subset.begin()); i != subset.end(); ++i) {
+            if (0 <= *i && *i < _superset.length()) {
+                _subset += *i;
+
+                if (!_state[*i]->checked) {
+                    _state[*i]->checked = true;
+                    _checked++;
+                }
+            }
+        }
+
+        if (!_allowEmpty && _checked == 0 && !_superset.isEmpty()) {
+            _subset += 0;
+            _state[0]->checked = true;
+            _checked = 1;
+        }
+
+        endResetModel();
+
+        Q_EMIT subsetChanged();
+    }
+}
+
+bool
+SubsetModel::allowEmpty() const
+{
+    return _allowEmpty;
+}
+
+void
+SubsetModel::setAllowEmpty(bool allowEmpty)
+{
+    if (allowEmpty != _allowEmpty) {
+        _allowEmpty = allowEmpty;
+
+        if (!_allowEmpty && _checked == 0) {
+            _subset += 0;
+            _state[0]->checked = true;
+            _checked = 1;
+        }
+
+        if (_checked == 1) {
+            int single(-1);
+
+            for (int i(0); i < _state.length(); i++) {
+                if (_state[i]->checked) {
+                    single = i;
+                    break;
+                }
+            }
+
+            for (int i(0); i < _subset.length(); i++) {
+                if (_subset[i] == single) {
+                    QModelIndex row(index(i, 0));
+                    Q_EMIT dataChanged(row, row, QVector<int>(1, ENABLED_ROLE));
+                }
+            }
+
+            if (single >= 0) {
+                QModelIndex row(index(_subset.length() + single, 0));
+                Q_EMIT dataChanged(row, row, QVector<int>(1, ENABLED_ROLE));
+            }
+        }
+
+        Q_EMIT allowEmptyChanged();
+    }
+}
+
+bool
+SubsetModel::checked(int element)
+{
+    return _state[element]->checked;
+}
+
+void
+SubsetModel::setChecked(int  element,
+                        bool checked,
+                        int  timeout)
+{
+    qint64 time(QDateTime::currentMSecsSinceEpoch());
+
+    if (checked)
+        _state[element]->check = time;
+    else
+        _state[element]->uncheck = time;
+
+    if (checked != _state[element]->checked) {
+        _state[element]->checked = checked;
+
+        if (checked)
+            _checked++;
+        else
+            _checked--;
+
+        if (!_allowEmpty && (_checked == 1 || (_checked == 2 && checked))) {
+            int single(-1);
+
+            for (int i(0); i < _state.length(); i++) {
+                if (i != element && _state[i]->checked) {
+                    single = i;
+                    break;
+                }
+            }
+
+            for (int i(0); i < _subset.length(); i++) {
+                if (_subset[i] == single) {
+                    QModelIndex row(index(i, 0));
+                    Q_EMIT dataChanged(row, row, QVector<int>(1, ENABLED_ROLE));
+                }
+            }
+
+            if (single >= 0) {
+                QModelIndex row(index(_subset.length() + single, 0));
+                Q_EMIT dataChanged(row, row, QVector<int>(1, ENABLED_ROLE));
+            }
+        }
+
+        for (int i(0); i < _subset.length(); i++) {
+            if (_subset[i] == element) {
+                QModelIndex row(index(i, 0));
+                Q_EMIT dataChanged(row, row, QVector<int>(1, CHECKED_ROLE));
+            }
+        }
+
+        QModelIndex row(index(_subset.length() + element, 0));
+        Q_EMIT dataChanged(row, row, QVector<int>(1, CHECKED_ROLE));
+
+        Change *change(new Change);
+        change->element = element;
+        change->checked = checked;
+        change->start = time;
+        change->finish = time + timeout;
+
+        _change.insert(qUpperBound(_change.begin(), _change.end(), change, changeLessThan), change);
+
+        QTimer::singleShot(timeout, this, SLOT(timerExpired()));
+    }
+}
+
+QHash<int, QByteArray>
+SubsetModel::roleNames() const
+{
+    QHash<int, QByteArray> roleNames;
+
+    roleNames.insert(CHECKED_ROLE, "checked");
+    roleNames.insert(ENABLED_ROLE, "enabled");
+    roleNames.insert(SUBSET_ROLE, "subset");
+    roleNames.insert(SUPERSET_ROLE, "superset");
+    roleNames.insert(DISPLAY_ROLE, "display");
+
+    for (int i = 0; i < _customRoles.length(); i++)
+        roleNames.insert(CUSTOM_ROLE + i, _customRoles[i].toUtf8());
+
+    return roleNames;
+}
+
+int
+SubsetModel::rowCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+
+    return _subset.length() + _superset.length();
+}
+
+Qt::ItemFlags
+SubsetModel::flags(const QModelIndex &index) const
+{
+    Q_UNUSED(index);
+
+    return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled;
+}
+
+QVariant
+SubsetModel::data(const QModelIndex &index,
+                  int                role) const
+{
+    switch (role) {
+    case CHECKED_ROLE:
+        return _state[elementAtIndex(index)]->checked ? Qt::Checked : Qt::Unchecked;
+
+    case ENABLED_ROLE:
+        return _allowEmpty || _checked != 1 || !_state[elementAtIndex(index)]->checked;
+
+    case SUBSET_ROLE:
+    case SUPERSET_ROLE:
+        return (role == SUBSET_ROLE) == (index.row() < _subset.length());
+
+    case DISPLAY_ROLE:
+        role = CUSTOM_ROLE;
+        break;
+    }
+
+    int column = role - CUSTOM_ROLE;
+    int element = elementAtIndex(index);
+    QVariantList list = _superset[element].toList();
+
+    if (0 <= column && column < list.length())
+        return list[column];
+
+    return QVariant();
+}
+
+bool
+SubsetModel::setData(const QModelIndex &index,
+                     const QVariant    &value,
+                     int                role)
+{
+    switch (role) {
+    case CHECKED_ROLE:
+        switch (static_cast<QMetaType::Type>(value.type())) {
+        case QMetaType::Bool:
+        case QMetaType::QChar:
+        case QMetaType::Int:
+        case QMetaType::UInt:
+        case QMetaType::LongLong:
+        case QMetaType::ULongLong:
+            setChecked(elementAtIndex(index), value.toBool(), 0);
+
+            return true;
+
+        default:
+            break;
+        }
+
+        break;
+    }
+
+    return false;
+}
+
+void
+SubsetModel::timerExpired()
+{
+    Change *change(_change.first());
+
+    _change.removeFirst();
+
+    if (change->start > _ignore) {
+        if (change->checked) {
+            if (change->start > _state[change->element]->uncheck) {
+                if (!_subset.contains(change->element)) {
+                    beginInsertRows(QModelIndex(), _subset.length(), _subset.length());
+                    _subset += change->element;
+                    endInsertRows();
+
+                    Q_EMIT subsetChanged();
+                }
+            }
+        }
+        else {
+            if (change->start > _state[change->element]->check) {
+                for (int i(0); i < _subset.length(); i++) {
+                    while (i < _subset.length() && _subset[i] == change->element) {
+                        beginRemoveRows(QModelIndex(), i, i);
+                        _subset.removeAt(i);
+                        endRemoveRows();
+                    }
+                }
+
+                Q_EMIT subsetChanged();
+            }
+        }
+    }
+
+    delete change;
+}
+
+int
+SubsetModel::elementAtRow(int row) const
+{
+    return row < _subset.length() ? _subset[row] : row - _subset.length();
+}
+
+int
+SubsetModel::elementAtIndex(const QModelIndex &index) const
+{
+    return elementAtRow(index.row());
+}

=== added file 'plugins/language/subset-model.h'
--- plugins/language/subset-model.h	1970-01-01 00:00:00 +0000
+++ plugins/language/subset-model.h	2013-09-27 21:32:49 +0000
@@ -0,0 +1,123 @@
+/*
+ * 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/>.
+ */
+
+#ifndef SUBSET_MODEL_H
+#define SUBSET_MODEL_H
+
+#include <QtCore>
+
+class SubsetModel : public QAbstractListModel
+{
+protected:
+
+    Q_OBJECT
+
+public:
+
+    Q_PROPERTY(QStringList customRoles
+               READ customRoles
+               WRITE setCustomRoles
+               NOTIFY customRolesChanged)
+
+    Q_PROPERTY(QVariantList superset
+               READ superset
+               WRITE setSuperset
+               NOTIFY supersetChanged)
+
+    Q_PROPERTY(QList<int> subset
+               READ subset
+               WRITE setSubset
+               NOTIFY subsetChanged)
+
+    Q_PROPERTY(bool allowEmpty
+               READ allowEmpty
+               WRITE setAllowEmpty
+               NOTIFY allowEmptyChanged)
+
+    explicit SubsetModel(QObject *parent = NULL);
+
+    virtual const QStringList &customRoles() const;
+    virtual void setCustomRoles(const QStringList &customRoles);
+    Q_SIGNAL virtual void customRolesChanged() const;
+
+    virtual const QVariantList &superset() const;
+    virtual void setSuperset(const QVariantList &superset);
+    Q_SIGNAL virtual void supersetChanged() const;
+
+    virtual const QList<int> &subset() const;
+    virtual void setSubset(const QList<int> &subset);
+    Q_SIGNAL virtual void subsetChanged() const;
+
+    virtual bool allowEmpty() const;
+    virtual void setAllowEmpty(bool allowEmpty);
+    Q_SIGNAL virtual void allowEmptyChanged() const;
+
+    Q_INVOKABLE virtual bool checked(int element);
+    Q_INVOKABLE virtual void setChecked(int  element,
+                                        bool checked,
+                                        int  timeout);
+
+    virtual QHash<int, QByteArray> roleNames() const;
+
+    virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    virtual QVariant data(const QModelIndex &index,
+                          int                role  = Qt::DisplayRole) const;
+    virtual bool setData(const QModelIndex &index,
+                         const QVariant    &value,
+                         int                role  = Qt::EditRole);
+
+protected:
+
+    Q_SLOT virtual void timerExpired();
+
+    virtual int elementAtRow(int row) const;
+    virtual int elementAtIndex(const QModelIndex &index) const;
+
+    struct State {
+        bool checked;
+        qint64 check;
+        qint64 uncheck;
+    };
+
+    struct Change {
+        int element;
+        bool checked;
+        qint64 start;
+        qint64 finish;
+    };
+
+    QStringList _customRoles;
+    QVariantList _superset;
+    QList<int> _subset;
+    bool _allowEmpty;
+
+    QList<State *> _state;
+    QList<Change *> _change;
+
+    int _checked;
+    qint64 _ignore;
+
+    friend bool changeLessThan(const Change *change0,
+                               const Change *change1);
+};
+
+#endif // SUBSET_MODEL_H