gary/sc9k
1
0
Fork 0
mirror of https://github.com/gtalent/sc9k.git synced 2025-01-23 10:53:37 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix show/hide button order and naming

Browse Source
This commit is contained in:
Gary Talent 2022-01-30 19:10:06 -06:00
parent 2d5af03724
commit 3115083267
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainwindow.cpp
View File

@ -30,19 +30,19 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
const auto btnPrevSlide = new QPushButton(tr("Previous Slide (Up)"), this); const auto btnPrevSlide = new QPushButton(tr("Previous Slide (Up)"), this);
const auto btnNextSlide = new QPushButton(tr("Next Slide (Down)"), this); const auto btnNextSlide = new QPushButton(tr("Next Slide (Down)"), this);
const auto btnNextSong = new QPushButton(tr("Next Song (Right)"), this); const auto btnNextSong = new QPushButton(tr("Next Song (Right)"), this);
const auto btnOpenLpHideSlides = new QPushButton(tr("Hide in OpenLP (2)"), this); const auto btnOpenLpHideSlides = new QPushButton(tr("Hide in Both (1)"), this);
const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP (3)"), this); const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP (3)"), this);
controlsLayout->addWidget(btnPrevSlide, 0, 1); controlsLayout->addWidget(btnPrevSlide, 0, 1);
controlsLayout->addWidget(btnNextSlide, 0, 2); controlsLayout->addWidget(btnNextSlide, 0, 2);
controlsLayout->addWidget(btnPrevSong, 0, 0); controlsLayout->addWidget(btnPrevSong, 0, 0);
controlsLayout->addWidget(btnNextSong, 0, 3); controlsLayout->addWidget(btnNextSong, 0, 3);
controlsLayout->addWidget(btnOpenLpHideSlides, 1, 1); controlsLayout->addWidget(btnOpenLpHideSlides, 1, 0);
controlsLayout->addWidget(btnOpenLpShowSlides, 1, 2); controlsLayout->addWidget(btnOpenLpShowSlides, 1, 2);
btnNextSong->setShortcut(Qt::Key_Right); btnNextSong->setShortcut(Qt::Key_Right);
btnPrevSong->setShortcut(Qt::Key_Left); btnPrevSong->setShortcut(Qt::Key_Left);
btnNextSlide->setShortcut(Qt::Key_Down); btnNextSlide->setShortcut(Qt::Key_Down);
btnPrevSlide->setShortcut(Qt::Key_Up); btnPrevSlide->setShortcut(Qt::Key_Up);
btnOpenLpHideSlides->setShortcut(Qt::Key_2); btnOpenLpHideSlides->setShortcut(Qt::Key_1);
btnOpenLpShowSlides->setShortcut(Qt::Key_3); btnOpenLpShowSlides->setShortcut(Qt::Key_3);
btnOpenLpHideSlides->setToolTip(tr("Also hides slides in OBS")); btnOpenLpHideSlides->setToolTip(tr("Also hides slides in OBS"));
connect(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide); connect(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide);
@ -59,11 +59,11 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent) {
connect(m_slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong); connect(m_slideView, &SlideView::songChanged, &m_openlpClient, &OpenLPClient::changeSong);
connect(m_slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide); connect(m_slideView, &SlideView::slideChanged, &m_openlpClient, &OpenLPClient::changeSlide);
// setup scene selector // setup scene selector
const auto btnObsHideSlides = new QPushButton(tr("Hide in Both (1)"), mainWidget); const auto btnObsHideSlides = new QPushButton(tr("Hide in OBS (2)"), mainWidget);
const auto btnObsShowSlides = new QPushButton(tr("Show in Both (4)"), mainWidget); const auto btnObsShowSlides = new QPushButton(tr("Show in Both (4)"), mainWidget);
controlsLayout->addWidget(btnObsHideSlides, 1, 0); controlsLayout->addWidget(btnObsHideSlides, 1, 1);
controlsLayout->addWidget(btnObsShowSlides, 1, 3); controlsLayout->addWidget(btnObsShowSlides, 1, 3);
btnObsHideSlides->setShortcut(Qt::Key_1); btnObsHideSlides->setShortcut(Qt::Key_2);
btnObsShowSlides->setShortcut(Qt::Key_4); btnObsShowSlides->setShortcut(Qt::Key_4);
btnObsShowSlides->setToolTip(tr("Also shows slides in OpenLP")); btnObsShowSlides->setToolTip(tr("Also shows slides in OpenLP"));
connect(btnObsHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides); connect(btnObsHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);