Fix bug http://www.lyx.org/trac/ticket/5812

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

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index daa77370a79c268f64d7979684b23bc5ea56462d..d9de4b6273f6a7950c96f3281198ad97a459ce57 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -13,6 +13,7 @@
 
 #include "TocWidget.h"
 
+#include "GuiApplication.h"
 #include "GuiView.h"
 #include "qt_helpers.h"
 #include "TocModel.h"
@@ -35,15 +36,15 @@ namespace lyx {
 namespace frontend {
 
 TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
-       : QWidget(parent), depth_(0), gui_view_(gui_view)
+       : QWidget(parent), depth_(0), persistent_(false), gui_view_(gui_view)
 {
        setupUi(this);
 
-       moveOutTB->setIcon(QIcon(":/images/promote.png"));
-       moveInTB->setIcon(QIcon(":/images/demote.png"));
-       moveUpTB->setIcon(QIcon(":/images/up.png"));
-       moveDownTB->setIcon(QIcon(":/images/down.png"));
-       updateTB->setIcon(QIcon(":/images/reload.png"));
+       moveOutTB->setIcon(QIcon(getPixmap("images/", "promote", "png")));
+       moveInTB->setIcon(QIcon(getPixmap("images/", "demote", "png")));
+       moveUpTB->setIcon(QIcon(getPixmap("images/", "up", "png")));
+       moveDownTB->setIcon(QIcon(getPixmap("images/", "down", "png")));
+       updateTB->setIcon(QIcon(getPixmap("images/", "reload", "png")));
 
        // avoid flickering
        tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
@@ -61,6 +62,12 @@ TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
 
        // The toc types combo won't change its model.
        typeCO->setModel(gui_view_.tocModels().nameModel());
+
+       // Make sure the buttons are disabled when first shown without a loaded
+       // Buffer.
+       enableControls(false);
+
+       init(QString());
 }
 
 
@@ -95,6 +102,18 @@ void TocWidget::on_updateTB_clicked()
 }
 
 
+void TocWidget::on_sortCB_stateChanged(int state)
+{
+       gui_view_.tocModels().sort(current_type_, state == Qt::Checked);
+       updateView();
+}
+
+void TocWidget::on_persistentCB_stateChanged(int state)
+{
+       persistent_ = state == Qt::Checked;
+}
+
+
 /* FIXME (Ugras 17/11/06):
 I have implemented a indexDepth function to get the model indices. In my
 opinion, somebody should derive a new qvariant class for tocModelItem
@@ -124,11 +143,18 @@ void TocWidget::setTreeDepth(int depth)
        if (!tocTV->model())
                return;
 
+#if QT_VERSION >= 0x040300
+       // this should be faster than our own code below
+       if (depth == 0)
+               tocTV->collapseAll();
+       else
+               tocTV->expandToDepth(depth - 1);
+#else
        // expanding and then collapsing is probably better,
        // but my qt 4.1.2 doesn't have expandAll()..
        //tocTV->expandAll();
        QModelIndexList indices = tocTV->model()->match(
-               tocTV->model()->index(0,0),
+               tocTV->model()->index(0, 0),
                Qt::DisplayRole, "*", -1,
                Qt::MatchFlags(Qt::MatchWildcard|Qt::MatchRecursive));
 
@@ -137,6 +163,7 @@ void TocWidget::setTreeDepth(int depth)
                QModelIndex index = indices[i];
                tocTV->setExpanded(index, indexDepth(index) < depth_);
        }
+#endif
 }
 
 
@@ -217,6 +244,21 @@ void TocWidget::enableControls(bool enable)
        moveDownTB->setEnabled(enable);
        moveInTB->setEnabled(enable);
        moveOutTB->setEnabled(enable);
+       if (!enable) {
+               depthSL->setMaximum(0);
+               depthSL->setValue(0);
+       }
+}
+
+
+/// Test if synchronized navigation is possible
+static bool canNavigate(QString const & type)
+{
+       // It is not possible to have synchronous navigation in a correctl
+       // and efficient way with the label type because Toc::item() do a linear
+       // seatch. Even if fixed, it might even not be desirable to do so if we 
+       // want to support drag&drop of labels and references.
+       return type != "label" && type != "change";
 }
 
 
@@ -230,21 +272,35 @@ void TocWidget::updateView()
                return;
        }
        typeCO->setEnabled(true);
-       tocTV->setEnabled(true);
+       tocTV->setEnabled(false);
+       tocTV->setUpdatesEnabled(false);
 
-       QStandardItemModel * toc_model = gui_view_.tocModels().model(current_type_);    
+       QAbstractItemModel * toc_model = gui_view_.tocModels().model(current_type_);
        if (tocTV->model() != toc_model) {
                tocTV->setModel(toc_model);
                tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
+               if (persistent_)
+                       setTreeDepth(depth_);
        }
+
+       sortCB->blockSignals(true);
+       sortCB->setChecked(gui_view_.tocModels().isSorted(current_type_));
+       sortCB->blockSignals(false);
+
+       persistentCB->setChecked(persistent_);
+
        bool controls_enabled = toc_model && toc_model->rowCount() > 0
                && !gui_view_.buffer()->isReadonly();
        enableControls(controls_enabled);
 
        depthSL->setMaximum(gui_view_.tocModels().depth(current_type_));
        depthSL->setValue(depth_);
-       setTreeDepth(depth_);
-       select(gui_view_.tocModels().currentIndex(current_type_));
+       if (!persistent_)
+               setTreeDepth(depth_);
+       if (canNavigate(current_type_))
+               select(gui_view_.tocModels().currentIndex(current_type_));
+       tocTV->setEnabled(true);
+       tocTV->setUpdatesEnabled(true);
 }
 
 
@@ -267,8 +323,6 @@ static QString decodeType(QString const & str)
 
 void TocWidget::init(QString const & str)
 {
-       typeCO->blockSignals(true);
-
        int new_index;
        if (str.isEmpty())
                new_index = typeCO->findData(current_type_);
@@ -280,8 +334,11 @@ void TocWidget::init(QString const & str)
        if (new_index == -1) {
                current_type_ = "tableofcontents";
                new_index = typeCO->findData(current_type_);
+       } else {
+               current_type_ = typeCO->itemData(new_index).toString();
        }
 
+       typeCO->blockSignals(true);
        typeCO->setCurrentIndex(new_index);
        typeCO->blockSignals(false);
 }
@@ -289,4 +346,4 @@ void TocWidget::init(QString const & str)
 } // namespace frontend
 } // namespace lyx
 
-#include "TocWidget_moc.cpp"
+#include "moc_TocWidget.cpp"