From b418dafb00847f1d769d73cf580699c0ad4ea33e Mon Sep 17 00:00:00 2001 From: June Tate-Gans Date: Sun, 30 May 2021 11:32:20 -0500 Subject: [PATCH] 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 | 2 +- debian/control | 7 ++++--- debian/copyright | 8 ++++---- ...p => com.theonelab.g13.Configurator.desktop} | 2 +- ...o.svg => com.theonelab.g13.Configurator.svg} | 0 ...p => com.theonelab.g13.applet.Clock.desktop} | 2 +- ...> com.theonelab.g13.applet.Profiles.desktop} | 2 +- .../apps/com.theonelab.g13.Configurator.png | Bin 0 -> 482 bytes .../apps/com.theonelab.g13.Configurator.png | Bin 0 -> 648 bytes .../apps/com.theonelab.g13.Configurator.png | Bin 0 -> 14736 bytes .../apps/com.theonelab.g13.Configurator.png | Bin 0 -> 1065 bytes .../apps/com.theonelab.g13.Configurator.png | Bin 0 -> 1733 bytes g13gui/app.py | 2 +- g13gui/ui/appindicator.py | 5 ++++- meson.build | 12 ++++++------ 15 files changed, 23 insertions(+), 19 deletions(-) rename etc/{com.theonelab.g13gui.Configurator.desktop => com.theonelab.g13.Configurator.desktop} (84%) rename etc/{g13-logo.svg => com.theonelab.g13.Configurator.svg} (100%) rename etc/{com.theonelab.g13gui.applet.Clock.desktop => com.theonelab.g13.applet.Clock.desktop} (84%) rename etc/{com.theonelab.g13gui.applet.Profiles.desktop => com.theonelab.g13.applet.Profiles.desktop} (84%) create mode 100644 etc/icons/hicolor/16x16/apps/com.theonelab.g13.Configurator.png create mode 100644 etc/icons/hicolor/22x22/apps/com.theonelab.g13.Configurator.png create mode 100644 etc/icons/hicolor/256x256/apps/com.theonelab.g13.Configurator.png create mode 100644 etc/icons/hicolor/32x32/apps/com.theonelab.g13.Configurator.png create mode 100644 etc/icons/hicolor/48x48/apps/com.theonelab.g13.Configurator.png diff --git a/debian/changelog b/debian/changelog index bdaf350..b8379b5 100644 --- a/debian/changelog +++ b/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 diff --git a/debian/control b/debian/control index 19fdf53..875f410 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ -Source: g13gui -Section: games +Source: g13 +Section: misc Priority: optional Maintainer: June Tate-Gans 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 diff --git a/debian/copyright b/debian/copyright index d3d54c7..92dbea0 100644 --- a/debian/copyright +++ b/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 Upstream-Source: https://github.com/jtgans/g13gui @@ -7,17 +7,17 @@ Files: * Copyright: 2021 June Tate-Gans License: MIT Copyright (c) 2021, June Tate-Gans - + . 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 diff --git a/etc/com.theonelab.g13gui.Configurator.desktop b/etc/com.theonelab.g13.Configurator.desktop similarity index 84% rename from etc/com.theonelab.g13gui.Configurator.desktop rename to etc/com.theonelab.g13.Configurator.desktop index c8b024c..824f413 100644 --- a/etc/com.theonelab.g13gui.Configurator.desktop +++ b/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 diff --git a/etc/g13-logo.svg b/etc/com.theonelab.g13.Configurator.svg similarity index 100% rename from etc/g13-logo.svg rename to etc/com.theonelab.g13.Configurator.svg diff --git a/etc/com.theonelab.g13gui.applet.Clock.desktop b/etc/com.theonelab.g13.applet.Clock.desktop similarity index 84% rename from etc/com.theonelab.g13gui.applet.Clock.desktop rename to etc/com.theonelab.g13.applet.Clock.desktop index ec9970d..5c070eb 100644 --- a/etc/com.theonelab.g13gui.applet.Clock.desktop +++ b/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 diff --git a/etc/com.theonelab.g13gui.applet.Profiles.desktop b/etc/com.theonelab.g13.applet.Profiles.desktop similarity index 84% rename from etc/com.theonelab.g13gui.applet.Profiles.desktop rename to etc/com.theonelab.g13.applet.Profiles.desktop index ad8f8d3..c0be3b4 100644 --- a/etc/com.theonelab.g13gui.applet.Profiles.desktop +++ b/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 diff --git a/etc/icons/hicolor/16x16/apps/com.theonelab.g13.Configurator.png b/etc/icons/hicolor/16x16/apps/com.theonelab.g13.Configurator.png new file mode 100644 index 0000000000000000000000000000000000000000..fe63d6670533796b39ad49f868d06b30cb7b5406 GIT binary patch literal 482 zcmV<80UiE{P)YesOcd!x;IN=RCQ(;_cZP&)b$E%lL49el$5Im{xdnea*+BAc^qh6uUs*-unrmF5F z0Gv*bG&;xo5b(g@Jzj*bS%&wXFiDV75)lzM{hr@ps*5p-hzP3sOTnK^hGAg4-8x;Z zR;VgfRgvd8Aq32f7~_#CB~nU^<4E84bX~`0v!Uxcr)}GQUa!}cnZ>_$xQjRcu=Bs+ YI{+ut(sIei=l}o!07*qoM6N<$g3Y|!*#H0l literal 0 HcmV?d00001 diff --git a/etc/icons/hicolor/22x22/apps/com.theonelab.g13.Configurator.png b/etc/icons/hicolor/22x22/apps/com.theonelab.g13.Configurator.png new file mode 100644 index 0000000000000000000000000000000000000000..bae18254d42e178f08e3dc194812ba0a45dba6a2 GIT binary patch literal 648 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 literal 0 HcmV?d00001 diff --git a/etc/icons/hicolor/32x32/apps/com.theonelab.g13.Configurator.png b/etc/icons/hicolor/32x32/apps/com.theonelab.g13.Configurator.png new file mode 100644 index 0000000000000000000000000000000000000000..ab866acd447de400ff492a17a8e814b74d1c3059 GIT binary patch literal 1065 zcmV+^1lIeBP)uRuBaRmsxe`AK)^7hZx)m zE=0whiggi4-K6C$IK+1ykvY|_Z%0^8>f?*H&jpan0-&lG7r~u+9m0&?Mn`eL3`Ydh z%_g=A1=RC-ycqS91wd6X3gE*>kMLl06n~D4;IpMA zm?XjHYipQVUq?BP;Q;vH;Y0i~K90z7aCc`X(|H>R!>Z~rb5}(o!t~J*R&L(JHZwLo z58utqz&Z}Tx^)ZHt5*R4i3q;AeH*?p2ptEhrL2&(l2BDmS_SP&Y0O?r68NqQ55UK} zySP)WqR(X%4W6JO`jt8o3-s!Vn37-!EUr>jwuY zbr@$=3|otDCnoUIy?eO3x!LLHl-+g)+$;cp2J}{9P#E=NmU#)3Cj@^$UU1 zuN9{Zbz`c%@et7|onDoYc0yKF&guh$N>(fG76Jy~WQE{m0Ll1&#y~#+okj)$)Taz{ zY>c5^)9|c-2H8*7thG>8!}WTd#>U1_Jjv*nbr;B*hKGlTSY2Jk@$s=kv$L~WsZ>y@ zR8TILTV<49GSh?BS^#LRiAby6o-`F$Ymwfp)4e#35d;CkFhsN2#NOT>s?{oLwHlHn zX}Uv0L)hQn$MW(r8jVKF(K$(ui74`YA3+eD8X)H&>u#-9yB|f-mr)cM5&7r5JQLBb js(x`^{$9x|`Txql@A!RrZB&LL00000NkvXXu0mjfRYT@v literal 0 HcmV?d00001 diff --git a/etc/icons/hicolor/48x48/apps/com.theonelab.g13.Configurator.png b/etc/icons/hicolor/48x48/apps/com.theonelab.g13.Configurator.png new file mode 100644 index 0000000000000000000000000000000000000000..4b579b88c2ca3773df8435dc21ffa88a4a3ca3ca GIT binary patch literal 1733 zcmV;$20HnPP)_^OuSzLp7>4;= zE;ne5>620p2_cHWpfM(|lqxumGi=*-!FAmM+qU~$*Y#}Mb{)r2xm-?$VaVLv+}(wR zh3_mZEYt+RwQJWt9v&V(UoMvsLhM>B%R)-o_!L4Qr363-K_(#t#u$t->{RwFDJ8aT zH;QFhjiQuld~eqC=g+x*{rcZ-+_>?U0z|1)I(O&Joo$_WlGYky3|i~1fHTN;b(Uqd z?7I~>K(Scl)TvXGfKa7U=_^2YmhVx`hIAUFRtC3&$mjFc*x1;B)LMIA-o);eEva^f z^#UP;a3$dWFAeNPy+E|O#~9;Dz{?zPKh$nEc7v$byV4l5uK<~Pg{aqgQV5ancK3PN z>II@P18JHb7y#%VqIm`eq?8?ZhF7g_?9f^RxDwbl1Kol&Z-={$TJv|Ub)$4Lwo51W zlrg4%w^MLuy)gzmNq8eo>DQWN+veX&VLQ$?xWOdBk&-pr#u!7Iri_Fkqd~yBZN8>8Kc1N(7#gBFG{nV6k9ez4;MW%}fRtPc0=~Yq#Nhlq z|GIL8)uTtzT61N2nbO_6JSmkpySmCHW4Qk2n@|Vr1tN1|RgVfg0yH<$TJxj%d7hR^ z{I*!!3h0g<<7Xd!$aiZs{*lk~jm1UgMn-s}T5ZgRtu^Ow-sBHgukyro(I-#x(+@tN zw6Vbh*Tu4|y`0XTGRE|Ey9*g($Qwi7{rkLo?%d}=n(OkXi3x0ALn(fB;R0G~zG>T^ zw^fSYyz>s5mW2eg5E!Mf>b}s)*bY#x0&?8~2q8En1je#>CInV}NhL|br}fBEHHFsO zIurt5DT+zLnQE2Oj~}y9Eb>ubA8rdD>)MHdo@PL$DJX>oq%r)kR^#;j`v5#Ud6M@} zocKcgp1}hY;+T=uRr*&}SU+(BSs#QBMs})mr4XX)831@DB_a$Ns2laqfdT&f`s;jF zEHY55H9FnddA19E>Uq33KF%*ECmDS5go#R}kze!z(KyHeuNQz7AQ>9s+rCelraS`{ zq~t$d=cv3tj`_(apP=J-D}hmp&7()@i{oyM-KOS)tm|M-2!XUL{ys6mw`OMe{^lm5 z_4DAhr6p?leA|TOh1TSsKILk;%<#qrm#S3?4<7LG;2=8>(rzG{ow%oHR0zRM$6Uq3BHU?v3TRWCgSZxNc zmr$Z-0HAHMz7sUNmenhzTHe3Me881}b5O$RJ>&zP1nh&5k!5NJ(awpb5W+qvGmxp9 z^}lTfvh}!MNzESDKh%9dHSZqT4X+wz59=Smlg1dU`Q2u#n_m@7kNGfwD=o|F2(Yu^ z%LeHNVjF<#y4L#oI)y@^r%qlb%x(~sN`)wj06gh=o|u`LVQOlM(k_5o zT3X`Pty`?DtN^&mbzOP;_HEYI*0^}_BID!ZIF3UYhHPwX5Cj2fni9t`T5FOdX$jEk zB|x^bHDAjN*_mf&OSt)YaU7E*2|*C>;>8QfQ42Ua4dT8DkoMNbIaj)08NRTDI9~beg6lNz!PO zU27p%9XWCYr4-d_l`sq&BklWsMtP8BOCdxY$1%R|6GahenjV-pbX{ms`o8~1-}ecE zfGCPclH~sh;1>em^5x4v_kI6L7=}(1MZORs*{$V1>$x%J_lt{*zuRv^4t1zQ9qLer b`cnEY;UF8IYSN4p00000NkvXXu0mjf4lzLc literal 0 HcmV?d00001 diff --git a/g13gui/app.py b/g13gui/app.py index 46227f9..8435eb0 100644 --- a/g13gui/app.py +++ b/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') diff --git a/g13gui/ui/appindicator.py b/g13gui/ui/appindicator.py index 7839cc4..12cc385 100644 --- a/g13gui/ui/appindicator.py +++ b/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): diff --git a/meson.build b/meson.build index 14fd563..f16e7ae 100644 --- a/meson.build +++ b/meson.build @@ -23,16 +23,16 @@ install_subdir( install_dir: pylibdir, ) -install_data( - files('etc/g13-logo.svg'), - install_dir: join_paths(datadir, 'icons/hicolor/scalable/apps'), +install_subdir( + 'etc/icons/hicolor', + install_dir: join_paths(datadir, 'icons'), install_mode: 'rw-r--r--', ) install_data( - files('etc/com.theonelab.g13gui.Configurator.desktop', - 'etc/com.theonelab.g13gui.applet.Clock.desktop', - 'etc/com.theonelab.g13gui.applet.Profiles.desktop'), + files('etc/com.theonelab.g13.Configurator.desktop', + 'etc/com.theonelab.g13.applet.Clock.desktop', + 'etc/com.theonelab.g13.applet.Profiles.desktop'), install_dir: join_paths(datadir, 'applications'), install_mode: 'rw-r--r--', )