]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiToolbar.cpp
Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...
[lyx.git] / src / frontends / qt4 / GuiToolbar.cpp
index 2539b89f905f17085608393b0cceadb33fd0762a..9f99c0b737fb25913d1158f2c32cc978bf438dfa 100644 (file)
@@ -7,6 +7,7 @@
  * \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.
 
 #include <config.h>
 
+#include "GuiView.h"
+#include "GuiCommandBuffer.h"
+#include "GuiToolbar.h"
+#include "LyXAction.h"
+#include "Action.h"
+#include "qt_helpers.h"
+#include "InsertTableWidget.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
+#include "BufferView.h"
+#include "Cursor.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
 #include "IconPalette.h"
 #include "Layout.h"
 #include "LyXFunc.h"
+#include "LyXRC.h"
+#include "Paragraph.h"
+#include "TextClass.h"
 #include "ToolbarBackend.h"
 
-#include "GuiView.h"
-#include "GuiCommandBuffer.h"
-#include "GuiToolbar.h"
-#include "LyXAction.h"
-#include "Action.h"
-#include "qt_helpers.h"
-#include "InsertTableWidget.h"
-
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h" // sorted
 
+#include <QAbstractItemDelegate>
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
 #include <QComboBox>
+#include <QFontMetrics>
+#include <QHeaderView>
+#include <QItemDelegate>
+#include <QKeyEvent>
+#include <QList>
+#include <QListView>
+#include <QPainter>
+#include <QPixmap>
+#include <QSortFilterProxyModel>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QTextDocument>
+#include <QTextFrame>
 #include <QToolBar>
 #include <QToolButton>
-#include <QAction>
-#include <QPixmap>
+#include <QVariant>
 
