* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index e399835a7bf8073a4bfbc9ec6d64056e229e4e6c..2a8affa33a6cfc1b2927bf28d23695d49487892c 100644 (file)
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -4,6 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ * \author Jürgen Spitzmüller
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -13,21 +14,24 @@
 
 #include "alert.h"
 
+
 #include "frontends/Application.h"
 
 #include "qt_helpers.h"
 #include "LyX.h" // for lyx::use_gui
-#include "ui_AskForTextUi.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>
 #include <QMessageBox>
 #include <QLineEdit>
 #include <QInputDialog>
+#include <QSettings>
 
 #include <iomanip>
 #include <iostream>
@@ -39,6 +43,8 @@ namespace lyx {
 namespace frontend {
 
 
+
+
 static docstring const formatted(docstring const & text)
 {
        const int w = 80;
@@ -99,6 +105,21 @@ static docstring const formatted(docstring const & text)
 }
 
 
+void noAppDialog(QString const & title, QString const & msg, QMessageBox::Icon mode)
+{
+       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;
+       }
+}
+
+
 namespace Alert {
 
 int prompt(docstring const & title0, docstring const & question,
@@ -123,10 +144,9 @@ int prompt(docstring const & title0, docstring const & question,
 
        docstring const title = bformat(_("LyX: %1$s"), title0);
 
-       // For some reason, sometimes Qt uses an hourglass or watch cursor when
+       // For some reason, sometimes Qt uses a hourglass or watch cursor when
        // displaying the alert. Hence, we ask for the standard cursor shape.
-       // This call has no effect if the cursor has not been overridden.
-       qApp->changeOverrideCursor(Qt::ArrowCursor);
+       qApp->setOverrideCursor(Qt::ArrowCursor);
 
        // FIXME replace that with guiApp->currentView()
        //LYXERR0("FOCUS: " << qApp->focusWidget());
@@ -138,6 +158,8 @@ int prompt(docstring const & title0, docstring const & question,
                                           b3.empty() ? QString::null : toqstr(b3),
                                           default_button, cancel_button);
 
+       qApp->restoreOverrideCursor();
+
        // Qt bug: can return -1 on cancel or WM close, despite the docs.
        if (res == -1)
                res = cancel_button;
@@ -145,7 +167,8 @@ int prompt(docstring const & title0, docstring const & question,
 }
 
 
-void warning(docstring const & title0, docstring const & message)
+void warning(docstring const & title0, docstring const & message,
+            bool const & askshowagain)
 {
        lyxerr << "Warning: " << title0 << '\n'
               << "----------------------------------------\n"
@@ -157,17 +180,25 @@ 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;
        }
-       QMessageBox::warning(qApp->focusWidget(),
-                            toqstr(title),
-                            toqstr(formatted(message)));
+
+       // Don't use a hourglass cursor while displaying the alert
+       qApp->setOverrideCursor(Qt::ArrowCursor);
+
+       if (!askshowagain) {
+               ProgressInterface::instance()->warning(
+                               toqstr(title),
+                               toqstr(formatted(message)));
+       } else {
+               ProgressInterface::instance()->toggleWarning(
+                               toqstr(title),
+                               toqstr(message),
+                               toqstr(formatted(message)));
+       }
+
+       qApp->restoreOverrideCursor();
 }
 
 
@@ -181,18 +212,20 @@ void error(docstring const & title0, docstring const & message)
                return;
 
        docstring const title = bformat(_("LyX: %1$s"), title0);
+
        if (theApp() == 0) {
-               int argc = 1;
-               char * argv[1];
-               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)));
+
+       // Don't use a hourglass cursor while displaying the alert
+       qApp->setOverrideCursor(Qt::ArrowCursor);
+
+       ProgressInterface::instance()->error(
+               toqstr(title),
+               toqstr(formatted(message)));
+
+       qApp->restoreOverrideCursor();
 }
 
 
@@ -207,9 +240,20 @@ 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;
+       }
+
+       // Don't use a hourglass cursor while displaying the alert
+       qApp->setOverrideCursor(Qt::ArrowCursor);
+
+       ProgressInterface::instance()->information(
+               toqstr(title),
+               toqstr(formatted(message)));
+
+       qApp->restoreOverrideCursor();
 }