Reapply "WIP: move tray icons"

This reverts commit f59e511bd1256f05b35ee12380a2629e51358084.

12 files changed, 25 insertions, 7 deletions

diff --git a/icons/tray_idle.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
index 431162b..431162b 100644
--- a/icons/tray_idle.png
+++ b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
diff --git a/icons/tray_paused.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
index d24957a..d24957a 100644
--- a/icons/tray_paused.png
+++ b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
diff --git a/icons/tray_recording.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
index 151a5a7..151a5a7 100644
--- a/icons/tray_recording.png
+++ b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
diff --git a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
new file mode 100644
index 0000000..431162b
--- /dev/null
+++ b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
diff --git a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
new file mode 100644
index 0000000..d24957a
--- /dev/null
+++ b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
diff --git a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
new file mode 100644
index 0000000..151a5a7
--- /dev/null
+++ b/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
diff --git a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
new file mode 100644
index 0000000..431162b
--- /dev/null
+++ b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png
diff --git a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
new file mode 100644
index 0000000..d24957a
--- /dev/null
+++ b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png
diff --git a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
new file mode 100644
index 0000000..151a5a7
--- /dev/null
+++ b/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png
diff --git a/install.sh b/install.sh
index a80e6d7..e8337eb 100755
--- a/install.sh
+++ b/install.sh
@@ -13,12 +13,19 @@ install -Dm755 "gpu-screen-recorder-gtk" "/usr/bin/gpu-screen-recorder-gtk"
 install -Dm644 "gpu-screen-recorder-gtk.desktop" "/usr/share/applications/com.dec05eba.gpu_screen_recorder.desktop"
 install -Dm644 com.dec05eba.gpu_screen_recorder.appdata.xml "/usr/share/metainfo/com.dec05eba.gpu_screen_recorder.appdata.xml"
 
+install -Dm644 "icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png" "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+install -Dm644 "icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png" "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+install -Dm644 "icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png" "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
 install -Dm644 "icons/hicolor/32x32/apps/com.dec05eba.gpu_screen_recorder.png" "/usr/share/icons/hicolor/32x32/apps/com.dec05eba.gpu_screen_recorder.png"
+
+install -Dm644 "icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png" "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+install -Dm644 "icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png" "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+install -Dm644 "icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png" "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
 install -Dm644 "icons/hicolor/64x64/apps/com.dec05eba.gpu_screen_recorder.png" "/usr/share/icons/hicolor/64x64/apps/com.dec05eba.gpu_screen_recorder.png"
-install -Dm644 "icons/hicolor/128x128/apps/com.dec05eba.gpu_screen_recorder.png" "/usr/share/icons/hicolor/128x128/apps/com.dec05eba.gpu_screen_recorder.png"
 
-install -Dm644 "icons/tray_idle.png" "/usr/share/com.dec05eba.gpu_screen_recorder/tray_idle.png"
-install -Dm644 "icons/tray_recording.png" "/usr/share/com.dec05eba.gpu_screen_recorder/tray_recording.png"
-install -Dm644 "icons/tray_paused.png" "/usr/share/com.dec05eba.gpu_screen_recorder/tray_paused.png"
+install -Dm644 "icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png" "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+install -Dm644 "icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png" "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+install -Dm644 "icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png" "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
+install -Dm644 "icons/hicolor/128x128/apps/com.dec05eba.gpu_screen_recorder.png" "/usr/share/icons/hicolor/128x128/apps/com.dec05eba.gpu_screen_recorder.png"
 
 echo "Successfully installed gpu-screen-recorder-gtk"
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 808e9cf..dcd03eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -140,9 +140,9 @@ static double notification_timeout_seconds = 0.0;
 static double notification_start_seconds = 0.0;
 
 static AppIndicator *app_indicator;
-static const char *tray_idle_icon_name = "/usr/share/com.dec05eba.gpu_screen_recorder/tray_idle.png";
-static const char *tray_recording_icon_name = "/usr/share/com.dec05eba.gpu_screen_recorder/tray_recording.png";
-static const char *tray_paused_icon_name = "/usr/share/com.dec05eba.gpu_screen_recorder/tray_paused.png";
+static const char *tray_idle_icon_name = "com.dec05eba.gpu_screen_recorder_tray_idle";
+static const char *tray_recording_icon_name = "com.dec05eba.gpu_screen_recorder_tray_recording";
+static const char *tray_paused_icon_name = "com.dec05eba.gpu_screen_recorder_tray_paused";
 
 struct AudioInput {
     std::string name;
diff --git a/uninstall.sh b/uninstall.sh
index cde08f5..79798db 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -6,8 +6,19 @@ rm -f "/usr/bin/gpu-screen-recorder-gtk"
 rm -f "/usr/share/applications/com.dec05eba.gpu_screen_recorder.desktop"
 rm -f "/usr/share/metainfo/com.dec05eba.gpu_screen_recorder.appdata.xml"
 
+rm -f "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+rm -f "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+rm -f "/usr/share/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
 rm -f "/usr/share/icons/hicolor/32x32/apps/com.dec05eba.gpu_screen_recorder.png"
+
+rm -f "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+rm -f "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+rm -f "/usr/share/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
 rm -f "/usr/share/icons/hicolor/64x64/apps/com.dec05eba.gpu_screen_recorder.png"
+
+rm -f "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png"
+rm -f "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png"
+rm -f "/usr/share/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png"
 rm -f "/usr/share/icons/hicolor/128x128/apps/com.dec05eba.gpu_screen_recorder.png"
 
 rm -f "/usr/share/com.dec05eba.gpu_screen_recorder/tray_idle.png"