X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.h;h=badd59930ab4d2d97fe12f99fabb7b1c1d3a09a1;hb=c0a1893008bd13650d470afff16f56720b65c87c;hp=0d0dceffba54d34cc59f3391da04bb10b94811d4;hpb=ba3fa9bd039799f25e67bee7c6c0c6ff4bdf35de;p=lyx.git

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index 0d0dceffba..badd59930a 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,74 +16,124 @@
 #ifndef GUITOOLBAR_H
 #define GUITOOLBAR_H
 
-#include "Session.h"
-
 #include <QList>
 #include <QToolBar>
-#include <QComboBox>
+#include <QToolButton>
+
+class QSettings;
 
 namespace lyx {
 
-class TextClass;
-class ToolbarItem;
+class DocumentClass;
+class Inset;
 
 namespace frontend {
 
+class Action;
 class GuiCommandBuffer;
+class GuiLayoutFilterModel;
+class GuiToolbar;
 class GuiView;
-class Action;
-
+class LayoutBox;
+class ToolbarInfo;
+class ToolbarItem;
 
-class GuiLayoutBox : public QComboBox
+class MenuButton : public QToolButton
 {
 	Q_OBJECT
 public:
-	GuiLayoutBox(GuiView &);
+	///
+	MenuButton(GuiToolbar * bar, ToolbarItem const & item,
+		bool const sticky = false);
 
-	/// 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(QString const & item, bool sorted);
+private:
+	///
+	void initialize();
+	///
+	GuiToolbar * bar_;
+	///
+	ToolbarItem const & tbitem_;
 
 private Q_SLOTS:
-	void selected(const QString & str);
-
-private:
-	GuiView & owner_;
-	TextClass const * text_class_;
+	///
+	void actionTriggered(QAction * action);
+	///
+	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);
+
 	/// Add a button to the bar.
 	void add(ToolbarItem const & item);
-	/** update toolbar information
-	* ToolbarInfo will then be saved by session
-	*/
-	void saveInfo(ToolbarSection::ToolbarInfo & info);
+
+	/// Session key.
+	/**
+	 * This key must be used for any session setting.
+	 **/
+	QString sessionKey() const;
+	/// Save session settings.
+	void saveSession(QSettings & settings) const;
+	/// Restore session settings.
+	void restoreSession();
+
+	///
+	bool isRestored() const;
+
 	/// Refresh the contents of the bar.
-	void updateContents();
+	void update(int context = 0);
+
+	///
+	void toggle();
+
+	/// toggles movability
+	void movable(bool silent = false);
+
 	///
 	GuiCommandBuffer * commandBuffer() { return command_buffer_; }
 
+	///
+	Action * addItem(ToolbarItem const & item);
+
 Q_SIGNALS:
+	///
 	void updated();
 
 private:
-	Action * addItem(ToolbarItem const & item);
+	// load flags with saved values
+	void initFlags();
+	///
+	void fill();
+	///
+	void showEvent(QShowEvent *);
 
+	///
 	QList<Action *> actions_;
+	/// initial visibility flags
+	int visibility_;
+	///
 	GuiView & owner_;
-
-	GuiLayoutBox * layout_;
+	///
 	GuiCommandBuffer * command_buffer_;
+	///
+	ToolbarInfo const & tbinfo_;
+	///
+	bool filled_;
+	///
+	bool restored_;
 };
 
 } // namespace frontend