X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.cpp;h=0469db25151c5542926b60ce49d4b9565da55f57;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=750019d1cd816068fe8413edfc546b7b4eaa20f4;hpb=d749ce138db3f4314bb2e9d20c60bd2197268a9c;p=lyx.git diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index 750019d1cd..0469db2515 100644 --- a/src/frontends/qt4/GuiToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -3,10 +3,11 @@ * 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 + * \author Stefan Schimanski * \author Abdelrazak Younes * * Full author contact details are available in file CREDITS. @@ -14,651 +15,97 @@ #include -#include "GuiView.h" -#include "GuiCommandBuffer.h" #include "GuiToolbar.h" -#include "LyXAction.h" + #include "Action.h" -#include "qt_helpers.h" +#include "GuiApplication.h" +#include "GuiCommandBuffer.h" +#include "GuiView.h" +#include "IconPalette.h" #include "InsertTableWidget.h" +#include "LayoutBox.h" +#include "qt_helpers.h" +#include "Toolbars.h" -#include "Buffer.h" -#include "BufferParams.h" -#include "BufferView.h" -#include "Cursor.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "IconPalette.h" -#include "Layout.h" +#include "KeyMap.h" #include "LyXFunc.h" #include "LyXRC.h" -#include "Paragraph.h" -#include "TextClass.h" -#include "ToolbarBackend.h" #include "support/debug.h" -#include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" -#include "support/lyxalgo.h" // sorted - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include #include #include -#include -#include +#include "support/lassert.h" using namespace std; using namespace lyx::support; -static void initializeResources() -{ - static bool initialized = false; - if (!initialized) { - Q_INIT_RESOURCE(Resources); - initialized = true; - } -} - - namespace lyx { namespace frontend { -namespace { - -struct PngMap { - char const * key; - char const * value; -}; - - -bool operator<(PngMap const & lhs, PngMap const & rhs) -{ - return strcmp(lhs.key, rhs.key) < 0; -} - - -class CompareKey { -public: - CompareKey(string const & name) : name_(name) {} - bool operator()(PngMap const & other) const { return other.key == name_; } -private: - string const name_; -}; - - -PngMap sorted_png_map[] = { - { "Bumpeq", "bumpeq2" }, - { "Cap", "cap2" }, - { "Cup", "cup2" }, - { "Delta", "delta2" }, - { "Downarrow", "downarrow2" }, - { "Gamma", "gamma2" }, - { "Lambda", "lambda2" }, - { "Leftarrow", "leftarrow2" }, - { "Leftrightarrow", "leftrightarrow2" }, - { "Longleftarrow", "longleftarrow2" }, - { "Longleftrightarrow", "longleftrightarrow2" }, - { "Longrightarrow", "longrightarrow2" }, - { "Omega", "omega2" }, - { "Phi", "phi2" }, - { "Pi", "pi2" }, - { "Psi", "psi2" }, - { "Rightarrow", "rightarrow2" }, - { "Sigma", "sigma2" }, - { "Subset", "subset2" }, - { "Supset", "supset2" }, - { "Theta", "theta2" }, - { "Uparrow", "uparrow2" }, - { "Updownarrow", "updownarrow2" }, - { "Upsilon", "upsilon2" }, - { "Vdash", "vdash3" }, - { "Xi", "xi2" }, - { "nLeftarrow", "nleftarrow2" }, - { "nLeftrightarrow", "nleftrightarrow2" }, - { "nRightarrow", "nrightarrow2" }, - { "nVDash", "nvdash3" }, - { "nvDash", "nvdash2" }, - { "textrm \\AA", "textrm_AA"}, - { "textrm \\O", "textrm_O"}, - { "vDash", "vdash2" } -}; - -size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap); - - -string const find_png(string const & name) -{ - PngMap const * const begin = sorted_png_map; - PngMap const * const end = begin + nr_sorted_png_map; - BOOST_ASSERT(sorted(begin, end)); - - PngMap const * const it = find_if(begin, end, CompareKey(name)); - - string png_name; - if (it != end) - png_name = it->value; - else { - png_name = subst(name, "_", "underscore"); - png_name = subst(png_name, ' ', '_'); - - // This way we can have "math-delim { }" on the toolbar. - png_name = subst(png_name, "(", "lparen"); - png_name = subst(png_name, ")", "rparen"); - png_name = subst(png_name, "[", "lbracket"); - png_name = subst(png_name, "]", "rbracket"); - png_name = subst(png_name, "{", "lbrace"); - png_name = subst(png_name, "}", "rbrace"); - png_name = subst(png_name, "|", "bars"); - png_name = subst(png_name, ",", "thinspace"); - png_name = subst(png_name, ":", "mediumspace"); - png_name = subst(png_name, ";", "thickspace"); - png_name = subst(png_name, "!", "negthinspace"); - } - - LYXERR(Debug::GUI, "find_png(" << name << ")\n" - << "Looking for math PNG called \"" << png_name << '"'); - return png_name; -} - -} // namespace anon - - -/// return a icon for the given action -static QIcon getIcon(FuncRequest const & f, bool unknown) -{ - initializeResources(); - QPixmap pm; - string name1; - string name2; - string path; - string fullname; - - switch (f.action) { - case LFUN_MATH_INSERT: - if (!f.argument().empty()) { - path = "math/"; - name1 = find_png(to_utf8(f.argument()).substr(1)); - } - break; - case LFUN_MATH_DELIM: - case LFUN_MATH_BIGDELIM: - path = "math/"; - name1 = find_png(to_utf8(f.argument())); - break; - case LFUN_CALL: - path = "commands/"; - name1 = to_utf8(f.argument()); - break; - default: - name2 = lyxaction.getActionName(f.action); - name1 = name2; - - if (!f.argument().empty()) - name1 = subst(name2 + ' ' + to_utf8(f.argument()), ' ', '_'); - } - - fullname = libFileSearch("images/" + path, name1, "png").absFilename(); - if (pm.load(toqstr(fullname))) - return pm; - - fullname = libFileSearch("images/" + path, name2, "png").absFilename(); - if (pm.load(toqstr(fullname))) - return pm; - - if (pm.load(":/images/" + toqstr(path + name1) + ".png")) - return pm; - - if (pm.load(":/images/" + toqstr(path + name2) + ".png")) - return pm; - - LYXERR(Debug::GUI, "Cannot find icon for command \"" - << lyxaction.getActionName(f.action) - << '(' << to_utf8(f.argument()) << ")\""); - if (unknown) - pm.load(":/images/unknown.png"); - - return pm; -} - - -///////////////////////////////////////////////////////////////////// -// -// GuiLayoutBox -// -///////////////////////////////////////////////////////////////////// - -class FilterItemDelegate : public QAbstractItemDelegate { -public: - /// - explicit FilterItemDelegate(QObject * parent = 0) - : QAbstractItemDelegate(parent) {} - - /// - void paint(QPainter * painter, QStyleOptionViewItem const & option, - const QModelIndex &index) const { - QComboBox * combo = static_cast(parent()); - - // Draw using the menu item style (this is how QComboBox does it). - // But for the rich text drawing below we will call it with an - // empty string, and later then draw over it the real string. - painter->save(); - QStyleOptionMenuItem opt = getStyleOption(option, index); - QString text = underlineFilter(opt.text); - opt.text = QString(); - painter->eraseRect(option.rect); - combo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, combo->view()); - painter->restore(); - - // don't draw string for separator - if (opt.menuItemType == QStyleOptionMenuItem::Separator) - return; - - // Draw the rich text. - painter->save(); - QColor col = opt.palette.text().color(); - if (opt.state & QStyle::State_Selected) - col = opt.palette.highlightedText().color(); - QAbstractTextDocumentLayout::PaintContext context; - context.palette.setColor(QPalette::Text, col); - - QTextDocument doc; - doc.setDefaultFont(opt.font); - doc.setHtml(text); - painter->translate(opt.rect.x() + 20, opt.rect.y()); - doc.documentLayout()->draw(painter, context); - painter->restore(); - } - - /// - QSize sizeHint(QStyleOptionViewItem const & option, - QModelIndex const & index) const { - QComboBox * combo = static_cast(parent()); - - QStyleOptionMenuItem opt = getStyleOption(option, index); - return combo->style()->sizeFromContents( - QStyle::CT_MenuItem, &opt, option.rect.size(), combo); - } - -private: - /// - QString underlineFilter(QString const & s) const - { - // get filter - GuiLayoutBox * p = static_cast(parent()); - QString const & f = p->filter(); - if (f.isEmpty()) - return s; - - // step through data item and put "(x)" for every matching character - QString r; - int lastp = -1; - p->filter(); - for (int i = 0; i < f.length(); ++i) { - int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive); - BOOST_ASSERT(p != -1); - if (lastp == p - 1 && lastp != -1) { - // remove ")" and append "x)" - r = r.left(r.length() - 4) + s[p] + ""; - } else { - // append "(x)" - r += s.mid(lastp + 1, p - lastp - 1); - r += QString("") + s[p] + ""; - } - lastp = p; - } - r += s.mid(lastp + 1); - return r; - } - - /// - QStyleOptionMenuItem getStyleOption(QStyleOptionViewItem const & option, - QModelIndex const & index) const - { - QComboBox * combo = static_cast(parent()); - - // create the options for a menu item - QStyleOptionMenuItem menuOption; - menuOption.palette = QApplication::palette("QMenu"); - menuOption.state = QStyle::State_Active | QStyle::State_Enabled; - if (option.state & QStyle::State_Selected) - menuOption.state |= QStyle::State_Selected; - menuOption.checkType = QStyleOptionMenuItem::NonExclusive; - menuOption.checked = combo->currentIndex() == index.row(); - menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() - .replace(QLatin1Char('&'), QLatin1String("&&")); - if (menuOption.text.left(2) == "--") - menuOption.menuItemType = QStyleOptionMenuItem::Separator; - else - menuOption.menuItemType = QStyleOptionMenuItem::Normal; - menuOption.tabWidth = 0; - menuOption.menuRect = option.rect; - menuOption.rect = option.rect; - menuOption.font = combo->font(); - menuOption.fontMetrics = QFontMetrics(menuOption.font); - - return menuOption; - } -}; - - -class GuiFilterProxyModel : public QSortFilterProxyModel -{ -public: - /// - GuiFilterProxyModel(QObject * parent) - : QSortFilterProxyModel(parent) {} - - /// - void setCharFilter(QString const & f) - { - setFilterRegExp(charFilterRegExp(f)); - dataChanged(index(0, 0), index(rowCount() - 1, 1)); - } - -private: - /// - QString charFilterRegExp(QString const & filter) - { - QString re; - for (int i = 0; i < filter.length(); ++i) - re += ".*" + QRegExp::escape(filter[i]); - return re; - } -}; - - -GuiLayoutBox::GuiLayoutBox(GuiView & owner) - : owner_(owner), filterItemDelegate_(new FilterItemDelegate(this)) -{ - setSizeAdjustPolicy(QComboBox::AdjustToContents); - setFocusPolicy(Qt::ClickFocus); - setMinimumWidth(sizeHint().width()); - setMaxVisibleItems(100); - - // set the layout model with two columns - // 1st: translated layout names - // 2nd: raw layout names - model_ = new QStandardItemModel(0, 2, this); - filterModel_ = new GuiFilterProxyModel(this); - filterModel_->setSourceModel(model_); - filterModel_->setDynamicSortFilter(true); - filterModel_->setFilterCaseSensitivity(Qt::CaseInsensitive); - setModel(filterModel_); - - // for the filtering we have to intercept characters - view()->installEventFilter(this); - view()->setItemDelegateForColumn(0, filterItemDelegate_); - - QObject::connect(this, SIGNAL(activated(int)), - this, SLOT(selected(int))); - owner_.setLayoutDialog(this); - updateContents(true); -} - - -void GuiLayoutBox::setFilter(QString const & s) -{ - // remember old selection - int sel = currentIndex(); - if (sel != -1) - lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row(); - - filter_ = s; - filterModel_->setCharFilter(s); - - // restore old selection - if (lastSel_ != -1) { - QModelIndex i = filterModel_->mapFromSource(model_->index(lastSel_, 0)); - if (i.isValid()) - setCurrentIndex(i.row()); - } -} - - -void GuiLayoutBox::resetFilter() -{ - setFilter(QString()); -} - - -bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e) -{ - if (e->type() != QEvent::KeyPress) - return QComboBox::eventFilter(o, e); - - QKeyEvent * ke = static_cast(e); - bool modified = (ke->modifiers() == Qt::ControlModifier) - || (ke->modifiers() == Qt::AltModifier) - || (ke->modifiers() == Qt::MetaModifier); - - switch (ke->key()) { - case Qt::Key_Escape: - if (!modified && !filter_.isEmpty()) { - resetFilter(); - return true; - } - break; - case Qt::Key_Backspace: - if (!modified) { - // cut off one character - setFilter(filter_.left(filter_.length() - 1)); - } - break; - default: - if (modified || ke->text().isEmpty()) - break; - // find chars for the filter string - QString s; - for (int i = 0; i < ke->text().length(); ++i) { - QChar c = ke->text()[i]; - if (c.isLetterOrNumber() - || c.isSymbol() - || c.isPunct() - || c.category() == QChar::Separator_Space) { - s += c; - } - } - if (!s.isEmpty()) { - // append new chars to the filter string - setFilter(filter_ + s); - return true; - } - break; - } - - return QComboBox::eventFilter(o, e); -} - - -void GuiLayoutBox::set(docstring const & layout) -{ - resetFilter(); - - if (!text_class_) - return; - - QString const & name = toqstr((*text_class_)[layout]->name()); - if (name == currentText()) - return; - - QList r = model_->findItems(name, Qt::MatchExactly, 1); - if (r.empty()) { - lyxerr << "Trying to select non existent layout type " - << fromqstr(name) << endl; - return; - } - - setCurrentIndex(filterModel_->mapFromSource(r.first()->index()).row()); -} - - -void GuiLayoutBox::addItemSort(docstring const & item, bool sorted) +GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) + : QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0), + allowauto_(false), owner_(owner), command_buffer_(0), + tbinfo_(tbinfo), filled_(false) { - QString qitem = toqstr(item); - QString titem = toqstr(translateIfPossible(item)); - - QList row; - row.append(new QStandardItem(titem)); - row.append(new QStandardItem(qitem)); + setIconSize(owner.iconSize()); + connect(&owner, SIGNAL(iconSizeChanged(QSize)), this, + SLOT(setIconSize(QSize))); - // the simple unsorted case - int const end = model_->rowCount(); - if (!sorted || end < 2 || qitem[0].category() != QChar::Letter_Uppercase) { - model_->appendRow(row); - return; - } - - // find row to insert the item, after the separator if it exists - int i = 1; // skip the Standard layout - - QList sep = model_->findItems("--", Qt::MatchStartsWith); - if (!sep.isEmpty()) - i = sep.first()->index().row() + 1; - if (i < model_->rowCount()) { - // find alphabetic position - QString is = model_->item(i, 0)->text(); - while (is.compare(titem) < 0) { - // e.g. --Separator-- - if (is[0].category() != QChar::Letter_Uppercase) - break; - ++i; - if (i == end) - break; - is = model_->item(i, 0)->text(); - } - } - - model_->insertRow(i, row); + // Toolbar dragging is allowed. + setMovable(true); + // This is used by QMainWindow::restoreState for proper main window state + // restauration. + setObjectName(toqstr(tbinfo.name)); + restoreSession(); } -void GuiLayoutBox::updateContents(bool reset) +void GuiToolbar::fill() { - resetFilter(); - - Buffer const * buffer = owner_.buffer(); - if (!buffer) { - model_->clear(); - setEnabled(false); - text_class_ = 0; - inset_ = 0; + if (filled_) return; - } - - // we'll only update the layout list if the text class has changed - // or we've moved from one inset to another - DocumentClass const * text_class = &buffer->params().documentClass(); - Inset const * inset = - owner_.view()->cursor().innerParagraph().inInset(); - if (!reset && text_class_ == text_class && inset_ == inset) { - set(owner_.view()->cursor().innerParagraph().layout()->name()); - return; - } - - inset_ = inset; - text_class_ = text_class; - - model_->clear(); - for (size_t i = 0; i != text_class_->layoutCount(); ++i) { - Layout const & lt = *text_class_->layout(i); - docstring const & name = lt.name(); - // if this inset requires the empty layout, we skip the default - // layout - if (name == text_class_->defaultLayoutName() && inset && - (inset->forceEmptyLayout() || inset->useEmptyLayout())) - continue; - // if it doesn't require the empty layout, we skip it - if (name == text_class_->emptyLayoutName() && inset && - !inset->forceEmptyLayout() && !inset->useEmptyLayout()) - continue; - addItemSort(name, lyxrc.sort_layouts); - } - - set(owner_.view()->cursor().innerParagraph().layout()->name()); - - // needed to recalculate size hint - hide(); - setMinimumWidth(sizeHint().width()); - setEnabled(!buffer->isReadonly()); - show(); + ToolbarInfo::item_iterator it = tbinfo_.items.begin(); + ToolbarInfo::item_iterator end = tbinfo_.items.end(); + for (; it != end; ++it) + add(*it); + filled_ = true; } -void GuiLayoutBox::selected(int index) +void GuiToolbar::showEvent(QShowEvent * ev) { - // get selection - QModelIndex mindex = filterModel_->mapToSource(filterModel_->index(index, 1)); - docstring const name = qstring_to_ucs4(model_->itemFromIndex(mindex)->text()); - - owner_.setFocus(); - - if (!text_class_) { - updateContents(false); - resetFilter(); - return; - } - - // find corresponding text class - for (size_t i = 0; i != text_class_->layoutCount(); ++i) { - docstring const & itname = text_class_->layout(i)->name(); - if (itname == name) { - FuncRequest const func(LFUN_LAYOUT, itname, - FuncRequest::TOOLBAR); - theLyXFunc().setLyXView(&owner_); - lyx::dispatch(func); - updateContents(false); - resetFilter(); - return; - } - } - lyxerr << "ERROR (layoutSelected): layout not found!" << endl; + fill(); + ev->accept(); } - -///////////////////////////////////////////////////////////////////// -// -// GuiToolbar -// -///////////////////////////////////////////////////////////////////// - - -GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) - : QToolBar(qt_(tbinfo.gui_name), &owner), owner_(owner), - layout_(0), command_buffer_(0) +void GuiToolbar::setVisibility(int visibility) { - // give visual separation between adjacent toolbars - addSeparator(); - - // TODO: save toolbar position - setMovable(true); - - ToolbarInfo::item_iterator it = tbinfo.items.begin(); - ToolbarInfo::item_iterator end = tbinfo.items.end(); - for (; it != end; ++it) - add(*it); + visibility_ = visibility; + allowauto_ = visibility_ >= Toolbars::MATH; } Action * GuiToolbar::addItem(ToolbarItem const & item) { - Action * act = new Action(owner_, - getIcon(item.func_, false), - toqstr(item.label_), item.func_, toqstr(item.label_)); + QString text = toqstr(item.label_); + // Get the keys bound to this action, but keep only the + // first one later + KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(item.func_); + if (bindings.size()) + text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]"; + + Action * act = new Action(&owner_, getIcon(item.func_, false), + text, item.func_, text, this); actions_.append(act); return act; } @@ -682,8 +129,7 @@ public: connect(bar_, SIGNAL(iconSizeChanged(QSize)), this, SLOT(setIconSize(QSize))); setCheckable(true); - ToolbarInfo const * tbinfo = - toolbarbackend.getDefinedToolbarInfo(tbitem_.name_); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); if (tbinfo) // use the icon of first action for the toolbar button setIcon(getIcon(tbinfo->items.begin()->func_, true)); @@ -698,10 +144,9 @@ public: initialized_ = true; - ToolbarInfo const * tbinfo = - toolbarbackend.getDefinedToolbarInfo(tbitem_.name_); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); if (!tbinfo) { - lyxerr << "Unknown toolbar " << tbitem_.name_ << endl; + LYXERR0("Unknown toolbar " << tbitem_.name_); return; } IconPalette * panel = new IconPalette(this); @@ -719,57 +164,64 @@ public: } }; -class MenuButton : public QToolButton +} + + +MenuButton::MenuButton(GuiToolbar * bar, ToolbarItem const & item, bool const sticky) + : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false) { -private: - GuiToolbar * bar_; - ToolbarItem const & tbitem_; - bool initialized_; -public: - MenuButton(GuiToolbar * bar, ToolbarItem const & item) - : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false) - { - setPopupMode(QToolButton::InstantPopup); - QString const label = qt_(to_ascii(tbitem_.label_)); - setToolTip(label); - setStatusTip(label); - setText(label); - setIcon(QPixmap(":images/math/" + toqstr(tbitem_.name_) + ".png")); - connect(bar, SIGNAL(iconSizeChanged(QSize)), - this, SLOT(setIconSize(QSize))); + setPopupMode(QToolButton::InstantPopup); + QString const label = qt_(to_ascii(tbitem_.label_)); + setToolTip(label); + setStatusTip(label); + setText(label); + QString const name = toqstr(tbitem_.name_); + FileName const fname = libFileSearch("images/math/", name, "png"); + if (fname.exists()) + setIcon(QIcon(getPixmap("images/math/", name, "png"))); + else + setIcon(QIcon(getPixmap("images/", name, "png"))); + if (sticky) + connect(this, SIGNAL(triggered(QAction *)), + this, SLOT(actionTriggered(QAction *))); + connect(bar, SIGNAL(iconSizeChanged(QSize)), + this, SLOT(setIconSize(QSize))); +} + +void MenuButton::mousePressEvent(QMouseEvent * e) +{ + if (initialized_) { + QToolButton::mousePressEvent(e); + return; } - void mousePressEvent(QMouseEvent * e) - { - if (initialized_) { - QToolButton::mousePressEvent(e); - return; - } + initialized_ = true; - initialized_ = true; + QString const label = qt_(to_ascii(tbitem_.label_)); + ButtonMenu * m = new ButtonMenu(label, this); + m->setWindowTitle(label); + m->setTearOffEnabled(true); + connect(bar_, SIGNAL(updated()), m, SLOT(updateParent())); + ToolbarInfo const * tbinfo = guiApp->toolbars().info(tbitem_.name_); + if (!tbinfo) { + LYXERR0("Unknown toolbar " << tbitem_.name_); + return; + } + ToolbarInfo::item_iterator it = tbinfo->items.begin(); + ToolbarInfo::item_iterator const end = tbinfo->items.end(); + for (; it != end; ++it) + if (!getStatus(it->func_).unknown()) + m->add(bar_->addItem(*it)); + setMenu(m); - QString const label = qt_(to_ascii(tbitem_.label_)); - ButtonMenu * m = new ButtonMenu(label, this); - m->setWindowTitle(label); - m->setTearOffEnabled(true); - connect(bar_, SIGNAL(updated()), m, SLOT(updateParent())); - ToolbarInfo const * tbinfo = - toolbarbackend.getDefinedToolbarInfo(tbitem_.name_); - if (!tbinfo) { - lyxerr << "Unknown toolbar " << tbitem_.name_ << endl; - return; - } - ToolbarInfo::item_iterator it = tbinfo->items.begin(); - ToolbarInfo::item_iterator const end = tbinfo->items.end(); - for (; it != end; ++it) - if (!getStatus(it->func_).unknown()) - m->add(bar_->addItem(*it)); - setMenu(m); + QToolButton::mousePressEvent(e); +} - QToolButton::mousePressEvent(e); - } -}; +void MenuButton::actionTriggered(QAction * action) +{ + QToolButton::setDefaultAction(action); + setPopupMode(QToolButton::DelayedPopup); } @@ -779,10 +231,14 @@ void GuiToolbar::add(ToolbarItem const & item) case ToolbarItem::SEPARATOR: addSeparator(); break; - case ToolbarItem::LAYOUTS: - layout_ = new GuiLayoutBox(owner_); - addWidget(layout_); + case ToolbarItem::LAYOUTS: { + LayoutBox * layout = owner_.getLayoutDialog(); + QObject::connect(this, SIGNAL(iconSizeChanged(QSize)), + layout, SLOT(setIconSize(QSize))); + QAction * action = addWidget(layout); + action->setVisible(true); break; + } case ToolbarItem::MINIBUFFER: command_buffer_ = new GuiCommandBuffer(&owner_); addWidget(command_buffer_); @@ -809,7 +265,11 @@ void GuiToolbar::add(ToolbarItem const & item) break; case ToolbarItem::POPUPMENU: { - addWidget(new MenuButton(this, item)); + addWidget(new MenuButton(this, item, false)); + break; + } + case ToolbarItem::STICKYPOPUPMENU: { + addWidget(new MenuButton(this, item, true)); break; } case ToolbarItem::COMMAND: { @@ -823,56 +283,88 @@ void GuiToolbar::add(ToolbarItem const & item) } -void GuiToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo) +void GuiToolbar::update(bool in_math, bool in_table, bool in_review, + bool in_mathmacrotemplate) { - // if tbinfo.state == auto *do not* set on/off - if (tbinfo.state != ToolbarSection::ToolbarInfo::AUTO) { - if (GuiToolbar::isVisible()) - tbinfo.state = ToolbarSection::ToolbarInfo::ON; - else - tbinfo.state = ToolbarSection::ToolbarInfo::OFF; + if (visibility_ & Toolbars::AUTO) { + bool show_it = (in_math && (visibility_ & Toolbars::MATH)) + || (in_table && (visibility_ & Toolbars::TABLE)) + || (in_review && (visibility_ & Toolbars::REVIEW)) + || (in_mathmacrotemplate && (visibility_ & Toolbars::MATHMACROTEMPLATE)); + setVisible(show_it); } - // - // no need to save it here. - Qt::ToolBarArea loc = owner_.toolBarArea(this); - - if (loc == Qt::TopToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::TOP; - else if (loc == Qt::BottomToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::BOTTOM; - else if (loc == Qt::RightToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::RIGHT; - else if (loc == Qt::LeftToolBarArea) - tbinfo.location = ToolbarSection::ToolbarInfo::LEFT; - else - tbinfo.location = ToolbarSection::ToolbarInfo::NOTSET; - - // save toolbar position. They are not used to restore toolbar position - // now because move(x,y) does not work for toolbar. - tbinfo.posx = pos().x(); - tbinfo.posy = pos().y(); -} - -void GuiToolbar::updateContents() -{ // update visible toolbars only if (!isVisible()) return; + // This is a speed bottleneck because this is called on every keypress // and update calls getStatus, which copies the cursor at least two times for (int i = 0; i < actions_.size(); ++i) actions_[i]->update(); - if (layout_) - layout_->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled()); + LayoutBox * layout = owner_.getLayoutDialog(); + if (layout) + layout->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled()); // emit signal updated(); } +QString GuiToolbar::sessionKey() const +{ + return "views/" + QString::number(owner_.id()) + "/" + objectName(); +} + + +void GuiToolbar::saveSession() const +{ + QSettings settings; + settings.setValue(sessionKey() + "/visibility", visibility_); +} + + +void GuiToolbar::restoreSession() +{ + QSettings settings; + setVisibility(settings.value(sessionKey() + "/visibility").toInt()); +} + + +void GuiToolbar::toggle() +{ + docstring state; + if (allowauto_) { + if (!(visibility_ & Toolbars::AUTO)) { + visibility_ |= Toolbars::AUTO; + hide(); + state = _("auto"); + } else { + visibility_ &= ~Toolbars::AUTO; + if (isVisible()) { + hide(); + state = _("off"); + } else { + show(); + state = _("on"); + } + } + } else { + if (isVisible()) { + hide(); + state = _("off"); + } else { + show(); + state = _("on"); + } + } + + owner_.message(bformat(_("Toolbar \"%1$s\" state set to %2$s"), + qstring_to_ucs4(windowTitle()), state)); +} + } // namespace frontend } // namespace lyx -#include "GuiToolbar_moc.cpp" +#include "moc_GuiToolbar.cpp"