#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 {
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, bool unknown);
-
- ///
- 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);
/// 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();
///
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_;
+ ///
+ bool restored_;
};
} // namespace frontend