Merge lp:~attente/ubuntu-keyboard/gsettings-schema into lp:ubuntu-keyboard

[William Hua]

Add GSettings schema file.

Add GSettings schema file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/68

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/68/rebuild

review: Approve (continuous-integration)

[lp:~attente/ubuntu-keyboard/gsettings-schema]

36. By William Hua on 2013-09-12

Use better key name than just 'feedback'.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/69/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

you don't need to modify debian/changelog. this will happen automatically with CI. Other than that it looks good.

review: Needs Fixing

[lp:~attente/ubuntu-keyboard/gsettings-schema]

37. By William Hua on 2013-09-23

Remove debian/changelog entry.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-keyboard-ci/85/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'data/data.pro'
--- data/data.pro	2013-07-19 12:05:07 +0000
+++ data/data.pro	2013-09-23 19:00:06 +0000
@@ -8,10 +8,13 @@
 # make it available for testing, not intended for proper release though:
 languages.files += languages/debug/showcase.xml
 
+schemas.path = $${PREFIX}/share/glib-2.0/schemas
+schemas.files = schemas/*.gschema.xml
+
 styles.path = $${UBUNTU_KEYBOARD_DATA_DIR}
 styles.files = styles
 
-INSTALLS += languages styles
+INSTALLS += languages schemas styles
 
 QMAKE_EXTRA_TARGETS += check
 check.target = check

=== added directory 'data/schemas'
=== added file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2013-09-23 19:00:06 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="com.canonical.keyboard.maliit" path="/com/canonical/keyboard/maliit/">
+    <key name="enabled-languages" type="as">
+      <summary>Enabled languages</summary>
+      <description>User-defined list of activatable languages.</description>
+      <default>[]</default>
+    </key>
+    <key name="auto-capitalization" type="b">
+      <summary>Auto-capitalization</summary>
+      <description>Capitalize the first letter of each sentence.</description>
+      <default>true</default>
+    </key>
+    <key name="auto-completion" type="b">
+      <summary>Auto-completion</summary>
+      <description>Complete current word with first suggestion when hitting space.</description>
+      <default>true</default>
+    </key>
+    <key name="predictive-text" type="b">
+      <summary>Predictive text</summary>
+      <description>Suggest potential words in word ribbon.</description>
+      <default>true</default>
+    </key>
+    <key name="key-press-feedback" type="b">
+      <summary>Key press feedback</summary>
+      <description>Vibrate or emit sound on key press.</description>
+      <default>true</default>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'debian/ubuntu-keyboard-data.install'
--- debian/ubuntu-keyboard-data.install	2013-08-15 20:33:21 +0000
+++ debian/ubuntu-keyboard-data.install	2013-09-23 19:00:06 +0000
@@ -1,1 +1,2 @@
+usr/share/glib-2.0/schemas/
 usr/share/maliit/plugins/com/ubuntu/