fix scrolling bug: 3320 and 3652, maybe not perfect

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

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 2624db24862dbaa6942d7d852d6f603d31c9a768..dc9b6df169a063f49958c245ae29e8ba0462a0ad 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>
@@ -27,14 +27,16 @@
 
 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;
 
@@ -68,12 +70,18 @@ public:
 
        virtual void close() = 0;
 
+       virtual void setFocus() = 0;
+
        std::vector<int> const & workAreaIds() const { return work_area_ids_; }
 
+       /// FIXME: rename to setCurrentWorkArea()
        void setWorkArea(frontend::WorkArea * work_area);
 
-       /// This signal is emitted with the LyXView id when it is closed.
-       boost::signal<void(int)> closed;
+       /// return the current WorkArea (the one that has the focus).
+       frontend::WorkArea const * currentWorkArea() const;
+       /// FIXME: This non-const access is needed because of
+       /// a mis-designed \c ControlSpellchecker.
+       frontend::WorkArea * currentWorkArea();
 
        /**
         * This is called after the concrete view has been created.
@@ -82,12 +90,21 @@ 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) = 0;
+               int maximize,
+               unsigned int iconSizeXY,
+               const std::string & geometryArg) = 0;
 
        /// save the geometry state in the session manager.
        virtual void saveGeometry() = 0;
@@ -95,7 +112,7 @@ public:
        /// show busy cursor
        virtual void busy(bool) = 0;
 
-       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarBackend::Toolbar const & tbb) = 0;
+       virtual Toolbars::ToolbarPtr makeToolbar(ToolbarInfo const & tbinfo, bool newline) = 0;
 
        //@{ generic accessor functions
 
@@ -126,7 +143,7 @@ public:
        //@}
 
        /// load a buffer into the current workarea
-       bool loadLyXFile(std::string const &  name, bool tolastfiles = true);
+       bool loadLyXFile(support::FileName const &  name, bool tolastfiles = true);
 
        /// set a buffer to the current workarea
        void setBuffer(Buffer * b);
@@ -136,6 +153,10 @@ public:
 
        /// update the toolbar
        void updateToolbars();
+       /// get toolbar state
+       ToolbarInfo::Flags getToolbarState(std::string const & name);
+       /// toggle toolbar state
+       void toggleToolbarState(std::string const & name);
        /// update the menubar
        void updateMenubar();
        /// update the status bar
@@ -165,7 +186,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;
@@ -210,6 +231,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
@@ -245,7 +268,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);
        //@}
@@ -254,6 +277,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!