Get rid of "in Both" language

deps/buildcore/base.mk

@@ -16,7 +16,15 @@ else
 	HOST_ENV=${OS}-$(shell uname -m)
 endif
 
-ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
+DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+DEVENV_IMAGE=${PROJECT_NAME}-devenv
+ifneq ($(shell which docker 2> /dev/null),)
+	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
+		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
+	endif
+endif
+
+ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
 	PYTHON3=python
 else
 	PYTHON3=python3
@@ -26,6 +34,7 @@ SCRIPTS=${BUILDCORE_PATH}/scripts
 SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
 PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
 CMAKE_BUILD=${PYBB} cmake-build
+CTEST=${PYBB} ctest-all
 RM_RF=${PYBB} rm
 ifdef USE_VCPKG
 	ifndef VCPKG_DIR_BASE
@@ -43,13 +52,6 @@ else
 endif
 
 VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
-DEVENV=devenv$(shell pwd | sed 's/\//-/g')
-DEVENV_IMAGE=${PROJECT_NAME}-devenv
-ifneq ($(shell which docker 2> /dev/null),)
-	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
-		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
-	endif
-endif
 CURRENT_BUILD=$(HOST_ENV)-$(shell ${PYBB} cat .current_build)
 
 .PHONY: build
@@ -69,6 +71,12 @@ purge:
 .PHONY: test
 test: build
 	${ENV_RUN} ${CMAKE_BUILD} build test
+.PHONY: test-verbose
+test-verbose: build
+	${ENV_RUN} ${CTEST} build --output-on-failure
+.PHONY: test-rerun-verbose
+test-rerun-verbose: build
+	${ENV_RUN} ${CTEST} build --rerun-failed --output-on-failure
 
 .PHONY: devenv-image
 devenv-image:
@@ -89,11 +97,14 @@ devenv-create:
 .PHONY: devenv-destroy
 devenv-destroy:
 	docker rm -f ${DEVENV}
+ifdef ENV_RUN
 .PHONY: devenv-shell
 devenv-shell:
 	${ENV_RUN} bash
+endif
 
 ifdef USE_VCPKG
+
 .PHONY: vcpkg
 vcpkg: ${VCPKG_DIR} vcpkg-install
 
@@ -114,18 +125,20 @@ ifneq (${OS},windows)
 else
 	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
 endif
-else # USE_VCPKG
+
+else # USE_VCPKG ################################################
 
 .PHONY: setup-conan
 conan-config:
-	conan profile new nostalgia --detect --force
+	${ENV_RUN} conan profile new ${PROJECT_NAME} --detect --force
 ifeq ($(OS),linux)
-	conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
+	${ENV_RUN} conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
 endif
 .PHONY: conan
 conan:
