#include <QComboBox>
#include <QFontMetrics>
#include <QHeaderView>
+#include <QItemDelegate>
#include <QKeyEvent>
#include <QList>
#include <QListView>
#include <QPainter>
#include <QPixmap>
-#include <QPlastiqueStyle>
#include <QSortFilterProxyModel>
#include <QStandardItem>
#include <QStandardItemModel>
#include <QToolButton>
#include <QVariant>
-#include <boost/assert.hpp>
+#include "support/assert.h"
#include <map>
#include <vector>
};
+// this must be sorted alphabetically
+// Upper case comes before lower case
PngMap sorted_png_map[] = {
{ "Bumpeq", "bumpeq2" },
{ "Cap", "cap2" },
{ "Updownarrow", "updownarrow2" },
{ "Upsilon", "upsilon2" },
{ "Vdash", "vdash3" },
+ { "Vert", "vert2" },
{ "Xi", "xi2" },
{ "nLeftarrow", "nleftarrow2" },
{ "nLeftrightarrow", "nleftrightarrow2" },
{
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 = find_if(begin, end, CompareKey(name));
//
/////////////////////////////////////////////////////////////////////
-class LayoutItemDelegate : public QAbstractItemDelegate {
+class LayoutItemDelegate : public QItemDelegate {
public:
///
explicit LayoutItemDelegate(QObject * parent = 0)
- : QAbstractItemDelegate(parent)
+ : QItemDelegate(parent)
{}
///
void paint(QPainter * painter, QStyleOptionViewItem const & option,
QModelIndex const & index) const
{
- QComboBox * combo = static_cast<QComboBox *>(parent());
- QSortFilterProxyModel const * model
- = static_cast<QSortFilterProxyModel const *>(index.model());
- QStyleOptionMenuItem opt = getStyleOption(option, index);
-
- painter->eraseRect(opt.rect);
+ QStyleOptionViewItem opt = option;
- QString text = underlineFilter(opt.text);
- opt.text = QString();
+ // 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
- paintBackground(painter, opt);
- paintCategoryHeader(painter, opt,
+ drawCategoryHeader(painter, opt,
category(*index.model(), index.row()));
// move rect down below header
- opt.rect.moveTop(opt.rect.top() + headerHeight(opt));
- opt.menuRect = opt.rect;
+ 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();
- 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();
QTextDocument doc;
doc.setDefaultFont(opt.font);
- doc.setHtml(text);
+ doc.setHtml(utext);
QTextFrameFormat fmt = doc.rootFrame()->frameFormat();
fmt.setMargin(0);
}
///
- QSize sizeHint(QStyleOptionViewItem const & option,
+ QSize sizeHint(QStyleOptionViewItem const & opt,
QModelIndex const & index) const
{
GuiLayoutBox * combo = static_cast<GuiLayoutBox *>(parent());
QSortFilterProxyModel const * model
- = static_cast<QSortFilterProxyModel const *>(index.model());
-
- // we use a compressed menu style here
- QStyleOptionMenuItem opt = getStyleOption(option, index);
- QSize size = combo->style()->sizeFromContents(
- QStyle::CT_MenuItem, &opt, opt.rect.size(), combo);
- size.setHeight(opt.rect.height());
+ = 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().
{
return model.data(model.index(row, 2), Qt::DisplayRole).toString();
}
-
- ///
- void paintBackground(QPainter * painter, QStyleOptionMenuItem const & opt) const
- {
- QComboBox * combo = static_cast<QComboBox *>(parent());
-
- // we only want to paint a background using the style, so
- // disable every thing else
- QStyleOptionMenuItem sopt = opt;
- sopt.menuRect = sopt.rect;
- sopt.state = QStyle::State_Active | QStyle::State_Enabled;
- sopt.checked = false;
- sopt.text = QString();
- painter->save();
- combo->style()->drawControl(QStyle::CE_MenuItem, &sopt,
- painter, combo->view());
- painter->restore();
- }
-
///
- int headerHeight(QStyleOptionMenuItem const & opt) const
+ int headerHeight(QStyleOptionViewItem const & opt) const
{
return opt.fontMetrics.height() * 8 / 10;
}
///
- void paintCategoryHeader(QPainter * painter, QStyleOptionMenuItem const & opt,
+ void drawCategoryHeader(QPainter * painter, QStyleOptionViewItem const & opt,
QString const & category) const
{
- painter->save();
-
// slightly blended color
QColor lcol = opt.palette.text().color();
lcol.setAlpha(127);
// draw the centered text
QFontMetrics fm(font);
- int w = opt.fontMetrics.width(category);
+ 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;
painter->drawLine(right + 1, ymid, opt.rect.right(), ymid);
} else
painter->drawLine(opt.rect.x(), ymid, opt.rect.right(), ymid);
-
- painter->restore();
}
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] + "</u>";
r += s.mid(lastp + 1);
return r;
}
-
- ///
- QStyleOptionMenuItem getStyleOption(QStyleOptionViewItem const & option,
- QModelIndex const & index) const
- {
- QComboBox * combo = static_cast<QComboBox *>(parent());
-
- // create the options for a menu item
- QStyleOptionMenuItem menuOption;
- menuOption.palette = QApplication::palette("QMenu");
- menuOption.state = QStyle::State_Active | QStyle::State_Enabled;
- menuOption.font = combo->font();
- menuOption.fontMetrics = QFontMetrics(menuOption.font);
- menuOption.rect = option.rect;
- menuOption.rect.setHeight(menuOption.fontMetrics.height() + 2);
- menuOption.menuRect = menuOption.rect;
- 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.checkType = QStyleOptionMenuItem::NotCheckable;
- menuOption.checked = false;
- return menuOption;
- }
};
};
-GuiLayoutBox::GuiLayoutBox(GuiView & owner)
- : owner_(owner), lastSel_(-1), layoutItemDelegate_(new LayoutItemDelegate(this)),
+GuiLayoutBox::GuiLayoutBox(GuiToolbar * bar, GuiView & owner)
+ : owner_(owner), bar_(bar), lastSel_(-1),
+ layoutItemDelegate_(new LayoutItemDelegate(this)),
visibleCategories_(0), inShowPopup_(false)
{
setSizeAdjustPolicy(QComboBox::AdjustToContents);
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);
}
void GuiLayoutBox::setFilter(QString const & s)
{
- 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."));
-
bool enabled = view()->updatesEnabled();
view()->setUpdatesEnabled(false);
// 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.
- BOOST_ASSERT(!inShowPopup_);
+ 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);
// call QComboBox::showPopup. But set the inShowPopup_ flag to switch on
// the hack in the item delegate to make space for the headers.
- BOOST_ASSERT(!inShowPopup_);
+ LASSERT(!inShowPopup_, /**/);
inShowPopup_ = true;
QComboBox::showPopup();
inShowPopup_ = false;
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)
{
// 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;
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 &&
- (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_->emptyLayoutName() && inset_ && !useEmpty)
continue;
addItemSort(name, lit->category(), lyxrc.sort_layouts, lyxrc.group_layouts);
}
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;
}
addSeparator();
break;
case ToolbarItem::LAYOUTS:
- layout_ = new GuiLayoutBox(owner_);
+ layout_ = new GuiLayoutBox(this, owner_);
addWidget(layout_);
break;
case ToolbarItem::MINIBUFFER:
projects / lyx.git / blobdiff