Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index ca4703ca0a9a0758a03ae59331095f4f6e60140c..57650ac8eff18664b23ac36badc77dc40350e60f 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -18,37 +18,91 @@
 
 #include "Session.h"
 
+#include <QAbstractProxyModel>
+#include <QComboBox>
 #include <QList>
 #include <QToolBar>
-#include <QComboBox>
+
+class QSortFilterProxyModel;
+class QStandardItemModel;
 
 namespace lyx {
 
+class DocumentClass;
+class Inset;
 class ToolbarItem;
 
 namespace frontend {
 
-class GuiCommandBuffer;
-class GuiViewBase;
 class Action;
-
+class GuiCommandBuffer;
+class GuiLayoutFilterModel;
+class GuiView;
+class LayoutItemDelegate;
 
 class GuiLayoutBox : public QComboBox
 {
        Q_OBJECT
 public:
-       GuiLayoutBox(GuiViewBase &);
+       GuiLayoutBox(GuiToolbar * bar, GuiView &);
 
        /// select the right layout in the combobox.
        void set(docstring const & layout);
        /// Populate the layout combobox.
-       void updateContents();
+       void updateContents(bool reset);
+       /// Add Item to Layout box according to sorting settings from preferences
+       void addItemSort(docstring const & item, docstring const & category,
+               bool sorted, bool sortedByCat);
+
+       ///
+       void showPopup();
+       
+       ///
+       bool eventFilter(QObject * o, QEvent * e);
+       ///
+       QString const & filter() { return filter_; }
 
 private Q_SLOTS:
-       void selected(const QString & str);
+       ///
+       void selected(int index);
+       ///
+       void setIconSize(QSize size);
 
 private:
-       GuiViewBase & owner_;
+       friend class LayoutItemDelegate;
+
+       ///
+       void resetFilter();
+       ///
+       void setFilter(QString const & s);
+       ///
+       QString charFilterRegExp(QString const & filter);
+       ///
+       void countCategories();
+       
+       ///
+       GuiView & owner_;
+       ///
+       GuiToolbar * bar_;
+       ///
+       DocumentClass const * text_class_;
+       ///
+       Inset const * inset_;
+       
+       /// the layout model: 1st column translated, 2nd column raw layout name
+       QStandardItemModel * model_;
+       /// the proxy model filtering \c model_
+       GuiLayoutFilterModel * filterModel_;
+       /// the (model-) index of the last successful selection
+       int lastSel_;
+       /// the character filter
+       QString filter_;
+       ///
+       LayoutItemDelegate * layoutItemDelegate_;
+       ///
+       unsigned visibleCategories_;
+       ///
+       bool inShowPopup_;
 };
 
 
@@ -56,7 +110,7 @@ class GuiToolbar : public QToolBar
 {
        Q_OBJECT
 public:
-       GuiToolbar(ToolbarInfo const &, GuiViewBase &);
+       GuiToolbar(ToolbarInfo const &, GuiView &);
 
        /// Add a button to the bar.
        void add(ToolbarItem const & item);
@@ -66,20 +120,25 @@ public:
        void saveInfo(ToolbarSection::ToolbarInfo & info);
        /// Refresh the contents of the bar.
        void updateContents();
-       GuiLayoutBox * layout() const { return layout_; }
        ///
        GuiCommandBuffer * commandBuffer() { return command_buffer_; }
 
+       ///
+       Action * addItem(ToolbarItem const & item);
+
 Q_SIGNALS:
+       ///
        void updated();
 
 private:
-       Action * addItem(ToolbarItem const & item);
-
+       ///
        QList<Action *> actions_;
-       GuiViewBase & owner_;
+       ///
+       GuiView & owner_;
 
+       ///
        GuiLayoutBox * layout_;
+       ///
        GuiCommandBuffer * command_buffer_;
 };