Transfer Text::drawSelection() from InsetText::drawSelection() to InsetText::draw...

[lyx.git] / src / frontends / qt4 / QLToolbar.h

diff --git a/src/frontends/qt4/QLToolbar.h b/src/frontends/qt4/QLToolbar.h
index 3557ff07d58e811e6a54c2de9bab17933b949854..f2f97ce74148c152a274650ebef8ed4716d7e2e0 100644 (file)
--- a/src/frontends/qt4/QLToolbar.h
+++ b/src/frontends/qt4/QLToolbar.h
@@ -17,17 +17,21 @@
 #define QLTOOLBAR_H
 
 #include "frontends/Toolbars.h"
+#include "Session.h"
+
+#include <QToolBar>
+
 #include <boost/scoped_ptr.hpp>
 
-#include <QObject>
 #include <vector>
 
 class QComboBox;
-class QToolBar;
 
 namespace lyx {
+class FuncRequest;
 namespace frontend {
 
+class QCommandBuffer;
 class QLayoutBox;
 class GuiView;
 class Action;
@@ -39,7 +43,7 @@ public:
        QLayoutBox(QToolBar *, GuiView &);
 
        /// select the right layout in the combox.
-       void set(std::string const & layout);
+       void set(docstring const & layout);
        /// Populate the layout combox.
        void update();
        /// Erase the layout list.
@@ -58,33 +62,38 @@ private:
 };
 
 
-class QLToolbar : public QObject, public Toolbar {
+class QLToolbar : public QToolBar, public Toolbar {
        Q_OBJECT
 public:
-       QLToolbar(ToolbarBackend::Toolbar const &, LyXView &);
+       QLToolbar(ToolbarInfo const &, GuiView &);
 
        //~QLToolbar();
 
-       void add(FuncRequest const & func, std::string const & tooltip);
+       void add(ToolbarItem const & item);
        void hide(bool);
        void show(bool);
+       bool isVisible() const;
+       void saveInfo(ToolbarSection::ToolbarInfo & info);
        void update();
        LayoutBox * layout() const { return layout_.get(); }
+       ///
+       void focusCommandBuffer();
 
 Q_SIGNALS:
        void updated();
 
 private:
+       QCommandBuffer * command_buffer_;
 
        std::vector<Action *> ActionVector;
        GuiView & owner_;
-       QToolBar * toolbar_;
 
        boost::scoped_ptr<QLayoutBox> layout_;
-
-       Qt::ToolBarArea tba;
 };
 
+/// return a full path of an XPM for the given action
+std::string const getIcon(FuncRequest const & f, bool unknown = true);
+
 } // namespace frontend
 } // namespace lyx