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 e5b869caa0ff8f4f60df956baa330610a7de751b..57650ac8eff18664b23ac36badc77dc40350e60f 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -18,39 +18,41 @@
 
 #include "Session.h"
 
+#include <QAbstractProxyModel>
+#include <QComboBox>
 #include <QList>
 #include <QToolBar>
-#include <QComboBox>
 
+class QSortFilterProxyModel;
 class QStandardItemModel;
 
 namespace lyx {
 
-class Inset;
 class DocumentClass;
+class Inset;
 class ToolbarItem;
 
 namespace frontend {
 
-class FilterItemDelegate;
+class Action;
 class GuiCommandBuffer;
-class GuiFilterProxyModel;
+class GuiLayoutFilterModel;
 class GuiView;
-class Action;
-
+class LayoutItemDelegate;
 
 class GuiLayoutBox : public QComboBox
 {
        Q_OBJECT
 public:
-       GuiLayoutBox(GuiView &);
+       GuiLayoutBox(GuiToolbar * bar, GuiView &);
 
        /// select the right layout in the combobox.
        void set(docstring const & layout);
        /// Populate the layout combobox.
        void updateContents(bool reset);
        /// Add Item to Layout box according to sorting settings from preferences
-       void addItemSort(docstring const & item, bool sorted);
+       void addItemSort(docstring const & item, docstring const & category,
+               bool sorted, bool sortedByCat);
 
        ///
        void showPopup();
@@ -63,16 +65,26 @@ public:
 private Q_SLOTS:
        ///
        void selected(int index);
+       ///
+       void setIconSize(QSize size);
 
 private:
+       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_;
@@ -80,13 +92,17 @@ private:
        /// the layout model: 1st column translated, 2nd column raw layout name
        QStandardItemModel * model_;
        /// the proxy model filtering \c model_
-       GuiFilterProxyModel * filterModel_;
+       GuiLayoutFilterModel * filterModel_;
        /// the (model-) index of the last successful selection
        int lastSel_;
        /// the character filter
        QString filter_;
        ///
-       FilterItemDelegate * filterItemDelegate_;
+       LayoutItemDelegate * layoutItemDelegate_;
+       ///
+       unsigned visibleCategories_;
+       ///
+       bool inShowPopup_;
 };
 
 
@@ -107,17 +123,22 @@ public:
        ///
        GuiCommandBuffer * commandBuffer() { return command_buffer_; }
 
+       ///
        Action * addItem(ToolbarItem const & item);
 
 Q_SIGNALS:
+       ///
        void updated();
 
 private:
-
+       ///
        QList<Action *> actions_;
+       ///
        GuiView & owner_;
 
+       ///
        GuiLayoutBox * layout_;
+       ///
        GuiCommandBuffer * command_buffer_;
 };