* frontends/Toolbars.C:

	revert first patch http://www.lyx.org/trac/changeset/15597
* frontends/qt4/GuiView.C:
	don't 'break' the toolbar because it doesn't work if
	the toolbar will be hidden

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15636 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C
index 6529298628df4cf83a27717b1f0c49c4e4fbee2d..a5b7273739b77def1a1001599b0c40a20eca6189 100644 (file)
--- a/src/frontends/Toolbars.C
+++ b/src/frontends/Toolbars.C
@@ -124,6 +124,11 @@ void Toolbars::add(ToolbarBackend::Toolbar const & tbb)
        ToolbarPtr tb_ptr = owner_.makeToolbar(tbb);
        toolbars_[tbb.name] = tb_ptr;
 
+       if (tbb.flags & ToolbarBackend::ON)
+               tb_ptr->show(false);
+       else
+               tb_ptr->hide(false);
+
        if (tb_ptr->layout())
                layout_ = tb_ptr->layout();
 }

diff --git a/src/frontends/qt4/GuiView.C b/src/frontends/qt4/GuiView.C
index ed81ade5e0540a38220fe7277a632d91b85fe67a..d56fced42e489dd9cae53546e93dec9886a53836 100644 (file)
--- a/src/frontends/qt4/GuiView.C
+++ b/src/frontends/qt4/GuiView.C
@@ -323,9 +323,13 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarBackend::Toolbar const & tbb)
        }
        if (tbb.flags & ToolbarBackend::BOTTOM) {
                addToolBar(Qt::BottomToolBarArea, Tb);
+               /*
+               // Qt bug. Doesn't work because the
+               // toolbar will evtl. be hidden.
                if (lastTb)
                        insertToolBarBreak(lastTb);
                lastTb = Tb;
+               */
        }
        if (tbb.flags & ToolbarBackend::LEFT) {
                addToolBar(Qt::LeftToolBarArea, Tb);