diff options
author | Dirk von Suchodoletz | 2011-06-04 12:45:19 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2011-06-04 12:45:19 +0200 |
commit | 8f758f7d7788493b1af047e4b35afd604b6d719a (patch) | |
tree | 2df518d6f7232d9915c3bd0b87793bca810a62f0 /src/os-plugins | |
parent | Changes for common subdirectory for virtual machines, nofuse fix in init. (diff) | |
parent | .. (diff) | |
download | core-8f758f7d7788493b1af047e4b35afd604b6d719a.tar.gz core-8f758f7d7788493b1af047e4b35afd604b6d719a.tar.xz core-8f758f7d7788493b1af047e4b35afd604b6d719a.zip |
Merge branch 'master' of git.openslx.org:openslx/core
Diffstat (limited to 'src/os-plugins')
-rw-r--r-- | src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm | 10 | ||||
-rw-r--r-- | src/os-plugins/plugins/desktop/XX_desktop.sh | 4 | ||||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/debian.png | bin | 0 -> 5874 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/fedora.png | bin | 0 -> 4809 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/linuxmint.png | bin | 0 -> 7818 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/scilin.png | bin | 0 -> 14887 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/suse.png | bin | 0 -> 4163 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/common/ubuntu.png | bin | 0 -> 6475 bytes | |||
-rw-r--r-- | src/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml | 5 |
9 files changed, 18 insertions, 1 deletions
diff --git a/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm b/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm index 2f04e124..6e6c929e 100644 --- a/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm +++ b/src/os-plugins/plugins/desktop/OpenSLX/OSPlugin/desktop.pm @@ -650,6 +650,16 @@ sub _setupSupportedThemes my $supportedThemes = $self->{attrs}->{'desktop::supported_themes'} || ''; my @supportedThemes = split m{\s*,\s*}, $supportedThemes; + + # Copy common theme distro icons into plugion-repo folder + my $commonThemeSourcePath = "$self->{openslxBasePath}/lib/plugins/desktop/themes/common"; + my $commonThemeTargetPath = "$self->{pluginRepositoryPath}/themes"; + mkpath($commonThemeTargetPath); + slxsystem( + "cp -r $commonThemeSourcePath $commonThemeTargetPath/ 2>/dev/null" + ) == 0 or die _tr('unable to copy common theme files!'); + + return if !@supportedThemes; # Every theme is copied from the folder where it is found first, such that diff --git a/src/os-plugins/plugins/desktop/XX_desktop.sh b/src/os-plugins/plugins/desktop/XX_desktop.sh index fb5a8e3a..ea3e2be9 100644 --- a/src/os-plugins/plugins/desktop/XX_desktop.sh +++ b/src/os-plugins/plugins/desktop/XX_desktop.sh @@ -16,8 +16,12 @@ if [ -e /initramfs/plugin-conf/desktop.conf ]; then . /initramfs/plugin-conf/desktop.conf + . /etc/slxsystem.conf if [ $desktop_active -ne 0 ]; then [ $DEBUGLEVEL -gt 0 ] && echo "executing the 'desktop' os-plugin ..."; + + ln -sf /opt/openslx/plugin-repo/desktop/themes/common/${slxconf_distro_name}.png \ + /mnt/etc/distro.png # problem which occurs if exporting was forgotten (quick fix code) if [ -e /mnt/opt/openslx/plugin-repo/desktop/${desktop_manager}/desktop.sh ] diff --git a/src/os-plugins/plugins/desktop/themes/common/debian.png b/src/os-plugins/plugins/desktop/themes/common/debian.png Binary files differnew file mode 100644 index 00000000..261e95dc --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/debian.png diff --git a/src/os-plugins/plugins/desktop/themes/common/fedora.png b/src/os-plugins/plugins/desktop/themes/common/fedora.png Binary files differnew file mode 100644 index 00000000..eed70d32 --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/fedora.png diff --git a/src/os-plugins/plugins/desktop/themes/common/linuxmint.png b/src/os-plugins/plugins/desktop/themes/common/linuxmint.png Binary files differnew file mode 100644 index 00000000..6f45c0b9 --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/linuxmint.png diff --git a/src/os-plugins/plugins/desktop/themes/common/scilin.png b/src/os-plugins/plugins/desktop/themes/common/scilin.png Binary files differnew file mode 100644 index 00000000..1a22f2d5 --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/scilin.png diff --git a/src/os-plugins/plugins/desktop/themes/common/suse.png b/src/os-plugins/plugins/desktop/themes/common/suse.png Binary files differnew file mode 100644 index 00000000..7997acf2 --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/suse.png diff --git a/src/os-plugins/plugins/desktop/themes/common/ubuntu.png b/src/os-plugins/plugins/desktop/themes/common/ubuntu.png Binary files differnew file mode 100644 index 00000000..916d62db --- /dev/null +++ b/src/os-plugins/plugins/desktop/themes/common/ubuntu.png diff --git a/src/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml b/src/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml index d748c776..8b4ca0f9 100644 --- a/src/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml +++ b/src/os-plugins/plugins/desktop/themes/kdm/openslx/theme.xml @@ -228,5 +228,8 @@ KDM-OpenSLX-Theme </box> </item> - + <item type="pixmap" id="distro_logo" button="false"> + <normal file="/etc/distro.png"/> + <pos anchor="se" x="99%" y="99%"/> + </item> </greeter> |