0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE make progress dialog abort button resistant to accidental key presses

Browse Source
This commit is contained in:
Petr Mrázek 2016-08-17 23:09:33 +02:00
parent ec05ca2775
commit 9aff21c181
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
application/dialogs/ProgressDialog.cpp
View File

@ -31,6 +31,9 @@ ProgressDialog::ProgressDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Pr
void ProgressDialog::setSkipButton(bool present, QString label) void ProgressDialog::setSkipButton(bool present, QString label)
{ {
ui->skipButton->setAutoDefault(false);
ui->skipButton->setDefault(false);
ui->skipButton->setFocusPolicy(Qt::ClickFocus);
ui->skipButton->setEnabled(present); ui->skipButton->setEnabled(present);
ui->skipButton->setVisible(present); ui->skipButton->setVisible(present);
ui->skipButton->setText(label); ui->skipButton->setText(label);
@ -159,8 +162,22 @@ void ProgressDialog::changeProgress(qint64 current, qint64 total)
void ProgressDialog::keyPressEvent(QKeyEvent *e) void ProgressDialog::keyPressEvent(QKeyEvent *e)
{ {
if (e->key() == Qt::Key_Escape) if(ui->skipButton->isVisible())
return; {
if (e->key() == Qt::Key_Escape)
{
on_skipButton_clicked(true);
return;
}
else if(e->key() == Qt::Key_Tab)
{
ui->skipButton->setFocusPolicy(Qt::StrongFocus);
ui->skipButton->setFocus();
ui->skipButton->setAutoDefault(true);
ui->skipButton->setDefault(true);
return;
}
}
QDialog::keyPressEvent(e); QDialog::keyPressEvent(e);
} }