From e0ee9b057b65856dacde9973036644a080d2e710 Mon Sep 17 00:00:00 2001 From: "Simental Magana, Marcos" Date: Mon, 10 Feb 2020 16:17:02 -0600 Subject: [PATCH] schemas: split theme/non-theme related overrides This separation awolls a better handling when changing UI overrides from functionality preference overrides. Signed-off-by: Simental Magana, Marcos --- schemas/meson.build | 31 ++++++++++++++----- ...e.desktop.interface-theme.gschema.override | 4 +++ ...g.gnome.desktop.interface.gschema.override | 3 -- ....shell-enabled-extensions.gschema.override | 2 ++ schemas/org.gnome.shell.gschema.override | 1 - 5 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 schemas/org.gnome.desktop.interface-theme.gschema.override create mode 100644 schemas/org.gnome.shell-enabled-extensions.gschema.override diff --git a/schemas/meson.build b/schemas/meson.build index 58c34ee..7e0b326 100644 --- a/schemas/meson.build +++ b/schemas/meson.build @@ -1,31 +1,46 @@ +gnome_extensions_theme_schemas = [ + 'org.gnome.Terminal.ProfilesList.gschema.override', + 'org.gnome.shell.extensions.dash-to-dock.gschema.override', + 'org.gnome.shell.extensions.desktop-icons.gschema.override', + 'org.gnome.shell.extensions.net.gfxmonk.impatience.gschema.override', + 'org.gnome.shell.extensions.user-theme.gschema.override', + 'org.gnome.desktop.interface-theme.gschema.override', + 'org.gnome.desktop.wm.preferences.gschema.override', + 'org.gnome.shell-enabled-extensions.gschema.override', +] + gnome_schemas = [ + 'org.gnome.Terminal.Legacy.Settings.gschema.override', 'org.gnome.desktop.app-folders.gschema.override', 'org.gnome.desktop.background.gschema.override', 'org.gnome.desktop.input-sources.gschema.override', 'org.gnome.desktop.interface.gschema.override', 'org.gnome.desktop.peripherals.touchpad.gschema.override', 'org.gnome.desktop.screensaver.gschema.override', - 'org.gnome.desktop.wm.preferences.gschema.override', 'org.gnome.nautilus.icon-view.gschema.override', 'org.gnome.nautilus.preferences.gschema.override', 'org.gnome.settings-daemon.plugins.media-keys.gschema.override', 'org.gnome.settings-daemon.plugins.power.gschema.override', 'org.gnome.settings-daemon.plugins.xsettings.gschema.override', 'org.gnome.desktop.sound.gschema.override', - 'org.gnome.shell.extensions.dash-to-dock.gschema.override', - 'org.gnome.shell.extensions.desktop-icons.gschema.override', - 'org.gnome.shell.extensions.net.gfxmonk.impatience.gschema.override', - 'org.gnome.shell.extensions.user-theme.gschema.override', 'org.gnome.shell.gschema.override', - 'org.gnome.Terminal.Legacy.Settings.gschema.override', - 'org.gnome.Terminal.ProfilesList.gschema.override', 'org.gtk.Settings.FileChooser.gschema.override', ] -# Generate single schema override file from all input files using cat redirect +# Single schema override file from all theme-related input files custom_target('10_gnome_settings.gschema.override', output: '10_gnome_settings.gschema.override', capture: true, + input: gnome_extensions_theme_schemas, + command: ['cat', '@INPUT@'], + install: true, + install_dir: schemasdir, +) + +# Single schema override file for non-theme related overrides +custom_target('20_gnome_settings.gschema.override', + output: '20_gnome_settings.gschema.override', + capture: true, input: gnome_schemas, command: ['cat', '@INPUT@'], install: true, diff --git a/schemas/org.gnome.desktop.interface-theme.gschema.override b/schemas/org.gnome.desktop.interface-theme.gschema.override new file mode 100644 index 0000000..146f135 --- /dev/null +++ b/schemas/org.gnome.desktop.interface-theme.gschema.override @@ -0,0 +1,4 @@ +[org.gnome.desktop.interface] +font-name='Clear Sans 10' +gtk-theme='Materia-compact' +icon-theme='Paper' diff --git a/schemas/org.gnome.desktop.interface.gschema.override b/schemas/org.gnome.desktop.interface.gschema.override index 85b97d9..3f53cb5 100644 --- a/schemas/org.gnome.desktop.interface.gschema.override +++ b/schemas/org.gnome.desktop.interface.gschema.override @@ -1,7 +1,4 @@ [org.gnome.desktop.interface] enable-animations=false -font-name='Clear Sans 10' -gtk-theme='Materia-compact' -icon-theme='Paper' cursor-blink-timeout=3 cursor-blink-time=1500 diff --git a/schemas/org.gnome.shell-enabled-extensions.gschema.override b/schemas/org.gnome.shell-enabled-extensions.gschema.override new file mode 100644 index 0000000..61912db --- /dev/null +++ b/schemas/org.gnome.shell-enabled-extensions.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.shell] +enabled-extensions=['dash-to-dock@micxgx.gmail.com', 'desktop-icons@csoriano', 'impatience@gfxmonk.net', 'user-theme@gnome-shell-extensions.gcampax.github.com'] diff --git a/schemas/org.gnome.shell.gschema.override b/schemas/org.gnome.shell.gschema.override index 992f367..7cae77f 100644 --- a/schemas/org.gnome.shell.gschema.override +++ b/schemas/org.gnome.shell.gschema.override @@ -1,3 +1,2 @@ [org.gnome.shell] -enabled-extensions=['dash-to-dock@micxgx.gmail.com', 'desktop-icons@csoriano', 'impatience@gfxmonk.net', 'user-theme@gnome-shell-extensions.gcampax.github.com'] favorite-apps=['org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'firefox.desktop', 'evolution.desktop', 'org.gnome.Software.desktop']