/// A QStandardItemModel that gives access to the reset methods.
/// This is needed in order to fix http://www.lyx.org/trac/ticket/3740
+// FIXME: Better appropriately subclass QStandardItemModel and implement
+// the toc-specific reset methods there.
class TocTypeModel : public QStandardItemModel
{
public:
///
void reset()
{
-#if (QT_VERSION < 0x050000)
- QStandardItemModel::reset();
-#else
+ QStandardItemModel::beginResetModel();
QStandardItemModel::endResetModel();
-#endif
}
///
void beginResetModel()
- {
- #if QT_VERSION >= 0x040600
- QStandardItemModel::beginResetModel();
- #endif
+ {
+ QStandardItemModel::beginResetModel();
}
///
void endResetModel()
- {
- #if QT_VERSION >= 0x040600
- QStandardItemModel::endResetModel();
- #else
- QStandardItemModel::reset();
- #endif
+ {
+ QStandardItemModel::endResetModel();
}
};
TocModel::TocModel(QObject * parent)
: model_(new TocTypeModel(parent)),
sorted_model_(new QSortFilterProxyModel(parent)),
- is_sorted_(false), toc_(lyx::make_shared<Toc const>()),
+ is_sorted_(false), toc_(new Toc()),
maxdepth_(0), mindepth_(0)
{
sorted_model_->setSortLocaleAware(true);
{
model_->blockSignals(true);
model_->clear();
- toc_ = lyx::make_shared<Toc const>();
+ toc_ = make_shared<Toc>();
model_->blockSignals(false);
}
if (toc_->empty())
return QModelIndex();
- unsigned int const toc_index = toc_->item(dit) - toc_->begin();
+ unsigned int const toc_index = TocBackend::findItem(*toc_, dit) -
+ toc_->begin();
QModelIndexList list = model()->match(model()->index(0, 0), Qt::UserRole,
QVariant(toc_index), 1,
}
+void TocModel::setString(TocItem const & item, QModelIndex index)
+{
+ // Use implicit sharing of QStrings
+ QString str = toqstr(item.asString());
+ model_->setData(index, str, Qt::DisplayRole);
+ model_->setData(index, str, Qt::ToolTipRole);
+}
+
+
void TocModel::updateItem(DocIterator const & dit)
{
- QModelIndex index = modelIndex(dit);
- TocItem const & toc_item = tocItem(index);
- model_->setData(index, toqstr(toc_item.asString()), Qt::DisplayRole);
- model_->setData(index, toqstr(toc_item.tooltip()), Qt::ToolTipRole);
+ QModelIndex const index = modelIndex(dit);
+ setString(tocItem(index), index);
}
int current_row = model_->rowCount();
model_->insertRows(current_row, 1);
QModelIndex top_level_item = model_->index(current_row, 0);
- model_->setData(top_level_item, toqstr(item.asString()), Qt::DisplayRole);
+ setString(item, top_level_item);
model_->setData(top_level_item, index, Qt::UserRole);
- model_->setData(top_level_item, toqstr(item.tooltip()), Qt::ToolTipRole);
LYXERR(Debug::GUI, "Toc: at depth " << item.depth()
<< ", added item " << item.asString());
int current_row = model_->rowCount(parent);
model_->insertRows(current_row, 1, parent);
child_item = model_->index(current_row, 0, parent);
- model_->setData(child_item, toqstr(item.asString()), Qt::DisplayRole);
+ setString(item, child_item);
model_->setData(child_item, index, Qt::UserRole);
- model_->setData(child_item, toqstr(item.tooltip()), Qt::ToolTipRole);
populate(index, child_item);
if (index >= end)
break;
///////////////////////////////////////////////////////////////////////////////
TocModels::TocModels()
- : bv_(0)
{
names_ = new TocTypeModel(this);
names_sorted_ = new TocModelSortProxyModel(this);
int TocModels::depth(QString const & type)
{
const_iterator it = models_.find(type);
- if (!bv_ || it == models_.end())
+ if (it == models_.end())
return 0;
return it.value()->modelDepth();
}
QAbstractItemModel * TocModels::model(QString const & type)
{
- if (!bv_)
- return 0;
iterator it = models_.find(type);
if (it != models_.end())
return it.value()->model();
}
-QModelIndex TocModels::currentIndex(QString const & type) const
+QModelIndex TocModels::currentIndex(QString const & type,
+ DocIterator const & dit) const
{
const_iterator it = models_.find(type);
- if (!bv_ || it == models_.end())
+ if (it == models_.end())
return QModelIndex();
- return it.value()->modelIndex(bv_->cursor());
+ return it.value()->modelIndex(dit);
}
return TocItem();
}
LASSERT(index.model() == it.value()->model(), return TocItem());
-
+
return it.value()->tocItem(index);
}
-
+
void TocModels::updateItem(QString const & type, DocIterator const & dit)
{
void TocModels::reset(BufferView const * bv)
{
- bv_ = bv;
clear();
- if (!bv_) {
+ if (!bv) {
iterator end = models_.end();
for (iterator it = models_.begin(); it != end; ++it)
it.value()->reset();
names_->blockSignals(true);
names_->beginResetModel();
names_->insertColumns(0, 1);
- TocList const & tocs = bv_->buffer().masterBuffer()->tocBackend().tocs();
- TocList::const_iterator it = tocs.begin();
- TocList::const_iterator toc_end = tocs.end();
- for (; it != toc_end; ++it) {
- QString const type = toqstr(it->first);
+ // In the outliner, add Tocs from the master document
+ TocBackend const & backend = bv->buffer().masterBuffer()->tocBackend();
+ for (pair<string, shared_ptr<Toc>> const & toc : backend.tocs()) {
+ QString const type = toqstr(toc.first);
// First, fill in the toc models.
iterator mod_it = models_.find(type);
if (mod_it == models_.end())
mod_it = models_.insert(type, new TocModel(this));
- mod_it.value()->reset(it->second);
+ mod_it.value()->reset(toc.second);
// Fill in the names_ model.
- QString const gui_name = guiName(it->first, bv->buffer().params());
+ QString const gui_name = toqstr(backend.outlinerName(toc.first));
int const current_row = names_->rowCount();
names_->insertRows(current_row, 1);
QModelIndex const index = names_->index(current_row, 0);