Merge lp:~hikiko/gsettings-ubuntu-touch-schemas/scale-factor-for-unity7-unity8 into lp:gsettings-ubuntu-touch-schemas

[Eleni Maria Stea]

new gsetting (scale factor for desktop components) and schema for unity 7 and unity 8

new gsetting (scale factor for desktop components) and schema for unity 7 and unity 8

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/10/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good to me, thanks!

review: Approve

[Robert Ancell (robert-ancell)]

Did anyone notice the schema file is called com.ubuntu.user-interface.gschema.xml but the schema is called com.ubuntu.desktop? They are normally the same...

[Sebastien Bacher (seb128)]

> Did anyone notice the schema file is called com.ubuntu.user-interface.gschema.xml but the schema is called com.ubuntu.desktop? They are normally the same...

Yeah, I noticed that as well and it seems a bit odd but it's work, +1 from me to use a consistent naming though

[Iain Lane (laney)]

Umm, I didn't notice that. Can we fix it before uploading?

[Eleni Maria Stea (hikiko)]

Hey, sorry about this let me fix it

[Florian Boucault (fboucault)]

I would like to fix the documentation before it lands too. Here is my proposal:

"""
Per monitor scale factor for all user interface components.
The values are stored in a dictionary where the keys are IDs of monitors and the values are the scale factors.
The scale factors are not the traditional float scale factors that one might expect. Instead they are integers that need to be divided by 8 before being used as regular scale factors.
That limits the number of possible scalings applied to the UI without jeopardizing flexibility (there is still enough possible scalings for all devices out there). This limiting allows for better testing since there is now only a finite number of possible scalings.
The scale factor also maps directly to the grid units used in the Ubuntu UI Toolkit where one grid unit is exactly equal to 'scale factor' number of pixels.
"""

review: Needs Fixing

[Florian Boucault (fboucault)]

The schema is supposed to be "com.ubuntu.user-interface", renaming it in the file was just something that was forgotten.

[Eleni Maria Stea (hikiko)]

let me change the doc too

[lp:~hikiko/gsettings-ubuntu-touch-schemas/scale-factor-for-unity7-unity8]

25. By Eleni Maria Stea on 2014-02-19

fixed documentation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/11/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-trusty-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/12/rebuild

review: Approve (continuous-integration)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-07-29 15:07:45 +0000
+++ po/POTFILES.in	2014-02-19 11:21:35 +0000
@@ -3,3 +3,4 @@
 schemas/com.ubuntu.touch.network.gschema.xml.in.in
 schemas/com.ubuntu.touch.sound.gschema.xml.in.in
 schemas/com.ubuntu.touch.system.gschema.xml.in.in
+schemas/com.ubuntu.user-interface.gschema.xml.in.in

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2013-07-19 14:38:00 +0000
+++ po/POTFILES.skip	2014-02-19 11:21:35 +0000
@@ -3,3 +3,4 @@
 # Please keep this file sorted alphabetically.
 schemas/com.ubuntu.touch.network.gschema.xml.in
 schemas/com.ubuntu.touch.system.gschema.xml.in
+schemas/com.ubuntu.user-interface.gschema.xml.in

=== modified file 'schemas/Makefile.am'
--- schemas/Makefile.am	2013-07-29 15:07:45 +0000
+++ schemas/Makefile.am	2014-02-19 11:21:35 +0000
@@ -1,7 +1,8 @@
 desktop_gschemas_in_in = \ 
 	com.ubuntu.touch.network.gschema.xml.in.in \
 	com.ubuntu.touch.sound.gschema.xml.in.in   \
-	com.ubuntu.touch.system.gschema.xml.in.in
+	com.ubuntu.touch.system.gschema.xml.in.in  \
+	com.ubuntu.user-interface.gschema.xml.in.in
 
 @INTLTOOL_XML_NOMERGE_RULE@
 

=== added file 'schemas/com.ubuntu.user-interface.gschema.xml.in.in'
--- schemas/com.ubuntu.user-interface.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ schemas/com.ubuntu.user-interface.gschema.xml.in.in	2014-02-19 11:21:35 +0000
@@ -0,0 +1,19 @@
+<schemalist gettext-domain="gsettings-ubuntu-touch-schemas">
+    <schema id="com.ubuntu.user-interface" path="/com/ubuntu/user-interface/">
+        <key name="scale-factor" type="a{si}">
+        <_summary>Per monitor scale factor</_summary>
+        <default>{}</default>
+        <_description>
+        Per monitor scale factor for all user interface components.
+        The values are stored in a dictionary where the keys are IDs of monitors and the values are the scale factors.
+        The scale factors are not the traditional float scale factors that one might expect. Instead they are integers
+        that need to be divided by 8 before being used as regular scale factors.
+        That limits the number of possible scalings applied to the UI without jeopardizing flexibility (there is still 
+        enough possible scalings for all devices out there). This limiting allows for better testing since there is now
+        only a finite number of possible scalings.
+        The scale factor also maps directly to the grid units used in the Ubuntu UI Toolkit where one grid unit is 
+        exactly equal to 'scale factor' number of pixels.
+        </_description>
+        </key>
+    </schema>
+</schemalist>