#include "support/debug.h"
#include <QHeaderView>
+#include <QTimer>
#include <vector>
{
setupUi(this);
- connect(&form_, SIGNAL(modelReset()), SLOT(updateGui()));
-
moveOutTB->setIcon(QIcon(":/images/promote.png"));
moveInTB->setIcon(QIcon(":/images/demote.png"));
moveUpTB->setIcon(QIcon(":/images/up.png"));
}
-void TocWidget::updateGui()
+void TocWidget::updateGui(int selected_type)
{
vector<docstring> const & type_names = form_.typeNames();
if (type_names.empty()) {
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()));
}