anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid redundant toolbar initialization

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-03-20 13:59:25 +01:00
parent d00ec4dece
commit 0f26aabeee
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,10 +501,8 @@ GuiView::GuiView(int id)
if (lyxrc.allow_geometry_session) {
// Now take care of session management.
if (restoreLayout()) {
initToolbars();
if (restoreLayout(true))
return;
}
}
// no session handling, default to a sane size.
@ -625,7 +623,7 @@ void GuiView::saveUISettings() const
}
bool GuiView::restoreLayout()
bool GuiView::restoreLayout(bool force_inittoolbars)
{
QSettings settings;
settings.beginGroup("views");
@ -674,7 +672,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;

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

@ -336,7 +336,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);
///