X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiProgress.cpp;h=c7b556e4e7ec16e01c591a84afa314c80e406ab9;hb=588d939722f4a516e8e4a932086e574bc3b13065;hp=ab8c6bd3cfb470284913784acc148ac2ebc765a5;hpb=1eb41a88f2a7b6d71c9996d7efda128e03504147;p=lyx.git

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index ab8c6bd3cf..c7b556e4e7 100644
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -32,6 +32,9 @@ 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
 class GuiToggleWarningDialog : public QDialog, public Ui::ToggleWarningUi
 {
 public:
@@ -56,8 +59,8 @@ GuiProgress::GuiProgress()
 		SLOT(doWarning(QString const &, QString const &)));
 	connect(this, SIGNAL(toggleWarning(QString const &, QString const &, QString const &)),
 		SLOT(doToggleWarning(QString const &, QString const &, QString const &)));
-	connect(this, SIGNAL(error(QString const &, QString const &)),
-		SLOT(doError(QString const &, QString const &)));
+	connect(this, SIGNAL(error(QString const &, QString const &, QString const &)),
+		SLOT(doError(QString const &, QString const &, QString const &)));
 	connect(this, SIGNAL(information(QString const &, QString const &)),
 		SLOT(doInformation(QString const &, QString const &)));
 	connect(this, SIGNAL(triggerFlush()),
@@ -183,9 +186,13 @@ void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QS
 }
 
 
-void GuiProgress::doError(QString const & title, QString const & message)
+void GuiProgress::doError(QString const & title, QString const & message, QString const & details)
 {
-	QMessageBox::critical(qApp->focusWidget(), title, message);
+	QMessageBox box(QMessageBox::Critical, title, message, QMessageBox::Ok, qApp->focusWidget());
+	if (!details.isEmpty()) {
+		box.setDetailedText(details);
+	}
+	box.exec();
 }