Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 1301e8d1747b394a2fc59bfb73f08d5f9d4ca994..d4017fc3e2ecb68914107a11e865fca9588258a2 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -18,10 +18,9 @@
 #include "Cursor.h"
 #include "DocIterator.h"
 #include "FuncRequest.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "TocBackend.h"
 
-#include "support/convert.h"
 #include "support/debug.h"
 #include "support/lassert.h"
 
@@ -34,22 +33,36 @@ using namespace std;
 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()
+       {
+               QStandardItemModel::reset();
+       }
+       ///
+       void beginResetModel()
+       { 
+       #if QT_VERSION >= 0x040600
+               QStandardItemModel::beginResetModel(); 
+       #endif
+       }
+       ///
+       void endResetModel()
+       { 
+       #if QT_VERSION >= 0x040600
+               QStandardItemModel::endResetModel(); 
+       #else
+               QStandardItemModel::reset();
+       #endif
+       }
+};
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -135,6 +148,7 @@ 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.tooltip()), Qt::ToolTipRole);
 }
 
 
@@ -149,6 +163,7 @@ void TocModel::reset(Toc const & toc)
        }
 
        model_->blockSignals(true);
+       model_->beginResetModel();
        model_->insertColumns(0, 1);
        maxdepth_ = 0;
        mindepth_ = INT_MAX;
@@ -163,6 +178,7 @@ void TocModel::reset(Toc const & toc)
                QModelIndex top_level_item = model_->index(current_row, 0);
                model_->setData(top_level_item, toqstr(item.str()), 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());
@@ -173,11 +189,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();
 }
 
 
@@ -204,6 +220,7 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
                child_item = model_->index(current_row, 0, parent);
                model_->setData(child_item, toqstr(item.str()), 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;
@@ -229,7 +246,7 @@ 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);
@@ -238,7 +255,7 @@ TocModels::TocModels()
 }
 
 
-void TocModels::clear()        
+void TocModels::clear()
 {
        names_->blockSignals(true);
        names_->clear();
@@ -299,6 +316,20 @@ void TocModels::goTo(QString const & type, QModelIndex const & index) const
 }
 
 
+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
 {
        bv_->buffer().masterBuffer()->tocBackend().update();
@@ -325,6 +356,7 @@ 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();
@@ -347,7 +379,7 @@ void TocModels::reset(BufferView const * bv)
                names_->setData(index, type, Qt::UserRole);
        }
        names_->blockSignals(false);
-       names_->reset();
+       names_->endResetModel();
 }