Move Color::color enum to ColorCode.h

[features.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 45426165a74d7f449b06e90ff3f3aa7571391a9e..c604af671b96c0ff25d48414521e7def91dce09d 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -17,10 +17,12 @@
 #include "qt_helpers.h"
 #include "GuiImage.h"
 
+#include "frontends/alert.h"
 #include "frontends/LyXView.h"
 
 #include "graphics/LoaderQueue.h"
 
+#include "support/ExceptionMessage.h"
 #include "support/FileName.h"
 #include "support/lstrings.h"
 #include "support/os.h"
@@ -125,6 +127,10 @@ GuiApplication * guiApp;
 GuiApplication::GuiApplication(int & argc, char ** argv)
        : QApplication(argc, argv), Application(argc, argv)
 {
+       QCoreApplication::setOrganizationName("The LyX Community");
+       QCoreApplication::setOrganizationDomain("lyx.org");
+       QCoreApplication::setApplicationName("LyX");
+
        // Qt bug? setQuitOnLastWindowClosed(true); does not work
        setQuitOnLastWindowClosed(false);
 
@@ -279,19 +285,35 @@ bool GuiApplication::event(QEvent * e)
 
 bool GuiApplication::notify(QObject * receiver, QEvent * event)
 {
-       bool return_value;
+       bool return_value = false;
        try {
                return_value = QApplication::notify(receiver, event);
        }
+       catch (support::ExceptionMessage  const & e) {
+               if (e.type_ == support::ErrorException) {
+                       Alert::error(e.title_, e.details_);
+                       LyX::cref().emergencyCleanup();
+                       QApplication::exit(1);
+               } else if (e.type_ == support::WarningException) {
+                       Alert::warning(e.title_, e.details_);
+                       return return_value;
+               }
+       }
        catch (std::exception  const & e) {
-               lyxerr << "Caught \"normal\" exception: " << e.what() << endl;
+               docstring s = _("LyX has caught an exception, it will now "
+                       "attemp to save all unsaved documents and exit."
+                       "\n\nException: ");
+               s += from_ascii(e.what());
+               Alert::error(_("Software exception Detected"), s);
                LyX::cref().emergencyCleanup();
-               abort();
+               QApplication::exit(1);
        }
        catch (...) {
-               lyxerr << "Caught some really weird exception..." << endl;
+               docstring s = _("LyX has caught some really weird exception, it will "
+                       "now attemp to save all unsaved documents and exit.");
+               Alert::error(_("Software exception Detected"), s);
                LyX::cref().emergencyCleanup();
-               abort();
+               QApplication::exit(1);
        }
 
        return return_value;
@@ -308,7 +330,7 @@ void GuiApplication::syncEvents()
 }
 
 
-bool GuiApplication::getRgbColor(Color_color col,
+bool GuiApplication::getRgbColor(ColorCode col,
        RGBColor & rgbcol)
 {
        QColor const & qcol = color_cache_.get(col);
@@ -325,13 +347,13 @@ bool GuiApplication::getRgbColor(Color_color col,
 }
 
 
-string const GuiApplication::hexName(Color_color col)
+string const GuiApplication::hexName(ColorCode col)
 {
        return support::ltrim(fromqstr(color_cache_.get(col).name()), "#");
 }
 
 
-void GuiApplication::updateColor(Color_color)
+void GuiApplication::updateColor(ColorCode)
 {
        // FIXME: Bleh, can't we just clear them all at once ?
        color_cache_.clear();