-namespace lyx {
+#include "support/assert.h"
 
-using std::string;
-using std::endl;
+#include <map>
+#include <vector>
 
-using support::FileName;
-using support::libFileSearch;
-using support::subst;
-using support::compare;
+using namespace std;
+using namespace lyx::support;
 
+static void initializeResources()
+{
+       static bool initialized = false;
+       if (!initialized) {
+               Q_INIT_RESOURCE(Resources); 
+               initialized = true;
+       }
+}
 
-namespace frontend {
 
+namespace lyx {
+namespace frontend {
 
 namespace {
 
 struct PngMap {
-       char const * key;
-       char const * value;
+       QString key;
+       QString value;
 };
 
 
 bool operator<(PngMap const & lhs, PngMap const & rhs)
 {
-               return compare(lhs.key, rhs.key) < 0;
+               return lhs.key < rhs.key;
 }
 
 
 class CompareKey {
 public:
-       CompareKey(string const & name) : name_(name) {}
+       CompareKey(QString const & name) : name_(name) {}
        bool operator()(PngMap const & other) const { return other.key == name_; }
 private:
-       string const name_;
+       QString const name_;
 };
 
 
+// this must be sorted alphabetically
+// Upper case comes before lower case
 PngMap sorted_png_map[] = {
        { "Bumpeq", "bumpeq2" },
        { "Cap", "cap2" },
@@ -106,6 +136,7 @@ PngMap sorted_png_map[] = {
        { "Updownarrow", "updownarrow2" },
        { "Upsilon", "upsilon2" },
        { "Vdash", "vdash3" },
+       { "Vert", "vert2" },
        { "Xi", "xi2" },
        { "nLeftarrow", "nleftarrow2" },
        { "nLeftrightarrow", "nleftrightarrow2" },
@@ -113,47 +144,46 @@ PngMap sorted_png_map[] = {
        { "nVDash", "nvdash3" },
        { "nvDash", "nvdash2" },
        { "textrm \\AA", "textrm_AA"},
-       { "textrm \\O", "textrm_Oe"},
+       { "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)
+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));
+       LASSERT(sorted(begin, end), /**/);
 
-       PngMap const * const it = std::find_if(begin, end, CompareKey(name));
+       PngMap const * const it = find_if(begin, end, CompareKey(name));
 
-       string png_name;
-       if (it != end)
+       QString png_name;
+       if (it != end) {
                png_name = it->value;
-       else {
-               png_name = subst(name, "_", "underscore");
-               png_name = subst(png_name, ' ', '_');
+       } else {
+               png_name = name;
+               png_name.replace('_', "underscore");
+               png_name.replace(' ', '_');
 
                // 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 << '"' << std::endl;
-
-       return libFileSearch("images/math/", png_name, "png").absFilename();
+               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
@@ -162,50 +192,58 @@ string const find_png(string const & name)
 /// return a icon for the given action
 static QIcon getIcon(FuncRequest const & f, bool unknown)
 {
-       string fullname;
-
+       initializeResources();
+       QPixmap pm;
+       QString name1;
+       QString name2;
+       QString path;
        switch (f.action) {
        case LFUN_MATH_INSERT:
-               if (!f.argument().empty())
-                       fullname = find_png(to_utf8(f.argument()).substr(1));
+               if (!f.argument().empty()) {
+                       path = "math/";
+                       name1 = findPng(toqstr(f.argument()).mid(1));
+               }
                break;
        case LFUN_MATH_DELIM:
        case LFUN_MATH_BIGDELIM:
-               fullname = find_png(to_utf8(f.argument()));
+               path = "math/";
+               name1 = findPng(toqstr(f.argument()));
+               break;
+       case LFUN_CALL:
+               path = "commands/";
+               name1 = toqstr(f.argument());
                break;
        default:
-               string const name = lyxaction.getActionName(f.action);
-               string png_name = name;
-
-               if (!f.argument().empty())
-                       png_name = subst(name + ' ' + to_utf8(f.argument()), ' ', '_');
+               name2 = toqstr(lyxaction.getActionName(f.action));
+               name1 = name2;
 
-               fullname = libFileSearch("images", png_name, "png").absFilename();
-
-               if (fullname.empty()) {
-                       // try without the argument
-                       fullname = libFileSearch("images", name, "png").absFilename();
+               if (!f.argument().empty()) {
+                       name1 = name2 + ' ' + toqstr(f.argument());
+                       name1.replace(' ', '_');
                }
        }
 
-       if (!fullname.empty()) {
-               LYXERR(Debug::GUI) << "Full icon name is `"
-                                  << fullname << '\'' << endl;
-               return QIcon(toqstr(fullname));
-       }
+       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;
 
-       LYXERR(Debug::GUI) << "Cannot find icon for command \""
+       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()) << ")\"" << endl;
+                          << '(' << to_utf8(f.argument()) << ")\"");
        if (unknown)
-               return QIcon(toqstr(libFileSearch("images", "unknown", "png").absFilename()));
-       return QIcon();
-}
+               pm.load(":/images/unknown.png");
 
-
-static TextClass const & textClass(LyXView const & lv)
-{
-       return lv.buffer()->params().getTextClass();
+       return pm;
 }
 
 
@@ -215,83 +253,579 @@ static TextClass const & textClass(LyXView const & lv)
 //
 /////////////////////////////////////////////////////////////////////
 
-GuiLayoutBox::GuiLayoutBox(GuiViewBase & owner)
-       : owner_(owner)
+class LayoutItemDelegate : public QItemDelegate {
+public:
+       ///
+       explicit LayoutItemDelegate(QObject * parent = 0)
+               : QItemDelegate(parent)
+       {}
+       
+       ///
+       void paint(QPainter * painter, QStyleOptionViewItem const & option,
+               QModelIndex const & index) const
+       {
+               QStyleOptionViewItem opt = option;
+               
+               // default background
+               painter->fillRect(opt.rect, opt.palette.color(QPalette::Base));
+               
+               // category header?
+               if (lyxrc.group_layouts) {
+                       QSortFilterProxyModel const * model
+                       = static_cast<QSortFilterProxyModel const *>(index.model());
+                       
+                       QString stdCat = category(*model->sourceModel(), 0);
+                       QString cat = category(*index.model(), index.row());
+                       
+                       // 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();
+                       }
+               }
+
+               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();
+               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(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 & opt,
+               QModelIndex const & index) const
+       {
+               GuiLayoutBox * combo = static_cast<GuiLayoutBox *>(parent());
+               QSortFilterProxyModel const * model
+               = static_cast<QSortFilterProxyModel const *>(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));
+               }
+
+               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
+       {
+               // get filter
+               GuiLayoutBox * p = static_cast<GuiLayoutBox *>(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);
+                       LASSERT(p != -1, /**/);
+                       if (lastp == p - 1 && lastp != -1) {
+                               // remove ")" and append "x)"
+                               r = r.left(r.length() - 4) + s[p] + "</u>";
+                       } else {
+                               // append "(x)"
+                               r += s.mid(lastp + 1, p - lastp - 1);
+                               r += QString("<u>") + s[p] + "</u>";
+                       }
+                       lastp = p;
+               }
+               r += s.mid(lastp + 1);
+               return r;
+       }
+};
+
+
+class GuiLayoutFilterModel : public QSortFilterProxyModel {
+public:
+       ///
+       GuiLayoutFilterModel(QObject * parent = 0)
+               : QSortFilterProxyModel(parent)
+       {}
+       
+       ///
+       void triggerLayoutChange()
+       {
+               layoutAboutToBeChanged();
+               layoutChanged();
+       }
+};
+
+
+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);
        setMinimumWidth(sizeHint().width());
        setMaxVisibleItems(100);
 
-       QObject::connect(this, SIGNAL(activated(QString)),
-                        this, SLOT(selected(QString)));
+       // set the layout model with two columns
+       // 1st: translated layout names
+       // 2nd: raw layout names
+       model_ = new QStandardItemModel(0, 2, this);
+       filterModel_ = new GuiLayoutFilterModel(this);
+       filterModel_->setSourceModel(model_);
+       setModel(filterModel_);
+
+       // for the filtering we have to intercept characters
+       view()->installEventFilter(this);
+       view()->setItemDelegateForColumn(0, layoutItemDelegate_);
+       
+       QObject::connect(this, SIGNAL(activated(int)),
+               this, SLOT(selected(int)));
+       QObject::connect(bar_, SIGNAL(iconSizeChanged(QSize)),
+               this, SLOT(setIconSize(QSize)));
+
+       owner_.setLayoutDialog(this);
+       updateContents(true);
 }
 
 
-void GuiLayoutBox::set(docstring const & layout)
+void GuiLayoutBox::setFilter(QString const & s)
 {
-       TextClass const & tc = textClass(owner_);
+       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_->setFilterRegExp(charFilterRegExp(filter_));
+       countCategories();
+       
+       // restore old selection
+       if (lastSel_ != -1) {
+               QModelIndex i = filterModel_->mapFromSource(model_->index(lastSel_, 0));
+               if (i.isValid())
+                       setCurrentIndex(i.row());
+       }
+       
+       // Workaround to resize to content size
+       // FIXME: There must be a better way. The QComboBox::AdjustToContents)
+       //        does not help.
+       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(_("Filtering layouts with \"" + fromqstr(s) + "\". "
+                                        "Press ESC to remove filter."));
+               else
+                       owner_.message(_("Enter characters to filter the layout list."));
+       }
+       
+       view()->setUpdatesEnabled(enabled);
+}
 
-       QString const & name = toqstr(translateIfPossible(tc[layout]->name()));
 
-       int i = 0;
-       for (; i < count(); ++i) {
-               if (name == itemText(i))
+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;
+}
+
+
+void GuiLayoutBox::resetFilter()
+{
+       setFilter(QString());
+}
+
+
+void GuiLayoutBox::showPopup()
+{
+       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);
+}
+
+
+bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e)
+{
+       if (e->type() != QEvent::KeyPress)
+               return QComboBox::eventFilter(o, e);
+
+       QKeyEvent * ke = static_cast<QKeyEvent*>(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;
        }
 
-       if (i == count()) {
+       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);
+#endif
+}
+
+
+void GuiLayoutBox::set(docstring const & layout)
+{
+       resetFilter();
+       
+       if (!text_class_)
+               return;
+
+       QString const & name = toqstr((*text_class_)[layout].name());
+       if (name == currentText())
+               return;
+
+       QList<QStandardItem *> r = model_->findItems(name, Qt::MatchExactly, 1);
+       if (r.empty()) {
                lyxerr << "Trying to select non existent layout type "
                        << fromqstr(name) << endl;
                return;
        }
 
-       setCurrentIndex(i);
+       setCurrentIndex(filterModel_->mapFromSource(r.first()->index()).row());
 }
 
 
-void GuiLayoutBox::updateContents()
+void GuiLayoutBox::addItemSort(docstring const & item, docstring const & category,
+       bool sorted, bool sortedByCat)
 {
-       TextClass const & tc = textClass(owner_);
+       QString qitem = toqstr(item);
+       QString titem = toqstr(translateIfPossible(item));
+       QString qcat = toqstr(translateIfPossible(category));
+
+       QList<QStandardItem *> row;
+       row.append(new QStandardItem(titem));
+       row.append(new QStandardItem(qitem));
+       row.append(new QStandardItem(qcat));
+
+       // the first entry is easy
+       int const end = model_->rowCount();
+       if (end == 0) {
+               model_->appendRow(row);
+               return;
+       }
 
-       setUpdatesEnabled(false);
-       clear();
+       // find category
+       int i = 0;
+       if (sortedByCat) {
+               while (i < end && model_->item(i, 2)->text() != qcat)
+                       ++i;
+       }
 
-       TextClass::const_iterator it = tc.begin();
-       TextClass::const_iterator const end = tc.end();
-       for (; it != end; ++it) {
-               // ignore obsolete entries
-               if ((*it)->obsoleted_by().empty())
-                       addItem(toqstr(translateIfPossible((*it)->name())));
+       // skip the Standard layout
+       if (i == 0)
+               ++i;
+       
+       // 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
+               while (i != end
+                      && model_->item(i, 0)->text().compare(titem) < 0 
+                      && (!sortedByCat || model_->item(i, 2)->text() == qcat))
+                       ++i;
+       }
+
+       model_->insertRow(i, row);
+}
+
+
+void GuiLayoutBox::updateContents(bool reset)
+{
+       resetFilter();
+       
+       Buffer const * buffer = owner_.buffer();
+       if (!buffer) {
+               model_->clear();
+               setEnabled(false);
+               text_class_ = 0;
+               inset_ = 0;
+               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();
+       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_->forceEmptyLayout() || inset_->useEmptyLayout();
+               // if this inset requires the empty layout, we skip the default
+               // layout
+               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_ && !useEmpty)
+                       continue;
+               addItemSort(name, lit->category(), lyxrc.sort_layouts, lyxrc.group_layouts);
+       }
+
+       set(owner_.view()->cursor().innerParagraph().layout().name());
+       countCategories();
+       
        // needed to recalculate size hint
        hide();
        setMinimumWidth(sizeHint().width());
+       setEnabled(!buffer->isReadonly());
        show();
-
-       setUpdatesEnabled(true);
 }
 
 
