icons: Fixup the G13 icons installation and usage

This actually makes the G13 icon show up everywhere, like we actually want. No
more blank icons!

debian/changelog

@@ -1,4 +1,4 @@
-g13gui (0.1.0ubuntu1) focal; urgency=medium
+g13 (0.1.0ubuntu1) focal; urgency=medium
 
   * Initial release of the Debian packaging for g13gui
 

debian/control

@@ -1,5 +1,5 @@
-Source: g13gui
+Source: g13
-Section: games
+Section: misc
 Priority: optional
 Maintainer: June Tate-Gans <june@theonelab.com>
 Build-Depends: debhelper-compat (= 12),
@@ -12,7 +12,7 @@ Homepage: https://github.com/jtgans/g13gui
 Vcs-Browser: https://github.com/jtgans/g13gui
 Vcs-Git: https://github.com/jtgans/g13gui.git
 
-Package: g13gui
+Package: g13
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
@@ -22,6 +22,7 @@ Depends: ${misc:Depends},
          python3-pil,
          python3-gi,
          python3-usb,
+         gir1.2-appindicator3-0.1,
 Description: Application to configure and drive the Logitech G13 gameboard
   This is the companion application to the Logitech G13 gameboard, and
   provides both configuration tooling, applet hosting, and also a user space

debian/copyright

@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: g13gui
+Upstream-Name: g13
 Upstream-Contact: June Tate-Gans <june@theonelab.com>
 Upstream-Source: https://github.com/jtgans/g13gui
 
@@ -7,17 +7,17 @@ Files: *
 Copyright: 2021 June Tate-Gans <june@theonelab.com>
 License: MIT
   Copyright (c) 2021, June Tate-Gans <june@theonelab.com>
-  
+  .
   Permission is hereby granted, free of charge, to any person obtaining a copy of
   this software and associated documentation files (the “Software”), to deal in
   the Software without restriction, including without limitation the rights to
   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
   the Software, and to permit persons to whom the Software is furnished to do so,
   subject to the following conditions:
-  
+  .
   The above copyright notice and this permission notice shall be included in all
   copies or substantial portions of the Software.
-  
+  .
   THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
   FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR

etc/com.theonelab.g13.Configurator.desktop

@@ -2,7 +2,7 @@
 Categories=Game;
 Comment=G13 gaming controller configuration tool and user space driver
 Exec=g13gui
-Icon=g13-logo
+Icon=com.theonelab.g13.Configurator.png
 Keywords=gaming;input;gameboard;logitech;controller
 Name=G13 Configurator
 Terminal=false

etc/com.theonelab.g13.applet.Clock.desktop

@@ -2,7 +2,7 @@
 Categories=Game;
 Comment=Clock and resource display applet for the Logitech G13
 Exec=g13-clock
-Icon=g13-logo
+Icon=com.theonelab.g13.Configurator.png
 Keywords=gaming;input;gameboard;logitech;controller
 Name=G13 clock applet
 Terminal=false

etc/com.theonelab.g13.applet.Profiles.desktop

@@ -2,7 +2,7 @@
 Categories=Game;
 Comment=Profile switching applet for the Logitech G13
 Exec=g13-profiles
-Icon=g13-logo
+Icon=com.theonelab.g13.Configurator.png
 Keywords=gaming;input;gameboard;logitech;controller
 Name=G13 profile switcher
 Terminal=false

g13gui/app.py

@@ -18,7 +18,7 @@ class Application(Gtk.Application):
     def __init__(self):
         Gtk.Application.__init__(
             self,
-            application_id='com.theonelab.g13.G13Configurator')
+            application_id='com.theonelab.g13.Configurator')
 
         GLib.set_application_name('G13 Configurator')
 

g13gui/ui/appindicator.py

@@ -34,7 +34,10 @@ class AppIndicator(GtkObserver):
 
     def _initIndicator(self):
         self._indicator = indicator.Indicator.new(
-            PROGNAME, "g13gui", indicator.IndicatorCategory.OTHER)
+            'com.theonelab.g13.Configurator',
+            'com.theonelab.g13.Configurator',
+            indicator.IndicatorCategory.OTHER)
+        self._indicator.set_attention_icon('com.theonelab.g13.Configurator')
         self._indicator.set_status(indicator.IndicatorStatus.ACTIVE)
 
     def _removeAllMenuItems(self):

meson.build

@@ -23,16 +23,16 @@ install_subdir(
   install_dir: pylibdir,
 )
 
-install_data(
+install_subdir(
-  files('etc/g13-logo.svg'),
+  'etc/icons/hicolor',
-  install_dir: join_paths(datadir, 'icons/hicolor/scalable/apps'),
+  install_dir: join_paths(datadir, 'icons'),
   install_mode: 'rw-r--r--',
 )
 
 install_data(
-  files('etc/com.theonelab.g13gui.Configurator.desktop',
+  files('etc/com.theonelab.g13.Configurator.desktop',
-        'etc/com.theonelab.g13gui.applet.Clock.desktop',
+        'etc/com.theonelab.g13.applet.Clock.desktop',
-        'etc/com.theonelab.g13gui.applet.Profiles.desktop'),
+        'etc/com.theonelab.g13.applet.Profiles.desktop'),
   install_dir: join_paths(datadir, 'applications'),
   install_mode: 'rw-r--r--',
 )