diff options
Diffstat (limited to 'src/libs/installer/messageboxhandler.cpp')
| -rw-r--r-- | src/libs/installer/messageboxhandler.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index cb9a845ff..832a96e85 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -47,8 +47,8 @@ #include <QDialogButtonBox> #include <QPushButton> -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptValue> +#include <QScriptEngine> +#include <QScriptValue> QScriptValue QInstaller::registerMessageBox(QScriptEngine *scriptEngine) { @@ -151,6 +151,19 @@ QWidget *MessageBoxHandler::currentBestSuitParent() return qApp->activeWindow(); } +QList<QMessageBox::Button> MessageBoxHandler::orderedButtons() +{ + static QList<QMessageBox::Button> buttons; + if (!buttons.isEmpty()) + return buttons; + buttons << QMessageBox::YesToAll << QMessageBox::Yes << QMessageBox::Ok << QMessageBox::Apply + << QMessageBox::SaveAll << QMessageBox::Save <<QMessageBox::Retry << QMessageBox::Ignore + << QMessageBox::Help << QMessageBox::RestoreDefaults << QMessageBox::Reset << QMessageBox::Open + << QMessageBox::Cancel << QMessageBox::Close << QMessageBox::Abort << QMessageBox::Discard + << QMessageBox::No << QMessageBox::NoToAll; + return buttons; +} + void MessageBoxHandler::setDefaultAction(DefaultAction defaultAction) { if (m_defaultAction == defaultAction) @@ -159,11 +172,7 @@ void MessageBoxHandler::setDefaultAction(DefaultAction defaultAction) m_buttonOrder.clear(); if (m_defaultAction != AskUser) { - m_buttonOrder << QMessageBox::YesToAll << QMessageBox::Yes << QMessageBox::Ok << QMessageBox::Apply - << QMessageBox::SaveAll << QMessageBox::Save <<QMessageBox::Retry << QMessageBox::Ignore - << QMessageBox::Help << QMessageBox::RestoreDefaults << QMessageBox::Reset << QMessageBox::Open - << QMessageBox::Cancel << QMessageBox::Close << QMessageBox::Abort << QMessageBox::Discard - << QMessageBox::No << QMessageBox::NoToAll; + m_buttonOrder = orderedButtons(); } if (m_defaultAction == Reject) { |