mirror of
https://github.com/gtalent/sc9k.git
synced 2025-01-23 10:53:37 -06:00
Get rid of "in Both" language
This commit is contained in:
parent
e57ba9e8f2
commit
6f6f77f104
@ -32,28 +32,33 @@ 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 Both (1)"), this);
|
const auto btnHideSlides = new QPushButton(tr("Hide (1)"), this);
|
||||||
const auto btnOpenLpShowSlides = new QPushButton(tr("Show in OpenLP Only (2)"), 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(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);
|
||||||
showHideLyt->addWidget(btnOpenLpHideSlides);
|
showHideLyt->addWidget(btnHideSlides);
|
||||||
showHideLyt->addWidget(btnOpenLpShowSlides);
|
showHideLyt->addWidget(btnOpenLpShowSlides);
|
||||||
|
showHideLyt->addWidget(btnShowSlides);
|
||||||
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_1);
|
btnHideSlides->setShortcut(Qt::Key_1);
|
||||||
btnOpenLpShowSlides->setShortcut(Qt::Key_2);
|
btnOpenLpShowSlides->setShortcut(Qt::Key_2);
|
||||||
btnOpenLpHideSlides->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(btnNextSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSlide);
|
||||||
connect(btnPrevSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSlide);
|
connect(btnPrevSlide, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSlide);
|
||||||
connect(btnNextSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSong);
|
connect(btnNextSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::nextSong);
|
||||||
connect(btnPrevSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSong);
|
connect(btnPrevSong, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::prevSong);
|
||||||
connect(btnOpenLpHideSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
|
connect(btnHideSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::blankScreen);
|
||||||
connect(btnOpenLpHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
|
connect(btnHideSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
|
||||||
connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_openlpClient, &OpenLPClient::showSlides);
|
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::pollUpdate, m_slideView, &SlideView::pollUpdate);
|
||||||
connect(&m_openlpClient, &OpenLPClient::songListUpdate, m_slideView, &SlideView::songListUpdate);
|
connect(&m_openlpClient, &OpenLPClient::songListUpdate, m_slideView, &SlideView::songListUpdate);
|
||||||
connect(&m_openlpClient, &OpenLPClient::slideListUpdate, m_slideView, &SlideView::slideListUpdate);
|
connect(&m_openlpClient, &OpenLPClient::slideListUpdate, m_slideView, &SlideView::slideListUpdate);
|
||||||
@ -61,12 +66,7 @@ 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 btnObsShowSlides = new QPushButton(tr("Show in Both (3)"), mainWidget);
|
|
||||||
showHideLyt->addWidget(btnObsShowSlides);
|
|
||||||
btnObsShowSlides->setShortcut(Qt::Key_3);
|
|
||||||
connect(btnOpenLpShowSlides, &QPushButton::clicked, &m_obsClient, &OBSClient::hideSlides);
|
connect(btnOpenLpShowSlides, &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
|
// setup status bar
|
||||||
setStatusBar(new QStatusBar(this));
|
setStatusBar(new QStatusBar(this));
|
||||||
connect(&m_openlpClient, &OpenLPClient::songChanged, this, &MainWindow::refreshStatusBar);
|
connect(&m_openlpClient, &OpenLPClient::songChanged, this, &MainWindow::refreshStatusBar);
|
||||||
|
Loading…
Reference in New Issue
Block a user