simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index f88683d1cc23b3a832985cd27da7113a9a391b51..bdc968670b084cb9397bdbffd59b4a706ee65f7d 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -31,9 +31,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"));
@@ -213,7 +210,7 @@ void TocWidget::updateView()
 }
 
 
-void TocWidget::updateGui()
+void TocWidget::updateGui(int selected_type)
 {
        vector<docstring> const & type_names = form_.typeNames();
        if (type_names.empty()) {
@@ -225,20 +222,13 @@ void TocWidget::updateGui()
        }
 
        QString current_text = typeCO->currentText();
-       //lyxerr << "current_text " << fromqstr(current_text) << endl;
        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());
+       typeCO->setCurrentIndex(selected_type);
        typeCO->blockSignals(false);
 
        setTocModel(typeCO->currentIndex());