Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-settings into lp:phablet-extras/maliit-framework

[Thomas Moenicke]

adding global settings file which can be overwritten by user settings. If no user settings, global settings is the fallback solution
  global path: /etc/xdg/maliit.org
  user path: ~/.config/maliit.org/server.conf

adding global settings file which can be overwritten by user settings. If no user settings, global settings is the fallback solution
  global path: /etc/xdg/maliit.org
  user path: ~/.config/maliit.org/server.conf

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1555
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-framework-ci/17/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'debian/maliit-framework.install'
--- debian/maliit-framework.install	2013-03-21 13:59:07 +0000
+++ debian/maliit-framework.install	2013-06-07 12:08:29 +0000
@@ -4,3 +4,4 @@
 usr/lib/maliit/plugins/factories/libmaliit-plugins-quick-factory*
 usr/lib/libmaliit-plugins-quick.so*
 ../xinput/* etc/X11/xinit/xinput.d
+etc/xdg/maliit.org/server.conf

=== modified file 'debian/rules'
--- debian/rules	2013-04-30 21:52:19 +0000
+++ debian/rules	2013-06-07 12:08:29 +0000
@@ -59,6 +59,9 @@
 	dh_clean -k
 	dh_installdirs $(EXCLUSIONS)
 
+	mkdir -vp $(CURDIR)/debian/tmp/etc/xdg/maliit.org/
+	cp $(CURDIR)/debian/server.conf $(CURDIR)/debian/tmp/etc/xdg/maliit.org/
+
 	# Then proceed to normal installation
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 INSTALL_ROOT=$(CURDIR)/debian/tmp make  $(PARALLEL_MAKEFLAGS) install
 

=== added file 'debian/server.conf'
--- debian/server.conf	1970-01-01 00:00:00 +0000
+++ debian/server.conf	2013-06-07 12:08:29 +0000
@@ -0,0 +1,20 @@
+[maliit]
+onscreen\active=libmaliit-keyboard-plugin.so:en_us
+
+pluginsettings\libmaliit-keyboard-plugin.so\current_style		= ubuntu
+pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled		= false
+
+onscreen\enabled=libmaliit-keyboard-plugin.so:en_gb, \
+libmaliit-keyboard-plugin.so:en_us, \
+libmaliit-keyboard-plugin.so:de, \
+libmaliit-keyboard-plugin.so:es, \
+libmaliit-keyboard-plugin.so:zh_cn_cangjie, \
+libmaliit-keyboard-plugin.so:zh_cn_pinyin, \
+libmaliit-keyboard-plugin.so:zh_cn_zhuyin, 
+
+
+; pluginsettings\libmaliit-keyboard-plugin.so\auto_correct_enabled	= false
+; pluginsettings\libmaliit-keyboard-plugin.so\feedback_enabled		= false
+; pluginsettings\libmaliit-keyboard-plugin.so\auto_caps_enabled		= false
+; pluginsettings\libmaliit-keyboard-plugin.so\hide_word_ribbon_in_potrait_mode = false
+

=== modified file 'passthroughserver/main.cpp'
--- passthroughserver/main.cpp	2013-03-21 13:59:07 +0000
+++ passthroughserver/main.cpp	2013-06-07 12:08:29 +0000
@@ -130,7 +130,7 @@
 #define Q_WS_QWS
 
 int main(int argc, char **argv)
-{printf("starting our own maliit server");
+{
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     qInstallMsgHandler(outputMessagesToStdErr);
 #else