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

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index a28c0a0c55..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,79 +16,126 @@
 #ifndef GUITOOLBAR_H
 #define GUITOOLBAR_H
 
-#include "frontends/Toolbars.h"
-#include "Session.h"
-
 #include <QList>
 #include <QToolBar>
+#include <QToolButton>
 
-class QComboBox;
+class QSettings;
 
 namespace lyx {
 
-class FuncRequest;
+class DocumentClass;
+class Inset;
 
 namespace frontend {
 
-class GuiCommandBuffer;
-class GuiLayoutBox;
-class GuiViewBase;
 class Action;
-
-
-class GuiLayoutBox : public QComboBox
+class GuiCommandBuffer;
+class GuiLayoutFilterModel;
+class GuiToolbar;
+class GuiView;
+class LayoutBox;
+class ToolbarInfo;
+class ToolbarItem;
+
+class MenuButton : public QToolButton
 {
 	Q_OBJECT
 public:
-	GuiLayoutBox(GuiViewBase &);
+	///
+	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 combox.
-	void updateContents();
+private:
+	///
+	void initialize();
+	///
+	GuiToolbar * bar_;
+	///
+	ToolbarItem const & tbitem_;
 
 private Q_SLOTS:
-	void selected(const QString & str);
-
-private:
-	GuiViewBase & owner_;
+	///
+	void actionTriggered(QAction * action);
+	///
+	void updateTriggered();
 };
 
 
+
 class GuiToolbar : public QToolBar
 {
 	Q_OBJECT
 public:
-	GuiToolbar(ToolbarInfo const &, GuiViewBase &);
+	///
+	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();
-	GuiLayoutBox * layout() const { return layout_; }
-	/// Set the focus on the command buffer, if any.
-	void focusCommandBuffer();
+	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_;
-	GuiViewBase & owner_;
-
-	GuiLayoutBox * layout_;
+	/// initial visibility flags
+	int visibility_;
+	///
+	GuiView & owner_;
+	///
 	GuiCommandBuffer * command_buffer_;
+	///
+	ToolbarInfo const & tbinfo_;
+	///
+	bool filled_;
+	///
+	bool restored_;
 };
 
-/// return a full path of an XPM for the given action
-std::string const getIcon(FuncRequest const & f, bool unknown = true);
-
 } // namespace frontend
 } // namespace lyx