X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.h;h=425469ac881ca230a89b78dba943f86272fd89c6;hb=98c966c64594611e469313314abd1e59524adb4a;hp=21a2d0cffb9f153b1dd1cf1a43dc89a2e28fba7f;hpb=fe4e2a84c664ab13a2cfbfcbdb953d72c77eb268;p=lyx.git

diff --git a/src/LyXView.h b/src/LyXView.h
index 21a2d0cffb..425469ac88 100644
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -1,70 +1,47 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
- *
- * ====================================================== */
-
-#ifndef LyXView_H
-#define LyXView_H
+
+#ifndef LYXVIEW_BASE_H
+#define LYXVIEW_BASE_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
+#include <boost/utility.hpp>
+#include <sigc++/signal_system.h>
 
-class LyXFunc;
+#include "LString.h"
+#include "support/types.h"
+
+class Buffer;
 class Toolbar;
 class MiniBuffer;
 class Intl;
-class Buffer;
-class Menus;
+class Menubar;
+
 class BufferView;
+class Dialogs;
+class LyXFunc;
+class Timeout;
 
 ///
-struct  FD_form_main {
+class LyXView : public SigC::Object, boost::noncopyable {
+public:
 	///
-	FL_FORM * form_main;
+	LyXView();
 	///
-	FL_OBJECT * timer_autosave;
+	virtual ~LyXView();
 	///
-	FL_OBJECT * timer_update;
+	virtual void init() = 0;
 	///
-	void * vdata;
+	virtual void setPosition(int, int) = 0;
 	///
-	long ldata;
-};
-
-
-/**
-  This class is the form containing the view of the buffer. The actual buffer
-  view is supposed (at least IMHO) to be another class, that shows its output
-  in one or more LyXView's.
- */
-class LyXView {
-public:
-	/// constructor
-	LyXView(int w, int h);
-
-	/// destructor
-	~LyXView();
-
-	/// Where to place the form.
-	void setPosition(int, int);
-
-	/// Show the main form.
-	void show(int, int, char const * t = "LyX");
-
-	/// init (should probably be removed later) (Lgb)
-	void init();
-
+	virtual void show(int, int, string const &) = 0;
 	/// Redraw the main form.
-	void redraw();
+	virtual void redraw() = 0;
+
+	/// Resize all BufferViews in this LyXView (because the width changed)
+	void resize();
 
 	/// returns the buffer currently shown in the main form.
 	Buffer * buffer() const;
@@ -72,15 +49,14 @@ public:
 	///
 	BufferView * view() const;
 
-	/// returns a pointer to the main form.
-	FD_form_main * getMainForm() const;
-
-	/// returns a pointer to the form.
-	FL_FORM * getForm() const;
-
 	/// return a pointer to the toolbar
 	Toolbar * getToolbar() const;
 
+	/// sets the layout in the toolbar layout combox
+	void setLayout(string const & layout);
+	/// update the toolbar
+	void updateToolbar();
+
 	/// return a pointer to the lyxfunc
 	LyXFunc * getLyXFunc() const;
 
@@ -88,57 +64,65 @@ public:
 	MiniBuffer * getMiniBuffer() const;
 
 	///
-	Menus * getMenus() const;
+	void message(string const &);
+	///
+	void messagePush(string const & str);
+	///
+	void messagePop();
+
+	///
+	Menubar * getMenubar() const;
+
+	///
+	void updateMenubar();
 
 	///
 	Intl * getIntl() const;
 
+	///
+	Dialogs * getDialogs() { return dialogs_; }
+
 	///
 	void updateLayoutChoice();
 
 	/// Updates the title of the window
 	void updateWindowTitle();
 
+	/// Show state (toolbar and font in minibuffer)
+	void showState();
+
 	/// Reset autosave timer
 	void resetAutosaveTimer();
-private:
-	/// 
-	LyXFunc * lyxfunc;
-	/// 
-	Toolbar * toolbar;
-	/// 
-	MiniBuffer * minibuffer;
 	///
-	Menus * menus;
+	virtual void prohibitInput() const = 0;
 	///
-	Intl * intl;
-
+	virtual void allowInput() const = 0;
+protected:
+	///
+	Menubar * menubar;
+	///
+	Toolbar * toolbar;
 	/** This is supposed to be a pointer or a list of pointers to the
 	   BufferViews currently being shown in the LyXView. So far
 	   this is not used, but that should change pretty soon. (Lgb) */
 	BufferView * bufferview;
 	///
-	void invalidateLayoutChoice();
+	MiniBuffer * minibuffer;
 	///
-	void UpdateDocumentClassChoice();
-public:
- 	///
- 	static int KeyPressMask_raw_callback(FL_FORM *, void * xev);
-	/** This callback is run when a close event is sent from the
-	  window manager. */
-	static int atCloseMainFormCB(FL_FORM *, void *);
+	Intl * intl;
+	///
+	Timeout * autosave_timeout;
 	/// A callback
 	void AutoSave();
-	/// A callback
-	static void UpdateTimerCB(FL_OBJECT *, long);
+	///
+	void invalidateLayoutChoice();
 private:
-	/// makes the main form.
-	void create_form_form_main(int width, int height);
-	/// A pointer to the form.	
-	FD_form_main * form_main_;
-	/// A pointer to the form.	
-	FL_FORM * form_;
-
+	///
+	LyXFunc * lyxfunc;
+	///
+	Dialogs * dialogs_;
+	///
+	virtual void setWindowTitle(string const &, string const &) = 0;
 	/** The last textclass layout list in the layout choice selector
 	  This should probably be moved to the toolbar, but for now it's
 	here. (Asger) */