#include "qt_helpers.h"
+#include "frontends/alert.h"
+
#include "support/debug.h"
#include "support/Systemcall.h"
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);
}
+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");
}
}
-void GuiProgress::lyxerrFlush()
+void GuiProgress::startFlushing()
{
flushDelay_.start();
}
+void GuiProgress::lyxerrFlush()
+{
+ triggerFlush();
+}
+
+
void GuiProgress::updateWithLyXErr()
{
appendLyXErrMessage(toqstr(lyxerr_stream_.str()));
void GuiProgress::lyxerrConnect()
{
- lyxerr.setSecond(&lyxerr_stream_);
+ lyxerr.setSecondStream(&lyxerr_stream_);
}
void GuiProgress::lyxerrDisconnect()
{
- lyxerr.setSecond(0);
+ lyxerr.setSecondStream(0);
}
}
-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();
}