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}
+	${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
-endif # USE_VCPKG
+	#@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME}
+endif # USE_VCPKG ###############################################
 
 .PHONY: configure-xcode
 configure-xcode:

src/mainwindow.cpp

@@ -15,7 +15,7 @@
 
 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;
@@ -26,31 +26,38 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
 	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 btnHideSlides = new QPushButton(tr("Hide (1)"), this);
-	const auto btnShowSlides = new QPushButton(tr("Show Slides (.)"), this);
+	const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP Only (2)"), this);
-	controlsLayout->addWidget(btnPrevSlide, 0, 0);
+	const auto btnShowSlides = new QPushButton(tr("Show (3)"), mainWidget);
-	controlsLayout->addWidget(btnNextSlide, 0, 1);
+	controlsLayout->addWidget(btnPrevSlide, 0, 1);
-	controlsLayout->addWidget(btnPrevSong, 1, 0);
+	controlsLayout->addWidget(btnNextSlide, 0, 2);
-	controlsLayout->addWidget(btnNextSong, 1, 1);
+	controlsLayout->addWidget(btnPrevSong, 0, 0);
-	controlsLayout->addWidget(btnBlankSlides, 2, 0);
+	controlsLayout->addWidget(btnNextSong, 0, 3);
-	controlsLayout->addWidget(btnShowSlides, 2, 1);
+	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);
+	btnHideSlides->setShortcut(Qt::Key_1);
-	btnShowSlides->setShortcut(Qt::Key_Period);
+	btnOpenLpShowSlides->setShortcut(Qt::Key_2);
-	btnBlankSlides->setToolTip(tr("Also hides slides in OBS"));
+	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(btnHideSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
-	connect(btnBlankSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
+	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, m_slideView, &SlideView::pollUpdate);
 	connect(&m_openlpClient, &OpenLPClient::songListUpdate, m_slideView, &SlideView::songListUpdate);
@@ -59,16 +66,7 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
 	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);
+	connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
-	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);
 	// setup status bar
 	setStatusBar(new QStatusBar(this));
 	connect(&m_openlpClient, &OpenLPClient::songChanged, this, &MainWindow::refreshStatusBar);