diff options
| -rw-r--r-- | config/live.cfg | 9 | ||||
| -rw-r--r-- | files/01_gsettings-desktop-schemas.gschema.override | 5 | ||||
| -rw-r--r-- | files/glib2-branding.gschema.override | 73 | ||||
| -rw-r--r-- | files/live.gschema.override | 5 |
4 files changed, 10 insertions, 82 deletions
diff --git a/config/live.cfg b/config/live.cfg index 30cce52..1ca4356 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -34,9 +34,9 @@ my $_l = { langs_always => [ 'en_US' ], files => [ if_($live->{settings}{desktop} eq 'GNOME', - # fix gnome-shell not showing draklive-install icon in menu in live mode - [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ], - [ 'files/glib2-branding.gschema.override', '/usr/share/glib-2.0/schemas/glib2-branding.gschema.override', { mode => 0644 } ], + # add draklive-install icon to favourites in live mode and disable screen locking + # (override files are processed in alphabetical order - make sure this one comes last) + [ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ], # disable Wayland when we know it won't work (workaround for mga#20079) [ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ], ), @@ -198,7 +198,8 @@ my $_l = { "ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak", ), if_($live->{settings}{desktop} eq 'GNOME', - # compile schema to get draklive-install in menu + # modify and compile schema to get draklive-install and Firefox in menu + "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override", "glib-compile-schemas /usr/share/glib-2.0/schemas/", # fix permissions to enable GDM to rerun if the user logs out "chown -R gdm:gdm /var/lib/gdm", diff --git a/files/01_gsettings-desktop-schemas.gschema.override b/files/01_gsettings-desktop-schemas.gschema.override deleted file mode 100644 index 5702350..0000000 --- a/files/01_gsettings-desktop-schemas.gschema.override +++ /dev/null @@ -1,5 +0,0 @@ -[org.gnome.shell] -favorite-apps = [ 'mageia-draklive-install.desktop', 'register.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop'] - -[org.gnome.desktop.screensaver] -lock-enabled=false diff --git a/files/glib2-branding.gschema.override b/files/glib2-branding.gschema.override deleted file mode 100644 index b4184eb..0000000 --- a/files/glib2-branding.gschema.override +++ /dev/null @@ -1,73 +0,0 @@ -[org.gnome.desktop.interface] -## No accessibility by default, until we're 100% there's no regression -toolkit-accessibility = false -### For the theme, we stay with the defaults -## Note: for non-GNOME sessions, the cursor theme is defined in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -# cursor-theme = "" -## Note: gtk[23]-branding-%{branding_name} must contain the same defaults for icon and gtk, otherwise the theme will change when gnome-settings-daemon starts -# icon-theme = "" -#gtk-theme = "oxygen-gtk" - -[org.gnome.desktop.background] -## Default wallpaper -picture-uri = "file:///usr/share/mga/backgrounds/default.jpg" -picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" - -[org.gnome.desktop.screensaver] -## Default wallpaper -picture-uri = "file:///usr/share/mga/backgrounds/default.jpg" -picture-options = "stretched" -primary-color = "#258c06" -secondary-color = "#258c06" - -[org.gnome.login-screen] -## Logo in the gdm login dialog -# logo='/usr/share/icons/hicolor/scalable/apps/distributor.svg' - -[org.gnome.libgnomekbd.desktop] -## Set keyboard layout global per session instead of per window -#group-per-window = false - -[org.gnome.desktop.sound] -## Make sure to have event sounds by default -event-sounds = true - -[org.gnome.desktop.wm.preferences] -## Audible bell is more annoying than useful -audible-bell = false -### For the theme, we stay with the defaults -# titlebar-uses-system-font = false -# titlebar-font = "" -# theme = "" - -[org.gnome.settings-daemon.plugins.xsettings] -## the PackageKit gtk+ module is too spammy, fdo#23917 -disabled-gtk-modules = [ "pk-gtk-module" ] - -[org.gnome.settings-daemon.plugins.media-keys] -help = "XF86Help" - -[org.gnome.shell] -## Default apps shown in the gnome-shell dash -favorite-apps = [ 'mageia-draklive-install.desktop', 'register.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'mageia-drakconf.desktop' ] -## Default extensions that are enabled -#enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gnome.org' ] - -[org.gnome.gnome-panel.applet.window-list] -## Display all workspaces in the gnome-panel window list applet -#display-all-workspaces = true - -[org.freedesktop.Tracker.Miner.Files] -## Disable indexing on removable media -index-removable-devices = false - -[org.gnome.eog.ui] -## External editor to use when editing image -external-editor = "gimp.desktop" - -# ovitters: disable to avoid longstanding bug causing occasional 100% CPU usage -# in gnome-settings-daemon as well as a blinking numlock -[org.gnome.settings-daemon.peripherals.keyboard] -remember-numlock-state = false diff --git a/files/live.gschema.override b/files/live.gschema.override new file mode 100644 index 0000000..9eefe6c --- /dev/null +++ b/files/live.gschema.override @@ -0,0 +1,5 @@ +[org.gnome.shell] +favorite-apps = [ 'mageia-draklive-install.desktop', 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop'] + +[org.gnome.desktop.screensaver] +lock-enabled=false |