If we are in a closeEvent, we don't want to close all buffers, because these may...

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

diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 0bfe388b7ddf4dfc7c02dbe921d22e669687002a..9d6bfe78f1574a7f73356d24e5f866b8e8df47c1 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -35,6 +35,7 @@ class QDropEvent;
 class QKeyEvent;
 class QWheelEvent;
 class QPaintEvent;
+class QToolButton;
 class QWidget;
 
 #ifdef CursorShape
@@ -86,7 +87,8 @@ public:
        bool restart_timeout;
        int x_old;
        int y_old;
-       double scrollbar_value_old;
+       int min_scrollbar_old;
+       int max_scrollbar_old;
 };
 
 
@@ -107,13 +109,12 @@ public:
        ///
        ~GuiWorkArea();
 
+       ///
+       void init();
        ///
        void setBuffer(Buffer &);
        ///
        void setGuiView(GuiView &);
-       /// Dummy methods for Designer.
-       void setWidgetResizable(bool) {}
-       void setWidget(QWidget *) {}
        ///
        void setFullScreen(bool full_screen);
        /// is LyXView in fullscreen mode?
@@ -170,8 +171,6 @@ private Q_SLOTS:
 
 private:
        friend class GuiCompleter;
-       ///
-       void init();
 
        /// update the passed area.
        void update(int x, int y, int w, int h);
@@ -261,9 +260,40 @@ private:
        /// Special mode in which Esc and Enter (with or without Shift)
        /// are ignored
        bool dialog_mode_;
+       /// store the position of the rightclick when the mouse is
+       /// pressed. This is used to get the correct context menu 
+       /// when the menu is actually shown (after releasing on Windwos).
+       QPoint context_target_pos_;
 }; // GuiWorkArea
 
 
+class EmbeddedWorkArea : public GuiWorkArea
+{
+       Q_OBJECT
+public:
+       ///
+       EmbeddedWorkArea(QWidget *);
+       ~EmbeddedWorkArea();
+
+       /// Dummy methods for Designer.
+       void setWidgetResizable(bool) {}
+       void setWidget(QWidget *) {}
+
+       ///
+       void disable();
+
+protected:
+       ///
+       void closeEvent(QCloseEvent * ev);
+       ///
+       void hideEvent(QHideEvent *ev);
+
+private:
+       /// Embedded Buffer.
+       Buffer * buffer_;
+}; // EmbeddedWorkArea
+
+
 /// A tabbed set of GuiWorkAreas.
 class TabWorkArea : public QTabWidget
 {
@@ -304,7 +334,12 @@ private Q_SLOTS:
        void moveTab(int fromIndex, int toIndex);
 
 private:
+       ///
        int clicked_tab_;
+#if QT_VERSION < 0x040500
+       ///
+       QToolButton * closeBufferButton;
+#endif
 }; // TabWorkArea
 
 
@@ -339,6 +374,10 @@ private:
 Q_SIGNALS:
        ///
        void tabMoveRequested(int fromIndex, int toIndex);
+
+private Q_SLOTS:
+       ///
+       void on_tabCloseRequested(int index);
 };
 
 } // namespace frontend