-void GuiLayoutBox::selected(const QString & str)
+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());
+
        owner_.setFocus();
-       TextClass const & tc = owner_.buffer()->params().getTextClass();
-       docstring const name = qstring_to_ucs4(str);
-       TextClass::const_iterator it  = tc.begin();
-       TextClass::const_iterator const end = tc.end();
-       for (; it != end; ++it) {
-               docstring const & itname = (*it)->name();
-               if (translateIfPossible(itname) == name) {
-                       FuncRequest const func(LFUN_LAYOUT, itname,
-                                              FuncRequest::TOOLBAR);
-                       owner_.dispatch(func);
-                       return;
-               }
+
+       if (!text_class_) {
+               updateContents(false);
+               resetFilter();
+               return;
+       }
+
+       // find corresponding text class
+       if (text_class_->hasLayout(layoutName)) {
+               FuncRequest const func(LFUN_LAYOUT, layoutName, FuncRequest::TOOLBAR);
+               theLyXFunc().setLyXView(&owner_);
+               lyx::dispatch(func);
+               updateContents(false);
+               resetFilter();
+               return;
        }
-       lyxerr << "ERROR (layoutSelected): layout not found!"
-              << endl;
+       lyxerr << "ERROR (layoutSelected): layout not found!" << endl;
 }
 
 
