#include "TocWidget.h"
-#include "GuiToc.h"
+#include "TocModel.h"
#include "qt_helpers.h"
-#include "debug.h"
+#include "FuncRequest.h"
+#include "LyXFunc.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 {
-TocWidget::TocWidget(GuiToc & form, QWidget * parent)
- : QWidget(parent), depth_(0), form_(form)
+TocWidget::TocWidget(TocModels & models, QWidget * parent)
+ : QWidget(parent), depth_(0), models_(models)
{
setupUi(this);
- setWindowTitle(qt_("Outline"));
-
- connect(&form_, SIGNAL(modelReset()), SLOT(updateGui()));
moveOutTB->setIcon(QIcon(":/images/promote.png"));
moveInTB->setIcon(QIcon(":/images/demote.png"));
LYXERR(Debug::GUI, "selectionChanged index " << current.row()
<< ", " << current.column());
- form_.goTo(typeCO->currentIndex(), current);
+ models_.goTo(typeCO->currentIndex(), current);
}
// The backend update can take some time so we disable
// the controls while waiting.
enableControls(false);
- form_.updateBackend();
+ models_.updateBackend();
}
/* FIXME (Ugras 17/11/06):
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_.goTo(typeCO->currentIndex(), list[0]);
- form_.outlineUp();
+ models_.goTo(typeCO->currentIndex(), list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_UP));
enableControls(true);
}
}
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_.goTo(typeCO->currentIndex(), list[0]);
- form_.outlineDown();
+ models_.goTo(typeCO->currentIndex(), list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_DOWN));
enableControls(true);
}
}
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_.goTo(typeCO->currentIndex(), list[0]);
- form_.outlineIn();
+ models_.goTo(typeCO->currentIndex(), list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_IN));
enableControls(true);
}
}
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_.goTo(typeCO->currentIndex(), list[0]);
- form_.outlineOut();
+ models_.goTo(typeCO->currentIndex(), list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_OUT));
enableControls(true);
}
}
{
updateTB->setEnabled(enable);
- if (!form_.canOutline(typeCO->currentIndex()))
+ if (!models_.canOutline(typeCO->currentIndex()))
enable = false;
moveUpTB->setEnabled(enable);
void TocWidget::updateView()
{
LYXERR(Debug::GUI, "In TocWidget::updateView()");
- select(form_.currentIndex(typeCO->currentIndex()));
+ setTreeDepth();
+ select(models_.currentIndex(typeCO->currentIndex()));
}
-void TocWidget::updateGui()
+void TocWidget::init(QString const & str)
{
- vector<docstring> const & type_names = form_.typeNames();
- if (type_names.empty()) {
+ QStringList const & type_names = models_.typeNames();
+ if (type_names.isEmpty()) {
enableControls(false);
typeCO->clear();
tocTV->setModel(new QStandardItemModel);
return;
}
- QString current_text = typeCO->currentText();
- //lyxerr << "current_text " << fromqstr(current_text) << endl;
+ int selected_type = models_.decodeType(str);
+
+ 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;
+ for (int i = 0; i != type_names.size(); ++i)
+ typeCO->addItem(type_names[i]);
+ if (!str.isEmpty())
+ typeCO->setCurrentIndex(selected_type);
+ else {
+ int const new_index = typeCO->findText(current_text);
+ if (new_index != -1)
+ typeCO->setCurrentIndex(new_index);
+ else
+ typeCO->setCurrentIndex(selected_type);
}
- if (current_type != -1)
- typeCO->setCurrentIndex(current_type);
- else
- typeCO->setCurrentIndex(form_.selectedType());
+
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(updateView()));
}
void TocWidget::setTocModel(size_t type)
{
bool controls_enabled = false;
- QStandardItemModel * toc_model = form_.tocModel(type);
+ QStandardItemModel * toc_model = models_.model(type);
if (toc_model) {
controls_enabled = toc_model->rowCount() > 0;
tocTV->setModel(toc_model);
reconnectSelectionModel();
if (controls_enabled) {
- depthSL->setMaximum(form_.getTocDepth(type));
+ depthSL->setMaximum(models_.depth(type));
depthSL->setValue(depth_);
}
LYXERR(Debug::GUI, "In TocWidget::updateGui()");
- select(form_.currentIndex(typeCO->currentIndex()));
+ select(models_.currentIndex(typeCO->currentIndex()));
if (toc_model) {
LYXERR(Debug::GUI, "tocModel()->rowCount "
void TocWidget::reconnectSelectionModel()
{
- connect(tocTV->selectionModel(),
- SIGNAL(currentChanged(const QModelIndex &,
- const QModelIndex &)),
- this,
- SLOT(selectionChanged(const QModelIndex &,
- const QModelIndex &)));
+ connect(tocTV->selectionModel(), SIGNAL(
+ currentChanged(const QModelIndex &, const QModelIndex &)),
+ this, SLOT(selectionChanged(const QModelIndex &, const QModelIndex &)));
}
+
void TocWidget::disconnectSelectionModel()
{
disconnect(tocTV->selectionModel(),