X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.h;h=43f61887485d56ef778944c3db59248b37772dc2;hb=161f7b7f62cb33dab681add6c5b5b68a887e2ea1;hp=caa50156e72ea18848fcd6ccdb7da53b5d90fd50;hpb=7bb8a5f183808b2801df176b8626dccb282f97d4;p=lyx.git

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index caa50156e7..43f6188748 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
@@ -16,15 +16,9 @@
 #ifndef GUITOOLBAR_H
 #define GUITOOLBAR_H
 
-#include "Session.h"
-
-#include <QAbstractProxyModel>
-#include <QComboBox>
 #include <QList>
 #include <QToolBar>
-
-class QSortFilterProxyModel;
-class QStandardItemModel;
+#include <QToolButton>
 
 namespace lyx {
 
@@ -38,82 +32,45 @@ 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();
-	
-	///
-	bool eventFilter(QObject * o, QEvent * e);
-	///
-	QString const & filter() { return filter_; }
-
-private Q_SLOTS:
-	///
-	void selected(int index);
 	///
-	void setIconSize(QSize size);
+	MenuButton(GuiToolbar * bar, ToolbarItem const & item,
+		bool const sticky = false);
 
 private:
-	friend class LayoutItemDelegate;
-
-	///
-	void resetFilter();
-	///
-	void setFilter(QString const & s);
 	///
-	QString charFilterRegExp(QString const & filter);
-	///
-	void countCategories();
-	
-	///
-	GuiView & owner_;
+	void initialize();
 	///
 	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_;
+
+private Q_SLOTS:
 	///
-	unsigned visibleCategories_;
+	void actionTriggered(QAction * action);
 	///
-	bool inShowPopup_;
+	void updateTriggered();
 };
 
 
+
 class GuiToolbar : public QToolBar
 {
 	Q_OBJECT
 public:
 	///
 	GuiToolbar(ToolbarInfo const &, GuiView &);
+	
+	/// Reimplemented from QToolbar to detect whether the 
+	/// toolbar is restored with MainWindow::restoreState().
+	void setVisible(bool visible);
 
 	///
 	void setVisibility(int visibility);
@@ -131,13 +88,18 @@ public:
 	/// Restore session settings.
 	void restoreSession();
 
+	///
+	bool isRestored() const;
+
 	/// Refresh the contents of the bar.
-	void update(bool in_math, bool in_table, bool review,
-		bool in_mathmacrotemplate);
+	void update(int context = 0);
 
 	///
 	void toggle();
 
+	/// toggles movability
+	void movable(bool silent = false);
+
 	///
 	GuiCommandBuffer * commandBuffer() { return command_buffer_; }
 
@@ -152,19 +114,24 @@ private:
 	// load flags with saved values
 	void initFlags();
 	///
-	QString name_;
+	void fill();
+	///
+	void showEvent(QShowEvent *);
+
 	///
 	QList<Action *> actions_;
 	/// initial visibility flags
 	int visibility_;
 	///
-	bool allowauto_;
-	///
 	GuiView & owner_;
 	///
-	GuiLayoutBox * layout_;
-	///
 	GuiCommandBuffer * command_buffer_;
+	///
+	ToolbarInfo const & tbinfo_;
+	///
+	bool filled_;
+	///
+	bool restored_;
 };
 
 } // namespace frontend