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 a65f1d0a3367139d39bb49a99d24c59a5fe63ac7..c604af671b96c0ff25d48414521e7def91dce09d 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -16,12 +16,13 @@
 
 #include "qt_helpers.h"
 #include "GuiImage.h"
-#include "SocketCallback.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"
@@ -45,6 +46,7 @@
 #include <QLibraryInfo>
 #include <QPixmapCache>
 #include <QSessionManager>
+#include <QSocketNotifier>
 #include <QTextCodec>
 #include <QTimer>
 #include <QTranslator>
@@ -73,12 +75,30 @@ frontend::Application * createApplication(int & argc, char * argv[])
 
 namespace frontend {
 
+class SocketNotifier : public QSocketNotifier
+{
+public:
+       /// connect a connection notification from the LyXServerSocket
+       SocketNotifier(QObject * parent, int fd, Application::SocketCallback func)
+               : QSocketNotifier(fd, QSocketNotifier::Read, parent), func_(func)
+       {}
+
+public:
+       /// The callback function
+       Application::SocketCallback func_;
+};
+
+
 ////////////////////////////////////////////////////////////////////////
 // Mac specific stuff goes here...
 
 class MenuTranslator : public QTranslator
 {
 public:
+       MenuTranslator(QObject * parent)
+               : QTranslator(parent)
+       {}
+
        QString translate(const char * /*context*/, 
          const char * sourceText, 
          const char * /*comment*/ = 0) 
@@ -105,8 +125,12 @@ GuiApplication * guiApp;
 
 
 GuiApplication::GuiApplication(int & argc, char ** argv)
-       : QApplication(argc, argv), Application(argc, argv), menu_trans_(0)
+       : 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);
 
@@ -165,8 +189,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 
 GuiApplication::~GuiApplication()
 {
-       delete menu_trans_;
-       socket_callbacks_.clear();
+       socket_notifiers_.clear();
 }
 
 
@@ -262,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;
@@ -291,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);
@@ -308,28 +347,36 @@ 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();
 }
 
 
-void GuiApplication::registerSocketCallback(int fd, boost::function<void()> func)
+void GuiApplication::registerSocketCallback(int fd, SocketCallback func)
+{
+       SocketNotifier * sn = new SocketNotifier(this, fd, func);
+       socket_notifiers_[fd] = sn;
+       connect(sn, SIGNAL(activated(int)), this, SLOT(socketDataReceived(int)));
+}
+
+
+void GuiApplication::socketDataReceived(int fd)
 {
-       socket_callbacks_[fd] = new SocketCallback(this, fd, func);
+       socket_notifiers_[fd]->func_();
 }
 
 
 void GuiApplication::unregisterSocketCallback(int fd)
 {
-       socket_callbacks_.erase(fd);
+       socket_notifiers_.erase(fd);
 }
 
 
@@ -383,8 +430,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
 
 void GuiApplication::addMenuTranslator()
 {
-       menu_trans_ = new MenuTranslator();
-       installTranslator(menu_trans_);
+       installTranslator(new MenuTranslator(this));
 }