Install logo to desktop icons (#542)

This shows the "n³" logo as  icon in application menus, when desktop file is
installed (using `install-desktop` make target).

diff --git a/Makefile b/Makefile
index 6a4aaa87a96a5647d47c1465a901b43ae82a4e2e..3c0e08a7ae9e66252c5ca825d0e270b453b66aa6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ VERSION = $(shell grep -m1 VERSION $(SRC) | cut -f 2 -d'"')
 PREFIX ?= /usr/local
 MANPREFIX ?= $(PREFIX)/share/man
 DESKTOPPREFIX ?= $(PREFIX)/share/applications
+DESKTOPICONPREFIX ?= $(PREFIX)/share/icons/hicolor
 STRIP ?= strip
 PKG_CONFIG ?= pkg-config
 INSTALL ?= install
@@ -83,6 +84,8 @@ SRC = src/nnn.c
 HEADERS = src/nnn.h
 BIN = nnn
 DESKTOPFILE = misc/desktop/nnn.desktop
+LOGOSVG = misc/logo/logo.svg
+LOGO64X64 = misc/logo/logo-64x64.png
 
 all: $(BIN)
 
@@ -97,9 +100,15 @@ noloc: $(BIN)
 install-desktop: $(DESKTOPFILE)
        $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPPREFIX)
        $(INSTALL) -m 0644 $(DESKTOPFILE) $(DESTDIR)$(DESKTOPPREFIX)
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps
+       $(INSTALL) -m 0644 $(LOGOSVG) $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps/nnn.svg
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(DESKTOPICONPREFIX)/64x64/apps
+       $(INSTALL) -m 0644 $(LOGO64X64) $(DESTDIR)$(DESKTOPICONPREFIX)/64x64/apps/nnn.png
 
 uninstall-desktop:
        $(RM) $(DESTDIR)$(DESKTOPPREFIX)/$(DESKTOPFILE)
+       $(RM) $(DESTDIR)$(DESKTOPICONPREFIX)/scalable/apps/nnn.svg
+       $(RM) $(DESTDIR)$(DESKTOPICONPREFIX)/64x64/apps/nnn.png
 
 install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin

diff --git a/misc/desktop/nnn.desktop b/misc/desktop/nnn.desktop
index 48cb0d513a44c1cab81896ac767094ae60e9b143..14f8ecee7cad781d78e5aac05f7d3abad3b9ce82 100644 (file)
--- a/misc/desktop/nnn.desktop
+++ b/misc/desktop/nnn.desktop
@@ -4,7 +4,7 @@ Name=nnn
 Comment=Terminal file manager
 Exec=nnn
 Terminal=true
-Icon=utilities-terminal
+Icon=nnn
 MimeType=inode/directory
 Categories=System;FileTools;FileManager;ConsoleOnly
 Keywords=File;Manager;Management;Explorer;Launcher