diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp index a290de8d95..7836b7cf98 100644 --- a/src/LyXFunc.cpp +++ b/src/LyXFunc.cpp @@ -1926,6 +1926,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_EXAMPLEPATH: case LyXRC::RC_FONT_ENCODING: case LyXRC::RC_FORMAT: + case LyXRC::RC_GROUP_LAYOUTS: case LyXRC::RC_INDEX_COMMAND: case LyXRC::RC_INPUT: case LyXRC::RC_KBMAP: diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 4ff601ef91..704dca576d 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -407,8 +407,8 @@ void GuiView::closeEvent(QCloseEvent * close_event) // Save toolbars configuration if (isFullScreen()) { - d.toolbars_->toggleFullScreen(!isFullScreen()); - updateToolbars(); + d.toolbars_->toggleFullScreen(!isFullScreen()); + updateToolbars(); } // Make sure the timer time out will not trigger a statusbar update. @@ -1184,6 +1184,7 @@ void GuiView::openDocument(string const & fname) Buffer * buf = loadDocument(fullname); if (buf) { updateLabels(*buf); + setBuffer(buf); buf->errors("Parse"); str2 = bformat(_("Document %1$s opened."), disp_fn); diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index ec398feb39..23e644a195 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -1162,14 +1162,14 @@ public: } }; -NoTabFrameMacStyle noTabFramemacStyle; +NoTabFrameMacStyle noTabFrameMacStyle; #endif TabWorkArea::TabWorkArea(QWidget * parent) : QTabWidget(parent) { #ifdef Q_WS_MACX - setStyle(&noTabFramemacStyle); + setStyle(&noTabFrameMacStyle); #endif QPalette pal = palette(); diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h index ffd4bad18c..eb57b63cfa 100644 --- a/src/insets/InsetText.h +++ b/src/insets/InsetText.h @@ -160,6 +160,7 @@ public: bool insertCompletion(Cursor & cur, docstring const & s, bool finished); /// void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const; + /// virtual docstring contextMenu(BufferView const & bv, int x, int y) const; ///