X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiWorkArea.h;h=4ec0af11a9fbd320b0bea301543a3b64563d9f06;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=4a36dd166dcf6026ea71dd38e046dd723acf3465;hpb=0933ba68803919cbb34fac81561892d00cfc1d6d;p=lyx.git

diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index 4a36dd166d..4ec0af11a9 100644
--- 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?
@@ -125,7 +126,7 @@ public:
 	///
 	BufferView const & bufferView() const;
 	///
-	void redraw();
+	void redraw(bool update_metrics);
 	///
 	void stopBlinkingCursor();
 	///
@@ -136,7 +137,7 @@ public:
 	///
 	void resizeBufferView();
 
-	bool inDialogMode() { return dialog_mode_; }
+	bool inDialogMode() const { return dialog_mode_; }
 	void setDialogMode(bool mode) { dialog_mode_ = 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);
@@ -185,7 +184,7 @@ private:
 	/// hide the cursor
 	virtual void removeCursor();
 
-	/// This function is called when the buffer readonly status change.
+	/// This function should be called to update the buffer readonly status.
 	void setReadOnly(bool);
 
 	/// Update window titles of all users.
@@ -232,6 +231,8 @@ private:
 
 	///
 	BufferView * buffer_view_;
+	/// Read only Buffer status cache.
+	bool read_only_;
 	///
 	GuiView * lyx_view_;
 	/// is the cursor currently displayed
@@ -261,9 +262,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
 {
@@ -290,8 +322,10 @@ Q_SIGNALS:
 public Q_SLOTS:
 	/// close current buffer, or the one given by \c clicked_tab_
 	void closeCurrentBuffer();
-	/// close current tab, or the one given by \c clicked_tab_
-	void closeCurrentTab();
+	/// hide current tab, or the one given by \c clicked_tab_
+	void hideCurrentTab();
+	/// close the tab given by \c index
+	void closeTab(int index);
 	///
 	void updateTabTexts();
 	
@@ -304,7 +338,10 @@ private Q_SLOTS:
 	void moveTab(int fromIndex, int toIndex);
 
 private:
+	///
 	int clicked_tab_;
+	///
+	QToolButton * closeBufferButton;
 }; // TabWorkArea