GSettings Ubuntu touch schemas

Merge lp:~seb128/gsettings-ubuntu-touch-schemas/shared-sound-setting into lp:gsettings-ubuntu-touch-schemas

  1. shared-sound-setting
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 26
Proposed branch: lp:~seb128/gsettings-ubuntu-touch-schemas/shared-sound-setting
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 47 lines (+13/-0)
4 files modified
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+3/-0)
schemas/Makefile.am (+1/-0)
schemas/com.ubuntu.sound.gschema.xml.in.in (+8/-0)
To merge this branch: bzr merge lp:~seb128/gsettings-ubuntu-touch-schemas/shared-sound-setting
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+207900@code.launchpad.net

Commit message

List "allow-amplified-volume" there rather than in indicator-sound,
that way we avoid having unity-control-center depending on the indicator
only to use that one key

Description of the change

List "allow-amplified-volume" there rather than in indicator-sound,
that way we avoid having unity-control-center depending on the indicator
only to use that one key

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

On Mon, Feb 24, 2014 at 11:39:44AM -0000, Sebastien Bacher wrote:
> Sebastien Bacher has proposed merging lp:~seb128/gsettings-ubuntu-touch-schemas/shared-sound-setting into lp:gsettings-ubuntu-touch-schemas.
>
> Commit message:
> List "allow-amplified-volume" there rather than in indicator-sound,
> that way we avoid having unity-control-center depending on the indicator
> only to use that one key

Looks good, apart from missing adding the files in po/POTFILES.* (just
noticed that touch.sound is missing from .skip)

(... translations should be set up here; I'll look into doing that.)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

lp:~seb128/gsettings-ubuntu-touch-schemas/shared-sound-setting updated
27. By Sebastien Bacher

Lists new schemas for translation

28. By Sebastien Bacher

Update skip list as well

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

Looks good. Thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2014-02-13 19:29:09 +0000
+++ po/POTFILES.in 2014-02-24 12:02:24 +0000
@@ -3,4 +3,5 @@
3schemas/com.ubuntu.touch.network.gschema.xml.in.in3schemas/com.ubuntu.touch.network.gschema.xml.in.in
4schemas/com.ubuntu.touch.sound.gschema.xml.in.in4schemas/com.ubuntu.touch.sound.gschema.xml.in.in
5schemas/com.ubuntu.touch.system.gschema.xml.in.in5schemas/com.ubuntu.touch.system.gschema.xml.in.in
6schemas/com.ubuntu.sound.gschema.xml.in.in
6schemas/com.ubuntu.user-interface.gschema.xml.in.in7schemas/com.ubuntu.user-interface.gschema.xml.in.in
78
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip 2014-02-13 19:29:09 +0000
+++ po/POTFILES.skip 2014-02-24 12:02:24 +0000
@@ -2,5 +2,8 @@
2# translated.2# translated.
3# Please keep this file sorted alphabetically.3# Please keep this file sorted alphabetically.
4schemas/com.ubuntu.touch.network.gschema.xml.in4schemas/com.ubuntu.touch.network.gschema.xml.in
5schemas/com.ubuntu.touch.sound.gschema.xml.in
5schemas/com.ubuntu.touch.system.gschema.xml.in6schemas/com.ubuntu.touch.system.gschema.xml.in
7schemas/com.ubuntu.sound.gschema.xml.in
6schemas/com.ubuntu.user-interface.gschema.xml.in8schemas/com.ubuntu.user-interface.gschema.xml.in
9
710
=== modified file 'schemas/Makefile.am'
--- schemas/Makefile.am 2014-02-13 17:32:04 +0000
+++ schemas/Makefile.am 2014-02-24 12:02:24 +0000
@@ -2,6 +2,7 @@
2 com.ubuntu.touch.network.gschema.xml.in.in \2 com.ubuntu.touch.network.gschema.xml.in.in \
3 com.ubuntu.touch.sound.gschema.xml.in.in \3 com.ubuntu.touch.sound.gschema.xml.in.in \
4 com.ubuntu.touch.system.gschema.xml.in.in \4 com.ubuntu.touch.system.gschema.xml.in.in \
5 com.ubuntu.sound.gschema.xml.in.in \
5 com.ubuntu.user-interface.gschema.xml.in.in6 com.ubuntu.user-interface.gschema.xml.in.in
67
7@INTLTOOL_XML_NOMERGE_RULE@8@INTLTOOL_XML_NOMERGE_RULE@
89
=== added file 'schemas/com.ubuntu.sound.gschema.xml.in.in'
--- schemas/com.ubuntu.sound.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ schemas/com.ubuntu.sound.gschema.xml.in.in 2014-02-24 12:02:24 +0000
@@ -0,0 +1,8 @@
1<schemalist gettext-domain="gsettings-ubuntu-touch-schemas">
2 <schema id="com.ubuntu.sound" path="/com/ubuntu/sound/">
3 <key name="allow-amplified-volume" type="b">
4 <default>false</default>
5 <summary>Whether the volume slider allows setting the volume above 100%</summary>
6 </key>
7 </schema>
8</schemalist>

Subscribers

People subscribed via source and target branches