X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffrontends%2Fqt4%2FTocModel.cpp;h=51365311aa9eba703bfeda79a7243a7e114f8db2;hb=b6eacd8d4f86734e8abef3335b190ce12a6a11b5;hp=e50ca368a5a6222851a6a84633da43484e787378;hpb=bd569ada80c783b91fc94c9b1e5acccc32875b96;p=lyx.git

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index e50ca368a5..51365311aa 100644
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -18,14 +18,16 @@
 #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>
 
@@ -34,20 +36,88 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
-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
+// FIXME: Better appropriately subclass QStandardItemModel and implement
+// the toc-specific reset methods there.
+class TocTypeModel : public QStandardItemModel
 {
+public:
+	///
+	TocTypeModel(QObject * parent) : QStandardItemModel(parent)
+	{}
+	///
+	void reset()
+	{
+		QStandardItemModel::beginResetModel();
+		QStandardItemModel::endResetModel();
+	}
+	///
+	void beginResetModel()
+	{
+		QStandardItemModel::beginResetModel();
+	}
+	///
+	void endResetModel()
+	{
+		QStandardItemModel::endResetModel();
+	}
+};
+
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// TocModel
+//
+///////////////////////////////////////////////////////////////////////////////
+
+TocModel::TocModel(QObject * parent)
+	: model_(new TocTypeModel(parent)),
+	  sorted_model_(new QSortFilterProxyModel(parent)),
+	  is_sorted_(false), toc_(new Toc()),
+	  maxdepth_(0), mindepth_(0)
+{
+	sorted_model_->setSortLocaleAware(true);
+	sorted_model_->setSourceModel(model_);
 }
 
 
-void TocTypeModel::reset()
+QAbstractItemModel * TocModel::model()
 {
-	QStandardItemModel::reset();
+	if (is_sorted_)
+		return sorted_model_;
+	return model_;
+}
+
+
+QAbstractItemModel const * TocModel::model() const
+{
+	if (is_sorted_)
+		return sorted_model_;
+	return model_;
+}
+
+
+void TocModel::clear()
+{
+	model_->blockSignals(true);
+	model_->clear();
+	toc_ = make_shared<Toc>();
+	model_->blockSignals(false);
+}
+
+
+void TocModel::sort(bool sort_it)
+{
+	is_sorted_ = sort_it;
+	if (is_sorted_)
+		sorted_model_->sort(0);
 }
 
 
 TocItem const & TocModel::tocItem(QModelIndex const & index) const
 {
-	return (*toc_)[data(index, Qt::UserRole).toUInt()];
+	return (*toc_)[model()->data(index, Qt::UserRole).toUInt()];
 }
 
 
@@ -56,9 +126,10 @@ QModelIndex TocModel::modelIndex(DocIterator const & dit) const
 	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 = match(index(0, 0), Qt::UserRole,
+	QModelIndexList list = model()->match(model()->index(0, 0), Qt::UserRole,
 		QVariant(toc_index), 1,
 		Qt::MatchFlags(Qt::MatchExactly | Qt::MatchRecursive));
 
@@ -67,29 +138,41 @@ QModelIndex TocModel::modelIndex(DocIterator const & dit) const
 }
 
 
-TocModel::TocModel(QObject * parent): QStandardItemModel(parent)
+void TocModel::reset()
 {
+	model_->reset();
 }
 
 
-void TocModel::reset()
+void TocModel::setString(TocItem const & item, QModelIndex index)
 {
-	QStandardItemModel::reset();
+	// Use implicit sharing of QStrings
+	QString str = toqstr(item.asString());
+	model_->setData(index, str, Qt::DisplayRole);
+	model_->setData(index, str, Qt::ToolTipRole);
 }
 
 
-void TocModel::reset(Toc const & toc)
+void TocModel::updateItem(DocIterator const & dit)
 {
-	toc_ = &toc;
+	QModelIndex const index = modelIndex(dit);
+	setString(tocItem(index), index);
+}
+
+
+void TocModel::reset(shared_ptr<Toc const> toc)
+{
+	toc_ = toc;
 	if (toc_->empty()) {
+		maxdepth_ = 0;
+		mindepth_ = 0;
 		reset();
 		return;
 	}
 
-	blockSignals(true);
-	int current_row;
-	QModelIndex top_level_item;
-	insertColumns(0, 1);
+	model_->blockSignals(true);
+	model_->beginResetModel();
+	model_->insertColumns(0, 1);
 	maxdepth_ = 0;
 	mindepth_ = INT_MAX;
 
@@ -98,24 +181,26 @@ void TocModel::reset(Toc const & toc)
 		TocItem const & item = (*toc_)[index];
 		maxdepth_ = max(maxdepth_, item.depth());
 		mindepth_ = min(mindepth_, item.depth());
-		current_row = rowCount();
-		insertRows(current_row, 1);
-		top_level_item = QStandardItemModel::index(current_row, 0);
-		setData(top_level_item, toqstr(item.str()), Qt::DisplayRole);
-		setData(top_level_item, index, Qt::UserRole);
+		int current_row = model_->rowCount();
+		model_->insertRows(current_row, 1);
+		QModelIndex top_level_item = model_->index(current_row, 0);
+		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)
 			break;
 	}
 
