X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiView.h;h=e4ab76331dc48fa160cc14215487bf905bafc56e;hb=8381d36098fb9244c15dba6b93cf509996c9c02e;hp=7e87cc1d898eb031b088c507ced1dae6a4f7727c;hpb=db36eae4c0edf30ff8684fa531d383d2fd9abb4f;p=lyx.git

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 7e87cc1d89..e4ab76331d 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -15,19 +15,18 @@
 #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 "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 {
@@ -69,11 +68,11 @@ public:
 	/// add toolbar, if newline==true, add a toolbar break before the toolbar
 	Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbinfo, bool newline);
 	virtual void updateStatusBar();
-	virtual void message(lyx::docstring const & str);
+	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();
@@ -84,8 +83,6 @@ public:
 	/// menu item has been selected
 	void activated(FuncRequest const &);
 
-	void initTab(QWidget* workArea);
-
 	QMenu* createPopupMenu();
 
 Q_SIGNALS:
@@ -95,10 +92,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();
@@ -115,16 +110,31 @@ protected:
 	///
 	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
 	 * @param t main window title
 	 * @param it iconified (short) title
 	 */
-	virtual void setWindowTitle(lyx::docstring const & t, lyx::docstring const & it);
+	virtual void setWindowTitle(docstring const & t, docstring const & it);
 
 	/// in order to catch Tab key press.
 	bool event(QEvent * e);