From 8257949e5db61315910e2fda942338e4f06c4118 Mon Sep 17 00:00:00 2001
From: "Geoffrey D. Bennett" <g@b4.vu>
Date: Tue, 15 Mar 2022 01:24:03 +1030
Subject: [PATCH] Add desktop and icon files and install into the correct place

Remove 48x48 icon; use 256x256 icon only.
Remove icons from the executable.
No need to call gtk_window_set_default_icon_name() anymore.
Add desktop file.
Add install and uninstall Makefile targets.
Update USAGE.md with installation instructions.
Thanks to @szszoke for figuring this one out!

Fixes #2.
---
 .gitignore                                    |   1 +
 USAGE.md                                      |  13 ++++++++
 src/Makefile                                  |  30 ++++++++++++++++--
 src/alsa-scarlett-gui-resources.xml           |   6 ----
 src/img/alsa-scarlett-gui-48.png              | Bin 3677 -> 0 bytes
 ...lett-gui-256.png => alsa-scarlett-gui.png} | Bin
 src/main.c                                    |   1 -
 src/vu.b4.alsa-scarlett-gui.desktop.template  |   9 ++++++
 8 files changed, 51 insertions(+), 9 deletions(-)
 delete mode 100644 src/img/alsa-scarlett-gui-48.png
 rename src/img/{alsa-scarlett-gui-256.png => alsa-scarlett-gui.png} (100%)
 create mode 100644 src/vu.b4.alsa-scarlett-gui.desktop.template

diff --git a/.gitignore b/.gitignore
index 7f5ce74..84db14b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 .gdb_history
 alsa-scarlett-gui
 alsa-scarlett-gui-resources.c
+vu.b4.alsa-scarlett-gui.desktop
diff --git a/USAGE.md b/USAGE.md
index 4af3f19..9395176 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -71,6 +71,19 @@ To run:
 ./alsa-scarlett-gui
 ```
 
+You can install it into `/usr/local` (binary, desktop file, and icon)
+with:
+
+```
+sudo make install
+```
+
+And uninstall with:
+
+```
+sudo make uninstall
+```
+
 ## No interface connected
 
 If no interface is detected (usually because there isn’t one
diff --git a/src/Makefile b/src/Makefile
index b0173d8..cf10135 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,13 +32,14 @@ XML_OBJ := $(patsubst %.xml,%.c,$(XML_SRC))
 SRCS := $(sort $(wildcard *.c) $(XML_OBJ))
 OBJS := $(patsubst %.c,%.o,$(SRCS))
 TARGET := alsa-scarlett-gui
+DESKTOP_FILE := vu.b4.$(TARGET).desktop
 
 GLIB_COMPILE_RESOURCES := $(shell $(PKG_CONFIG) --variable=glib_compile_resources gio-2.0)
 
-all: $(TARGET)
+all: $(TARGET) $(DESKTOP_FILE)
 
 clean:
-	rm -f $(TARGET) $(OBJS) $(XML_OBJ)
+	rm -f $(TARGET) $(DESKTOP_FILE) $(OBJS) $(XML_OBJ)
 
 depclean:
 	rm -rf $(DEPDIR)
@@ -52,3 +53,28 @@ include $(wildcard $(DEPFILES))
 
 $(TARGET): $(OBJS)
 	cc ${LDFLAGS} -lm -o $(TARGET) $(OBJS)
+
+ifeq ($(PREFIX),)
+  PREFIX := /usr/local
+endif
+
+BINDIR := $(DESTDIR)$(PREFIX)/bin
+ICONTOP := $(DESTDIR)$(PREFIX)/share/icons/hicolor
+ICONDIR := $(ICONTOP)/256x256/apps
+DESKTOPDIR := $(DESTDIR)$(PREFIX)/share/applications
+
+$(DESKTOP_FILE): $(DESKTOP_FILE).template
+	sed 's_PREFIX_$(PREFIX)_' < $< > $@
+
+install: all
+	install -d $(BINDIR)
+	install -m 755 $(TARGET) $(BINDIR)
+	install -d $(ICONDIR)
+	install -m 644 img/$(TARGET).png $(ICONDIR)
+	install -d $(DESKTOPDIR)
+	install -m 644 $(DESKTOP_FILE) $(DESKTOPDIR)
+
+uninstall:
+	rm -f $(BINDIR)/$(TARGET)
+	rm -f $(ICONDIR)/$(TARGET).png
+	rm -f $(DESKTOPDIR)/$(DESKTOP_FILE)
diff --git a/src/alsa-scarlett-gui-resources.xml b/src/alsa-scarlett-gui-resources.xml
index 23df2ce..117f1d6 100644
--- a/src/alsa-scarlett-gui-resources.xml
+++ b/src/alsa-scarlett-gui-resources.xml
@@ -4,12 +4,6 @@
     <file alias="alsa-scarlett-gui-logo.png">img/alsa-scarlett-gui-logo.png</file>
     <file alias="socket.svg">img/socket.svg</file>
   </gresource>
-  <gresource prefix="/vu/b4/alsa-scarlett-gui/icons/48x48/apps">
-    <file alias="alsa-scarlett-gui.png">img/alsa-scarlett-gui-48.png</file>
-  </gresource>
-  <gresource prefix="/vu/b4/alsa-scarlett-gui/icons/256x256/apps">
-    <file alias="alsa-scarlett-gui.png">img/alsa-scarlett-gui-256.png</file>
-  </gresource>
   <gresource prefix="/vu/b4/alsa-scarlett-gui">
     <file>alsa-scarlett-gui.css</file>
   </gresource>
diff --git a/src/img/alsa-scarlett-gui-48.png b/src/img/alsa-scarlett-gui-48.png
deleted file mode 100644
index e8856309098a9b014a13b63b2160081a68f83547..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3677
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

diff --git a/src/img/alsa-scarlett-gui-256.png b/src/img/alsa-scarlett-gui.png
similarity index 100%
rename from src/img/alsa-scarlett-gui-256.png
rename to src/img/alsa-scarlett-gui.png
diff --git a/src/main.c b/src/main.c
index 4c979a4..c206dd1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,7 +30,6 @@ static void load_css(void) {
 // gtk init
 
 static void startup(GtkApplication *app, gpointer user_data) {
-  gtk_window_set_default_icon_name("alsa-scarlett-gui");
   gtk_application_set_menubar(app, G_MENU_MODEL(create_app_menu(app)));
 
   alsa_inotify_init();
diff --git a/src/vu.b4.alsa-scarlett-gui.desktop.template b/src/vu.b4.alsa-scarlett-gui.desktop.template
new file mode 100644
index 0000000..5aeb414
--- /dev/null
+++ b/src/vu.b4.alsa-scarlett-gui.desktop.template
@@ -0,0 +1,9 @@
+[Desktop Entry]
+
+Encoding=UTF-8
+Value=1.5
+Type=Application
+Name=ALSA Scarlett Gen 2/3 Control Panel
+Icon=alsa-scarlett-gui
+Exec=PREFIX/bin/alsa-scarlett-gui
+Categories=GTK;AudioVideo;Audio;Mixer;