X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiAlert.cpp;h=9b651d3681580244faf905e060dfe66f0e92897d;hb=58505db8192762ee74a30622a3a0a8b6e091c555;hp=983d58d1c1056f6d05268c481ea7f88fc849a9b7;hpb=605f6bebf2b0403e82700f5e692eedf6bfc78390;p=lyx.git

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 983d58d1c1..9b651d3681 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -14,17 +14,17 @@
 
 #include "alert.h"
 
+
 #include "frontends/Application.h"
 
 #include "qt_helpers.h"
 #include "LyX.h" // for lyx::use_gui
-#include "ui_AskForTextUi.h"
-#include "ui_ToggleWarningUi.h"
 #include "support/gettext.h"
 
 #include "support/debug.h"
 #include "support/docstring.h"
 #include "support/lstrings.h"
+#include "support/ProgressInterface.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -43,15 +43,6 @@ namespace lyx {
 namespace frontend {
 
 
-class GuiToggleWarningDialog : public QDialog, public Ui::ToggleWarningUi
-{
-public:
-	GuiToggleWarningDialog(QWidget * parent) : QDialog(parent)
-	{
-		Ui::ToggleWarningUi::setupUi(this);
-		QDialog::setModal(true);
-	}
-};
 
 
 static docstring const formatted(docstring const & text)
@@ -114,26 +105,18 @@ static docstring const formatted(docstring const & text)
 }
 
 
-void toggleWarning(docstring const & title, docstring const & msg)
+void noAppDialog(QString const & title, QString const & msg, QMessageBox::Icon mode)
 {
-	if (!use_gui)
-		return;
-
-	QSettings settings;
-	if (settings.value("hidden_warnings/" + toqstr(msg), false).toBool())
-		return;
-
-	GuiToggleWarningDialog * dlg =
-		new GuiToggleWarningDialog(qApp->focusWidget());
-
-	dlg->setWindowTitle(toqstr(title));
-	dlg->messageLA->setText(toqstr(formatted(msg)));
-	dlg->dontShowAgainCB->setChecked(false);
-
-	if (dlg->exec() == QDialog::Accepted)
-		if (dlg->dontShowAgainCB->isChecked())
-			settings.setValue("hidden_warnings/"
-				+ toqstr(msg), true);
+	int argc = 1;
+	char * argv[1];
+	QApplication app(argc, argv);
+	switch (mode)
+	{
+		case QMessageBox::Information: QMessageBox::information(0, title, msg); break;
+		case QMessageBox::Warning: QMessageBox::warning(0, title, msg); break;
+		case QMessageBox::Critical: QMessageBox::critical(0, title, msg); break;
+		default: break;
+	}
 }
 
 
@@ -196,26 +179,23 @@ void warning(docstring const & title0, docstring const & message,
 	docstring const title = bformat(_("LyX: %1$s"), title0);
 
 	if (theApp() == 0) {
-		int argc = 1;
-		char * argv[1];
-		QApplication app(argc, argv);
-		QMessageBox::warning(0,
-			toqstr(title),
-			toqstr(formatted(message)));
+		noAppDialog(toqstr(title), toqstr(formatted(message)), QMessageBox::Warning);
 		return;
 	}
-	if (!askshowagain)
-		QMessageBox::warning(qApp->focusWidget(),
+
+	if (!askshowagain) {
+		ProgressInterface::instance()->warning(
 				toqstr(title),
 				toqstr(formatted(message)));
-	else
-		toggleWarning(title, message);
+	} else {
+		ProgressInterface::instance()->toggleWarning(
+				toqstr(title),
+				toqstr(message),
+				toqstr(formatted(message)));
+	}
 }
 
 
-int argc = 1;
-char * argv[1];
-
 void error(docstring const & title0, docstring const & message)
 {
 	lyxerr << "Error: " << title0 << '\n'
@@ -226,16 +206,15 @@ void error(docstring const & title0, docstring const & message)
 		return;
 
 	docstring const title = bformat(_("LyX: %1$s"), title0);
+
 	if (theApp() == 0) {
-		QApplication app(argc, argv);
-		QMessageBox::critical(0,
-			toqstr(title),
-			toqstr(formatted(message)));
+		noAppDialog(toqstr(title), toqstr(formatted(message)), QMessageBox::Critical);
 		return;
 	}
-	QMessageBox::critical(qApp->focusWidget(),
-			      toqstr(title),
-			      toqstr(formatted(message)));
+
+	ProgressInterface::instance()->error(
+		toqstr(title),
+		toqstr(formatted(message)));
 }
 
 
@@ -250,9 +229,15 @@ void information(docstring const & title0, docstring const & message)
 		return;
 
 	docstring const title = bformat(_("LyX: %1$s"), title0);
-	QMessageBox::information(qApp->focusWidget(),
-				 toqstr(title),
-				 toqstr(formatted(message)));
+
+	if (theApp() == 0) {
+		noAppDialog(toqstr(title), toqstr(formatted(message)), QMessageBox::Information);
+		return;
+	}
+
+	ProgressInterface::instance()->information(
+		toqstr(title),
+		toqstr(formatted(message)));
 }