anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix the zombie toolbar problem (bug #8520)"

Browse Source 
This reverts commit c72c6f8732.
This commit is contained in:
Juergen Spitzmueller 2013-03-21 09:42:32 +01:00
parent 25b8ddf407
commit 13d6d2e2c7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/GuiView.cpp
View File

@ -495,7 +495,7 @@ GuiView::GuiView(int id)
if (lyxrc.allow_geometry_session) { if (lyxrc.allow_geometry_session) {
// Now take care of session management. // Now take care of session management.
if (restoreLayout(true)) if (restoreLayout())
return; return;
} }
@ -616,7 +616,7 @@ void GuiView::saveUISettings() const
} }
bool GuiView::restoreLayout(bool force_inittoolbars) bool GuiView::restoreLayout()
{ {
QSettings settings; QSettings settings;
settings.beginGroup("views"); settings.beginGroup("views");
@ -665,8 +665,7 @@ bool GuiView::restoreLayout(bool force_inittoolbars)
if ((dialog = findOrBuild("findreplaceadv", true))) if ((dialog = findOrBuild("findreplaceadv", true)))
dialog->prepareView(); dialog->prepareView();
if (!restoreState(settings.value("layout").toByteArray(), 0) if (!restoreState(settings.value("layout").toByteArray(), 0))
|| force_inittoolbars)
initToolbars(); initToolbars();
updateDialogs(); updateDialogs();
return true; return true;

2
src/frontends/qt4/GuiView.h
View File

@ -337,7 +337,7 @@ private:
/// Saves the settings of toolbars and all dialogs /// Saves the settings of toolbars and all dialogs
void saveUISettings() const; void saveUISettings() const;
/// ///
bool restoreLayout(bool force_inittoolbars = false); bool restoreLayout();
/// ///
GuiToolbar * toolbar(std::string const & name); GuiToolbar * toolbar(std::string const & name);
/// ///

2
status.20x
View File

@ -129,8 +129,6 @@ What's new
- Fix regression in which clicking in the main work area always resets - Fix regression in which clicking in the main work area always resets
the selected format in View -> Source (bug 8411). 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 - When selecting text and then using the menu Insert -> Preview, immediately
display the preview (bug 8075). display the preview (bug 8075).