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 857a12139c3cfd72c1117255fc15957bb32764dc..adf88d0ec3ca601f799694766419e776720c6a69 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -16,7 +16,7 @@
 #include "frontends/Application.h"
 #include "frontends/Toolbars.h"
 
-#include "lyxfunc.h"
+#include "LyXFunc.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
@@ -30,13 +30,13 @@ namespace lyx {
 namespace support { class FileName; }
 
 class Buffer;
-class InsetBase;
+class Inset;
 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();
 
@@ -90,12 +90,19 @@ public:
         */
        virtual void init() = 0;
 
+       enum Maximized {
+               NotMaximized,
+               VerticallyMaximized,
+               HorizontallyMaximized,
+               CompletelyMaximized
+       };
+
        ///
        virtual void setGeometry(
                unsigned int width,
                unsigned int height,
                int posx, int posy,
-               bool maximize,
+               int maximize,
                unsigned int iconSizeXY,
                const std::string & geometryArg) = 0;
 
@@ -105,7 +112,7 @@ public:
        /// show busy cursor
        virtual void busy(bool) = 0;
 
-       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarBackend::Toolbar const & tbb, bool newline) = 0;
+       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbinfo, bool newline) = 0;
 
        //@{ generic accessor functions
 
@@ -135,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
-       ToolbarBackend::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
@@ -179,7 +190,7 @@ public:
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
         */
-       Buffer const * const updateInset(InsetBase const *) const;
+       Buffer const * const updateInset(Inset const *) const;
 
        /// returns true if this view has the focus.
        virtual bool hasFocus() const = 0;
@@ -224,6 +235,8 @@ private:
 
        /// buffer changed signal connection
        boost::signals::connection bufferChangedConnection_;
+       /// buffer structure changed signal connection
+       boost::signals::connection bufferStructureChangedConnection_;
        /// buffer errors signal connection
        boost::signals::connection errorsConnection_;
        /// buffer messages signal connection
@@ -241,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
@@ -259,7 +278,7 @@ private:
        void showDialogWithData(std::string const & name,
                std::string const & data);
        void showInsetDialog(std::string const & name,
-               std::string const & data, InsetBase * inset);
+               std::string const & data, Inset * inset);
        void updateDialog(std::string const & name,
                std::string const & data);
        //@}
@@ -268,6 +287,9 @@ private:
        void showReadonly(bool);
 
 protected:
+       ///
+       void updateToc();
+
        /// view's command buffer controller
        // this has to be declared _after_ lyxfunc_ as its initialization depends
        // on it!