X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiView.h;h=428f9325f11b8173408ba2e90104973bb2560a7e;hb=50de85396c785a454fe07b77d815c57f3e462282;hp=57116664d41cf01e7e75e1b05fbe8292d1702e59;hpb=00e305c9d9bd8b0ff54b6c58adb6192d5934ed60;p=lyx.git

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 57116664d4..428f9325f1 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -15,44 +15,41 @@
 #ifndef GUI_VIEW_H
 #define GUI_VIEW_H
 
-// Must be here because of moc.
-#include <config.h>
-
 #include "frontends/LyXView.h"
 #include "FuncRequest.h"
 
-#include <QMainWindow>
-#include <QTimer>
 #include <QAction>
 #include <QCloseEvent>
+#include <QMainWindow>
+#include <QTimer>
 
-class QToolBar;
+class QDragEnterEvent;
+class QDropEvent;
 class QMenu;
-
+class QToolBar;
 
 namespace lyx {
 namespace frontend {
 
-class QCommandBuffer;
-
-QWidget* mainWindow();
+QWidget * mainWindow();
 
 /**
  * GuiView - Qt4 implementation of LyXView
  *
  * qt4-private implementation of the main LyX window.
  *
- * Note: any QObject emits a destroyed(QObject *) Qt signal when it
- *       is deleted.This might be useful for closing other dialogs
- *       depending on a given GuiView.
+ * Note: a QObject emits a destroyed(QObject *) Qt signal when it
+ * is deleted. This might be useful for closing other dialogs
+ * depending on a given GuiView.
  */
-class GuiView : public QMainWindow, public LyXView {
+class GuiViewBase : public QMainWindow, public LyXView
+{
 	Q_OBJECT
 public:
 	/// create a main window of the given dimensions
-	GuiView(int id);
+	GuiViewBase(int id);
 
-	~GuiView();
+	~GuiViewBase();
 
 	virtual void init();
 	virtual void close();
@@ -72,20 +69,15 @@ public:
 	virtual void message(docstring const & str);
 	virtual void clearMessage();
 	virtual bool hasFocus() const;
-
-	virtual void updateTab();
+	void showMiniBuffer(bool);
+	void openMenu(docstring const &);
 
 	/// show - display the top-level window
-	void show();
-
-	/// add the command buffer
-	void addCommandBuffer(QToolBar * toolbar);
+	void showView();
 
 	/// menu item has been selected
 	void activated(FuncRequest const &);
 
-	void initTab(QWidget* workArea);
-
 	QMenu* createPopupMenu();
 
 Q_SIGNALS:
@@ -95,10 +87,8 @@ public Q_SLOTS:
 	/// idle timeout
 	void update_view_state_qt();
 
-	/// populate a toplevel menu and all its children on demand
-	void updateMenu(QAction *);
-
-	void currentTabChanged (int index); 
+	void currentTabChanged(int index);
+	void closeCurrentTab();
 
 	/// slots to change the icon size
 	void smallSizedIcons();
@@ -108,16 +98,29 @@ public Q_SLOTS:
 protected:
 	/// make sure we quit cleanly
 	virtual void closeEvent(QCloseEvent * e);
-
 	///
 	virtual void resizeEvent(QResizeEvent * e);
-
 	///
 	virtual void moveEvent(QMoveEvent * e);
 
+	/// \return the \c Workarea associated to \p  Buffer
+	/// \retval 0 if no \c WorkArea is found.
+	WorkArea * workArea(Buffer & buffer);
+
+	/// Add a \c WorkArea 
+	/// \return the \c Workarea associated to \p  Buffer
+	/// \retval 0 if no \c WorkArea is found.
+	WorkArea * addWorkArea(Buffer & buffer);
+	void setCurrentWorkArea(WorkArea * work_area);
+	void removeWorkArea(WorkArea * work_area);
+	WorkArea const * currentWorkArea() const;
+	WorkArea * currentWorkArea();
+
 private:
-	/// focus the command buffer widget
-	void focus_command_widget();
+	///
+	void dragEnterEvent(QDragEnterEvent * ev);
+	///
+	void dropEvent(QDropEvent * ev);
 
 	/**
 	 * setWindowTitle - set title of window
@@ -132,9 +135,6 @@ private:
 
 	QTimer statusbar_timer_;
 
-	/// command buffer
-	QCommandBuffer * commandbuffer_;
-
 	/// are we quitting by the menu?
 	bool quitting_by_menu_;