fix tooltips in toolbar

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

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index bf8388a3a4d4be908c9ad566ac7baddb44b0288a..24fb6c952fa658ee7b693d5dae978569843e8b23 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -22,12 +22,13 @@
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/signals/signal0.hpp>
 
 class Buffer;
 class Toolbar;
-class MiniBuffer;
 class Intl;
 class Menubar;
+class ControlCommandBuffer;
 
 class BufferView;
 class Dialogs;
@@ -55,7 +56,11 @@ public:
 
        virtual ~LyXView();
 
-       /// FIXME: what is the requirement for this be to separate from the ctor ?
+       /**
+        * This is called after the concrete view has been created.
+        * We have to have the toolbar and the other stuff created
+        * before we can populate it with this call.
+        */
        void init();
 
        /// start modal operation
@@ -80,11 +85,6 @@ public:
        /// return the menubar for this view
        Menubar * getMenubar() const;
 
-       /// return the minibuffer for this view
-       /// FIXME: I'm not at all sure that LyXFunc should be
-       /// aware of a mini buffer as such
-       MiniBuffer * getMiniBuffer() const;
-
        /// get access to the dialogs
        Dialogs * getDialogs() { return dialogs_.get(); }
 
@@ -103,15 +103,15 @@ public:
        /// update the menubar
        void updateMenubar();
 
+       /// focus the command buffer (minibuffer)
+       boost::signal0<void> focus_command_buffer;
+ 
+       /// view state string changed
+       boost::signal0<void> view_state_changed;
+
        /// display a message in the view
-       void message(string const &);
-       /// push a message onto the history, and show it
-       void messagePush(string const & str);
-       /// pop the last message pushed
-       void messagePop();
-       /// show state (font etc.) in minibuffer
-       void showState();
-       
+       virtual void message(string const &) = 0;
+
        /// updates the title of the window
        void updateWindowTitle();
 
@@ -126,8 +126,8 @@ protected:
        boost::scoped_ptr<Menubar> menubar_;
        /// view's toolbar
        boost::scoped_ptr<Toolbar> toolbar_;
-       /// view's minibuffer
-       boost::scoped_ptr<MiniBuffer> minibuffer_;
+       /// view's command buffer controller
+       boost::scoped_ptr<ControlCommandBuffer> controlcommand_;
 
        /// keyboard mapping object
        boost::scoped_ptr<Intl> intl_;
@@ -138,9 +138,6 @@ protected:
        /// called on timeout
        void autoSave();
 
-       /// FIXME: GUII - toolbar property
-       void invalidateLayoutChoice();
-
 private:
        /**
         * setWindowTitle - set title of window
@@ -153,15 +150,6 @@ private:
        boost::scoped_ptr<LyXFunc> lyxfunc_;
        /// dialogs for this view
        boost::scoped_ptr<Dialogs> dialogs_;
-
-       /**
-        * 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)
-        *
-        * FIXME: GUII
-        */
-       int last_textclass_;
 };
 
 #endif // LYXVIEW_H