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

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index 28367deddb..c7b556e4e7 100644
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -17,6 +17,8 @@
 
 #include "qt_helpers.h"
 
+#include "frontends/alert.h"
+
 #include "support/debug.h"
 #include "support/Systemcall.h"
 
@@ -30,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:
@@ -54,10 +59,12 @@ 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()),
+		SLOT(startFlushing()));
 
 	flushDelay_.setInterval(200);
 	flushDelay_.setSingleShot(true);
@@ -65,9 +72,17 @@ GuiProgress::GuiProgress()
 }
 
 
+int GuiProgress::prompt(docstring const & title, docstring const & question,
+			int default_button, int cancel_button,
+			docstring const & b1, docstring const & b2)
+{
+	return Alert::prompt(title, question, default_button, cancel_button, b1, b2);
+}
+
+
 QString GuiProgress::currentTime()
 {
-	return QTime::currentTime().toString("hh:mm:ss:zzz") + "ms";
+	return QTime::currentTime().toString("hh:mm:ss.zzz");
 }
 
 
@@ -101,12 +116,18 @@ void GuiProgress::doClearMessages()
 }
 
 
-void GuiProgress::lyxerrFlush()
+void GuiProgress::startFlushing()
 {
 	flushDelay_.start();
 }
 
 
+void GuiProgress::lyxerrFlush()
+{
+	triggerFlush();
+}
+
+
 void GuiProgress::updateWithLyXErr()
 {
 	appendLyXErrMessage(toqstr(lyxerr_stream_.str()));
@@ -116,13 +137,13 @@ void GuiProgress::updateWithLyXErr()
 
 void GuiProgress::lyxerrConnect()
 {
-	lyxerr.setSecond(&lyxerr_stream_);
+	lyxerr.setSecondStream(&lyxerr_stream_);
 }
 
 
 void GuiProgress::lyxerrDisconnect()
 {
-	lyxerr.setSecond(0);
+	lyxerr.setSecondStream(0);
 }
 
 
@@ -165,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();
 }