The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit c72c6f8732f984084b64e320152a1e3147a053a0 Author: Juergen Spitzmueller <[email protected]> Date: Wed Mar 20 16:19:53 2013 +0100 Fix the zombie toolbar problem (bug #8520) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 4271619..0d0f0c1 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -495,7 +495,7 @@ GuiView::GuiView(int id) if (lyxrc.allow_geometry_session) { // Now take care of session management. - if (restoreLayout()) + if (restoreLayout(true)) return; } @@ -616,7 +616,7 @@ void GuiView::saveUISettings() const } -bool GuiView::restoreLayout() +bool GuiView::restoreLayout(bool force_inittoolbars) { QSettings settings; settings.beginGroup("views"); @@ -665,7 +665,8 @@ bool GuiView::restoreLayout() if ((dialog = findOrBuild("findreplaceadv", true))) dialog->prepareView(); - if (!restoreState(settings.value("layout").toByteArray(), 0)) + if (!restoreState(settings.value("layout").toByteArray(), 0) + || force_inittoolbars) initToolbars(); updateDialogs(); return true; diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index 667ce60..03fca2f 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -337,7 +337,7 @@ private: /// Saves the settings of toolbars and all dialogs void saveUISettings() const; /// - bool restoreLayout(); + bool restoreLayout(bool force_inittoolbars = false); /// GuiToolbar * toolbar(std::string const & name); /// diff --git a/status.20x b/status.20x index 1539617..d72a0ec 100644 --- a/status.20x +++ b/status.20x @@ -125,6 +125,8 @@ What's new - Fix regression in which clicking in the main work area always resets the selected format in View -> Source (bug 8411). + +- Fix toolbar initialization problems with sessions (bug 8520). - When selecting text and then using the menu Insert -> Preview, immediately display the preview (bug 8075). ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiView.cpp | 7 ++++--- src/frontends/qt4/GuiView.h | 2 +- status.20x | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
