Amend f441590c

[lyx.git] / src / frontends / qt4 / TocModel.cpp

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 4ace85c7a844495b5b192c508d7dfb10de73579d..7b4a38b223bf6022d671a24c99fffd5f7f020102 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -19,12 +19,15 @@
 #include "DocIterator.h"
 #include "FuncRequest.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>
 
@@ -33,7 +36,7 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
-/// A QStandardItemModel that gives access to the reset method.
+/// 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
 {
@@ -41,11 +44,14 @@ public:
        ///
        TocTypeModel(QObject * parent) : QStandardItemModel(parent)
        {}
-
        ///
        void reset()
        {
+#if (QT_VERSION < 0x050000)
                QStandardItemModel::reset();
+#else
+               QStandardItemModel::endResetModel();
+#endif
        }
        ///
        void beginResetModel()
@@ -60,7 +66,7 @@ public:
        #if QT_VERSION >= 0x040600
                QStandardItemModel::endResetModel(); 
        #else
-               reset();
+               QStandardItemModel::reset();
        #endif
        }
 };
@@ -74,12 +80,11 @@ public:
 
 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_);
 }
 
@@ -104,6 +109,7 @@ void TocModel::clear()
 {
        model_->blockSignals(true);
        model_->clear();
+       toc_ = lyx::make_shared<Toc const>();
        model_->blockSignals(false);
 }
 
@@ -148,13 +154,14 @@ 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);
+       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;
@@ -163,6 +170,7 @@ void TocModel::reset(Toc const & toc)
        }
 
        model_->blockSignals(true);
+       model_->beginResetModel();
        model_->insertColumns(0, 1);
        maxdepth_ = 0;
        mindepth_ = INT_MAX;
@@ -175,11 +183,12 @@ void TocModel::reset(Toc const & toc)
                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)
@@ -187,11 +196,11 @@ void TocModel::reset(Toc const & toc)
        }
 
        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();
 }
 
 
@@ -199,7 +208,6 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
 {
        int curdepth = (*toc_)[index].depth() + 1;
 
-       int current_row;
        QModelIndex child_item;
        model_->insertColumns(0, 1, parent);
 
@@ -213,11 +221,12 @@ void TocModel::populate(unsigned int & index, QModelIndex const & 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;
@@ -243,11 +252,9 @@ 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);
 }
 
@@ -308,7 +315,7 @@ void TocModels::goTo(QString const & type, QModelIndex const & index) const
        }
        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());
 }
 
@@ -327,13 +334,6 @@ TocItem const TocModels::currentItem(QString const & type,
 }
  
 
-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);