summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMartin Pitt <[email protected]>2010-10-05 11:30:46 +0200
committerBenjamin Valentin <[email protected]>2012-03-16 09:29:10 +0100
commita525db8f795d2101969a47f06c9fb6b60a497fb3 (patch)
treea6cde3942823a1523aece0285b63b129ff8a5054 /data
parent60b0ab065772c3f109d7471c0d6d814d477f9803 (diff)
downloadmate-settings-daemon-a525db8f795d2101969a47f06c9fb6b60a497fb3.tar.bz2
mate-settings-daemon-a525db8f795d2101969a47f06c9fb6b60a497fb3.tar.xz
RANDR - Add mateconf key for disabling boot time configuration
In a lot of situations it is undesirable to have g-s-d change the XRandR settings, because it overrides X.org customizations, leads to unnecessary mode switches, or increases boot time. Add a mateconf key "use_xorg_monitor_settings" to disable apply_default_boot_configuration(), in which case the XRandR configuration will not be touched unless there is a global or per-user configuration file. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=631388 Bug-Ubuntu: https://launchpad.net/bugs/640807
Diffstat (limited to 'data')
-rw-r--r--data/apps_mate_settings_daemon_xrandr.schemas.in19
1 files changed, 19 insertions, 0 deletions
diff --git a/data/apps_mate_settings_daemon_xrandr.schemas.in b/data/apps_mate_settings_daemon_xrandr.schemas.in
index 2314ac8..a8adbc9 100644
--- a/data/apps_mate_settings_daemon_xrandr.schemas.in
+++ b/data/apps_mate_settings_daemon_xrandr.schemas.in
@@ -15,6 +15,25 @@
</locale>
</schema>
<schema>
+ <key>/schemas/apps/mate_settings_daemon/xrandr/use_xorg_monitor_settings</key>
+ <applyto>/apps/mate_settings_daemon/xrandr/use_xorg_monitor_settings</applyto>
+ <owner>mate</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Do not touch monitor configuration</short>
+ <long>Usually, mate-settings-daemon configures internal and
+ external monitors according to the
+ turn_on_external_monitors_at_startup and
+ turn_on_laptop_monitor_at_startup settings and determines
+ an appropriate cloning/side-by-side mode. Setting this key
+ to True disables this, and the monitor settings are not
+ touched at all (unless there is an explicit user
+ configuration).
+ </long>
+ </locale>
+ </schema>
+ <schema>
<key>/schemas/apps/mate_settings_daemon/xrandr/turn_on_external_monitors_at_startup</key>
<applyto>/apps/mate_settings_daemon/xrandr/turn_on_external_monitors_at_startup</applyto>
<owner>mate</owner>