* added WidgetFlags argument to DockView to set Qt::Drawer flag where needed

[features.git] / src / frontends / qt4 / Dialogs.cpp

diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp
index 619e0ed6ac89dece72254f626be2e1e4dc81c2ad..977d7f334559e43e0fd39d50916e44bb07cae4b6 100644 (file)
--- a/src/frontends/qt4/Dialogs.cpp
+++ b/src/frontends/qt4/Dialogs.cpp
@@ -243,14 +243,8 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                QViewSource * qvs = new QViewSource(*dialog);
                dialog->setController(qvs);
                GuiView & gui_view = static_cast<GuiView &>(lyxview_);
-#ifdef Q_WS_MACX
-               // Mac uses a drawer that should be on the right.
-               dialog->setView(new DockView<QViewSource, QViewSourceDialog>(
-                       *dialog, qvs, &gui_view, _("LaTeX Source")));
-#else
                dialog->setView(new DockView<QViewSource, QViewSourceDialog>(
                        *dialog, qvs, &gui_view, _("LaTeX Source"), Qt::BottomDockWidgetArea));
-#endif
                dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "mathdelimiter") {
                dialog->setController(new ControlMath(*dialog));
@@ -311,8 +305,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                GuiView & gui_view = static_cast<GuiView &>(lyxview_);
                QToc * qtoc = new QToc(*dialog, &gui_view);
                dialog->setController(qtoc);
+#ifdef Q_WS_MACX
+               // On Mac show as a drawer at the right
+               dialog->setView(new DockView<QToc, TocWidget>(
+                       *dialog, qtoc, &gui_view, _("Outline"), Qt::RightDockWidgetArea, Qt::Drawer));
+#else
                dialog->setView(new DockView<QToc, TocWidget>(
                        *dialog, qtoc, &gui_view, _("Outline")));
+#endif
                dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "url") {
                dialog->setController(new ControlCommand(*dialog, name, name));