From 367a3a704afbd85910b77dbac42ffac301900595 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Thu, 23 May 2019 13:06:03 +0300 Subject: [PATCH] Use different desktop files for menu and desktop --- Makefile.in | 5 +++-- branding.spec | 1 + configure.ac | 1 + icons/alt-education-desktop.png | Bin 0 -> 19905 bytes indexhtml/indexhtml-desktop.desktop.in | 11 +++++++++++ 5 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 icons/alt-education-desktop.png create mode 100644 indexhtml/indexhtml-desktop.desktop.in diff --git a/Makefile.in b/Makefile.in index f13decf..a64bb86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,6 +127,7 @@ education-install: for size in 16 22 24 32 48 64 128; do \ install -Dm 0644 icons/alt-education-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-education.png; \ done + install -Dm 0644 icons/alt-education-desktop.png $(datadir)/icons/hicolor/48x48/apps/alt-education-desktop.png install -Dm 0644 kde-settings/kdeglobals $(sysconfdir)/skel/.config/kdeglobals install -Dm 0644 kde-settings/Education.profile $(datadir)/kf5/konsole/Education.profile install -Dm 0644 kde-settings/konsolerc $(sysconfdir)/skel/.config/konsolerc @@ -186,8 +187,8 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml education-ins #indexhtml install -d $(datadir)/doc/indexhtml cp -a indexhtml/{*.html,images} $(datadir)/doc/indexhtml - install -Dm755 indexhtml/indexhtml.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop - install -Dm755 indexhtml/indexhtml.desktop $(datadir)/Desktop/indexhtml.desktop + install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop + install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/Desktop/indexhtml.desktop #menu mkdir -p $(datadir)/slinux-style/applications install menu/applications/* $(datadir)/slinux-style/applications/ diff --git a/branding.spec b/branding.spec index 127f64b..5ede6f1 100644 --- a/branding.spec +++ b/branding.spec @@ -424,6 +424,7 @@ subst 's/#theme-name=/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.c %_desktopdir/* %_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop %attr(0755,root,root) %_datadir/Desktop/indexhtml.desktop +%_iconsdir/hicolor/*/apps/alt-education-desktop.png %files menu /usr/share/slinux-style diff --git a/configure.ac b/configure.ac index 2ec97f7..4834cb6 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AC_CONFIG_FILES([ notes/license.ru.html notes/license.all.html indexhtml/indexhtml.desktop + indexhtml/indexhtml-desktop.desktop indexhtml/index-ru.html indexhtml/index-en.html systemd/os-release diff --git a/icons/alt-education-desktop.png b/icons/alt-education-desktop.png new file mode 100644 index 0000000000000000000000000000000000000000..245617dfdbd8c1707ead6201bc39c308eb9ab022 GIT binary patch literal 19905 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 literal 0 HcmV?d00001 diff --git a/indexhtml/indexhtml-desktop.desktop.in b/indexhtml/indexhtml-desktop.desktop.in new file mode 100644 index 0000000..adf4609 --- /dev/null +++ b/indexhtml/indexhtml-desktop.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=xbrowser /usr/share/doc/indexhtml/index.html +StartupNotify=false +Icon=alt-education-desktop +Name=About system +Categories=System;Documentation; + +# Translations +Name[ru]=О системе