2006-03-05 17:24:44 +00:00
|
|
|
|
/**
|
2007-08-31 05:53:55 +00:00
|
|
|
|
* \file qt4/GuiToolbar.cpp
|
2006-03-05 17:24:44 +00:00
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
|
*
|
|
|
|
|
* \author Lars Gullik Bj<EFBFBD>nnes
|
|
|
|
|
* \author John Levon
|
|
|
|
|
* \author Jean-Marc Lasgouttes
|
|
|
|
|
* \author Angus Leeming
|
|
|
|
|
* \author Abdelrazak Younes
|
|
|
|
|
*
|
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "GuiView.h"
|
|
|
|
|
#include "GuiCommandBuffer.h"
|
|
|
|
|
#include "GuiToolbar.h"
|
|
|
|
|
#include "LyXAction.h"
|
|
|
|
|
#include "Action.h"
|
|
|
|
|
#include "qt_helpers.h"
|
|
|
|
|
#include "InsertTableWidget.h"
|
|
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
|
#include "Buffer.h"
|
|
|
|
|
#include "BufferParams.h"
|
2007-11-20 22:03:56 +00:00
|
|
|
|
#include "BufferView.h"
|
|
|
|
|
#include "Cursor.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
|
#include "FuncRequest.h"
|
2006-03-05 17:24:44 +00:00
|
|
|
|
#include "FuncStatus.h"
|
2007-04-26 03:53:02 +00:00
|
|
|
|
#include "IconPalette.h"
|
2007-09-29 20:02:32 +00:00
|
|
|
|
#include "Layout.h"
|
2007-09-19 22:37:22 +00:00
|
|
|
|
#include "LyXFunc.h"
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "LyXRC.h"
|
2007-11-20 22:03:56 +00:00
|
|
|
|
#include "Paragraph.h"
|
2007-11-07 23:25:08 +00:00
|
|
|
|
#include "TextClass.h"
|
2007-09-19 22:37:22 +00:00
|
|
|
|
#include "ToolbarBackend.h"
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "support/debug.h"
|
2007-10-20 23:08:02 +00:00
|
|
|
|
#include "support/filetools.h"
|
2008-02-18 07:14:42 +00:00
|
|
|
|
#include "support/gettext.h"
|
2007-04-19 19:43:15 +00:00
|
|
|
|
#include "support/lstrings.h"
|
2007-10-03 22:28:53 +00:00
|
|
|
|
#include "support/lyxalgo.h" // sorted
|
2007-09-19 22:37:22 +00:00
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
#include <QAbstractItemDelegate>
|
|
|
|
|
#include <QAbstractTextDocumentLayout>
|
|
|
|
|
#include <QApplication>
|
2006-03-05 17:24:44 +00:00
|
|
|
|
#include <QComboBox>
|
2008-03-04 09:46:35 +00:00
|
|
|
|
#include <QHeaderView>
|
|
|
|
|
#include <QKeyEvent>
|
|
|
|
|
#include <QList>
|
2008-03-05 12:00:56 +00:00
|
|
|
|
#include <QPainter>
|
2008-03-04 09:46:35 +00:00
|
|
|
|
#include <QPixmap>
|
|
|
|
|
#include <QSortFilterProxyModel>
|
|
|
|
|
#include <QStandardItem>
|
|
|
|
|
#include <QStandardItemModel>
|
2008-03-05 12:00:56 +00:00
|
|
|
|
#include <QTextDocument>
|
2006-03-05 17:24:44 +00:00
|
|
|
|
#include <QToolBar>
|
|
|
|
|
#include <QToolButton>
|
2008-03-04 09:46:35 +00:00
|
|
|
|
#include <QVariant>
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2007-11-02 19:59:08 +00:00
|
|
|
|
#include <boost/assert.hpp>
|
|
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
|
using namespace std;
|
2007-12-12 19:57:42 +00:00
|
|
|
|
using namespace lyx::support;
|
2007-10-17 18:28:45 +00:00
|
|
|
|
|
|
|
|
|
static void initializeResources()
|
|
|
|
|
{
|
|
|
|
|
static bool initialized = false;
|
|
|
|
|
if (!initialized) {
|
2007-10-19 18:45:09 +00:00
|
|
|
|
Q_INIT_RESOURCE(Resources);
|
2007-10-17 18:28:45 +00:00
|
|
|
|
initialized = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
namespace lyx {
|
2007-10-17 18:28:45 +00:00
|
|
|
|
namespace frontend {
|
2007-04-19 19:43:15 +00:00
|
|
|
|
|
2007-10-15 22:43:55 +00:00
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
|
|
struct PngMap {
|
|
|
|
|
char const * key;
|
|
|
|
|
char const * value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool operator<(PngMap const & lhs, PngMap const & rhs)
|
|
|
|
|
{
|
2007-12-12 22:43:37 +00:00
|
|
|
|
return strcmp(lhs.key, rhs.key) < 0;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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"},
|
2007-12-25 09:14:00 +00:00
|
|
|
|
{ "textrm \\O", "textrm_O"},
|
2007-10-15 22:43:55 +00:00
|
|
|
|
{ "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));
|
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
|
PngMap const * const it = find_if(begin, end, CompareKey(name));
|
2007-10-15 22:43:55 +00:00
|
|
|
|
|
|
|
|
|
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");
|
|
|
|
|
}
|
|
|
|
|
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::GUI, "find_png(" << name << ")\n"
|
|
|
|
|
<< "Looking for math PNG called \"" << png_name << '"');
|
2007-10-17 18:28:45 +00:00
|
|
|
|
return png_name;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// return a icon for the given action
|
|
|
|
|
static QIcon getIcon(FuncRequest const & f, bool unknown)
|
|
|
|
|
{
|
2007-10-17 18:28:45 +00:00
|
|
|
|
initializeResources();
|
|
|
|
|
QPixmap pm;
|
|
|
|
|
string name1;
|
|
|
|
|
string name2;
|
2007-10-20 23:08:02 +00:00
|
|
|
|
string path;
|
|
|
|
|
string fullname;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
|
|
|
|
|
switch (f.action) {
|
|
|
|
|
case LFUN_MATH_INSERT:
|
2007-10-20 23:08:02 +00:00
|
|
|
|
if (!f.argument().empty()) {
|
|
|
|
|
path = "math/";
|
|
|
|
|
name1 = find_png(to_utf8(f.argument()).substr(1));
|
|
|
|
|
}
|
2007-10-15 22:43:55 +00:00
|
|
|
|
break;
|
|
|
|
|
case LFUN_MATH_DELIM:
|
|
|
|
|
case LFUN_MATH_BIGDELIM:
|
2007-10-20 23:08:02 +00:00
|
|
|
|
path = "math/";
|
|
|
|
|
name1 = find_png(to_utf8(f.argument()));
|
2007-10-15 22:43:55 +00:00
|
|
|
|
break;
|
2007-10-20 23:27:03 +00:00
|
|
|
|
case LFUN_CALL:
|
|
|
|
|
path = "commands/";
|
|
|
|
|
name1 = to_utf8(f.argument());
|
|
|
|
|
break;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
default:
|
2007-10-17 18:28:45 +00:00
|
|
|
|
name2 = lyxaction.getActionName(f.action);
|
|
|
|
|
name1 = name2;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
|
|
|
|
|
if (!f.argument().empty())
|
2007-10-17 18:28:45 +00:00
|
|
|
|
name1 = subst(name2 + ' ' + to_utf8(f.argument()), ' ', '_');
|
2007-10-15 22:43:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-10-20 23:08:02 +00:00
|
|
|
|
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"))
|
2007-10-17 18:28:45 +00:00
|
|
|
|
return pm;
|
|
|
|
|
|
2007-10-20 23:08:02 +00:00
|
|
|
|
if (pm.load(":/images/" + toqstr(path + name2) + ".png"))
|
2007-10-17 18:28:45 +00:00
|
|
|
|
return pm;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
|
2007-11-15 20:04:51 +00:00
|
|
|
|
LYXERR(Debug::GUI, "Cannot find icon for command \""
|
2007-10-15 22:43:55 +00:00
|
|
|
|
<< lyxaction.getActionName(f.action)
|
2007-11-15 20:04:51 +00:00
|
|
|
|
<< '(' << to_utf8(f.argument()) << ")\"");
|
2007-10-15 22:43:55 +00:00
|
|
|
|
if (unknown)
|
2007-10-17 18:28:45 +00:00
|
|
|
|
pm.load(":/images/unknown.png");
|
|
|
|
|
|
|
|
|
|
return pm;
|
2007-10-15 22:43:55 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-09-28 22:53:00 +00:00
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// GuiLayoutBox
|
|
|
|
|
//
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
class FilterItemDelegate : public QAbstractItemDelegate {
|
2008-03-04 09:46:35 +00:00
|
|
|
|
public:
|
|
|
|
|
///
|
2008-03-05 12:00:56 +00:00
|
|
|
|
explicit FilterItemDelegate(QObject * parent = 0)
|
2008-03-05 20:43:55 +00:00
|
|
|
|
: QAbstractItemDelegate(parent) {}
|
2008-03-04 09:46:35 +00:00
|
|
|
|
|
|
|
|
|
///
|
2008-03-05 12:04:46 +00:00
|
|
|
|
void paint(QPainter * painter, QStyleOptionViewItem const & option,
|
2008-03-05 13:07:01 +00:00
|
|
|
|
QModelIndex const & index) const {
|
2008-03-05 22:41:56 +00:00
|
|
|
|
QComboBox * combo = static_cast<QComboBox *>(parent());
|
2008-03-05 20:43:55 +00:00
|
|
|
|
QStyleOptionMenuItem opt = getStyleOption(option, index);
|
2008-03-05 12:00:56 +00:00
|
|
|
|
|
2008-03-05 20:43:55 +00:00
|
|
|
|
// 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);
|
|
|
|
|
|
|
|
|
|
painter->restore();
|
|
|
|
|
|
|
|
|
|
// move rect down 8/20 of the original height
|
|
|
|
|
opt.rect.setTop(sopt.rect.y() + sopt.rect.height());
|
|
|
|
|
opt.menuRect = opt.rect;
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
// 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.
|
2008-03-05 12:01:27 +00:00
|
|
|
|
painter->save();
|
2008-03-05 12:00:56 +00:00
|
|
|
|
QString text = underlineFilter(opt.text);
|
|
|
|
|
opt.text = QString();
|
2008-03-05 20:43:55 +00:00
|
|
|
|
painter->eraseRect(opt.rect);
|
2008-03-05 12:01:40 +00:00
|
|
|
|
combo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, combo->view());
|
2008-03-05 12:01:27 +00:00
|
|
|
|
painter->restore();
|
2008-03-05 12:02:00 +00:00
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
// 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);
|
2008-03-05 12:01:27 +00:00
|
|
|
|
painter->translate(opt.rect.x() + 20, opt.rect.y());
|
2008-03-05 12:00:56 +00:00
|
|
|
|
doc.documentLayout()->draw(painter, context);
|
|
|
|
|
painter->restore();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
///
|
2008-03-05 12:04:46 +00:00
|
|
|
|
QSize sizeHint(QStyleOptionViewItem const & option,
|
|
|
|
|
QModelIndex const & index) const {
|
2008-03-05 22:41:56 +00:00
|
|
|
|
QComboBox * combo = static_cast<QComboBox *>(parent());
|
2008-03-05 12:00:56 +00:00
|
|
|
|
|
|
|
|
|
QStyleOptionMenuItem opt = getStyleOption(option, index);
|
2008-03-05 20:43:55 +00:00
|
|
|
|
QSize size = combo->style()->sizeFromContents(
|
2008-03-05 12:00:56 +00:00
|
|
|
|
QStyle::CT_MenuItem, &opt, option.rect.size(), combo);
|
2008-03-05 20:43:55 +00:00
|
|
|
|
if (opt.text.left(2) == "--")
|
|
|
|
|
size.setHeight(size.height() * 18 / 10);
|
|
|
|
|
return size;
|
2008-03-05 12:00:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
///
|
|
|
|
|
QString underlineFilter(QString const & s) const
|
2008-03-04 09:46:35 +00:00
|
|
|
|
{
|
2008-03-05 12:00:56 +00:00
|
|
|
|
// get filter
|
2008-03-04 09:46:35 +00:00
|
|
|
|
GuiLayoutBox * p = static_cast<GuiLayoutBox *>(parent());
|
|
|
|
|
QString const & f = p->filter();
|
2008-03-05 12:00:56 +00:00
|
|
|
|
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] + "</u>";
|
|
|
|
|
} else {
|
|
|
|
|
// append "(x)"
|
|
|
|
|
r += s.mid(lastp + 1, p - lastp - 1);
|
|
|
|
|
r += QString("<u>") + s[p] + "</u>";
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
2008-03-05 12:00:56 +00:00
|
|
|
|
lastp = p;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
2008-03-05 12:00:56 +00:00
|
|
|
|
r += s.mid(lastp + 1);
|
|
|
|
|
return r;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
2008-03-05 12:00:56 +00:00
|
|
|
|
|
|
|
|
|
///
|
2008-03-05 12:04:46 +00:00
|
|
|
|
QStyleOptionMenuItem getStyleOption(QStyleOptionViewItem const & option,
|
|
|
|
|
QModelIndex const & index) const
|
2008-03-05 12:00:56 +00:00
|
|
|
|
{
|
2008-03-05 22:41:56 +00:00
|
|
|
|
QComboBox * combo = static_cast<QComboBox *>(parent());
|
2008-03-05 20:43:55 +00:00
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
// create the options for a menu item
|
|
|
|
|
QStyleOptionMenuItem menuOption;
|
|
|
|
|
menuOption.palette = QApplication::palette("QMenu");
|
|
|
|
|
menuOption.checkType = QStyleOptionMenuItem::NonExclusive;
|
2008-03-05 20:43:55 +00:00
|
|
|
|
menuOption.state = QStyle::State_Active | QStyle::State_Enabled;
|
2008-03-05 12:00:56 +00:00
|
|
|
|
menuOption.menuRect = option.rect;
|
|
|
|
|
menuOption.rect = option.rect;
|
|
|
|
|
menuOption.font = combo->font();
|
|
|
|
|
menuOption.fontMetrics = QFontMetrics(menuOption.font);
|
2008-03-05 20:43:55 +00:00
|
|
|
|
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();
|
2008-03-05 12:02:00 +00:00
|
|
|
|
|
2008-03-05 12:00:56 +00:00
|
|
|
|
return menuOption;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class GuiFilterProxyModel : public QSortFilterProxyModel
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
///
|
|
|
|
|
GuiFilterProxyModel(QObject * parent)
|
2008-03-05 19:00:26 +00:00
|
|
|
|
: QSortFilterProxyModel(parent) {}
|
2008-03-05 12:00:56 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
///
|
|
|
|
|
void setCharFilter(QString const & f)
|
|
|
|
|
{
|
|
|
|
|
setFilterRegExp(charFilterRegExp(f));
|
2008-03-05 12:01:27 +00:00
|
|
|
|
dataChanged(index(0, 0), index(rowCount() - 1, 1));
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
///
|
|
|
|
|
QString charFilterRegExp(QString const & filter)
|
|
|
|
|
{
|
|
|
|
|
QString re;
|
|
|
|
|
for (int i = 0; i < filter.length(); ++i)
|
|
|
|
|
re += ".*" + QRegExp::escape(filter[i]);
|
|
|
|
|
return re;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2007-11-05 13:52:37 +00:00
|
|
|
|
GuiLayoutBox::GuiLayoutBox(GuiView & owner)
|
2008-03-05 12:00:56 +00:00
|
|
|
|
: owner_(owner), filterItemDelegate_(new FilterItemDelegate(this))
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
2007-10-01 21:26:25 +00:00
|
|
|
|
setSizeAdjustPolicy(QComboBox::AdjustToContents);
|
|
|
|
|
setFocusPolicy(Qt::ClickFocus);
|
|
|
|
|
setMinimumWidth(sizeHint().width());
|
|
|
|
|
setMaxVisibleItems(100);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
// 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);
|
2008-03-05 12:00:56 +00:00
|
|
|
|
view()->setItemDelegateForColumn(0, filterItemDelegate_);
|
2008-03-04 09:46:35 +00:00
|
|
|
|
|
|
|
|
|
QObject::connect(this, SIGNAL(activated(int)),
|
|
|
|
|
this, SLOT(selected(int)));
|
2007-11-20 22:03:56 +00:00
|
|
|
|
owner_.setLayoutDialog(this);
|
2007-11-20 22:29:17 +00:00
|
|
|
|
updateContents(true);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
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());
|
|
|
|
|
}
|
2008-03-05 12:26:50 +00:00
|
|
|
|
|
|
|
|
|
// Workaround to resize to content size
|
|
|
|
|
// FIXME: There must be a better way. The QComboBox::AdjustToContents)
|
|
|
|
|
// does not help.
|
|
|
|
|
if (view()->isVisible())
|
2008-03-05 16:02:18 +00:00
|
|
|
|
QComboBox::showPopup();
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void GuiLayoutBox::resetFilter()
|
|
|
|
|
{
|
|
|
|
|
setFilter(QString());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-05 16:02:18 +00:00
|
|
|
|
void GuiLayoutBox::showPopup()
|
|
|
|
|
{
|
|
|
|
|
resetFilter();
|
|
|
|
|
owner_.message(_("Enter characters to filter the layout list."));
|
|
|
|
|
QComboBox::showPopup();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-04 09:46:49 +00:00
|
|
|
|
bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e)
|
2008-03-04 09:46:35 +00:00
|
|
|
|
{
|
2008-03-04 09:46:49 +00:00
|
|
|
|
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())
|
2008-03-04 09:46:35 +00:00
|
|
|
|
break;
|
2008-03-04 09:46:49 +00:00
|
|
|
|
// 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;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2008-03-04 09:46:49 +00:00
|
|
|
|
if (!s.isEmpty()) {
|
|
|
|
|
// append new chars to the filter string
|
|
|
|
|
setFilter(filter_ + s);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
2008-03-04 09:46:49 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
return QComboBox::eventFilter(o, e);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-08-31 05:53:55 +00:00
|
|
|
|
void GuiLayoutBox::set(docstring const & layout)
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
2008-03-04 09:46:35 +00:00
|
|
|
|
resetFilter();
|
|
|
|
|
|
2007-11-20 22:03:56 +00:00
|
|
|
|
if (!text_class_)
|
|
|
|
|
return;
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
QString const & name = toqstr((*text_class_)[layout]->name());
|
2007-11-20 22:03:56 +00:00
|
|
|
|
if (name == currentText())
|
|
|
|
|
return;
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
QList<QStandardItem *> r = model_->findItems(name, Qt::MatchExactly, 1);
|
|
|
|
|
if (r.empty()) {
|
2006-03-05 17:24:44 +00:00
|
|
|
|
lyxerr << "Trying to select non existent layout type "
|
|
|
|
|
<< fromqstr(name) << endl;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
setCurrentIndex(filterModel_->mapFromSource(r.first()->index()).row());
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
void GuiLayoutBox::addItemSort(docstring const & item, bool sorted)
|
2007-11-10 00:21:42 +00:00
|
|
|
|
{
|
2008-03-04 09:46:35 +00:00
|
|
|
|
QString qitem = toqstr(item);
|
2008-03-04 09:47:11 +00:00
|
|
|
|
QString titem = toqstr(translateIfPossible(item));
|
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
QList<QStandardItem *> row;
|
2008-03-04 09:47:11 +00:00
|
|
|
|
row.append(new QStandardItem(titem));
|
2008-03-04 09:46:35 +00:00
|
|
|
|
row.append(new QStandardItem(qitem));
|
|
|
|
|
|
|
|
|
|
// the simple unsorted case
|
|
|
|
|
int const end = model_->rowCount();
|
|
|
|
|
if (!sorted || end < 2 || qitem[0].category() != QChar::Letter_Uppercase) {
|
|
|
|
|
model_->appendRow(row);
|
2007-11-10 00:21:42 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2008-03-05 12:02:18 +00:00
|
|
|
|
// find row to insert the item, after the separator if it exists
|
2008-03-04 09:46:35 +00:00
|
|
|
|
int i = 1; // skip the Standard layout
|
2008-03-05 12:02:18 +00:00
|
|
|
|
|
|
|
|
|
QList<QStandardItem *> 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--
|
2008-03-05 19:00:11 +00:00
|
|
|
|
if (is.at(0).category() != QChar::Letter_Uppercase)
|
2008-03-05 12:02:18 +00:00
|
|
|
|
break;
|
|
|
|
|
++i;
|
|
|
|
|
if (i == end)
|
|
|
|
|
break;
|
|
|
|
|
is = model_->item(i, 0)->text();
|
|
|
|
|
}
|
2007-11-10 00:21:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
model_->insertRow(i, row);
|
2007-11-10 00:21:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-11-20 22:03:56 +00:00
|
|
|
|
void GuiLayoutBox::updateContents(bool reset)
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
2008-03-04 09:46:35 +00:00
|
|
|
|
resetFilter();
|
|
|
|
|
|
2007-11-20 22:03:56 +00:00
|
|
|
|
Buffer const * buffer = owner_.buffer();
|
|
|
|
|
if (!buffer) {
|
2008-03-04 09:46:35 +00:00
|
|
|
|
model_->clear();
|
2007-11-20 22:03:56 +00:00
|
|
|
|
setEnabled(false);
|
|
|
|
|
text_class_ = 0;
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
inset_ = 0;
|
2007-11-20 22:03:56 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
// we'll only update the layout list if the text class has changed
|
|
|
|
|
// or we've moved from one inset to another
|
2008-03-04 09:46:35 +00:00
|
|
|
|
DocumentClass const * text_class = &buffer->params().documentClass();
|
|
|
|
|
Inset const * inset =
|
|
|
|
|
owner_.view()->cursor().innerParagraph().inInset();
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
if (!reset && text_class_ == text_class && inset_ == inset) {
|
2007-11-20 22:03:56 +00:00
|
|
|
|
set(owner_.view()->cursor().innerParagraph().layout()->name());
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
inset_ = inset;
|
2007-11-20 22:03:56 +00:00
|
|
|
|
text_class_ = text_class;
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
model_->clear();
|
2008-03-06 05:59:21 +00:00
|
|
|
|
DocumentClass::const_iterator lit = text_class_->begin();
|
|
|
|
|
DocumentClass::const_iterator len = text_class_->end();
|
|
|
|
|
for (; lit != len; ++lit) {
|
|
|
|
|
Layout const & lt = **lit;
|
2008-02-23 16:45:38 +00:00
|
|
|
|
docstring const & name = lt.name();
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
// 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;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
addItemSort(name, lyxrc.sort_layouts);
|
Fix bug 4037 and related problems. The patch has been cleaned up a bit
from the one posted to the list.
The basic idea has two parts. First, we hard code an "empty layout"
(called PlainLayout, for want of a better name) in TextClass and read it
before doing anything else. It can therefore be customized by classes,
if they want---say, to make it left-aligned. Second, InsetText's are
divided into three types: (i) normal ones, that use the "default" layout
defined by the text class; (ii) highly restrictive ones, such as ERT and
(not quite an inset) table cells, which demand the empty layout; (iii)
middling ones, which default to an empty layout and use the empty layout
in place of the default. (This is so we don't get the same problem we
had with ERT in e.g. footnotes.) The type of inset is signaled by new
methods InsetText::forceEmptyLayout() and InsetText::useEmptyLayout().
(The latter might better be called: useEmptyLayoutInsteadOfDefault(),
but that's silly.) The old InsetText::forceDefaultParagraphs() has been
split into these, plus a new method InsetText::allowParagraphCustomization().
A lot of the changes just adapt to this change.
The other big change is in GuiToolbar: We want to show LyXDefault and
the "default" layout only when they're active.
There are a handful of places where I'm not entirely sure whether we
should be using forceEmptyLayout or !allowParagraphCustomization() or
both. The InsetCaption is one of these. These places, and some others,
are marked with FIXMEs, so I'd appreciate it if people would search
through the patch and let me know whether these need changing. If they
don't, the FIXMEs can be deleted.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22966 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-12 17:31:07 +00:00
|
|
|
|
}
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2008-02-07 16:46:19 +00:00
|
|
|
|
set(owner_.view()->cursor().innerParagraph().layout()->name());
|
2007-11-10 00:21:42 +00:00
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
// needed to recalculate size hint
|
2007-10-01 21:26:25 +00:00
|
|
|
|
hide();
|
|
|
|
|
setMinimumWidth(sizeHint().width());
|
2008-02-07 16:46:19 +00:00
|
|
|
|
setEnabled(!buffer->isReadonly());
|
|
|
|
|
show();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
2007-10-01 20:45:50 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
void GuiLayoutBox::selected(int index)
|
2007-10-01 20:45:50 +00:00
|
|
|
|
{
|
2008-03-04 09:46:35 +00:00
|
|
|
|
// get selection
|
|
|
|
|
QModelIndex mindex = filterModel_->mapToSource(filterModel_->index(index, 1));
|
2008-03-06 05:10:04 +00:00
|
|
|
|
docstring const layoutName =
|
|
|
|
|
qstring_to_ucs4(model_->itemFromIndex(mindex)->text());
|
2008-03-04 09:46:35 +00:00
|
|
|
|
|
2007-10-01 21:08:07 +00:00
|
|
|
|
owner_.setFocus();
|
2008-03-04 09:46:35 +00:00
|
|
|
|
|
|
|
|
|
if (!text_class_) {
|
|
|
|
|
updateContents(false);
|
|
|
|
|
resetFilter();
|
2007-11-20 22:03:56 +00:00
|
|
|
|
return;
|
2008-03-04 09:46:35 +00:00
|
|
|
|
}
|
2007-11-20 22:03:56 +00:00
|
|
|
|
|
2008-03-04 09:46:35 +00:00
|
|
|
|
// find corresponding text class
|
2008-03-06 05:10:04 +00:00
|
|
|
|
if (text_class_->hasLayout(layoutName)) {
|
|
|
|
|
FuncRequest const func(LFUN_LAYOUT, layoutName, FuncRequest::TOOLBAR);
|
|
|
|
|
theLyXFunc().setLyXView(&owner_);
|
|
|
|
|
lyx::dispatch(func);
|
|
|
|
|
updateContents(false);
|
|
|
|
|
resetFilter();
|
|
|
|
|
return;
|
2007-10-01 20:45:50 +00:00
|
|
|
|
}
|
2007-10-17 18:28:45 +00:00
|
|
|
|
lyxerr << "ERROR (layoutSelected): layout not found!" << endl;
|
2007-10-01 20:45:50 +00:00
|
|
|
|
}
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2007-09-28 22:53:00 +00:00
|
|
|
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// GuiToolbar
|
|
|
|
|
//
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
|
2007-11-05 13:52:37 +00:00
|
|
|
|
GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
|
2007-09-28 22:53:00 +00:00
|
|
|
|
: QToolBar(qt_(tbinfo.gui_name), &owner), owner_(owner),
|
|
|
|
|
layout_(0), command_buffer_(0)
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
|
|
|
|
// give visual separation between adjacent toolbars
|
2006-09-10 11:03:21 +00:00
|
|
|
|
addSeparator();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2006-10-31 14:39:16 +00:00
|
|
|
|
// TODO: save toolbar position
|
|
|
|
|
setMovable(true);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
2007-04-21 17:38:43 +00:00
|
|
|
|
ToolbarInfo::item_iterator it = tbinfo.items.begin();
|
|
|
|
|
ToolbarInfo::item_iterator end = tbinfo.items.end();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
for (; it != end; ++it)
|
2007-04-19 19:43:15 +00:00
|
|
|
|
add(*it);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-09-28 22:53:00 +00:00
|
|
|
|
Action * GuiToolbar::addItem(ToolbarItem const & item)
|
|
|
|
|
{
|
2007-09-28 23:14:33 +00:00
|
|
|
|
Action * act = new Action(owner_,
|
2007-10-15 22:43:55 +00:00
|
|
|
|
getIcon(item.func_, false),
|
2007-09-28 23:14:33 +00:00
|
|
|
|
toqstr(item.label_), item.func_, toqstr(item.label_));
|
2007-09-28 22:53:00 +00:00
|
|
|
|
actions_.append(act);
|
|
|
|
|
return act;
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-16 18:27:24 +00:00
|
|
|
|
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)
|
|
|
|
|
{
|
2008-01-17 09:19:52 +00:00
|
|
|
|
QString const label = qt_(to_ascii(tbitem_.label_));
|
2008-01-17 08:32:48 +00:00
|
|
|
|
setToolTip(label);
|
|
|
|
|
setStatusTip(label);
|
|
|
|
|
setText(label);
|
2008-01-16 18:27:24 +00:00
|
|
|
|
connect(bar_, SIGNAL(iconSizeChanged(QSize)),
|
|
|
|
|
this, SLOT(setIconSize(QSize)));
|
|
|
|
|
setCheckable(true);
|
2008-01-16 20:36:45 +00:00
|
|
|
|
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));
|
2008-01-16 18:27:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2008-01-16 20:36:45 +00:00
|
|
|
|
void mousePressEvent(QMouseEvent * e)
|
2008-01-16 18:27:24 +00:00
|
|
|
|
{
|
|
|
|
|
if (initialized_) {
|
2008-01-16 20:36:45 +00:00
|
|
|
|
QToolButton::mousePressEvent(e);
|
2008-01-16 18:27:24 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
initialized_ = true;
|
|
|
|
|
|
|
|
|
|
ToolbarInfo const * tbinfo =
|
|
|
|
|
toolbarbackend.getDefinedToolbarInfo(tbitem_.name_);
|
|
|
|
|
if (!tbinfo) {
|
|
|
|
|
lyxerr << "Unknown toolbar " << tbitem_.name_ << endl;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2008-01-17 08:42:28 +00:00
|
|
|
|
IconPalette * panel = new IconPalette(this);
|
2008-01-17 09:19:52 +00:00
|
|
|
|
QString const label = qt_(to_ascii(tbitem_.label_));
|
2008-01-17 08:42:28 +00:00
|
|
|
|
panel->setWindowTitle(label);
|
|
|
|
|
connect(this, SIGNAL(clicked(bool)), panel, SLOT(setVisible(bool)));
|
|
|
|
|
connect(panel, SIGNAL(visible(bool)), this, SLOT(setChecked(bool)));
|
2008-01-16 18:27:24 +00:00
|
|
|
|
ToolbarInfo::item_iterator it = tbinfo->items.begin();
|
|
|
|
|
ToolbarInfo::item_iterator const end = tbinfo->items.end();
|
2008-01-16 20:36:45 +00:00
|
|
|
|
for (; it != end; ++it)
|
|
|
|
|
if (!getStatus(it->func_).unknown())
|
2008-01-17 08:42:28 +00:00
|
|
|
|
panel->addButton(bar_->addItem(*it));
|
2008-01-16 20:36:45 +00:00
|
|
|
|
|
|
|
|
|
QToolButton::mousePressEvent(e);
|
2008-01-16 18:27:24 +00:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2008-01-17 08:20:22 +00:00
|
|
|
|
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);
|
2008-01-17 09:19:52 +00:00
|
|
|
|
QString const label = qt_(to_ascii(tbitem_.label_));
|
2008-01-17 08:32:48 +00:00
|
|
|
|
setToolTip(label);
|
|
|
|
|
setStatusTip(label);
|
|
|
|
|
setText(label);
|
2008-01-17 08:20:22 +00:00
|
|
|
|
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;
|
|
|
|
|
|
2008-01-17 09:19:52 +00:00
|
|
|
|
QString const label = qt_(to_ascii(tbitem_.label_));
|
2008-01-17 08:32:48 +00:00
|
|
|
|
ButtonMenu * m = new ButtonMenu(label, this);
|
|
|
|
|
m->setWindowTitle(label);
|
2008-01-17 08:20:22 +00:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2008-01-16 18:27:24 +00:00
|
|
|
|
}
|
2007-09-28 22:53:00 +00:00
|
|
|
|
|
2008-01-17 08:32:48 +00:00
|
|
|
|
|
2007-08-31 05:53:55 +00:00
|
|
|
|
void GuiToolbar::add(ToolbarItem const & item)
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
2007-04-19 19:43:15 +00:00
|
|
|
|
switch (item.type_) {
|
|
|
|
|
case ToolbarItem::SEPARATOR:
|
2006-09-10 11:03:21 +00:00
|
|
|
|
addSeparator();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
break;
|
2007-04-19 19:43:15 +00:00
|
|
|
|
case ToolbarItem::LAYOUTS:
|
2007-10-01 21:26:25 +00:00
|
|
|
|
layout_ = new GuiLayoutBox(owner_);
|
|
|
|
|
addWidget(layout_);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
break;
|
2007-04-19 19:43:15 +00:00
|
|
|
|
case ToolbarItem::MINIBUFFER:
|
2007-08-31 05:53:55 +00:00
|
|
|
|
command_buffer_ = new GuiCommandBuffer(&owner_);
|
2007-08-24 07:13:07 +00:00
|
|
|
|
addWidget(command_buffer_);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
/// \todo find a Qt4 equivalent to setHorizontalStretchable(true);
|
2006-09-10 11:03:21 +00:00
|
|
|
|
//setHorizontalStretchable(true);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
break;
|
2007-04-19 19:43:15 +00:00
|
|
|
|
case ToolbarItem::TABLEINSERT: {
|
2006-05-31 12:53:05 +00:00
|
|
|
|
QToolButton * tb = new QToolButton;
|
|
|
|
|
tb->setCheckable(true);
|
2007-10-15 22:43:55 +00:00
|
|
|
|
tb->setIcon(getIcon(FuncRequest(LFUN_TABULAR_INSERT), true));
|
2008-01-17 09:19:52 +00:00
|
|
|
|
QString const label = qt_(to_ascii(item.label_));
|
2008-01-17 08:32:48 +00:00
|
|
|
|
tb->setToolTip(label);
|
|
|
|
|
tb->setStatusTip(label);
|
|
|
|
|
tb->setText(label);
|
2006-06-01 20:34:22 +00:00
|
|
|
|
InsertTableWidget * iv = new InsertTableWidget(owner_, tb);
|
2007-01-17 13:06:16 +00:00
|
|
|
|
connect(tb, SIGNAL(clicked(bool)), iv, SLOT(show(bool)));
|
2006-05-31 12:53:05 +00:00
|
|
|
|
connect(iv, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool)));
|
|
|
|
|
connect(this, SIGNAL(updated()), iv, SLOT(updateParent()));
|
2006-09-10 11:03:21 +00:00
|
|
|
|
addWidget(tb);
|
2006-05-31 12:53:05 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
2008-01-16 18:27:24 +00:00
|
|
|
|
case ToolbarItem::ICONPALETTE:
|
|
|
|
|
addWidget(new PaletteButton(this, item));
|
2007-04-19 20:29:27 +00:00
|
|
|
|
break;
|
2008-01-16 18:27:24 +00:00
|
|
|
|
|
2007-04-19 20:29:27 +00:00
|
|
|
|
case ToolbarItem::POPUPMENU: {
|
2008-01-17 08:20:22 +00:00
|
|
|
|
addWidget(new MenuButton(this, item));
|
2007-04-19 20:29:27 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case ToolbarItem::COMMAND: {
|
2007-09-28 22:53:00 +00:00
|
|
|
|
if (!getStatus(item.func_).unknown())
|
|
|
|
|
addAction(addItem(item));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
break;
|
2006-05-31 12:53:05 +00:00
|
|
|
|
}
|
2007-04-19 20:29:27 +00:00
|
|
|
|
default:
|
|
|
|
|
break;
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-08-31 05:53:55 +00:00
|
|
|
|
void GuiToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo)
|
2006-11-02 16:01:36 +00:00
|
|
|
|
{
|
2007-04-21 17:38:43 +00:00
|
|
|
|
// if tbinfo.state == auto *do not* set on/off
|
|
|
|
|
if (tbinfo.state != ToolbarSection::ToolbarInfo::AUTO) {
|
2007-08-31 05:53:55 +00:00
|
|
|
|
if (GuiToolbar::isVisible())
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.state = ToolbarSection::ToolbarInfo::ON;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
else
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.state = ToolbarSection::ToolbarInfo::OFF;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
}
|
2007-05-28 22:27:45 +00:00
|
|
|
|
//
|
2006-11-02 16:01:36 +00:00
|
|
|
|
// no need to save it here.
|
|
|
|
|
Qt::ToolBarArea loc = owner_.toolBarArea(this);
|
|
|
|
|
|
|
|
|
|
if (loc == Qt::TopToolBarArea)
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.location = ToolbarSection::ToolbarInfo::TOP;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
else if (loc == Qt::BottomToolBarArea)
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.location = ToolbarSection::ToolbarInfo::BOTTOM;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
else if (loc == Qt::RightToolBarArea)
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.location = ToolbarSection::ToolbarInfo::RIGHT;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
else if (loc == Qt::LeftToolBarArea)
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.location = ToolbarSection::ToolbarInfo::LEFT;
|
2006-11-02 16:01:36 +00:00
|
|
|
|
else
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.location = ToolbarSection::ToolbarInfo::NOTSET;
|
2007-05-28 22:27:45 +00:00
|
|
|
|
|
|
|
|
|
// save toolbar position. They are not used to restore toolbar position
|
2007-01-27 20:54:17 +00:00
|
|
|
|
// now because move(x,y) does not work for toolbar.
|
2007-04-21 17:38:43 +00:00
|
|
|
|
tbinfo.posx = pos().x();
|
|
|
|
|
tbinfo.posy = pos().y();
|
2006-11-02 16:01:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-10-01 20:45:50 +00:00
|
|
|
|
void GuiToolbar::updateContents()
|
2006-03-05 17:24:44 +00:00
|
|
|
|
{
|
2007-10-01 09:19:09 +00:00
|
|
|
|
// update visible toolbars only
|
|
|
|
|
if (!isVisible())
|
|
|
|
|
return;
|
2006-10-20 19:40:02 +00:00
|
|
|
|
// This is a speed bottleneck because this is called on every keypress
|
|
|
|
|
// and update calls getStatus, which copies the cursor at least two times
|
2007-09-28 22:53:00 +00:00
|
|
|
|
for (int i = 0; i < actions_.size(); ++i)
|
2007-09-28 21:41:56 +00:00
|
|
|
|
actions_[i]->update();
|
2006-05-31 12:53:05 +00:00
|
|
|
|
|
2007-11-20 22:03:56 +00:00
|
|
|
|
if (layout_)
|
|
|
|
|
layout_->setEnabled(lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled());
|
|
|
|
|
|
2006-09-09 22:27:22 +00:00
|
|
|
|
// emit signal
|
2006-06-30 14:11:50 +00:00
|
|
|
|
updated();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace frontend
|
|
|
|
|
} // namespace lyx
|
2006-05-18 08:51:12 +00:00
|
|
|
|
|
2007-08-31 05:53:55 +00:00
|
|
|
|
#include "GuiToolbar_moc.cpp"
|