do what the FIXME suggested

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

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 7fef1afd3596a4eba4e7a1e0235e0b9106b8fd54..299791559aedc01294c15f1d7de44cd0c82d2171 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -16,17 +16,14 @@
 #include "GuiToc.h"
 #include "qt_helpers.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
 #include <QHeaderView>
-#include <QPushButton>
-#include <QTreeWidgetItem>
+#include <QTimer>
 
 #include <vector>
 
-using std::endl;
-using std::vector;
-
+using namespace std;
 
 namespace lyx {
 namespace frontend {
@@ -35,9 +32,6 @@ TocWidget::TocWidget(GuiToc & form, QWidget * parent)
        : QWidget(parent), depth_(0), form_(form)
 {
        setupUi(this);
-       setWindowTitle(qt_("Outline"));
-
-       connect(&form_, SIGNAL(modelReset()), SLOT(updateGui()));
 
        moveOutTB->setIcon(QIcon(":/images/promote.png"));
        moveInTB->setIcon(QIcon(":/images/demote.png"));
@@ -64,10 +58,8 @@ TocWidget::TocWidget(GuiToc & form, QWidget * parent)
 void TocWidget::selectionChanged(const QModelIndex & current,
                                  const QModelIndex & /*previous*/)
 {
-       LYXERR(Debug::GUI)
-               << "selectionChanged index " << current.row()
-               << ", " << current.column()
-               << endl;
+       LYXERR(Debug::GUI, "selectionChanged index " << current.row()
+               << ", " << current.column());
 
        form_.goTo(typeCO->currentIndex(), current);
 }
@@ -185,8 +177,7 @@ void TocWidget::on_moveOutTB_clicked()
 void TocWidget::select(QModelIndex const & index)
 {
        if (!index.isValid()) {
-               LYXERR(Debug::GUI)
-                       << "TocWidget::select(): QModelIndex is invalid!" << endl;
+               LYXERR(Debug::GUI, "TocWidget::select(): QModelIndex is invalid!");
                return;
        }
 
@@ -215,12 +206,12 @@ void TocWidget::enableControls(bool enable)
 
 void TocWidget::updateView()
 {
-       LYXERR(Debug::GUI) << "In TocWidget::updateView()" << endl;
+       LYXERR(Debug::GUI, "In TocWidget::updateView()");
        select(form_.currentIndex(typeCO->currentIndex()));
 }
 
 
-void TocWidget::updateGui()
+void TocWidget::updateGui(int selected_type)
 {
        vector<docstring> const & type_names = form_.typeNames();
        if (type_names.empty()) {
@@ -231,24 +222,28 @@ void TocWidget::updateGui()
                return;
        }
 
-       QString current_text = typeCO->currentText();
-       //lyxerr << "current_text " << fromqstr(current_text) << endl;
+       QString const current_text = typeCO->currentText();
        typeCO->blockSignals(true);
        typeCO->clear();
-       int current_type = -1;
        for (size_t i = 0; i != type_names.size(); ++i) {
                QString item = toqstr(type_names[i]);
                typeCO->addItem(item);
-               if (item == current_text)
-                       current_type = i;
        }
-       if (current_type != -1)
-               typeCO->setCurrentIndex(current_type);
-       else
-               typeCO->setCurrentIndex(form_.selectedType());
+       if (selected_type != -1)
+               typeCO->setCurrentIndex(selected_type);
+       else {
+               int const new_index = typeCO->findText(current_text);
+               if (new_index != -1)
+                       typeCO->setCurrentIndex(new_index);
+       }
+
        typeCO->blockSignals(false);
 
        setTocModel(typeCO->currentIndex());
+
+       // setTocModel produce QTreeView reset and setting depth again
+       // is needed. That must be done after all Qt updates are processed.
+       QTimer::singleShot(0, this, SLOT(setTreeDepth()));
 }
 
 
@@ -271,17 +266,15 @@ void TocWidget::setTocModel(size_t type)
                depthSL->setValue(depth_);
        }
 
-       LYXERR(Debug::GUI) << "In TocWidget::updateGui()" << endl;
+       LYXERR(Debug::GUI, "In TocWidget::updateGui()");
 
        select(form_.currentIndex(typeCO->currentIndex()));
 
        if (toc_model) {
-               LYXERR(Debug::GUI)
-               << "tocModel()->rowCount "
+               LYXERR(Debug::GUI, "tocModel()->rowCount "
                        << toc_model->rowCount()
                        << "\nform_->tocModel()->columnCount "
-                       << toc_model->columnCount()
-                       << endl;
+                       << toc_model->columnCount());
        }
 }