#include "TocWidget.h"
-#include "QToc.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>
-#include <string>
-#include <stack>
-
-using std::endl;
-using std::pair;
-using std::stack;
-using std::vector;
-using std::string;
+using namespace std;
namespace lyx {
namespace frontend {
-
-TocWidget::TocWidget(QToc * form, QWidget * parent)
- : QWidget(parent), form_(form), depth_(0)
+TocWidget::TocWidget(TocModels & models, QWidget * parent)
+ : QWidget(parent), depth_(0), models_(models)
{
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"));
+ moveDownTB->setIcon(QIcon(":/images/down.png"));
+ updateTB->setIcon(QIcon(":/images/reload.png"));
// avoid flickering
tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
// like labels, bookmarks, etc...
// tocTV->header()->hide();
tocTV->header()->setVisible(false);
+
+ // Only one item selected at a time.
+ tocTV->setSelectionMode(QAbstractItemView::SingleSelection);
+}
+
+
+void TocWidget::on_tocTV_activated(QModelIndex const & index)
+{
+ goTo(index);
}
-void TocWidget::selectionChanged(const QModelIndex & current,
- const QModelIndex & /*previous*/)
+void TocWidget::on_tocTV_clicked(QModelIndex const & index)
{
- LYXERR(Debug::GUI)
- << "selectionChanged index " << current.row()
- << ", " << current.column()
- << endl;
+ goTo(index);
+ // FIXME: It would be nice to return the focus to the work area in this
+ // case. But we need access to the GuiView!
+}
+
+
+void TocWidget::goTo(QModelIndex const & index)
+{
+ LYXERR(Debug::GUI, "goto " << index.row()
+ << ", " << index.column());
- form_->goTo(typeCO->currentIndex(), current);
+ models_.goTo(typeCO->currentIndex(), index);
}
-void TocWidget::on_updatePB_clicked()
+void TocWidget::on_updateTB_clicked()
{
- form_->updateBackend();
- form_->update();
- update();
+ // The backend update can take some time so we disable
+ // the controls while waiting.
+ enableControls(false);
+ models_.updateBackend();
}
/* FIXME (Ugras 17/11/06):
int TocWidget::getIndexDepth(QModelIndex const & index, int depth)
{
++depth;
- return (index.parent() == QModelIndex())? depth : getIndexDepth(index.parent(),depth);
+ return (index.parent() == QModelIndex())
+ ? depth : getIndexDepth(index.parent(),depth);
}
{
depth_ = depth;
- // expanding and then collapsing is probably better,
+ // expanding and then collapsing is probably better,
// but my qt 4.1.2 doesn't have expandAll()..
- //tocTV->expandAll();
+ //tocTV->expandAll();
QModelIndexList indices = tocTV->model()->match(
tocTV->model()->index(0,0),
- Qt::DisplayRole, "*", -1,
- Qt::MatchWildcard|Qt::MatchRecursive);
-
+ Qt::DisplayRole, "*", -1,
+ Qt::MatchFlags(Qt::MatchWildcard|Qt::MatchRecursive));
+
int size = indices.size();
for (int i = 0; i < size; i++) {
QModelIndex index = indices[i];
- if (getIndexDepth(index) < depth_)
- tocTV->expand(index);
+ if (getIndexDepth(index) < depth_)
+ tocTV->expand(index);
else
- tocTV->collapse(index);
+ tocTV->collapse(index);
}
}
-
-void TocWidget::on_typeCO_activated(int value)
+void TocWidget::on_typeCO_currentIndexChanged(int value)
{
setTocModel(value);
}
-void TocWidget::on_moveUpPB_clicked()
+void TocWidget::on_moveUpTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_->goTo(typeCO->currentIndex(), list[0]);
- form_->outlineUp();
+ goTo(list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_UP));
enableControls(true);
}
}
-void TocWidget::on_moveDownPB_clicked()
+void TocWidget::on_moveDownTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_->goTo(typeCO->currentIndex(), list[0]);
- form_->outlineDown();
+ goTo(list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_DOWN));
enableControls(true);
}
}
-void TocWidget::on_moveInPB_clicked()
+void TocWidget::on_moveInTB_clicked()
{
enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_->goTo(typeCO->currentIndex(), list[0]);
- form_->outlineIn();
+ goTo(list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_IN));
enableControls(true);
}
}
-void TocWidget::on_moveOutPB_clicked()
+void TocWidget::on_moveOutTB_clicked()
{
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
- form_->goTo(typeCO->currentIndex(), list[0]);
- form_->outlineOut();
+ goTo(list[0]);
+ dispatch(FuncRequest(LFUN_OUTLINE_OUT));
enableControls(true);
}
}
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;
}
- tocTV->selectionModel()->blockSignals(true);
tocTV->scrollTo(index);
- tocTV->selectionModel()->setCurrentIndex(index,
- QItemSelectionModel::ClearAndSelect);
- tocTV->selectionModel()->blockSignals(false);
+ tocTV->clearSelection();
+ tocTV->setCurrentIndex(index);
}
void TocWidget::enableControls(bool enable)
{
- updatePB->setEnabled(enable);
+ updateTB->setEnabled(enable);
- if (!form_->canOutline(typeCO->currentIndex()))
+ if (!models_.canOutline(typeCO->currentIndex()))
enable = false;
- moveUpPB->setEnabled(enable);
- moveDownPB->setEnabled(enable);
- moveInPB->setEnabled(enable);
- moveOutPB->setEnabled(enable);
+ moveUpTB->setEnabled(enable);
+ moveDownTB->setEnabled(enable);
+ moveInTB->setEnabled(enable);
+ moveOutTB->setEnabled(enable);
depthSL->setEnabled(enable);
}
-void TocWidget::update()
+void TocWidget::updateView()
{
- LYXERR(Debug::GUI) << "In TocWidget::update()" << endl;
- select(form_->getCurrentIndex(typeCO->currentIndex()));
- QWidget::update();
+ LYXERR(Debug::GUI, "In TocWidget::updateView()");
+ setTreeDepth(depth_);
+ select(models_.currentIndex(typeCO->currentIndex()));
}
-void TocWidget::updateGui()
+void TocWidget::init(QString const & str)
{
- QStringListModel * type_model = form_->typeModel();
- if (type_model->stringList().isEmpty()) {
+ QStringList const & type_names = models_.typeNames();
+ if (type_names.isEmpty()) {
enableControls(false);
- typeCO->setModel(type_model);
+ typeCO->clear();
tocTV->setModel(new QStandardItemModel);
tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
return;
}
- QString current_text = typeCO->currentText();
- typeCO->setModel(type_model);
- int const current_type = typeCO->findText(current_text);
- if (current_type != -1)
- typeCO->setCurrentIndex(current_type);
- else
- typeCO->setCurrentIndex(form_->selectedType());
+ int selected_type = models_.decodeType(str);
+
+ QString const current_text = typeCO->currentText();
+ typeCO->blockSignals(true);
+ typeCO->clear();
+ 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);
+ }
+
+ typeCO->blockSignals(false);
setTocModel(typeCO->currentIndex());
}
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);
tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
+ LYXERR(Debug::GUI, "tocModel()->rowCount "
+ << toc_model->rowCount()
+ << "\nform_->tocModel()->columnCount "
+ << toc_model->columnCount());
}
enableControls(controls_enabled);
- reconnectSelectionModel();
-
if (controls_enabled) {
- depthSL->setMaximum(form_->getTocDepth(type));
+ depthSL->setMaximum(models_.depth(type));
depthSL->setValue(depth_);
}
- LYXERR(Debug::GUI) << "In TocWidget::updateGui()" << endl;
-
- select(form_->getCurrentIndex(typeCO->currentIndex()));
-
- if (toc_model) {
- LYXERR(Debug::GUI)
- << "form_->tocModel()->rowCount "
- << toc_model->rowCount()
- << "\nform_->tocModel()->columnCount "
- << toc_model->columnCount()
- << endl;
- }
-}
-
-
-void TocWidget::reconnectSelectionModel()
-{
- connect(tocTV->selectionModel(),
- SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
- this, SLOT(selectionChanged(const QModelIndex &, const QModelIndex &)));
+ // 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()));
}
} // namespace frontend