Commit 367a3a70 authored by Andrey Cherepanov's avatar Andrey Cherepanov

Use different desktop files for menu and desktop

parent 79bc7081
...@@ -127,6 +127,7 @@ education-install: ...@@ -127,6 +127,7 @@ education-install:
for size in 16 22 24 32 48 64 128; do \ 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; \ install -Dm 0644 icons/alt-education-$$size.png $(datadir)/icons/hicolor/$${size}x$${size}/apps/alt-education.png; \
done 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/kdeglobals $(sysconfdir)/skel/.config/kdeglobals
install -Dm 0644 kde-settings/Education.profile $(datadir)/kf5/konsole/Education.profile install -Dm 0644 kde-settings/Education.profile $(datadir)/kf5/konsole/Education.profile
install -Dm 0644 kde-settings/konsolerc $(sysconfdir)/skel/.config/konsolerc 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 ...@@ -186,8 +187,8 @@ install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml education-ins
#indexhtml #indexhtml
install -d $(datadir)/doc/indexhtml install -d $(datadir)/doc/indexhtml
cp -a indexhtml/{*.html,images} $(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.desktop $(datadir)/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
install -Dm755 indexhtml/indexhtml.desktop $(datadir)/Desktop/indexhtml.desktop install -Dm755 indexhtml/indexhtml-desktop.desktop $(datadir)/Desktop/indexhtml.desktop
#menu #menu
mkdir -p $(datadir)/slinux-style/applications mkdir -p $(datadir)/slinux-style/applications
install menu/applications/* $(datadir)/slinux-style/applications/ install menu/applications/* $(datadir)/slinux-style/applications/
......
...@@ -424,6 +424,7 @@ subst 's/#theme-name=/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.c ...@@ -424,6 +424,7 @@ subst 's/#theme-name=/theme-name=%gtk_theme/' /etc/lightdm/lightdm-gtk-greeter.c
%_desktopdir/* %_desktopdir/*
%_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop %_datadir/kf5/kio_desktop/DesktopLinks/indexhtml.desktop
%attr(0755,root,root) %_datadir/Desktop/indexhtml.desktop %attr(0755,root,root) %_datadir/Desktop/indexhtml.desktop
%_iconsdir/hicolor/*/apps/alt-education-desktop.png
%files menu %files menu
/usr/share/slinux-style /usr/share/slinux-style
......
...@@ -55,6 +55,7 @@ AC_CONFIG_FILES([ ...@@ -55,6 +55,7 @@ AC_CONFIG_FILES([
notes/license.ru.html notes/license.ru.html
notes/license.all.html notes/license.all.html
indexhtml/indexhtml.desktop indexhtml/indexhtml.desktop
indexhtml/indexhtml-desktop.desktop
indexhtml/index-ru.html indexhtml/index-ru.html
indexhtml/index-en.html indexhtml/index-en.html
systemd/os-release systemd/os-release
......
[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]=О системе
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment