Cosmetic changes to the needauth dialogs

[lyx.git] / src / frontends / qt4 / GuiProgress.cpp

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index d72ef0e1294a117187386194b08311e469d7dea3..c7b556e4e7ec16e01c591a84afa314c80e406ab9 100644 (file)
--- 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()));
@@ -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();
 }