X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiProgress.cpp;h=0735265384532e891035c4346f3fecb3a128d498;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=b421616ab4d329543cd86f0304ead46382b81368;hpb=aa613aaf010f1dd991222dbf1e83d51aa9f4b8a7;p=lyx.git

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index b421616ab4..0735265384 100644
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -5,6 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Peter Kümmel
+ * \author Pavel Sanda
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,51 +13,73 @@
 #include <config.h>
 
 #include "GuiProgress.h"
+#include "ui_ToggleWarningUi.h"
 
 #include "qt_helpers.h"
 
+#include "support/debug.h"
 #include "support/Systemcall.h"
 
 #include <QApplication>
-#include <QDebug>
+#include <QTime>
+#include <QMessageBox>
+#include <QSettings>
 
 
 namespace lyx {
 namespace frontend {
 
 
-
-GuiProgress::GuiProgress(GuiView & parent, Qt::DockWidgetArea area, 
-	Qt::WindowFlags flags) : DockView(parent, "progress", "External tools", area, flags)
+class GuiToggleWarningDialog : public QDialog, public Ui::ToggleWarningUi
 {
-	setWindowTitle(qt_("Tool monitoring"));
-	setWidget(&text_edit);
-	text_edit.setReadOnly(true);
+public:
+	GuiToggleWarningDialog(QWidget * parent) : QDialog(parent)
+	{
+		Ui::ToggleWarningUi::setupUi(this);
+		QDialog::setModal(true);
+	}
+};
+
 
+GuiProgress::GuiProgress(GuiView * view) : view_(view)
+{
 	connect(this, SIGNAL(processStarted(QString const &)), SLOT(doProcessStarted(QString const &)));
 	connect(this, SIGNAL(processFinished(QString const &)), SLOT(doProcessFinished(QString const &)));
 	connect(this, SIGNAL(appendMessage(QString const &)), SLOT(doAppendMessage(QString const &)));
 	connect(this, SIGNAL(appendError(QString const &)), SLOT(doAppendError(QString const &)));
 	connect(this, SIGNAL(clearMessages()), SLOT(doClearMessages()));
+	
+	// Alert interface
+	connect(this, SIGNAL(warning(QString const &, QString const &)),
+		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(information(QString const &, QString const &)),
+		SLOT(doInformation(QString const &, QString const &)));
+
+	support::ProgressInterface::setInstance(this);
 }
 
 
 void GuiProgress::doProcessStarted(QString const & cmd)
 {
-	appendText("Process started : " + cmd + "\n");
+	QString time = QTime::currentTime().toString();
+	appendText(time + ": <" + cmd + "> started");
 }
 
 
 void GuiProgress::doProcessFinished(QString const & cmd)
 {
-	appendText("Process finished: " + cmd + "\n");
+	QString time = QTime::currentTime().toString();
+	appendText(time + ": <" + cmd + "> done");
 }
 
 
 void GuiProgress::doAppendMessage(QString const & msg)
 {
-	// No good messages from the processes
-	//appendText(msg);
+	appendText(msg);
 }
 
 
@@ -68,44 +91,81 @@ void GuiProgress::doAppendError(QString const & msg)
 
 void GuiProgress::doClearMessages()
 {
-	text_edit.clear();
+	view_->message(docstring());
 }
 
 
-void GuiProgress::appendText(QString const & text)
+void GuiProgress::lyxerrFlush()
 {
-	text_edit.insertPlainText(text);
-	text_edit.ensureCursorVisible();
+	appendLyXErrMessage(toqstr(lyxerr_stream_.str()));
+	lyxerr_stream_.str("");
 }
 
 
-void GuiProgress::showEvent(QShowEvent*)
+void GuiProgress::lyxerrConnect()
 {
-	support::ProgressInterface::setInstance(this);
+	lyxerr.setSecond(&lyxerr_stream_);
+}
+
+
+void GuiProgress::lyxerrDisconnect()
+{
+	lyxerr.setSecond(0);
+}
+
+
+GuiProgress::~GuiProgress()
+{
+	lyxerrDisconnect();
 }
 
 
-void GuiProgress::hideEvent(QHideEvent*)
+void GuiProgress::appendText(QString const & text)
 {
-	support::ProgressInterface::setInstance(0);
+	if (!text.isEmpty())
+		view_->updateMessage(text);
 }
 
 
+void GuiProgress::doWarning(QString const & title, QString const & message)
+{
+	QMessageBox::warning(qApp->focusWidget(), title, message);
+}
+
 
-Dialog * createGuiProgress(GuiView & lv)
+void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QString const & formatted)
 {
-	GuiView & guiview = static_cast<GuiView &>(lv);
-#ifdef Q_WS_MACX
-	// TODO where to show up on the Mac?
-	//return new GuiProgress(guiview, Qt::RightDockWidgetArea, Qt::Drawer);
-#else
-	return new GuiProgress(guiview, Qt::BottomDockWidgetArea);
-#endif
+	QSettings settings;
+	if (settings.value("hidden_warnings/" + msg, false).toBool())
+			return;
+
+	GuiToggleWarningDialog * dlg =
+		new GuiToggleWarningDialog(qApp->focusWidget());
+
+	dlg->setWindowTitle(title);
+	dlg->messageLA->setText(formatted);
+	dlg->dontShowAgainCB->setChecked(false);
+
+	if (dlg->exec() == QDialog::Accepted)
+		if (dlg->dontShowAgainCB->isChecked())
+			settings.setValue("hidden_warnings/"
+				+ msg, true);
 }
 
 
+void GuiProgress::doError(QString const & title, QString const & message)
+{
+	QMessageBox::critical(qApp->focusWidget(), title, message);
+}
+
+
+void GuiProgress::doInformation(QString const & title, QString const & message)
+{
+	QMessageBox::information(qApp->focusWidget(), title, message);
+}
+
 
 } // namespace frontend
 } // namespace lyx
 
-#include "moc_GuiProgress.cpp"
\ No newline at end of file
+#include "moc_GuiProgress.cpp"