@@ -303,7 +837,7 @@ void GuiLayoutBox::selected(const QString & str)
 /////////////////////////////////////////////////////////////////////
 
 
-GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiViewBase & owner)
+GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
        : QToolBar(qt_(tbinfo.gui_name), &owner), owner_(owner),
          layout_(0), command_buffer_(0)
 {
@@ -322,13 +856,121 @@ GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiViewBase & owner)
 
 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;
 }
 
+namespace {
+
+class PaletteButton : public QToolButton
+{
+private:
+       GuiToolbar * bar_;
+       ToolbarItem const & tbitem_;
+       bool initialized_;
+public:
+       PaletteButton(GuiToolbar * bar, ToolbarItem const & item)
+               : QToolButton(bar), bar_(bar), tbitem_(item), initialized_(false)
+       {
+               QString const label = qt_(to_ascii(tbitem_.label_));
+               setToolTip(label);
+               setStatusTip(label);
+               setText(label);
+               connect(bar_, SIGNAL(iconSizeChanged(QSize)),
+                       this, SLOT(setIconSize(QSize)));
+               setCheckable(true);
+               ToolbarInfo const * tbinfo = 
+                       toolbarbackend.getDefinedToolbarInfo(tbitem_.name_);
+               if (tbinfo)
+                       // use the icon of first action for the toolbar button
+                       setIcon(getIcon(tbinfo->items.begin()->func_, true));
+       }
+
+       void mousePressEvent(QMouseEvent * e)
+       {
+               if (initialized_) {
+                       QToolButton::mousePressEvent(e);
+                       return;
+               }
+
+               initialized_ = true;
+
+               ToolbarInfo const * tbinfo = 
+                       toolbarbackend.getDefinedToolbarInfo(tbitem_.name_);
+               if (!tbinfo) {
+                       lyxerr << "Unknown toolbar " << tbitem_.name_ << endl;
+                       return;
+               }
+               IconPalette * panel = new IconPalette(this);
+               QString const label = qt_(to_ascii(tbitem_.label_));
+               panel->setWindowTitle(label);
+               connect(this, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool)));
+               connect(panel, SIGNAL(visible(bool)), this, SLOT(setChecked(bool)));
+               ToolbarInfo::item_iterator it = tbinfo->items.begin();
+               ToolbarInfo::item_iterator const end = tbinfo->items.end();
+               for (; it != end; ++it)
+                       if (!getStatus(it->func_).unknown())
+                               panel->addButton(bar_->addItem(*it));
+
+               QToolButton::mousePressEvent(e);
+       }
+};
+
+class MenuButton : public QToolButton
+{
+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)));
+       }
+
+       void mousePressEvent(QMouseEvent * e)
+       {
+               if (initialized_) {
+                       QToolButton::mousePressEvent(e);
+                       return;
+               }
+
+               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 = 
+                       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);
+       }
+};
+
+}
+
 
 void GuiToolbar::add(ToolbarItem const & item)
 {
@@ -337,7 +979,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:
@@ -350,9 +992,10 @@ void GuiToolbar::add(ToolbarItem const & item)
                QToolButton * tb = new QToolButton;
                tb->setCheckable(true);
                tb->setIcon(getIcon(FuncRequest(LFUN_TABULAR_INSERT), true));
-               tb->setToolTip(qt_(to_ascii(item.label_)));
-               tb->setStatusTip(qt_(to_ascii(item.label_)));
-               tb->setText(qt_(to_ascii(item.label_)));
+               QString const label = qt_(to_ascii(item.label_));
+               tb->setToolTip(label);
+               tb->setStatusTip(label);
+               tb->setText(label);
                InsertTableWidget * iv = new InsertTableWidget(owner_, tb);
                connect(tb, SIGNAL(clicked(bool)), iv, SLOT(show(bool)));
                connect(iv, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool)));
