* 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 693a396d5005545c9d2cef0967d218b1d99379be..0289eb61a28a8d7f07840c4603d9aafb7fcd3a1a 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -29,7 +29,6 @@
 #include "Font.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "LyX.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
@@ -40,6 +39,7 @@
 #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"
@@ -315,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
@@ -649,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