X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiToolbar.cpp;h=6ff3e9636596977e683264dbda48d617ac5b8085;hb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;hp=2da16848aab5e78240b409ca38b52217b74aa379;hpb=be624b3de0df348047ac2db05d27dbf16ec56e07;p=features.git diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp index 2da16848aa..6ff3e96365 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,13 +15,16 @@ #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 "qt_helpers.h" +#include "Toolbars.h" #include "Buffer.h" #include "BufferParams.h" @@ -28,289 +32,109 @@ #include "Cursor.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "IconPalette.h" #include "Layout.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 #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 { - QString key; - QString value; -}; - - -bool operator<(PngMap const & lhs, PngMap const & rhs) -{ - return lhs.key < rhs.key; -} - - -class CompareKey { -public: - CompareKey(QString const & name) : name_(name) {} - bool operator()(PngMap const & other) const { return other.key == name_; } -private: - QString 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); - - -QString findPng(QString 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)); - - QString png_name; - if (it != end) { - png_name = it->value; - } else { - png_name = name; - png_name.replace('_', "underscore"); - png_name.replace(' ', '_'); - - // This way we can have "math-delim { }" on the toolbar. - png_name.replace('(', "lparen"); - png_name.replace(')', "rparen"); - png_name.replace('[', "lbracket"); - png_name.replace(']', "rbracket"); - png_name.replace('{', "lbrace"); - png_name.replace('}', "rbrace"); - png_name.replace('|', "bars"); - png_name.replace(',', "thinspace"); - png_name.replace(':', "mediumspace"); - png_name.replace(';', "thickspace"); - png_name.replace('!', "negthinspace"); - } - - LYXERR(Debug::GUI, "findPng(" << fromqstr(name) << ")\n" - << "Looking for math PNG called \"" << fromqstr(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; - QString name1; - QString name2; - QString path; - switch (f.action) { - case LFUN_MATH_INSERT: - if (!f.argument().empty()) { - path = "math/"; - name1 = findPng(toqstr(f.argument()).mid(1)); - } - break; - case LFUN_MATH_DELIM: - case LFUN_MATH_BIGDELIM: - path = "math/"; - name1 = findPng(toqstr(f.argument())); - break; - case LFUN_CALL: - path = "commands/"; - name1 = toqstr(f.argument()); - break; - default: - name2 = toqstr(lyxaction.getActionName(f.action)); - name1 = name2; - - if (!f.argument().empty()) { - name1 = name2 + ' ' + toqstr(f.argument()); - name1.replace(' ', '_'); - } - } - - string 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/" + path + name1 + ".png")) - return pm; - - if (pm.load(":/images/" + 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 { +class LayoutItemDelegate : public QItemDelegate { public: /// - explicit FilterItemDelegate(QObject * parent = 0) - : QAbstractItemDelegate(parent) + explicit LayoutItemDelegate(QObject * parent = 0) + : QItemDelegate(parent) {} /// void paint(QPainter * painter, QStyleOptionViewItem const & option, QModelIndex const & index) const { - QComboBox * combo = static_cast(parent()); - QStyleOptionMenuItem opt = getStyleOption(option, index); + QStyleOptionViewItem opt = option; - // draw line with small text string for separator - if (opt.text.left(2) == "--") { - painter->save(); - - // set options for the separator, the first 8/18 of the vertical space - QStyleOptionMenuItem sopt = opt; - sopt.state = QStyle::State_Active | QStyle::State_Enabled; - sopt.checked = false; - sopt.text = QString(); - sopt.rect.setHeight(sopt.rect.height() * 8 / 18); - sopt.menuRect.setHeight(sopt.menuRect.height() * 8 / 18); - - // use the style with an empty text to paint the background - painter->eraseRect(sopt.rect); - combo->style()->drawControl(QStyle::CE_MenuItem, &sopt, painter, combo->view()); - - // draw the centered text, small and bold - QPen pen; - pen.setWidth(1); - pen.setColor(sopt.palette.text().color()); - painter->setPen(pen); - QFont font = sopt.font; - font.setBold(true); - font.setWeight(QFont::Black); - font.setPointSize(sopt.font.pointSize() * 8 / 10); - painter->setFont(font); - QRect brect; - painter->drawText(sopt.rect, Qt::AlignCenter, "Modules", &brect); - - // draw the horizontal line - QColor lcol = sopt.palette.text().color(); - lcol.setAlpha(127); - painter->setPen(lcol); - painter->drawLine(sopt.rect.x(), sopt.rect.y() + sopt.rect.height() / 2 , - brect.left() - 1, sopt.rect.y() + sopt.rect.height() / 2); - painter->drawLine(brect.right() + 1, sopt.rect.y() + sopt.rect.height() / 2, - sopt.rect.right(), sopt.rect.y() + sopt.rect.height() / 2); + // default background + painter->fillRect(opt.rect, opt.palette.color(QPalette::Base)); + + // category header? + if (lyxrc.group_layouts) { + QSortFilterProxyModel const * model + = static_cast(index.model()); - painter->restore(); + QString stdCat = category(*model->sourceModel(), 0); + QString cat = category(*index.model(), index.row()); - // move rect down 8/20 of the original height - opt.rect.setTop(sopt.rect.y() + sopt.rect.height()); - opt.menuRect = opt.rect; + // not the standard layout and not the same as in the previous line? + if (stdCat != cat + && (index.row() == 0 || cat != category(*index.model(), index.row() - 1))) { + painter->save(); + + // draw unselected background + QStyle::State state = opt.state; + opt.state = opt.state & ~QStyle::State_Selected; + drawBackground(painter, opt, index); + opt.state = state; + + // draw category header + drawCategoryHeader(painter, opt, + category(*index.model(), index.row())); + + // move rect down below header + opt.rect.setTop(opt.rect.top() + headerHeight(opt)); + + painter->restore(); + } } - // 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(); - QString text = underlineFilter(opt.text); - opt.text = QString(); - painter->eraseRect(opt.rect); - combo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, combo->view()); - painter->restore(); - + QItemDelegate::paint(painter, opt, index); + } + + /// + void drawDisplay(QPainter * painter, QStyleOptionViewItem const & opt, + const QRect & /*rect*/, const QString & text ) const + { + QString utext = underlineFilter(text); + // Draw the rich text. painter->save(); QColor col = opt.palette.text().color(); @@ -321,27 +145,107 @@ public: QTextDocument doc; doc.setDefaultFont(opt.font); - doc.setHtml(text); - painter->translate(opt.rect.x() + 20, opt.rect.y()); + doc.setHtml(utext); + + QTextFrameFormat fmt = doc.rootFrame()->frameFormat(); + fmt.setMargin(0); + doc.rootFrame()->setFrameFormat(fmt); + + painter->translate(opt.rect.x() + 5, + opt.rect.y() + (opt.rect.height() - opt.fontMetrics.height()) / 2); doc.documentLayout()->draw(painter, context); painter->restore(); } /// - QSize sizeHint(QStyleOptionViewItem const & option, + QSize sizeHint(QStyleOptionViewItem const & opt, QModelIndex const & index) const { - QComboBox * combo = static_cast(parent()); + GuiLayoutBox * combo = static_cast(parent()); + QSortFilterProxyModel const * model + = static_cast(index.model()); + QSize size = QItemDelegate::sizeHint(opt, index); + + /// QComboBox uses the first row height to estimate the + /// complete popup height during QComboBox::showPopup(). + /// To avoid scrolling we have to sneak in space for the headers. + /// So we tweak this value accordingly. It's not nice, but the + /// only possible way it seems. + if (lyxrc.group_layouts && index.row() == 0 && combo->inShowPopup_) { + int itemHeight = size.height(); + + // we have to show \c cats many headers: + unsigned cats = combo->visibleCategories_; + + // and we have \c n items to distribute the needed space over + unsigned n = combo->model()->rowCount(); + + // so the needed average height (rounded upwards) is: + size.setHeight((headerHeight(opt) * cats + itemHeight * n + n - 1) / n); + return size; + } + + // Add space for the category headers here? + // Not for the standard layout though. + QString stdCat = category(*model->sourceModel(), 0); + QString cat = category(*index.model(), index.row()); + if (lyxrc.group_layouts && stdCat != cat + && (index.row() == 0 || cat != category(*index.model(), index.row() - 1))) { + size.setHeight(size.height() + headerHeight(opt)); + } - QStyleOptionMenuItem opt = getStyleOption(option, index); - QSize size = combo->style()->sizeFromContents( - QStyle::CT_MenuItem, &opt, option.rect.size(), combo); - if (opt.text.left(2) == "--") - size.setHeight(size.height() * 18 / 10); return size; } private: + /// + QString category(QAbstractItemModel const & model, int row) const + { + return model.data(model.index(row, 2), Qt::DisplayRole).toString(); + } + + /// + int headerHeight(QStyleOptionViewItem const & opt) const + { + return opt.fontMetrics.height() * 8 / 10; + } + /// + void drawCategoryHeader(QPainter * painter, QStyleOptionViewItem const & opt, + QString const & category) const + { + // slightly blended color + QColor lcol = opt.palette.text().color(); + lcol.setAlpha(127); + painter->setPen(lcol); + + // set 80% scaled, bold font + QFont font = opt.font; + font.setBold(true); + font.setWeight(QFont::Black); + font.setPointSize(opt.font.pointSize() * 8 / 10); + painter->setFont(font); + + // draw the centered text + QFontMetrics fm(font); + int w = fm.width(category); + int x = opt.rect.x() + (opt.rect.width() - w) / 2; + int y = opt.rect.y() + fm.ascent(); + int left = x; + int right = x + w; + painter->drawText(x, y, category); + + // the vertical position of the line: middle of lower case chars + int ymid = y - 1 - fm.xHeight() / 2; // -1 for the baseline + + // draw the horizontal line + if (!category.isEmpty()) { + painter->drawLine(opt.rect.x(), ymid, left - 1, ymid); + painter->drawLine(right + 1, ymid, opt.rect.right(), ymid); + } else + painter->drawLine(opt.rect.x(), ymid, opt.rect.right(), ymid); + } + + /// QString underlineFilter(QString const & s) const { @@ -357,7 +261,7 @@ private: p->filter(); for (int i = 0; i < f.length(); ++i) { int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive); - BOOST_ASSERT(p != -1); + LASSERT(p != -1, /**/); if (lastp == p - 1 && lastp != -1) { // remove ")" and append "x)" r = r.left(r.length() - 4) + s[p] + ""; @@ -371,63 +275,29 @@ private: 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.checkType = QStyleOptionMenuItem::NonExclusive; - menuOption.state = QStyle::State_Active | QStyle::State_Enabled; - menuOption.menuRect = option.rect; - menuOption.rect = option.rect; - menuOption.font = combo->font(); - menuOption.fontMetrics = QFontMetrics(menuOption.font); - menuOption.tabWidth = 0; - menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() - .replace(QLatin1Char('&'), QLatin1String("&&")); - menuOption.menuItemType = QStyleOptionMenuItem::Normal; - if (option.state & QStyle::State_Selected) - menuOption.state |= QStyle::State_Selected; - menuOption.checked = combo->currentIndex() == index.row(); - - return menuOption; - } }; -class GuiFilterProxyModel : public QSortFilterProxyModel -{ +class GuiLayoutFilterModel : 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: + GuiLayoutFilterModel(QObject * parent = 0) + : QSortFilterProxyModel(parent) + {} + /// - QString charFilterRegExp(QString const & filter) + void triggerLayoutChange() { - QString re; - for (int i = 0; i < filter.length(); ++i) - re += ".*" + QRegExp::escape(filter[i]); - return re; + layoutAboutToBeChanged(); + layoutChanged(); } }; -GuiLayoutBox::GuiLayoutBox(GuiView & owner) - : owner_(owner), filterItemDelegate_(new FilterItemDelegate(this)) +GuiLayoutBox::GuiLayoutBox(GuiToolbar * bar, GuiView & owner) + : owner_(owner), bar_(bar), lastSel_(-1), + layoutItemDelegate_(new LayoutItemDelegate(this)), + visibleCategories_(0), inShowPopup_(false) { setSizeAdjustPolicy(QComboBox::AdjustToContents); setFocusPolicy(Qt::ClickFocus); @@ -438,18 +308,19 @@ GuiLayoutBox::GuiLayoutBox(GuiView & owner) // 1st: translated layout names // 2nd: raw layout names model_ = new QStandardItemModel(0, 2, this); - filterModel_ = new GuiFilterProxyModel(this); + filterModel_ = new GuiLayoutFilterModel(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_); + view()->setItemDelegateForColumn(0, layoutItemDelegate_); QObject::connect(this, SIGNAL(activated(int)), - this, SLOT(selected(int))); + this, SLOT(selected(int))); + QObject::connect(bar_, SIGNAL(iconSizeChanged(QSize)), + this, SLOT(setIconSize(QSize))); + owner_.setLayoutDialog(this); updateContents(true); } @@ -457,13 +328,17 @@ GuiLayoutBox::GuiLayoutBox(GuiView & owner) void GuiLayoutBox::setFilter(QString const & s) { + bool enabled = view()->updatesEnabled(); + view()->setUpdatesEnabled(false); + // remember old selection int sel = currentIndex(); if (sel != -1) lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row(); filter_ = s; - filterModel_->setCharFilter(s); + filterModel_->setFilterRegExp(charFilterRegExp(filter_)); + countCategories(); // restore old selection if (lastSel_ != -1) { @@ -475,8 +350,63 @@ void GuiLayoutBox::setFilter(QString const & s) // Workaround to resize to content size // FIXME: There must be a better way. The QComboBox::AdjustToContents) // does not help. - if (view()->isVisible()) + if (view()->isVisible()) { + // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on + // the hack in the item delegate to make space for the headers. + // We do not call our implementation of showPopup because that + // would reset the filter again. This is only needed if the user clicks + // on the QComboBox. + LASSERT(!inShowPopup_, /**/); + inShowPopup_ = true; QComboBox::showPopup(); + inShowPopup_ = false; + + // The item delegate hack is off again. So trigger a relayout of the popup. + filterModel_->triggerLayoutChange(); + + if (!s.isEmpty()) + owner_.message(bformat(_("Filtering layouts with \"%1$s\". " + "Press ESC to remove filter."), + qstring_to_ucs4(s))); + else + owner_.message(_("Enter characters to filter the layout list.")); + } + + view()->setUpdatesEnabled(enabled); +} + + +void GuiLayoutBox::countCategories() +{ + int n = filterModel_->rowCount(); + visibleCategories_ = 0; + if (n == 0 || !lyxrc.group_layouts) + return; + + // skip the "Standard" category + QString prevCat = model_->index(0, 2).data().toString(); + + // count categories + for (int i = 0; i < n; ++i) { + QString cat = filterModel_->index(i, 2).data().toString(); + if (cat != prevCat) + ++visibleCategories_; + prevCat = cat; + } +} + + +QString GuiLayoutBox::charFilterRegExp(QString const & filter) +{ + QString re; + for (int i = 0; i < filter.length(); ++i) { + QChar c = filter[i]; + if (c.isLower()) + re += ".*[" + QRegExp::escape(c) + QRegExp::escape(c.toUpper()) + "]"; + else + re += ".*" + QRegExp::escape(c); + } + return re; } @@ -488,9 +418,24 @@ void GuiLayoutBox::resetFilter() void GuiLayoutBox::showPopup() { - resetFilter(); owner_.message(_("Enter characters to filter the layout list.")); + + bool enabled = view()->updatesEnabled(); + view()->setUpdatesEnabled(false); + + resetFilter(); + + // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on + // the hack in the item delegate to make space for the headers. + LASSERT(!inShowPopup_, /**/); + inShowPopup_ = true; QComboBox::showPopup(); + inShowPopup_ = false; + + // The item delegate hack is off again. So trigger a relayout of the popup. + filterModel_->triggerLayoutChange(); + + view()->setUpdatesEnabled(enabled); } @@ -542,6 +487,18 @@ bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e) return QComboBox::eventFilter(o, e); } + +void GuiLayoutBox::setIconSize(QSize size) +{ +#ifdef Q_WS_MACX + bool small = size.height() < 20; + setAttribute(Qt::WA_MacSmallSize, small); + setAttribute(Qt::WA_MacNormalSize, !small); +#else + (void)size; // suppress warning +#endif +} + void GuiLayoutBox::set(docstring const & layout) { @@ -550,14 +507,21 @@ void GuiLayoutBox::set(docstring const & layout) if (!text_class_) return; - QString const & name = toqstr((*text_class_)[layout].name()); - if (name == currentText()) + Layout const & lay = (*text_class_)[layout]; + QString const newLayout = toqstr(lay.name()); + + int const curItem = currentIndex(); + QModelIndex const mindex = + filterModel_->mapToSource(filterModel_->index(curItem, 1)); + QString const & currentLayout = model_->itemFromIndex(mindex)->text(); + if (newLayout == currentLayout) { + LYXERR(Debug::GUI, "Already had " << newLayout << " selected."); return; + } - QList r = model_->findItems(name, Qt::MatchExactly, 1); + QList r = model_->findItems(newLayout, Qt::MatchExactly, 1); if (r.empty()) { - lyxerr << "Trying to select non existent layout type " - << fromqstr(name) << endl; + LYXERR0("Trying to select non existent layout type " << newLayout); return; } @@ -565,40 +529,57 @@ void GuiLayoutBox::set(docstring const & layout) } -void GuiLayoutBox::addItemSort(docstring const & item, bool sorted) +void GuiLayoutBox::addItemSort(docstring const & item, docstring const & category, + bool sorted, bool sortedByCat, bool unknown) { QString qitem = toqstr(item); - QString titem = toqstr(translateIfPossible(item)); + // FIXME This is wrong for RTL, I'd suppose. + QString titem = toqstr(translateIfPossible(item) + + (unknown ? _(" (unknown)") : from_ascii(""))); + QString qcat = toqstr(translateIfPossible(category)); QList row; row.append(new QStandardItem(titem)); row.append(new QStandardItem(qitem)); + row.append(new QStandardItem(qcat)); - // the simple unsorted case + // the first entry is easy int const end = model_->rowCount(); - if (!sorted || end < 2 || qitem[0].category() != QChar::Letter_Uppercase) { + if (end == 0) { model_->appendRow(row); return; } - // find row to insert the item, after the separator if it exists - int i = 1; // skip the Standard layout + // find category + int i = 0; + if (sortedByCat) { + while (i < end && model_->item(i, 2)->text() != qcat) + ++i; + } + + // skip the Standard layout + if (i == 0) + ++i; - QList sep = model_->findItems("--", Qt::MatchStartsWith); - if (!sep.isEmpty()) - i = sep.first()->index().row() + 1; - if (i < model_->rowCount()) { + // the simple unsorted case + if (!sorted) { + if (sortedByCat) { + // jump to the end of the category group + while (i < end && model_->item(i, 2)->text() == qcat) + ++i; + model_->insertRow(i, row); + } else + model_->appendRow(row); + return; + } + + // find row to insert the item, after the separator if it exists + if (i < end) { // find alphabetic position - QString is = model_->item(i, 0)->text(); - while (is.compare(titem) < 0) { - // e.g. --Separator-- - if (is.at(0).category() != QChar::Letter_Uppercase) - break; + while (i != end + && model_->item(i, 0)->text().localeAwareCompare(titem) < 0 + && (!sortedByCat || model_->item(i, 2)->text() == qcat)) ++i; - if (i == end) - break; - is = model_->item(i, 0)->text(); - } } model_->insertRow(i, row); @@ -622,7 +603,7 @@ void GuiLayoutBox::updateContents(bool reset) // or we've moved from one inset to another DocumentClass const * text_class = &buffer->params().documentClass(); Inset const * inset = - owner_.view()->cursor().innerParagraph().inInset(); + &(owner_.view()->cursor().innerParagraph().inInset()); if (!reset && text_class_ == text_class && inset_ == inset) { set(owner_.view()->cursor().innerParagraph().layout().name()); return; @@ -634,26 +615,32 @@ void GuiLayoutBox::updateContents(bool reset) model_->clear(); DocumentClass::const_iterator lit = text_class_->begin(); DocumentClass::const_iterator len = text_class_->end(); + for (; lit != len; ++lit) { docstring const & name = lit->name(); + bool const useEmpty = inset_->forcePlainLayout() || inset_->usePlainLayout(); // if this inset requires the empty layout, we skip the default // layout - if (name == text_class_->defaultLayoutName() && inset && - (inset->forceEmptyLayout() || inset->useEmptyLayout())) + if (name == text_class_->defaultLayoutName() && inset_ && useEmpty) continue; // if it doesn't require the empty layout, we skip it - if (name == text_class_->emptyLayoutName() && inset && - !inset->forceEmptyLayout() && !inset->useEmptyLayout()) + if (name == text_class_->plainLayoutName() && inset_ && !useEmpty) continue; - addItemSort(name, lyxrc.sort_layouts); + // obsoleted layouts are skipped as well + if (!lit->obsoleted_by().empty()) + continue; + addItemSort(name, lit->category(), lyxrc.sort_layouts, + lyxrc.group_layouts, lit->isUnknown()); } set(owner_.view()->cursor().innerParagraph().layout().name()); - + countCategories(); + // needed to recalculate size hint hide(); setMinimumWidth(sizeHint().width()); - setEnabled(!buffer->isReadonly()); + setEnabled(!buffer->isReadonly() && + lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled()); show(); } @@ -662,9 +649,7 @@ void GuiLayoutBox::selected(int index) { // get selection QModelIndex mindex = filterModel_->mapToSource(filterModel_->index(index, 1)); - docstring const layoutName = - qstring_to_ucs4(model_->itemFromIndex(mindex)->text()); - + docstring layoutName = qstring_to_ucs4(model_->itemFromIndex(mindex)->text()); owner_.setFocus(); if (!text_class_) { @@ -682,7 +667,7 @@ void GuiLayoutBox::selected(int index) resetFilter(); return; } - lyxerr << "ERROR (layoutSelected): layout not found!" << endl; + LYXERR0("ERROR (layoutSelected): layout " << layoutName << " not found!"); } @@ -695,27 +680,53 @@ void GuiLayoutBox::selected(int index) GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner) - : QToolBar(qt_(tbinfo.gui_name), &owner), owner_(owner), - layout_(0), command_buffer_(0) + : QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0), + allowauto_(false), owner_(owner), layout_(0), command_buffer_(0), + tbinfo_(tbinfo), filled_(false) { - // give visual separation between adjacent toolbars - addSeparator(); + setIconSize(owner.iconSize()); + connect(&owner, SIGNAL(iconSizeChanged(QSize)), this, + SLOT(setIconSize(QSize))); - // TODO: save toolbar position + // Toolbar dragging is allowed. setMovable(true); + // This is used by QMainWindow::restoreState for proper main window state + // restauration. + setObjectName(toqstr(tbinfo.name)); + restoreSession(); +} + - ToolbarInfo::item_iterator it = tbinfo.items.begin(); - ToolbarInfo::item_iterator end = tbinfo.items.end(); +void GuiToolbar::fill() +{ + if (filled_) + return; + ToolbarInfo::item_iterator it = tbinfo_.items.begin(); + ToolbarInfo::item_iterator end = tbinfo_.items.end(); for (; it != end; ++it) - add(*it); + add(*it); + filled_ = true; +} + + +void GuiToolbar::showEvent(QShowEvent * ev) +{ + fill(); + ev->accept(); +} + + +void GuiToolbar::setVisibility(int visibility) +{ + 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_)); + Action * act = new Action(&owner_, getIcon(item.func_, false), + toqstr(item.label_), item.func_, toqstr(item.label_), this); actions_.append(act); return act; } @@ -739,8 +750,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)); @@ -755,10 +765,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); @@ -810,10 +819,9 @@ public: m->setWindowTitle(label); m->setTearOffEnabled(true); connect(bar_, SIGNAL(updated()), m, SLOT(updateParent())); - 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; } ToolbarInfo::item_iterator it = tbinfo->items.begin(); @@ -837,7 +845,7 @@ void GuiToolbar::add(ToolbarItem const & item) addSeparator(); break; case ToolbarItem::LAYOUTS: - layout_ = new GuiLayoutBox(owner_); + layout_ = new GuiLayoutBox(this, owner_); addWidget(layout_); break; case ToolbarItem::MINIBUFFER: @@ -880,42 +888,21 @@ 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) @@ -929,7 +916,59 @@ void GuiToolbar::updateContents() } +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"