-	@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME}
-endif # USE_VCPKG
+	${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
+	#@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME}
+endif # USE_VCPKG ###############################################
 
 .PHONY: configure-xcode
 configure-xcode:

obs_scene_switcher.py

@@ -3,6 +3,7 @@ from urllib.parse import urlparse, parse_qs
 import threading
 import obspython as obs
 
+
 def set_current_scene(scene_name):
     scenes = obs.obs_frontend_get_scenes()
     for scene in scenes:
@@ -12,6 +13,7 @@ def set_current_scene(scene_name):
             return 0
     return 1
 
+
 class RqstHandler(BaseHTTPRequestHandler):
 
     def do_GET(self):
@@ -25,12 +27,15 @@ class RqstHandler(BaseHTTPRequestHandler):
             self.send_response(200)
             self.end_headers()
 
+
     def log_message(self, format, *args):
         pass
 
+
 def run(name):
     httpd = HTTPServer(('127.0.0.1', 9302), RqstHandler)
     httpd.serve_forever()
 
+
 t = threading.Thread(target=run, args=(1,), daemon=True)
 t.start()

src/mainwindow.cpp

@@ -6,9 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <QFormLayout>
 #include <QHBoxLayout>
-#include <QLineEdit>
 #include <QPushButton>
 #include <QStatusBar>
 
@@ -17,62 +15,61 @@
 
 MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
 	move(0, 0);
-	setFixedSize(590, 555);
+	setFixedSize(600, 555);
 	setWindowTitle(tr("Slide Controller 9000"));
 	const auto mainWidget = new QWidget(this);
 	const auto rootLyt = new QVBoxLayout;
 	const auto controlsLayout = new QGridLayout;
-	const auto slideView = new SlideView(this);
+	m_slideView = new SlideView(this);
 	setCentralWidget(mainWidget);
 	mainWidget->setLayout(rootLyt);
-	rootLyt->addWidget(slideView);
+	rootLyt->addWidget(m_slideView);
 	rootLyt->addLayout(controlsLayout);
 	// setup slide controls
+	const auto showHideLyt = new QHBoxLayout;
+	rootLyt->addLayout(showHideLyt);
 	const auto btnPrevSong = new QPushButton(tr("Previous Song (Left)"), this);
 	const auto btnPrevSlide = new QPushButton(tr("Previous Slide (Up)"), this);
 	const auto btnNextSlide = new QPushButton(tr("Next Slide (Down)"), this);
-	const auto btnNextSong = new QPushButton(tr("Next Song (Right))"), this);
-	const auto btnBlankSlides = new QPushButton(tr("Blank Slides (,)"), this);
-	const auto btnShowSlides = new QPushButton(tr("Show Slides (.)"), this);
-	controlsLayout->addWidget(btnPrevSlide, 0, 0);
-	controlsLayout->addWidget(btnNextSlide, 0, 1);
-	controlsLayout->addWidget(btnPrevSong, 1, 0);
-	controlsLayout->addWidget(btnNextSong, 1, 1);
-	controlsLayout->addWidget(btnBlankSlides, 2, 0);
-	controlsLayout->addWidget(btnShowSlides, 2, 1);
+	const auto btnNextSong = new QPushButton(tr("Next Song (Right)"), this);
+	const auto btnHideSlides = new QPushButton(tr("Hide (1)"), this);
+	const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP Only (2)"), this);
+	const auto btnShowSlides = new QPushButton(tr("Show (3)"), mainWidget);
+	controlsLayout->addWidget(btnPrevSlide, 0, 1);
+	controlsLayout->addWidget(btnNextSlide, 0, 2);
+	controlsLayout->addWidget(btnPrevSong, 0, 0);
+	controlsLayout->addWidget(btnNextSong, 0, 3);
+	showHideLyt->addWidget(btnHideSlides);
+	showHideLyt->addWidget(btnOpenLpShowSlides);
+	showHideLyt->addWidget(btnShowSlides);
 	btnNextSong->setShortcut(Qt::Key_Right);
 	btnPrevSong->setShortcut(Qt::Key_Left);
 	btnNextSlide->setShortcut(Qt::Key_Down);
 	btnPrevSlide->setShortcut(Qt::Key_Up);
-	btnBlankSlides->setShortcut(Qt::Key_Comma);
-	btnShowSlides->setShortcut(Qt::Key_Period);
-	btnBlankSlides->setToolTip(tr("Also hides slides in OBS"));
+	btnHideSlides->setShortcut(Qt::Key_1);
+	btnOpenLpShowSlides->setShortcut(Qt::Key_2);
+	btnHideSlides->setToolTip(tr("Also hides slides in OBS"));
+	btnShowSlides->setShortcut(Qt::Key_3);
 	connect(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide);
 	connect(btnPrevSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSlide);
 	connect(btnNextSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSong);
 	connect(btnPrevSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSong);
-	connect(btnBlankSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
-	connect(btnBlankSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
+	connect(btnHideSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
+	connect(btnHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
+	connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
+	connect(btnShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::showSlides);
 	connect(btnShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
-	connect(&m_openlpClient, &OpenLPClient::pollUpdate, slideView, &SlideView::pollUpdate);
-	connect(&m_openlpClient, &OpenLPClient::songListUpdate, slideView, &SlideView::songListUpdate);
-	connect(&m_openlpClient, &OpenLPClient::slideListUpdate, slideView, &SlideView::slideListUpdate);
-	connect(&m_openlpClient, &OpenLPClient::pollFailed, slideView, &SlideView::reset);
-	connect(slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong);
-	connect(slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide);
+	connect(&m_openlpClient, &OpenLPClient::pollUpdate, m_slideView, &SlideView::pollUpdate);
+	connect(&m_openlpClient, &OpenLPClient::songListUpdate, m_slideView, &SlideView::songListUpdate);
+	connect(&m_openlpClient, &OpenLPClient::slideListUpdate, m_slideView, &SlideView::slideListUpdate);
+	connect(&m_openlpClient, &OpenLPClient::pollFailed, m_slideView, &SlideView::reset);
+	connect(m_slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong);
+	connect(m_slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide);
 	// setup scene selector
-	const auto btnObsHideSlides = new QPushButton(tr("Hide Slides in OBS (;)"), mainWidget);
-	const auto btnObsShowSlides = new QPushButton(tr("Show Slides in OBS (')"), mainWidget);
-	controlsLayout->addWidget(btnObsHideSlides, 3, 0);
-	controlsLayout->addWidget(btnObsShowSlides, 3, 1);
-	btnObsHideSlides->setShortcut(Qt::Key_Semicolon);
-	btnObsShowSlides->setShortcut(Qt::Key_Apostrophe);
-	btnObsShowSlides->setToolTip(tr("Also shows slides in OpenLP"));
-	connect(btnObsHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
-	connect(btnObsShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::showSlides);
-	connect(btnObsShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
+	connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
 	// setup status bar
 	setStatusBar(new QStatusBar(this));
+	connect(&m_openlpClient, &OpenLPClient::songChanged, this, &MainWindow::refreshStatusBar);
 	connect(&m_openlpClient, &OpenLPClient::pollUpdate, this, &MainWindow::openLpConnectionInit);
 	connect(&m_obsClient, &OBSClient::pollUpdate, this, &MainWindow::obsConnectionInit);
 	refreshStatusBar();
@@ -109,5 +106,7 @@ void MainWindow::obsConnectionLost() {
 void MainWindow::refreshStatusBar() {
 	const auto openLpStatus = m_openLpConnected ? tr("OpenLP: Connected") : tr("OpenLP: Not Connected");
 	const auto obsStatus = m_obsConnected ? tr("OBS: Connected") : tr("OBS: Not Connected");
-	statusBar()->showMessage(openLpStatus + " | " + obsStatus);
+	const auto nextSong = m_openlpClient.getNextSong();
+	const auto nextSongTxt = m_openLpConnected ? " | Next Song: " + nextSong : "";
+	statusBar()->showMessage(openLpStatus + " | " + obsStatus + nextSongTxt);
 }

src/mainwindow.hpp

@@ -21,6 +21,7 @@ class MainWindow: public QMainWindow {
 	private:
 		OBSClient m_obsClient;
 		OpenLPClient m_openlpClient;
+		class SlideView *m_slideView = nullptr;
 		bool m_openLpConnected = false;
 		bool m_obsConnected = false;
 

src/obsclient.cpp

@@ -5,6 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QUrl>

src/openlpclient.cpp

@@ -24,6 +24,15 @@ OpenLPClient::OpenLPClient(QObject *parent): QObject(parent) {
 	connect(m_pollingNam, &QNetworkAccessManager::finished, this, &OpenLPClient::handlePollResponse);
 }
 
+QString OpenLPClient::getNextSong() {
+	const auto currentSong = m_songNameMap[m_currentSongId];
+	const auto songIdx = m_songList.indexOf(currentSong) + 1;
+	if (songIdx < m_songList.size()) {
+		return m_songList[songIdx];
+	}
+	return "";
+}
+
 void OpenLPClient::nextSlide() {
 	get("/api/controller/live/next");
 }
@@ -117,6 +126,7 @@ void OpenLPClient::handlePollResponse(QNetworkReply *reply) {
 	if (m_currentSongId != songId) {
 		requestSlideList();
 		m_currentSongId = songId;
+		emit songChanged(songId);
 	}
 	emit pollUpdate(m_songNameMap[songId], slide);
 }
@@ -130,18 +140,18 @@ void OpenLPClient::handleSongListResponse(QNetworkReply *reply) {
 	if (data.isEmpty()) {
 		return;
 	}
-	QStringList songList;
 	auto doc = QJsonDocument::fromJson(data);
 	auto items = doc.object()["results"].toObject()["items"].toArray();
 	m_songNameMap.clear();
+	m_songList.clear();
 	for (const auto &item : items) {
 		auto song = item.toObject();
 		auto name = song["title"].toString();
 		auto id = song["id"].toString();
 		m_songNameMap[id] = name;
-		songList.push_back(name);
+		m_songList.push_back(name);
 	}
-	emit songListUpdate(songList);
+	emit songListUpdate(m_songList);
 }
 
 void OpenLPClient::handleSlideListResponse(QNetworkReply *reply) {

src/openlpclient.hpp

@@ -30,13 +30,17 @@ class OpenLPClient: public QObject {
 		QNetworkAccessManager *m_slideListNam = new QNetworkAccessManager(this);
 		QTimer m_pollTimer;
 		QHash<QString, QString> m_songNameMap;
+		QStringList m_songList;
 		int m_currentServiceId = -1;
 		QString m_currentSongId;
 
 	public:
 		explicit OpenLPClient(QObject *parent = nullptr);
 
-	public slots:
+		[[nodiscard]]
+		QString getNextSong();
+
+   public slots:
 		void nextSlide();
 
 		void prevSlide();
@@ -80,5 +84,6 @@ class OpenLPClient: public QObject {
 
 		void slideListUpdate(QStringList, QStringList);
 
+		void songChanged(QString);
 };
 

src/slideview.cpp

@@ -33,6 +33,15 @@ SlideView::SlideView(QWidget *parent): QWidget(parent) {
 	connect(m_slideTable, &QTableWidget::currentCellChanged, this, &SlideView::slideChanged);
 }
 
+QString SlideView::getNextSong() const {
+	const auto cnt = m_songSelector->count();
+	const auto idx = m_songSelector->currentIndex() + 1;
+	if (idx < cnt) {
+		return m_songSelector->itemText(idx);
+	}
+	return "";
+}
+
 void SlideView::pollUpdate(QString songName, int slide) {
 	if (songName != m_currentSong) {
 		m_currentSong = songName;

src/slideview.hpp

@@ -19,6 +19,8 @@ class SlideView: public QWidget {
 	public:
 		explicit SlideView(QWidget *parent = nullptr);
 
+		QString getNextSong() const;
+
 	public slots:
 		void pollUpdate(QString songId, int slideNum);