#include "Cursor.h"
#include "DocIterator.h"
#include "FuncRequest.h"
-#include "LyXFunc.h"
+#include "LyX.h"
+#include "qt_helpers.h"
#include "TocBackend.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)
+/// A QStandardItemModel that gives access to the reset methods.
+/// This is needed in order to fix http://www.lyx.org/trac/ticket/3740
+class TocTypeModel : public QStandardItemModel
{
-}
-
-
-void TocTypeModel::reset()
-{
- QStandardItemModel::reset();
-}
+public:
+ ///
+ TocTypeModel(QObject * parent) : QStandardItemModel(parent)
+ {}
+ ///
+ void reset()
+ {
+#if (QT_VERSION < 0x050000)
+ QStandardItemModel::reset();
+#else
+ QStandardItemModel::endResetModel();
+#endif
+ }
+ ///
+ void beginResetModel()
+ {
+ #if QT_VERSION >= 0x040600
+ QStandardItemModel::beginResetModel();
+ #endif
+ }
+ ///
+ void endResetModel()
+ {
+ #if QT_VERSION >= 0x040600
+ QStandardItemModel::endResetModel();
+ #else
+ QStandardItemModel::reset();
+ #endif
+ }
+};
///////////////////////////////////////////////////////////////////////////////
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_(lyx::make_shared<Toc const>()),
+ maxdepth_(0), mindepth_(0)
{
-#if QT_VERSION >= 0x040300
sorted_model_->setSortLocaleAware(true);
-#endif
sorted_model_->setSourceModel(model_);
}
{
model_->blockSignals(true);
model_->clear();
+ toc_ = lyx::make_shared<Toc const>();
model_->blockSignals(false);
}
{
QModelIndex index = modelIndex(dit);
TocItem const & toc_item = tocItem(index);
- model_->setData(index, toqstr(toc_item.str()), Qt::DisplayRole);
+ model_->setData(index, toqstr(toc_item.asString()), Qt::DisplayRole);
+ model_->setData(index, toqstr(toc_item.tooltip()), Qt::ToolTipRole);
}
-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);
+ model_->setData(top_level_item, toqstr(item.asString()), Qt::DisplayRole);
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.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);
+ model_->setData(child_item, toqstr(item.asString()), Qt::DisplayRole);
model_->setData(child_item, index, Qt::UserRole);
+ model_->setData(child_item, toqstr(item.tooltip()), Qt::ToolTipRole);
populate(index, child_item);
if (index >= end)
break;
: 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();
}
LASSERT(index.model() == it.value()->model(), return);
TocItem const item = it.value()->tocItem(index);
- LYXERR(Debug::GUI, "TocModels::goTo " << item.str());
+ LYXERR(Debug::GUI, "TocModels::goTo " << item.asString());
dispatch(item.action());
}
}
-void TocModels::updateBackend() const
-{
- bv_->buffer().masterBuffer()->tocBackend().update();
- bv_->buffer().structureChanged();
-}
-
-
void TocModels::updateItem(QString const & type, DocIterator const & dit)
{
models_[type]->updateItem(dit);
}
names_->blockSignals(true);
+ names_->beginResetModel();
names_->insertColumns(0, 1);
TocList const & tocs = bv_->buffer().masterBuffer()->tocBackend().tocs();
TocList::const_iterator it = tocs.begin();
names_->setData(index, type, Qt::UserRole);
}
names_->blockSignals(false);
- names_->reset();
+ names_->endResetModel();
}