-	setHeaderData(0, Qt::Horizontal, QVariant("title"), Qt::DisplayRole);
-	blockSignals(false);
-	reset();
-//	emit headerDataChanged();
+	model_->setHeaderData(0, Qt::Horizontal, QVariant("title"), Qt::DisplayRole);
+	sorted_model_->setSourceModel(model_);
+	if (is_sorted_)
+		sorted_model_->sort(0);
+	model_->blockSignals(false);
+	model_->endResetModel();
 }
 
 
@@ -123,9 +208,8 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
 {
 	int curdepth = (*toc_)[index].depth() + 1;
 
-	int current_row;
 	QModelIndex child_item;
-	insertColumns(0, 1, parent);
+	model_->insertColumns(0, 1, parent);
 
 	size_t end = toc_->size();
 	++index;
@@ -137,11 +221,11 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
 		}
 		maxdepth_ = max(maxdepth_, item.depth());
 		mindepth_ = min(mindepth_, item.depth());
-		current_row = rowCount(parent);
-		insertRows(current_row, 1, parent);
-		child_item = QStandardItemModel::index(current_row, 0, parent);
-		setData(child_item, toqstr(item.str()), Qt::DisplayRole);
-		setData(child_item, index, Qt::UserRole);
+		int current_row = model_->rowCount(parent);
+		model_->insertRows(current_row, 1, parent);
+		child_item = model_->index(current_row, 0, parent);
+		setString(item, child_item);
+		model_->setData(child_item, index, Qt::UserRole);
 		populate(index, child_item);
 		if (index >= end)
 			break;
@@ -151,56 +235,53 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
 
 int TocModel::modelDepth() const
 {
-	return maxdepth_ - mindepth_;
+	int const d = maxdepth_ - mindepth_;
+	LASSERT(d >= 0 && d <= 100, return 0);
+	return d;
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// TocModels implementation.
+//
+// TocModels
+//
 ///////////////////////////////////////////////////////////////////////////////
 
-TocModels::TocModels(): bv_(0)
+TocModels::TocModels()
 {
 	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();
 	names_->blockSignals(false);
 	iterator end = models_.end();
-	for (iterator it = models_.begin(); it != end;  ++it) {
-		it.value()->blockSignals(true);
+	for (iterator it = models_.begin(); it != end;  ++it)
 		it.value()->clear();
-		it.value()->blockSignals(false);
-	}
 }
 
 
 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();
 }
 
 
-QStandardItemModel * TocModels::model(QString const & type)
+QAbstractItemModel * TocModels::model(QString const & type)
 {
-	if (!bv_)
-		return 0;
 	iterator it = models_.find(type);
 	if (it != models_.end())
-		return it.value();
+		return it.value()->model();
 	LYXERR0("type not found: " << type);
 	return 0;
 }
@@ -212,41 +293,54 @@ QAbstractItemModel * TocModels::nameModel()
 }
 
 
-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(), 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();
+}
+
+
+TocItem const TocModels::currentItem(QString const & type,
+	QModelIndex const & index) const
+{
+	const_iterator it = models_.find(type);
+	if (it == models_.end() || !index.isValid()) {
+		LYXERR(Debug::GUI, "TocModels::currentItem(): QModelIndex is invalid!");
+		return TocItem();
+	}
+	LASSERT(index.model() == it.value()->model(), return TocItem());
+
+	return it.value()->tocItem(index);
 }
 
 
-void TocModels::updateBackend() const
+void TocModels::updateItem(QString const & type, DocIterator const & dit)
 {
-	bv_->buffer().masterBuffer()->tocBackend().update();
-	bv_->buffer().structureChanged();
+	models_[type]->updateItem(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();
@@ -255,21 +349,21 @@ void TocModels::reset(BufferView const * bv)
 	}
 
 	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);
@@ -277,11 +371,31 @@ void TocModels::reset(BufferView const * bv)
 		names_->setData(index, type, Qt::UserRole);
 	}
 	names_->blockSignals(false);
-	names_->reset();
+	names_->endResetModel();
+}
+
+
+bool TocModels::isSorted(QString const & type) const
+{
+	const_iterator it = models_.find(type);
+	if (it == models_.end()) {
+		LYXERR0("type not found: " << type);
+		return false;
+	}
+	return it.value()->isSorted();
 }
 
 
+void TocModels::sort(QString const & type, bool sort_it)
+{
+	iterator it = models_.find(type);
+	if (it == models_.end())
+		LYXERR0("type not found: " << type);
+	else
+		it.value()->sort(sort_it);
+}
+
 } // namespace frontend
 } // namespace lyx
 
-#include "TocModel_moc.cpp"
+#include "moc_TocModel.cpp"