Fix the tab ordering of GuiDocument components.

[lyx.git] / src / frontends / qt4 / DockView.h

diff --git a/src/frontends/qt4/DockView.h b/src/frontends/qt4/DockView.h
index c94f9a685bcc7baa8824361d3c4cf1331816dfe6..1024bb50fd6636d1ff34a5079abb7b5cc488eb90 100644 (file)
--- a/src/frontends/qt4/DockView.h
+++ b/src/frontends/qt4/DockView.h
@@ -16,6 +16,7 @@
 #include "GuiView.h"
 
 #include <QDockWidget>
+#include <QKeyEvent>
 
 namespace lyx {
 namespace frontend {
@@ -31,16 +32,16 @@ class DockView : public QDockWidget, public Dialog
 public:
        DockView(
                GuiView & parent, ///< the main window where to dock.
-               std::string const & name, ///< dialog identifier.
+               QString const & name, ///< dialog identifier.
                QString const & title, ///< dialog title.
                Qt::DockWidgetArea area = Qt::LeftDockWidgetArea, ///< Position of the dock (and also drawer)
                Qt::WindowFlags flags = 0
        )
                : QDockWidget(&parent, flags), Dialog(parent, name, title)
        {
-               if (flags & Qt::Drawer)
-                       setFeatures(QDockWidget::NoDockWidgetFeatures);
+               setObjectName(name);
                parent.addDockWidget(area, this);
+               hide();
        }
 
        virtual ~DockView() {}
@@ -48,10 +49,27 @@ public:
        virtual QWidget * asQWidget() { return this; }
        virtual QWidget const * asQWidget() const { return this; }
 
+       /// We don't want to restore geometry session for dock widgets.
+       void restoreSession() {}
+
+       void keyPressEvent(QKeyEvent * ev)
+       {
+               if (ev->key() == Qt::Key_Escape) {
+                       QMainWindow * mw = static_cast<QMainWindow *>(parent());
+                       if (!mw) {
+                               ev->ignore();
+                               return;
+                       }
+                       mw->activateWindow();
+                       mw->setFocus();
+                       ev->accept();
+               }
+       }
        /// Dialog inherited methods
        //@{
        void applyView() {}
        bool isClosing() const { return false; }
+       bool needBufferOpen() const { return false; }
        //@}
 };