@@ -360,63 +1003,12 @@ void GuiToolbar::add(ToolbarItem const & item)
                addWidget(tb);
                break;
                }
-       case ToolbarItem::ICONPALETTE: {
-               QToolButton * tb = new QToolButton(this);
-               tb->setToolTip(qt_(to_ascii(item.label_)));
-               tb->setStatusTip(qt_(to_ascii(item.label_)));
-               tb->setText(qt_(to_ascii(item.label_)));
-               connect(this, SIGNAL(iconSizeChanged(QSize)),
-                       tb, SLOT(setIconSize(QSize)));
-               IconPalette * panel = new IconPalette(tb);
-               panel->setWindowTitle(qt_(to_ascii(item.label_)));
-               connect(this, SIGNAL(updated()), panel, SLOT(updateParent()));
-               ToolbarInfo const * tbinfo = toolbarbackend.getDefinedToolbarInfo(item.name_);
-               if (!tbinfo) {
-                       lyxerr << "Unknown toolbar " << item.name_ << endl;
-                       break;
-               }
-               ToolbarInfo::item_iterator it = tbinfo->items.begin();
-               ToolbarInfo::item_iterator const end = tbinfo->items.end();
-               for (; it != end; ++it)
-                       if (!getStatus(it->func_).unknown()) {
-                               panel->addButton(addItem(*it));
-                               // use the icon of first action for the toolbar button
-                               if (it == tbinfo->items.begin())
-                                       tb->setIcon(getIcon(it->func_, true));
-                       }
-               tb->setCheckable(true);
-               connect(tb, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool)));
-               connect(panel, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool)));
-               addWidget(tb);
+       case ToolbarItem::ICONPALETTE:
+               addWidget(new PaletteButton(this, item));
                break;
