merge controllers/Makefile.am and controllers/tests/Makefile.am

[lyx.git] / src / frontends / LyXView.h

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index ae9f770807c3d9e8dcdbd069d0af162c587222f4..adf88d0ec3ca601f799694766419e776720c6a69 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -36,7 +36,7 @@ class Menubar;
 class BufferView;
 class Dialogs;
 class LyXFunc;
-class LyXFont;
+class Font;
 class Timeout;
 class FuncRequest;
 
@@ -79,7 +79,7 @@ public:
 
        /// return the current WorkArea (the one that has the focus).
        frontend::WorkArea const * currentWorkArea() const;
-       /// FIXME: This non-const access is needed because of 
+       /// FIXME: This non-const access is needed because of
        /// a mis-designed \c ControlSpellchecker.
        frontend::WorkArea * currentWorkArea();
 
@@ -142,21 +142,25 @@ public:
 
        //@}
 
-       /// load a buffer into the current workarea
-       bool loadLyXFile(support::FileName const &  name, bool tolastfiles = true);
+       /// load a buffer into the current workarea.
+       bool loadLyXFile(support::FileName const &  name, ///< File to load.
+               bool tolastfiles = true,  ///< append to the "Open recent" menu?
+               bool child_document = false, ///< Is this a child document?
+    bool auto_open = false); ///< Is this being opened by LyX itself?
 
-       /// set a buffer to the current workarea
-       void setBuffer(Buffer * b);
+       /// set a buffer to the current workarea.
+       void setBuffer(Buffer * b, ///< \c Buffer to set.
+               bool child_document = false);  ///< Is this a child document?
 
        /// updates the possible layouts selectable
        void updateLayoutChoice();
 
        /// update the toolbar
        void updateToolbars();
-       /// get toolbar state
-       ToolbarInfo::Flags getToolbarState(std::string const & name);
+       /// get toolbar info
+       ToolbarInfo * getToolbarInfo(std::string const & name);
        /// toggle toolbar state
-       void toggleToolbarState(std::string const & name);
+       void toggleToolbarState(std::string const & name, bool allowauto);
        /// update the menubar
        void updateMenubar();
        /// update the status bar
@@ -250,6 +254,12 @@ private:
        /// connect to signals in the given buffer
        void connectBuffer(Buffer & buf);
        /// disconnect from signals in the given buffer
+       /// NOTE: Do not call this unless you really want no buffer
+       /// to be connected---for example, when closing the last open
+       /// buffer. If you are switching buffers, just call 
+       /// connectBuffer(), and the old buffer will be disconnected
+       /// automatically. This ensures that we do not leave LyX in a
+       /// state in which no buffer is connected.
        void disconnectBuffer();
 
        /// BufferView messages signal connection