* copy icon size to new GuiView from the last GuiView

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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 705b9acec70637c38ead3a4fc019e3f5074535fc..0289eb61a28a8d7f07840c4603d9aafb7fcd3a1a 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -23,27 +23,27 @@
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 
-#include "support/ExceptionMessage.h"
-#include "support/FileName.h"
-#include "support/ForkedCalls.h"
-#include "support/lstrings.h"
-#include "support/os.h"
-#include "support/Package.h"
-
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferView.h"
-#include "support/debug.h"
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Session.h"
 #include "version.h"
 
+#include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/FileName.h"
+#include "support/ForkedCalls.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/Package.h"
+
 #include <QApplication>
 #include <QClipboard>
 #include <QEventLoop>
@@ -139,8 +139,13 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QCoreApplication::setOrganizationDomain("lyx.org");
        QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
 
-       // Qt bug? setQuitOnLastWindowClosed(true); does not work
-       setQuitOnLastWindowClosed(false);
+       //FIXME: quitOnLastWindowClosed is true by default, at least on Windows and
+       // X11 platforms. We should have a lyxrc setting for this in order to let the
+       // application stay resident.
+       /*
+       if (lyxrc.quit_on_last_window_closed)
+               setQuitOnLastWindowClosed(false);
+       */
 
 #ifdef Q_WS_X11
        // doubleClickInterval() is 400 ms on X11 which is just too long.
@@ -251,9 +256,6 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
                // update bookmark pit of the current buffer before window close
                for (size_t i = 0; i < LyX::ref().session().bookmarks().size(); ++i)
                        theLyXFunc().gotoBookmark(i+1, false, false);
-               // ask the user for saving changes or cancel quit
-               if (!current_view_->quitWriteAll())
-                       break;
                current_view_->close();
                break;
 
@@ -261,8 +263,8 @@ bool GuiApplication::dispatch(FuncRequest const & cmd)
                // quitting is triggered by the gui code
                // (leaving the event loop).
                current_view_->message(from_utf8(N_("Exiting.")));
-               if (current_view_->quitWriteAll())
-                       closeAllViews();
+               if (closeAllViews())
+                       quit();
                break;
 
        case LFUN_SCREEN_FONT_UPDATE: {
@@ -313,16 +315,25 @@ static void updateIds(map<int, GuiView *> const & stdmap, vector<int> & ids)
 
 void GuiApplication::createView(QString const & geometry_arg)
 {
+       if (global_menubar_)
+               global_menubar_->releaseKeyboard();
+
+       // create new view
        updateIds(views_, view_ids_);
        int id = 0;
        while (views_.find(id) != views_.end())
                id++;
-       views_[id] = new GuiView(id);
-       updateIds(views_, view_ids_);
+       GuiView * view = new GuiView(id);
+       
+       // copy the icon size from old view
+       if (viewCount() > 0)
+               view->setIconSize(current_view_->iconSize());
 
-       GuiView * view  = views_[id];
+       // register view
+       views_[id] = view;
+       updateIds(views_, view_ids_);
+       
        theLyXFunc().setLyXView(view);
-
        view->show();
        if (!geometry_arg.isEmpty()) {
 #ifdef Q_WS_WIN
@@ -465,13 +476,32 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
                return QApplication::notify(receiver, event);
        }
        catch (ExceptionMessage const & e) {
-               if (e.type_ == ErrorException) {
+               switch(e.type_) { 
+               case ErrorException:
+                       LyX::cref().emergencyCleanup();
+                       setQuitOnLastWindowClosed(false);
+                       closeAllViews();
                        Alert::error(e.title_, e.details_);
-                       LyX::cref().exit(1);
-               } else if (e.type_ == WarningException) {
-                       Alert::warning(e.title_, e.details_);
+#ifndef NDEBUG
+                       // Properly crash in debug mode in order to get a useful backtrace.
+                       abort();
+#endif
+                       // In release mode, try to exit gracefully.
+                       this->exit(1);
+
+               case BufferException: {
+                       Buffer * buf = current_view_->buffer();
+                       docstring details = e.details_ + '\n';
+                       details += theBufferList().emergencyWrite(buf);
+                       theBufferList().release(buf);
+                       details += _("\nThe current document was closed.");
+                       Alert::error(e.title_, details);
                        return false;
                }
+               case WarningException:
+                       Alert::warning(e.title_, e.details_);
+                       return false;
+               };
        }
        catch (exception const & e) {
                docstring s = _("LyX has caught an exception, it will now "
@@ -548,8 +578,9 @@ void GuiApplication::commitData(QSessionManager & sm)
        /// The default implementation sends a close event to all
        /// visible top level widgets when session managment allows
        /// interaction.
-       /// We are changing that to write all unsaved buffers...
-       if (sm.allowsInteraction() && !current_view_->quitWriteAll())
+       /// We are changing that to close all wiew one by one.
+       /// FIXME: verify if the default implementation is enough now.
+       if (sm.allowsInteraction() && !closeAllViews())
                sm.cancel();
 }
 
@@ -581,20 +612,14 @@ bool GuiApplication::unregisterView(int id)
 bool GuiApplication::closeAllViews()
 {
        updateIds(views_, view_ids_);
-       if (views_.empty()) {
-               // quit in CloseEvent will not be triggert
-               qApp->quit();
+       if (views_.empty())
                return true;
-       }
 
        map<int, GuiView*> const cmap = views_;
        map<int, GuiView*>::const_iterator it;
        for (it = cmap.begin(); it != cmap.end(); ++it) {
-               // TODO: return false when close event was ignored
-               //       e.g. quitWriteAll()->'Cancel'
-               //       maybe we need something like 'bool closeView()'
-               it->second->close();
-               // unregisterd by the CloseEvent
+               if (!it->second->close())
+                       return false;
        }
 
        views_.clear();
@@ -633,6 +658,19 @@ Buffer const * GuiApplication::updateInset(Inset const * inset) const
 }
 
 
+void GuiApplication::readMenus(Lexer & lex)
+{
+       menus().read(lex);
+}
+
+
+bool GuiApplication::searchMenu(FuncRequest const & func,
+       vector<docstring> & names) const
+{
+       return menus().searchMenu(func, names);
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 // X11 specific stuff goes here...
 #ifdef Q_WS_X11