X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.h;h=31146ee3999c7fff26c43d695a62e35bf0c5010e;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=095be20f90438682b0b54c7510b8553f960478f5;hpb=15b42ccd4a6ddd69706dffdb053719a2f2091534;p=lyx.git

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index 095be20f90..31146ee399 100644
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
@@ -18,13 +18,9 @@
 
 #include "Session.h"
 
-#include <QAbstractProxyModel>
-#include <QComboBox>
 #include <QList>
 #include <QToolBar>
-
-class QSortFilterProxyModel;
-class QStandardItemModel;
+#include <QToolButton>
 
 namespace lyx {
 
@@ -38,76 +34,35 @@ class GuiCommandBuffer;
 class GuiLayoutFilterModel;
 class GuiToolbar;
 class GuiView;
-class LayoutItemDelegate;
+class LayoutBox;
 class ToolbarInfo;
 class ToolbarItem;
 
-class GuiLayoutBox : public QComboBox
+class MenuButton : public QToolButton
 {
 	Q_OBJECT
 public:
-	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, docstring const & category,
-		bool sorted, bool sortedByCat);
-
 	///
-	void showPopup();
-	
+	MenuButton(GuiToolbar * bar, ToolbarItem const & item,
+		bool const sticky = false);
 	///
-	bool eventFilter(QObject * o, QEvent * e);
-	///
-	QString const & filter() { return filter_; }
-
-private Q_SLOTS:
-	///
-	void selected(int index);
-	///
-	void setIconSize(QSize size);
+	void mousePressEvent(QMouseEvent * e);
 
 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_;
-	
-	/// 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_;
+	ToolbarItem const & tbitem_;
 	///
-	unsigned visibleCategories_;
+	bool initialized_;
+
+private Q_SLOTS:
 	///
-	bool inShowPopup_;
+	void actionTriggered(QAction * action);
 };
 
 
+
 class GuiToolbar : public QToolBar
 {
 	Q_OBJECT
@@ -167,11 +122,11 @@ private:
 	///
 	GuiView & owner_;
 	///
-	GuiLayoutBox * layout_;
-	///
 	GuiCommandBuffer * command_buffer_;
 	///
 	ToolbarInfo const & tbinfo_;
+	///
+	bool filled_;
 };
 
 } // namespace frontend