* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiToolbar.h

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index f616410658cc3c4358375fad71becdf14533840f..31146ee3999c7fff26c43d695a62e35bf0c5010e 100644 (file)
--- 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,119 +18,115 @@
 
 #include "Session.h"
 
-#include <QAbstractProxyModel>
-#include <QComboBox>
 #include <QList>
 #include <QToolBar>
-
-class QSortFilterProxyModel;
-class QStandardItemModel;
+#include <QToolButton>
 
 namespace lyx {
 
 class DocumentClass;
 class Inset;
-class ToolbarItem;
 
 namespace frontend {
 
 class Action;
 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(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 mousePressEvent(QMouseEvent * e);
 
 private:
-       friend class LayoutItemDelegate;
-
        ///
-       void resetFilter();
+       GuiToolbar * bar_;
        ///
-       void setFilter(QString const & s);
+       ToolbarItem const & tbitem_;
        ///
-       QString charFilterRegExp(QString const & filter);
-       ///
-       void countCategories();
-       
-       ///
-       GuiView & owner_;
-       ///
-       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_;
-       ///
-       unsigned visibleCategories_;
+       bool initialized_;
+
+private Q_SLOTS:
        ///
-       bool inShowPopup_;
+       void actionTriggered(QAction * action);
 };
 
 
+
 class GuiToolbar : public QToolBar
 {
        Q_OBJECT
 public:
+       ///
        GuiToolbar(ToolbarInfo const &, GuiView &);
 
+       ///
+       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() const;
+       /// Restore session settings.
+       void restoreSession();
+
        /// Refresh the contents of the bar.
-       void updateContents();
+       void update(bool in_math, bool in_table, bool review,
+               bool in_mathmacrotemplate);
+
+       ///
+       void toggle();
+
        ///
        GuiCommandBuffer * commandBuffer() { return command_buffer_; }
 
+       ///
        Action * addItem(ToolbarItem const & item);
 
 Q_SIGNALS:
+       ///
        void updated();
 
 private:
+       // load flags with saved values
+       void initFlags();
+       ///
+       void fill();
+       ///
+       void showEvent(QShowEvent *);
 
+       ///
+       QString name_;
+       ///
        QList<Action *> actions_;
+       /// initial visibility flags
+       int visibility_;
+       ///
+       bool allowauto_;
+       ///
        GuiView & owner_;
-
-       GuiLayoutBox * layout_;
+       ///
        GuiCommandBuffer * command_buffer_;
+       ///
+       ToolbarInfo const & tbinfo_;
+       ///
+       bool filled_;
 };
 
 } // namespace frontend