Adjust the window settings for MacOSX.

- No more Drawers,
- ProgressView and SourceView are docked at the bottom,
- SpellChecker, FindAndReplace and Outline are floating by default, but dockable.

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

diff --git a/src/frontends/qt4/DockView.h b/src/frontends/qt4/DockView.h
index bb456d9b5deea53ebf93641146ea0c936db7a5bd..2ff08f63e2019937ae8c4eff1861f3ae38ac68ea 100644 (file)
--- a/src/frontends/qt4/DockView.h
+++ b/src/frontends/qt4/DockView.h
@@ -39,8 +39,6 @@ public:
                : QDockWidget(&parent, flags), Dialog(parent, name, title)
        {
                setObjectName(name);
-               if (flags & Qt::Drawer)
-                       setFeatures(QDockWidget::NoDockWidgetFeatures);
                parent.addDockWidget(area, this);
                hide();
        }

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 50f3641b5700fa6ad0442a08c84dd0dea7f3bd49..d57c272fc271e7347266777d16e29e1f10c711cb 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -615,7 +615,12 @@ bool FindAndReplace::initialiseParams(std::string const & params)
 
 Dialog * createGuiSearchAdv(GuiView & lv)
 {
-       return new FindAndReplace(lv, Qt::RightDockWidgetArea);
+       FindAndReplace * gui = new FindAndReplace(lv, Qt::RightDockWidgetArea);
+#ifdef Q_WS_MACX
+       // On Mac show and floating
+       gui->setFloating(true);
+#endif
+       return gui;
 }
 
 

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index a608c53442b93b6bd8a7b154acf4b14f7b54b45b..3413963f3eb2130476f18e4a0995f4de3b580866 100644 (file)
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -237,11 +237,7 @@ void GuiProgressView::hideEvent(QHideEvent*)
 
 Dialog * createGuiProgressView(GuiView & guiview)
 {
-#ifdef Q_WS_MACX
-       return new GuiProgressView(guiview, Qt::RightDockWidgetArea, Qt::Drawer);
-#else
        return new GuiProgressView(guiview, Qt::BottomDockWidgetArea);
-#endif
 }
 
 

diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 5c766eb04fb38d0acc46b850c04bf082f64f01a5..fe03e249b90a7ab97cc5793daedf957eefa96566 100644 (file)
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -338,7 +338,15 @@ void GuiSpellchecker::showSummary()
 }
 
 
-Dialog * createGuiSpellchecker(GuiView & lv) { return new GuiSpellchecker(lv); }
+Dialog * createGuiSpellchecker(GuiView & lv) 
+{ 
+       GuiSpellchecker * gui = new GuiSpellchecker(lv);
+#ifdef Q_WS_MACX
+       gui->setFloating(true);
+#endif
+       return gui;
+}
+
 
 } // namespace frontend
 } // namespace lyx

diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 787bbb7058b458efddfa609794727b95ecb02925..e7840b102e9139df9961c2cc59abf09d8a22a817 100644 (file)
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -48,27 +48,8 @@ GuiToc::~GuiToc()
 
 void GuiToc::updateView()
 {
-#ifndef Q_WS_MACX
        widget_->updateView();
        return;
-#endif
-
-       widget_->updateView();
-
-       // For Mac: switch to a docked TOC in fullscreen mode.
-       // We use the features() here instead of WindowFlags because
-       // the latter are not reliable (always returns Qt::Drawer).
-       if (!(features() & DockWidgetClosable) && lyxview().isFullScreen()) {
-               setWindowFlags(Qt::Widget);
-               setFeatures(DockWidgetClosable);
-               // Setting features hides the dialog, see Qt's doc.
-               show();
-       } else if ((features() & DockWidgetClosable) && !lyxview().isFullScreen()) {
-               setWindowFlags(Qt::Drawer);
-               setFeatures(NoDockWidgetFeatures);
-               // Setting features hides the dialog, see Qt's doc.
-               show();
-       }
 }
 
 
@@ -115,13 +96,15 @@ bool GuiToc::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 Dialog * createGuiToc(GuiView & lv)
 {
-       GuiView & guiview = static_cast<GuiView &>(lv);
+       GuiToc * toc;
 #ifdef Q_WS_MACX
-       // On Mac show as a drawer at the right
-       return new GuiToc(guiview, Qt::RightDockWidgetArea, Qt::Drawer);
+       // On Mac show at the right and floating
+       toc = new GuiToc(lv, Qt::RightDockWidgetArea);
+       toc->setFloating(true);
 #else
-       return new GuiToc(guiview);
+       toc = new GuiToc(lv);
 #endif
+       return toc;
 }