From f59e511bd1256f05b35ee12380a2629e51358084 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 11 Jun 2024 00:24:38 +0200 Subject: Revert "WIP: move tray icons" This reverts commit fbc0f2087d1b70e9c42d929f34887961276f6dba. --- .../com.dec05eba.gpu_screen_recorder_tray_idle.png | Bin 2202 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_paused.png | Bin 2206 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_recording.png | Bin 2186 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_idle.png | Bin 2202 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_paused.png | Bin 2206 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_recording.png | Bin 2186 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_idle.png | Bin 2202 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_paused.png | Bin 2206 -> 0 bytes .../com.dec05eba.gpu_screen_recorder_tray_recording.png | Bin 2186 -> 0 bytes icons/tray_idle.png | Bin 0 -> 2202 bytes icons/tray_paused.png | Bin 0 -> 2206 bytes icons/tray_recording.png | Bin 0 -> 2186 bytes install.sh | 15 ++++----------- src/main.cpp | 6 +++--- uninstall.sh | 11 ----------- 15 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png delete mode 100644 icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png delete mode 100644 icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png delete mode 100644 icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png delete mode 100644 icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png delete mode 100644 icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png delete mode 100644 icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png delete mode 100644 icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png delete mode 100644 icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png create mode 100644 icons/tray_idle.png create mode 100644 icons/tray_paused.png create mode 100644 icons/tray_recording.png diff --git a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png deleted file mode 100644 index 431162b..0000000 Binary files a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_idle.png and /dev/null differ diff --git a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png deleted file mode 100644 index d24957a..0000000 Binary files a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_paused.png and /dev/null differ diff --git a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png b/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png deleted file mode 100644 index 151a5a7..0000000 Binary files a/icons/hicolor/128x128/status/com.dec05eba.gpu_screen_recorder_tray_recording.png and /dev/null differ 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 deleted file mode 100644 index 431162b..0000000 Binary files a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_idle.png and /dev/null differ 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 deleted file mode 100644 index d24957a..0000000 Binary files a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_paused.png and /dev/null differ 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 deleted file mode 100644 index 151a5a7..0000000 Binary files a/icons/hicolor/32x32/status/com.dec05eba.gpu_screen_recorder_tray_recording.png and /dev/null differ 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 deleted file mode 100644 index 431162b..0000000 Binary files a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_idle.png and /dev/null differ 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 deleted file mode 100644 index d24957a..0000000 Binary files a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_paused.png and /dev/null differ 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 deleted file mode 100644 index 151a5a7..0000000 Binary files a/icons/hicolor/64x64/status/com.dec05eba.gpu_screen_recorder_tray_recording.png and /dev/null differ diff --git a/icons/tray_idle.png b/icons/tray_idle.png new file mode 100644 index 0000000..431162b Binary files /dev/null and b/icons/tray_idle.png differ diff --git a/icons/tray_paused.png b/icons/tray_paused.png new file mode 100644 index 0000000..d24957a Binary files /dev/null and b/icons/tray_paused.png differ diff --git a/icons/tray_recording.png b/icons/tray_recording.png new file mode 100644 index 0000000..151a5a7 Binary files /dev/null and b/icons/tray_recording.png differ diff --git a/install.sh b/install.sh index e8337eb..a80e6d7 100755 --- a/install.sh +++ b/install.sh @@ -13,19 +13,12 @@ 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/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" +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" + echo "Successfully installed gpu-screen-recorder-gtk" \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index dcd03eb..808e9cf 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 = "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"; +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"; struct AudioInput { std::string name; diff --git a/uninstall.sh b/uninstall.sh index 8aeed8c..0652173 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -6,19 +6,8 @@ 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 -rf "/usr/share/com.dec05eba.gpu_screen_recorder" -- cgit v1.2.3