#include "Cursor.h"
#include "DocIterator.h"
#include "FuncRequest.h"
-#include "LyXFunc.h"
+#include "LyX.h"
+#include "qt_helpers.h"
#include "TocBackend.h"
-#include "support/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+
#include <climits>
namespace lyx {
namespace frontend {
-///////////////////////////////////////////////////////////////////////////////
-//
-// TocTypeModel
-//
-///////////////////////////////////////////////////////////////////////////////
-
-TocTypeModel::TocTypeModel(QObject * parent)
- : QStandardItemModel(parent)
-{
-}
-
-
-void TocTypeModel::reset()
+/// 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
{
- QStandardItemModel::reset();
-}
+public:
+ ///
+ TocTypeModel(QObject * parent) : QStandardItemModel(parent)
+ {}
+ ///
+ void reset()
+ {
+ QStandardItemModel::beginResetModel();
+ QStandardItemModel::endResetModel();
+ }
+ ///
+ void beginResetModel()
+ {
+ QStandardItemModel::beginResetModel();
+ }
+ ///
+ void endResetModel()
+ {
+ QStandardItemModel::endResetModel();
+ }
+};
///////////////////////////////////////////////////////////////////////////////
TocModel::TocModel(QObject * parent)
: model_(new TocTypeModel(parent)),
- sorted_model_(new QSortFilterProxyModel(parent)),
- is_sorted_(false), maxdepth_(0), mindepth_(0)
+ sorted_model_(new QSortFilterProxyModel(parent)),
+ is_sorted_(false), toc_(new Toc()),
+ maxdepth_(0), mindepth_(0)
{
-#if QT_VERSION >= 0x040300
sorted_model_->setSortLocaleAware(true);
-#endif
sorted_model_->setSourceModel(model_);
}
{
model_->blockSignals(true);
model_->clear();
+ 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.str()), Qt::DisplayRole);
+ QModelIndex const index = modelIndex(dit);
+ setString(tocItem(index), index);
}
-void TocModel::reset(Toc const & toc)
+void TocModel::reset(shared_ptr<Toc const> toc)
{
- toc_ = &toc;
+ toc_ = toc;
if (toc_->empty()) {
maxdepth_ = 0;
mindepth_ = 0;
}
model_->blockSignals(true);
+ model_->beginResetModel();
model_->insertColumns(0, 1);
maxdepth_ = 0;
mindepth_ = INT_MAX;
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.str()), Qt::DisplayRole);
+ setString(item, top_level_item);
model_->setData(top_level_item, index, Qt::UserRole);
LYXERR(Debug::GUI, "Toc: at depth " << item.depth()
- << ", added item " << item.str());
+ << ", added item " << item.asString());
populate(index, top_level_item);
if (index >= end)
}
model_->setHeaderData(0, Qt::Horizontal, QVariant("title"), Qt::DisplayRole);
+ sorted_model_->setSourceModel(model_);
if (is_sorted_)
sorted_model_->sort(0);
model_->blockSignals(false);
- reset();
-// emit headerDataChanged();
+ model_->endResetModel();
}
{
int curdepth = (*toc_)[index].depth() + 1;
- int current_row;
QModelIndex child_item;
model_->insertColumns(0, 1, parent);
}
maxdepth_ = max(maxdepth_, item.depth());
mindepth_ = min(mindepth_, item.depth());
- current_row = model_->rowCount(parent);
+ 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.str()), Qt::DisplayRole);
+ setString(item, child_item);
model_->setData(child_item, index, Qt::UserRole);
populate(index, child_item);
if (index >= end)
///////////////////////////////////////////////////////////////////////////////
TocModels::TocModels()
- : bv_(0)
{
names_ = new TocTypeModel(this);
- names_sorted_ = new QSortFilterProxyModel(this);
+ names_sorted_ = new TocModelSortProxyModel(this);
names_sorted_->setSourceModel(names_);
-#if QT_VERSION >= 0x040300
names_sorted_->setSortLocaleAware(true);
-#endif
names_sorted_->sort(0);
}
-void TocModels::clear()
+void TocModels::clear()
{
names_->blockSignals(true);
names_->clear();
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);
}
-void TocModels::goTo(QString const & type, QModelIndex const & index) const
+FuncRequest TocModels::goTo(QString const & type, QModelIndex const & index) const
{
const_iterator it = models_.find(type);
if (it == models_.end() || !index.isValid()) {
LYXERR(Debug::GUI, "TocModels::goTo(): QModelIndex is invalid!");
- return;
+ return FuncRequest(LFUN_NOACTION);
}
- LASSERT(index.model() == it.value()->model(), return);
+ LASSERT(index.model() == it.value()->model(), return FuncRequest(LFUN_NOACTION));
TocItem const item = it.value()->tocItem(index);
- LYXERR(Debug::GUI, "TocModels::goTo " << item.str());
- dispatch(item.action());
+ LYXERR(Debug::GUI, "TocModels::goTo " << item.asString());
+ return item.action();
}
return TocItem();
}
LASSERT(index.model() == it.value()->model(), return TocItem());
-
- return it.value()->tocItem(index);
-}
-
-void TocModels::updateBackend() const
-{
- bv_->buffer().masterBuffer()->tocBackend().update();
- bv_->buffer().structureChanged();
+ return it.value()->tocItem(index);
}
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);
names_->setData(index, type, Qt::UserRole);
}
names_->blockSignals(false);
- names_->reset();
+ names_->endResetModel();
}
projects / lyx.git / blobdiff