chatterino2
Code Issues

Keyboard integration for Streamlink quality confirmation (#3169)

Browse Source 
Co-authored-by: zneix <zneix@zneix.eu>
This commit is contained in:
pajlada
2021-08-15 15:59:52 +02:00
committed by GitHub
parent b2d9b678a2
commit 1d664f88e5
5 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/QualityPopup.cpp
+29 -21
View File
@@ -7,35 +7,32 @@
namespace chatterino {
QualityPopup::QualityPopup(const QString &_channelName, QStringList options)
QualityPopup::QualityPopup(const QString &channelURL, QStringList options)
: BasePopup({},
static_cast<QWidget *>(&(getApp()->windows->getMainWindow())))
, channelName_(_channelName)
, channelURL_(channelURL)
{
this->ui_.okButton.setText("OK");
this->ui_.cancelButton.setText("Cancel");
this->ui_.selector = new QComboBox(this);
this->ui_.vbox = new QVBoxLayout(this);
this->ui_.buttonBox = new QDialogButtonBox(
QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
QObject::connect(&this->ui_.okButton, &QPushButton::clicked, this,
QObject::connect(this->ui_.buttonBox, &QDialogButtonBox::accepted, this,
&QualityPopup::okButtonClicked);
QObject::connect(&this->ui_.cancelButton, &QPushButton::clicked, this,
QObject::connect(this->ui_.buttonBox, &QDialogButtonBox::rejected, this,
&QualityPopup::cancelButtonClicked);
this->ui_.buttonBox.addButton(&this->ui_.okButton,
QDialogButtonBox::ButtonRole::AcceptRole);
this->ui_.buttonBox.addButton(&this->ui_.cancelButton,
QDialogButtonBox::ButtonRole::RejectRole);
this->ui_.selector->addItems(options);
this->ui_.selector.addItems(options);
this->ui_.vbox->addWidget(this->ui_.selector);
this->ui_.vbox->addWidget(this->ui_.buttonBox);
this->ui_.vbox.addWidget(&this->ui_.selector);
this->ui_.vbox.addWidget(&this->ui_.buttonBox);
this->setLayout(&this->ui_.vbox);
this->setLayout(this->ui_.vbox);
}
void QualityPopup::showDialog(const QString &channelName, QStringList options)
void QualityPopup::showDialog(const QString &channelURL, QStringList options)
{
QualityPopup *instance = new QualityPopup(channelName, options);
QualityPopup *instance = new QualityPopup(channelURL, options);
instance->window()->setWindowTitle("Chatterino - select stream quality");
instance->setAttribute(Qt::WA_DeleteOnClose, true);
@@ -43,16 +40,27 @@ void QualityPopup::showDialog(const QString &channelName, QStringList options)
instance->show();
instance->activateWindow();
instance->raise();
instance->setFocus();
}
void QualityPopup::keyPressEvent(QKeyEvent *e)
{
if (this->handleEscape(e, this->ui_.buttonBox))
{
return;
}
if (this->handleEnter(e, this->ui_.buttonBox))
{
return;
}
BasePopup::keyPressEvent(e);
}
void QualityPopup::okButtonClicked()
{
QString channelURL = "twitch.tv/" + this->channelName_;
try
{
openStreamlink(channelURL, this->ui_.selector.currentText());
openStreamlink(this->channelURL_, this->ui_.selector->currentText());
}
catch (const Exception &ex)
{
src/widgets/dialogs/QualityPopup.hpp
+9 -9
View File
@@ -4,7 +4,6 @@
#include <QComboBox>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
namespace chatterino {
@@ -12,22 +11,23 @@ namespace chatterino {
class QualityPopup : public BasePopup
{
public:
QualityPopup(const QString &_channelName, QStringList options);
static void showDialog(const QString &_channelName, QStringList options);
QualityPopup(const QString &channelURL, QStringList options);
static void showDialog(const QString &channelURL, QStringList options);
protected:
void keyPressEvent(QKeyEvent *e) override;
private:
void okButtonClicked();
void cancelButtonClicked();
struct {
QVBoxLayout vbox;
QComboBox selector;
QDialogButtonBox buttonBox;
QPushButton okButton;
QPushButton cancelButton;
QVBoxLayout *vbox;
QComboBox *selector;
QDialogButtonBox *buttonBox;
} ui_;
QString channelName_;
QString channelURL_;
};
} // namespace chatterino