anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use QMessageBox for toggleWarning if possible

Browse Source 
Qt 5.2 introduces the possibility to place a checkbox on a QMessageBox,
so we need no longer to use our own crude dialog.
This commit is contained in:
Juergen Spitzmueller 2018-07-10 15:00:25 +02:00
parent b21c512e14
commit 0148ef7e6c
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontends/qt4/GuiProgress.cpp
View File

@ -32,9 +32,10 @@ namespace lyx {
namespace frontend {
// FIXME: This dialog has issues with line breaking and size, in particular with
// html. But it could easily be reimplemented as a QMessageBox using
// QMessageBox::setCheckBox() available starting from Qt 5.2
// This dialog is only a fallback for Qt < 5.2, which does not feature
// QMessageBox::setCheckBox() yet. Note that it has issues with line
// breaking and size, in particular with html.
#if QT_VERSION < 0x050200
class GuiToggleWarningDialog : public QDialog, public Ui::ToggleWarningUi
{
public:
@ -44,6 +45,7 @@ public:
QDialog::setModal(true);
}
};
#endif
GuiProgress::GuiProgress()
@ -172,6 +174,9 @@ void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QS
if (settings.value("hidden_warnings/" + msg, false).toBool())
return;
// Qt < 5.2 does not feature QMessageBox::setCheckBox() yet,
// so we roll our own dialog.
#if QT_VERSION < 0x050200
GuiToggleWarningDialog * dlg =
new GuiToggleWarningDialog(qApp->focusWidget());
@ -183,6 +188,18 @@ void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QS
if (dlg->dontShowAgainCB->isChecked())
settings.setValue("hidden_warnings/"
+ msg, true);
#else
QCheckBox * dontShowAgainCB = new QCheckBox();
dontShowAgainCB->setText(qt_("&Do not show this warning again!"));
dontShowAgainCB->setToolTip(qt_("If you check this, LyX will not warn you again in the given case."));
QMessageBox box(QMessageBox::Warning, title, formatted,
QMessageBox::Ok, qApp->focusWidget());
box.setCheckBox(dontShowAgainCB);
if (box.exec() == QMessageBox::Ok)
if (dontShowAgainCB->isChecked())
settings.setValue("hidden_warnings/"
+ msg, true);
#endif
}