From 7eead25cd00a547753ec94f6b301c5b32968291b Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Mon, 21 May 2012 18:54:06 +0000 Subject: really fix showing draklive-install and register icons on live GNOME desktop --- config/auto_inst.cfg.pl | 2 -- config/live.cfg | 9 ++++++ .../01_gsettings-desktop-schemas.gschema.override | 2 ++ files/draklive-install.desktop | 36 ++++++++++++++++++++++ files/register.desktop | 14 +++++++++ 5 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 files/01_gsettings-desktop-schemas.gschema.override create mode 100755 files/draklive-install.desktop create mode 100755 files/register.desktop diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 99452a1..5840900 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -304,8 +304,6 @@ $o = { "ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target", # have inittab match systemd defaulting to init 5 "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'", - # enable icons on gnome desktop - if_($has_gnome, "gsettings set org.gnome.desktop.background show-desktop-icons true"), #- FIXME: in any::set_autologin, unlink if gdm/kdm conf file and binary exist if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), if_($distro_theme eq 'Liveusb-Rw', diff --git a/config/live.cfg b/config/live.cfg index ad7c890..18595d9 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -39,6 +39,12 @@ my $_l = { [ 'files/desktop-directories-liveusb-rw', '/etc/X11/xinit.d/xx_desktop-directories-liveusb-rw', { mode => 0755, no_install => 1 } ], [ 'files/draklive-install.usb', '/etc/sysconfig/draklive-install', { mode => 0755 } ], ), + # fix gnome-shell not showing draklive-install and register icons on desktop in live mode + if_($live->{settings}{desktop} eq 'GNOME', + [ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ], + [ 'files/register.desktop', '/home/live/Desktop/register.desktop', { mode => 0755 } ], + [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ], + ), # disable suspend and hibernate in live mode [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], #- make cups the default spooler @@ -180,6 +186,9 @@ my $_l = { "cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf", "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', + "glib-compile-schemas /usr/share/glib-2.0/schemas/", + ), # FIXME #if_($live->{settings}{desktop} eq 'GNOME', # "mkdir -p '/home/$live->{settings}{default_user}/.config/autostart'", diff --git a/files/01_gsettings-desktop-schemas.gschema.override b/files/01_gsettings-desktop-schemas.gschema.override new file mode 100644 index 0000000..0656c96 --- /dev/null +++ b/files/01_gsettings-desktop-schemas.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.desktop.background] +show-desktop-icons=true diff --git a/files/draklive-install.desktop b/files/draklive-install.desktop new file mode 100755 index 0000000..d579b05 --- /dev/null +++ b/files/draklive-install.desktop @@ -0,0 +1,36 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/draklive-install-lock-storage +Icon=draklive-install +Terminal=false +Type=Application +StartupNotify=true +Name=Install on Hard Disk +Name[ar]=التنصيب إلى القرص الصلب +Name[ca]=Instal·la al Disc Dur +Name[cs]=Instalace na pevný disk +Name[da]=Installér på harddisk +Name[de]=Auf die Festplatte installieren +Name[el]=Εγκατάσταση στο σκληρό δίσκο +Name[es]=Instalar en el Disco Duro +Name[et]=Paigaldamine kõvakettale +Name[eu]=Instalatu disko zurrunean +Name[fi]=Asenna kiintolevylle +Name[fr]=Installer sur disque dur +Name[hu]=Telepítés a merevlemezre +Name[it]=Installa sul disco fisso +Name[ky]=Катуу дискке орнотуу +Name[nb]=Installer på harddisk +Name[nl]=Installeer op de harde schijf +Name[nn]=Installer på harddisken +Name[pl]=Zainstaluj na dysku twardym +Name[pt]=Instalar no Disco Rígido +Name[pt_BR]=Instalar no Disco Rígido +Name[ro]=Instalare pe discul dur +Name[ru]=Установка на жесткий диск +Name[sl]=Namestitev na trdi disk +Name[sv]=Installera på hårddisk +Name[tr]=Sabit diske kur +Name[uk]=Встановити на жорсткий диск +Name[zh_CN]=安装到硬盘 +Name[zh_TW]=安裝在硬碟上 diff --git a/files/register.desktop b/files/register.desktop new file mode 100755 index 0000000..d48259b --- /dev/null +++ b/files/register.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Icon=register-mga +Name=Join Mageia Community +Name[de]=Trete in die Mageia-Community ein +Name[el]=Συμμετοχή στην κοινότητα της Mageia +Name[fi]=Liity Mageia-yhteisöön +Name[it]=Unisciti alla comunità Mageia +Name[sl]=Pridružite se skupnosti Mageia +Name[sv]=Gå med i Mageia Communityn +Name[uk]=Приєднатися до спільноти Mageia +Name[zh_CN]=加入 Mageia 社区 +Type=Link +URL=http://mageia.org/contribute -- cgit v1.2.1