#ifndef LYXVIEW_H
#define LYXVIEW_H
-#include <boost/utility.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
+#include <boost/signal.hpp>
#include <boost/signals/trackable.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/utility.hpp>
class Buffer;
-class Toolbar;
-class InsetOld;
+class Toolbars;
+class InsetBase;
class Intl;
class Menubar;
-class ControlCommandBuffer;
class BufferView;
class Dialogs;
class Timeout;
class FuncRequest;
+namespace lyx {
+namespace frontend {
+class ControlCommandBuffer;
+} // namespace frontend
+} // namespace lyx
+
/**
* LyXView - main LyX window
*
LyXFunc const & getLyXFunc() const { return *lyxfunc_.get(); }
/// return the toolbar for this view
- Toolbar & getToolbar() { return *toolbar_.get(); }
+ Toolbars & getToolbars() { return *toolbars_.get(); }
///
- Toolbar const & getToolbar() const { return *toolbar_.get(); }
+ Toolbars const & getToolbars() const { return *toolbars_.get(); }
/// return the menubar for this view
Menubar & getMenubar() { return *menubar_.get(); }
void updateLayoutChoice();
/// update the toolbar
- void updateToolbar();
+ void updateToolbars();
/// update the menubar
void updateMenubar();
/// focus the command buffer (minibuffer)
- boost::signal0<void> focus_command_buffer;
+ boost::signal<void()> focus_command_buffer;
/// view state string changed
- boost::signal0<void> view_state_changed;
+ boost::signal<void()> view_state_changed;
/// display a message in the view
virtual void message(std::string const &) = 0;
void resetAutosaveTimer();
/// dispatch to current BufferView
- void dispatch(FuncRequest const & req);
+ void dispatch(FuncRequest const & cmd);
/** 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(InsetOld const *) const;
+ Buffer const * const updateInset(InsetBase const *) const;
+
+ // returns true if this view has the focus.
+ virtual bool hasFocus() const = 0;
protected:
/// view of a buffer. Eventually there will be several.
/// view's menubar
boost::scoped_ptr<Menubar> menubar_;
- /// view's toolbar
- boost::scoped_ptr<Toolbar> toolbar_;
private:
/**
/// called on timeout
void autoSave();
+ /// view's toolbar
+ boost::scoped_ptr<Toolbars> toolbars_;
/// keyboard mapping object
boost::scoped_ptr<Intl> const intl_;
/// auto-saving of buffers
/// view's command buffer controller
// this has to be declared _after_ lyxfunc_ as its initialization depends
// on it!
- boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
+ typedef boost::scoped_ptr<lyx::frontend::ControlCommandBuffer>
+ CommandBufferPtr;
+
+ CommandBufferPtr const controlcommand_;
};
#endif // LYXVIEW_H