Repath icons to match their linux install locations

CMakeLists.txt

@@ -25,11 +25,3 @@ endif()
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 
 add_subdirectory(src)
-
-install(
-	PROGRAMS
-		install.sh
-	DESTINATION
-		.
-)
-

install.sh

@@ -1,13 +0,0 @@
-#! /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/
-
-if command -v gtk-update-icon-cache >/dev/null 2>&1; then
-	sudo gtk-update-icon-cache /usr/share/icons/hicolor
-fi

release-notes.md

@@ -1,5 +0,0 @@
-
-# 1.1.0
-
-* Add Linux app icon, desktop file, and install script
-* Rename MusicScene SlidesScene and SpeakerScene to NoSlidesScene

src/CMakeLists.txt

@@ -33,30 +33,3 @@ install(
 	BUNDLE DESTINATION .
 )
 
-install(
-	DIRECTORY
-		icons
-	DESTINATION
-		share
-)
-
-install(
-	FILES
-		net.drinkingtea.sc9k.desktop
-	DESTINATION
-		share/applications
-)
-
-if(UNIX)
-	qt_add_resources(
-		SlideController "app_images"
-			PREFIX "/"
-			FILES
-				icons/hicolor/16x16/apps/net.drinkingtea.sc9k.png
-				icons/hicolor/32x32/apps/net.drinkingtea.sc9k.png
-				icons/hicolor/64x64/apps/net.drinkingtea.sc9k.png
-				icons/hicolor/128x128/apps/net.drinkingtea.sc9k.png
-				icons/hicolor/256x256/apps/net.drinkingtea.sc9k.png
-				icons/hicolor/512x512/apps/net.drinkingtea.sc9k.png
-	)
-endif()

src/consts.hpp

@@ -10,5 +10,5 @@
 
 constexpr auto MaxCameraPresets = 9;
 constexpr auto MaxViews = 9;
-constexpr auto Version = "1.1.0";
+constexpr auto Version = "1.0.0";
 

src/main.cpp

@@ -13,22 +13,12 @@
 
 int main(int argc, char *argv[]) {
 	QSettings::setDefaultFormat(QSettings::Format::IniFormat);
-#ifdef _WIN32
+#ifndef __APPLE__
 	QApplication::setStyle("Fusion");
 #endif
 	QApplication a(argc, argv);
 	QApplication::setOrganizationName("DrinkingTea");
 	QApplication::setApplicationName("Slide Controller 9000");
-#ifdef __linux
-	QIcon icon;
-	icon.addFile(":/icons/hicolor/16x16/apps/net.drinkingtea.sc9k.png");
-	icon.addFile(":/icons/hicolor/32x32/apps/net.drinkingtea.sc9k.png");
-	icon.addFile(":/icons/hicolor/64x64/apps/net.drinkingtea.sc9k.png");
-	icon.addFile(":/icons/hicolor/128x128/apps/net.drinkingtea.sc9k.png");
-	icon.addFile(":/icons/hicolor/256x256/apps/net.drinkingtea.sc9k.png");
-	icon.addFile(":/icons/hicolor/512x512/apps/net.drinkingtea.sc9k.png");
-	QApplication::setWindowIcon(icon);
-#endif
 	MainWindow w;
 	w.show();
 	return QApplication::exec();

src/net.drinkingtea.sc9k.desktop

@@ -1,14 +0,0 @@
-[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=SlideController
-StartupNotify=false

src/obsclient.cpp

@@ -26,18 +26,18 @@ void OBSClient::setScene(QString const&scene) {
 }
 
 void OBSClient::showSlides() {
-	setScene(SceneSlides);
+	setScene("MusicScene");
 }
 
 void OBSClient::hideSlides() {
-	setScene(SceneNoSlides);
+	setScene("SpeakerScene");
 }
 
 void OBSClient::setSlidesVisible(bool state) {
 	if (state) {
-		setScene(SceneSlides);
+		setScene("MusicScene");
 	} else {
-		setScene(SceneNoSlides);
+		setScene("SpeakerScene");
 	}
 }
 

src/obsclient.hpp

@@ -17,8 +17,6 @@
 class OBSClient: public QObject {
 	Q_OBJECT
 	private:
-		static constexpr auto SceneSlides = "SlidesScene";
-		static constexpr auto SceneNoSlides = "NoSlidesScene";
 		QString m_baseUrl;
 		QNetworkAccessManager *m_nam = new QNetworkAccessManager(this);
 		QNetworkAccessManager *m_pollingNam = new QNetworkAccessManager(this);