diff --git a/iconsrc/project/SC9K_Logo.npal b/iconsrc/project/SC9K_Logo.npal new file mode 100644 index 0000000..d5336ef --- /dev/null +++ b/iconsrc/project/SC9K_Logo.npal @@ -0,0 +1,27 @@ +K1;3d1a77ec-265f-4905-2061-4f1003ee2189;O1;net.drinkingtea.nostalgia.core.Palette;4;{ + "colorNames" : + [ + "Color 1", + "Color 2", + "Color 3" + ], + "pages" : + [ + { + "colors" : + [ + { + "b" : 10, + "g" : 5, + "r" : 5 + }, + {}, + { + "b" : 31, + "g" : 31, + "r" : 31 + } + ] + } + ] +} \ No newline at end of file diff --git a/iconsrc/project/SC9K_Logo.nts b/iconsrc/project/SC9K_Logo.nts new file mode 100644 index 0000000..d39118e --- /dev/null +++ b/iconsrc/project/SC9K_Logo.nts @@ -0,0 +1,269 @@ +K1;40f7b4ac-7f90-409e-80e0-64b59b594a63;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{ + "bpp" : 4, + "defaultPalette" : "uuid://3d1a77ec-265f-4905-2061-4f1003ee2189", + "subsheet" : + { + "columns" : 2, + "name" : "Root", + "pixels" : + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 2, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 2, + 2, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 2, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 2, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "rows" : 2 + } +} \ No newline at end of file diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..b7c4d0c --- /dev/null +++ b/install.sh @@ -0,0 +1,9 @@ +#! /usr/bin/env bash + +set -eu + +dist_dir=. + +install -Dm 755 $dist_dir/bin/SlideController /usr/local/bin/SlideController +install -Dm 755 $dist_dir/share/applications/net.drinkingtea.sc9k.desktop /usr/share/applications/net.drinkingtea.sc9k.desktop +cp -r $dist_dir/share/ /usr/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc1f961..34a1dfb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,3 +33,17 @@ install( BUNDLE DESTINATION . ) +install( + DIRECTORY + icons + DESTINATION + share +) + +install( + FILES + net.drinkingtea.sc9k.desktop + DESTINATION + share/applications +) + diff --git a/src/icons/hicolor/128x128/apps/net.drinkingtea.sc9k.png b/src/icons/hicolor/128x128/apps/net.drinkingtea.sc9k.png new file mode 100644 index 0000000..808231b Binary files /dev/null and b/src/icons/hicolor/128x128/apps/net.drinkingtea.sc9k.png differ diff --git a/iconsrc/icon-16.png b/src/icons/hicolor/16x16/apps/net.drinkingtea.sc9k.png similarity index 100% rename from iconsrc/icon-16.png rename to src/icons/hicolor/16x16/apps/net.drinkingtea.sc9k.png diff --git a/iconsrc/icon-256.png b/src/icons/hicolor/256x256/apps/net.drinkingtea.sc9k.png similarity index 100% rename from iconsrc/icon-256.png rename to src/icons/hicolor/256x256/apps/net.drinkingtea.sc9k.png diff --git a/iconsrc/icon-32.png b/src/icons/hicolor/32x32/apps/net.drinkingtea.sc9k.png similarity index 100% rename from iconsrc/icon-32.png rename to src/icons/hicolor/32x32/apps/net.drinkingtea.sc9k.png diff --git a/src/icons/hicolor/512x512/apps/net.drinkingtea.sc9k.png b/src/icons/hicolor/512x512/apps/net.drinkingtea.sc9k.png new file mode 100644 index 0000000..d9a7720 Binary files /dev/null and b/src/icons/hicolor/512x512/apps/net.drinkingtea.sc9k.png differ diff --git a/src/icons/hicolor/64x64/apps/net.drinkingtea.sc9k.png b/src/icons/hicolor/64x64/apps/net.drinkingtea.sc9k.png new file mode 100644 index 0000000..559af11 Binary files /dev/null and b/src/icons/hicolor/64x64/apps/net.drinkingtea.sc9k.png differ diff --git a/src/net.drinkingtea.sc9k.desktop b/src/net.drinkingtea.sc9k.desktop new file mode 100644 index 0000000..59ebac7 --- /dev/null +++ b/src/net.drinkingtea.sc9k.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Name=Slide Controller 9000 +Comment=Slide and Live Stream Coordinator +GenericName=Slide and Live Stream Coordinator +X-GNOME-FullName=Slide Controller 9000 +Type=Application +Exec=/usr/local/bin/SlideController +Terminal=false +X-MultipleArgs=false +Icon=net.drinkingtea.sc9k +Categories=Multimedia +Keywords=slide;controller;sc9k +StartupWMClass=Slide Controller 9000 +StartupNotify=false diff --git a/src/obsclient.cpp b/src/obsclient.cpp index 973b692..7f6081f 100644 --- a/src/obsclient.cpp +++ b/src/obsclient.cpp @@ -26,18 +26,18 @@ void OBSClient::setScene(QString const&scene) { } void OBSClient::showSlides() { - setScene("MusicScene"); + setScene(SceneSlides); } void OBSClient::hideSlides() { - setScene("SpeakerScene"); + setScene(SceneNoSlides); } void OBSClient::setSlidesVisible(bool state) { if (state) { - setScene("MusicScene"); + setScene(SceneSlides); } else { - setScene("SpeakerScene"); + setScene(SceneNoSlides); } } diff --git a/src/obsclient.hpp b/src/obsclient.hpp index 1914b65..e653d4f 100644 --- a/src/obsclient.hpp +++ b/src/obsclient.hpp @@ -17,6 +17,8 @@ class OBSClient: public QObject { Q_OBJECT private: + static constexpr auto SceneSlides = "MusicScene"; + static constexpr auto SceneNoSlides = "SpeakerScene"; QString m_baseUrl; QNetworkAccessManager *m_nam = new QNetworkAccessManager(this); QNetworkAccessManager *m_pollingNam = new QNetworkAccessManager(this);