ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6479 from leoetlino/ignore 

Qt: Add ignore button for panic alerts
This commit is contained in:
Pierre Bourdon 2018-03-21 11:57:16 +01:00 committed by GitHub
parent 8308d6b464 8580b3ba1f
commit 682a6117b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinQt2/Main.cpp
View File

@ -7,6 +7,7 @@
#include <QApplication> #include <QApplication>
#include <QMessageBox> #include <QMessageBox>
#include <QObject> #include <QObject>
#include <QPushButton>
#include <QWidget> #include <QWidget>
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
@ -30,7 +31,11 @@ static bool QtMsgAlertHandler(const char* caption, const char* text, bool yes_no
QMessageBox message_box(QApplication::activeWindow()); QMessageBox message_box(QApplication::activeWindow());
message_box.setWindowTitle(QString::fromUtf8(caption)); message_box.setWindowTitle(QString::fromUtf8(caption));
message_box.setText(QString::fromUtf8(text)); message_box.setText(QString::fromUtf8(text));
message_box.setStandardButtons(yes_no ? QMessageBox::Yes | QMessageBox::No : QMessageBox::Ok); message_box.setStandardButtons(yes_no ? QMessageBox::Yes | QMessageBox::No : QMessageBox::Ok);
if (style == MsgType::Warning)
message_box.addButton(QMessageBox::Ignore)->setText(QObject::tr("Ignore for this session"));
message_box.setIcon([&] { message_box.setIcon([&] {
switch (style) switch (style)
{ {
@ -47,7 +52,14 @@ static bool QtMsgAlertHandler(const char* caption, const char* text, bool yes_no
return QMessageBox::NoIcon; return QMessageBox::NoIcon;
}()); }());
return message_box.exec() == QMessageBox::Yes; const int button = message_box.exec();
if (button == QMessageBox::Yes)
return true;
if (button == QMessageBox::Ignore)
SetEnableAlert(false);
return false;
}); });
} }