-               }
+
        case ToolbarItem::POPUPMENU: {
-               QToolButton * tb = new QToolButton;
-               tb->setPopupMode(QToolButton::InstantPopup);
-               tb->setToolTip(qt_(to_ascii(item.label_)));
-               tb->setStatusTip(qt_(to_ascii(item.label_)));
-               tb->setText(qt_(to_ascii(item.label_)));
-               FileName icon_path = libFileSearch("images/math", item.name_, "png");
-               tb->setIcon(QIcon(toqstr(icon_path.absFilename())));
-               connect(this, SIGNAL(iconSizeChanged(QSize)),
-                       tb, SLOT(setIconSize(QSize)));
-
-               ButtonMenu * m = new ButtonMenu(qt_(to_ascii(item.label_)), tb);
-               m->setWindowTitle(qt_(to_ascii(item.label_)));
-               m->setTearOffEnabled(true);
-               connect(this, SIGNAL(updated()), m, SLOT(updateParent()));
-               ToolbarInfo const * tbinfo = toolbarbackend.getDefinedToolbarInfo(item.name_);
-               if (!tbinfo) {
-                       lyxerr << "Unknown toolbar " << item.name_ << endl;
-                       break;
-               }
-               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(addItem(*it));
-               tb->setMenu(m);
-               addWidget(tb);
+               addWidget(new MenuButton(this, item));
                break;
                }
        case ToolbarItem::COMMAND: {
@@ -471,12 +1063,14 @@ void GuiToolbar::updateContents()
        for (int i = 0; i < actions_.size(); ++i)
                actions_[i]->update();
 
+       if (layout_)
+               layout_->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled());
+
        // emit signal
        updated();
 }
 
 
-
 } // namespace frontend
 } // namespace lyx