The branch, master, has been updated. - Log -----------------------------------------------------------------
commit be0610362d87d9089b5caf59a3facff73bf05924 Author: Juergen Spitzmueller <[email protected]> Date: Sat Apr 20 11:42:21 2013 +0200 Revert "Fix the zombie toolbar problem (bug #8520)" This reverts commit d00ec4dececeae51c3edb032cf7e97d7bb81f5cf. diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index d29cc3f..9ce5165 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -501,10 +501,8 @@ GuiView::GuiView(int id) if (lyxrc.allow_geometry_session) { // Now take care of session management. - if (restoreLayout()) { - initToolbars(); + if (restoreLayout()) return; - } } // no session handling, default to a sane size. commit f3bb757f9778004c7a1554e9d1b4ee05d312d01e Author: Juergen Spitzmueller <[email protected]> Date: Sat Apr 20 11:40:40 2013 +0200 Revert "avoid redundant toolbar initialization" This reverts commit 0f26aabeee3663f2cfaa89c983b668486610e564. It turned out this breaks session. diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index e46ec16..d29cc3f 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -501,8 +501,10 @@ GuiView::GuiView(int id) if (lyxrc.allow_geometry_session) { // Now take care of session management. - if (restoreLayout(true)) + if (restoreLayout()) { + initToolbars(); return; + } } // no session handling, default to a sane size. @@ -623,7 +625,7 @@ void GuiView::saveUISettings() const } -bool GuiView::restoreLayout(bool force_inittoolbars) +bool GuiView::restoreLayout() { QSettings settings; settings.beginGroup("views"); @@ -672,8 +674,7 @@ bool GuiView::restoreLayout(bool force_inittoolbars) if ((dialog = findOrBuild("findreplaceadv", true))) dialog->prepareView(); - if (!restoreState(settings.value("layout").toByteArray(), 0) - || force_inittoolbars) + if (!restoreState(settings.value("layout").toByteArray(), 0)) initToolbars(); updateDialogs(); return true; diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index 596e661..aa03b84 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -336,7 +336,7 @@ private: /// Saves the settings of toolbars and all dialogs void saveUISettings() const; /// - bool restoreLayout(bool force_inittoolbars = false); + bool restoreLayout(); /// GuiToolbar * toolbar(std::string const & name); /// ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiView.cpp | 7 +++---- src/frontends/qt4/GuiView.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
