More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 23e2a30e666a01f1a097eef0627d489cb85f0100..8017453af51c88e2c90f1e80d9119653181f7626 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,16 +16,21 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
+#include "LString.h"
 #include "Timeout.h"
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
 class Buffer;
-class Menus;
+class Menubar;
+
 class BufferView;
 class Dialogs;
 
@@ -39,7 +44,7 @@ using SigC::Object;
   view is supposed (at least IMHO) to be another class, that shows its output
   in one or more LyXView's.
  */
-class LyXView : public Object {
+class LyXView : public Object, public noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -51,7 +56,7 @@ public:
        void setPosition(int, int);
 
        /// Show the main form.
-       void show(int, int, char const * t = "LyX");
+       void show(int, int, string const & t = string("LyX"));
 
        /// init (should probably be removed later) (Lgb)
        void init();
@@ -71,6 +76,12 @@ public:
        /// return a pointer to the toolbar
        Toolbar * getToolbar() const;
 
+       /// sets the layout in the toolbar layout combox
+       void setLayout(LyXTextClass::size_type layout);
+
+       /// update the toolbar
+       void updateToolbar();
+
        /// return a pointer to the lyxfunc
        LyXFunc * getLyXFunc() const;
 
@@ -78,7 +89,10 @@ public:
        MiniBuffer * getMiniBuffer() const;
 
        ///
-       Menus * getMenus() const;
+       Menubar * getMenubar() const;
+
+       ///
+       void updateMenubar();
 
        ///
        Intl * getIntl() const;
@@ -92,6 +106,10 @@ public:
        /// Updates the title of the window
        void updateWindowTitle();
 
+
+       /// Show state (toolbar and font in minibuffer)
+       void showState();
+
        /// Reset autosave timer
        void resetAutosaveTimer();
 private:
@@ -102,7 +120,7 @@ private:
        /// 
        MiniBuffer * minibuffer;
        ///
-       Menus * menus;
+       Menubar * menubar;
        ///
        Intl * intl;
        ///
@@ -114,11 +132,7 @@ private:
        BufferView * bufferview;
        ///
        void invalidateLayoutChoice();
-       ///
-       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 *);