anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify navigator. Get rid of the selectionModel() based navigation as this was too buggy. The tree now react to 'clicked' and activated signal. Changing a selection with the keyboard won't trigger a cursor jump, the user will have to hit 'Enter' for that. This is a ui change that probably needs to be documented (if it was already).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24812 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-05-17 17:03:53 +00:00
parent fdea53d34b
commit 0d61832d22
2 changed files with 33 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/frontends/qt4/TocWidget.cpp
View File

@ -58,13 +58,24 @@ TocWidget::TocWidget(TocModels & models, QWidget * parent)
}
void TocWidget::selectionChanged(const QModelIndex & current,
const QModelIndex & /*previous*/)
void TocWidget::on_tocTV_activated(QModelIndex const & index)
{
LYXERR(Debug::GUI, "selectionChanged index " << current.row()
<< ", " << current.column());
goTo(index);
}
models_.goTo(typeCO->currentIndex(), current);
void TocWidget::on_tocTV_clicked(QModelIndex const & index)
{
goTo(index);
}
void TocWidget::goTo(QModelIndex const & index)
{
LYXERR(Debug::GUI, "goto " << index.row()
<< ", " << index.column());
models_.goTo(typeCO->currentIndex(), index);
}
@ -132,7 +143,7 @@ void TocWidget::on_moveUpTB_clicked()
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
models_.goTo(typeCO->currentIndex(), list[0]);
goTo(list[0]);
dispatch(FuncRequest(LFUN_OUTLINE_UP));
enableControls(true);
}
@ -145,7 +156,7 @@ void TocWidget::on_moveDownTB_clicked()
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
models_.goTo(typeCO->currentIndex(), list[0]);
goTo(list[0]);
dispatch(FuncRequest(LFUN_OUTLINE_DOWN));
enableControls(true);
}
@ -158,7 +169,7 @@ void TocWidget::on_moveInTB_clicked()
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
models_.goTo(typeCO->currentIndex(), list[0]);
goTo(list[0]);
dispatch(FuncRequest(LFUN_OUTLINE_IN));
enableControls(true);
}
@ -170,7 +181,7 @@ void TocWidget::on_moveOutTB_clicked()
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (!list.isEmpty()) {
enableControls(false);
models_.goTo(typeCO->currentIndex(), list[0]);
goTo(list[0]);
dispatch(FuncRequest(LFUN_OUTLINE_OUT));
enableControls(true);
}
@ -184,10 +195,9 @@ void TocWidget::select(QModelIndex const & index)
return;
}
disconnectSelectionModel();
tocTV->setCurrentIndex(index);
tocTV->scrollTo(index);
reconnectSelectionModel();
tocTV->clearSelection();
tocTV->setCurrentIndex(index);
}
@ -210,7 +220,7 @@ void TocWidget::enableControls(bool enable)
void TocWidget::updateView()
{
LYXERR(Debug::GUI, "In TocWidget::updateView()");
setTreeDepth();
setTreeDepth(depth_);
select(models_.currentIndex(typeCO->currentIndex()));
}
@ -246,10 +256,6 @@ void TocWidget::init(QString const & str)
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()));
}
@ -261,43 +267,22 @@ void TocWidget::setTocModel(size_t type)
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(models_.depth(type));
depthSL->setValue(depth_);
}
LYXERR(Debug::GUI, "In TocWidget::updateGui()");
select(models_.currentIndex(typeCO->currentIndex()));
if (toc_model) {
LYXERR(Debug::GUI, "tocModel()->rowCount "
<< toc_model->rowCount()
<< "\nform_->tocModel()->columnCount "
<< toc_model->columnCount());
}
}
void TocWidget::reconnectSelectionModel()
{
connect(tocTV->selectionModel(), SIGNAL(
currentChanged(const QModelIndex &, const QModelIndex &)),
this, SLOT(selectionChanged(const QModelIndex &, const QModelIndex &)));
}
void TocWidget::disconnectSelectionModel()
{
disconnect(tocTV->selectionModel(),
SIGNAL(currentChanged(QModelIndex, QModelIndex)),
this, SLOT(selectionChanged(QModelIndex, 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

11
src/frontends/qt4/TocWidget.h
View File

@ -43,9 +43,10 @@ protected Q_SLOTS:
///
void select(QModelIndex const & index);
///
void selectionChanged(const QModelIndex & current,
const QModelIndex & previous);
void goTo(QModelIndex const &);
void on_tocTV_activated(QModelIndex const &);
void on_tocTV_clicked(QModelIndex const &);
void on_updateTB_clicked();
void on_depthSL_valueChanged(int depth);
void on_typeCO_currentIndexChanged(int value);
@ -53,7 +54,6 @@ protected Q_SLOTS:
void on_moveDownTB_clicked();
void on_moveInTB_clicked();
void on_moveOutTB_clicked();
void setTreeDepth() { setTreeDepth(depth_); }
private:
///
@ -62,11 +62,6 @@ private:
int getIndexDepth(QModelIndex const & index, int depth = -1);
///
void setTreeDepth(int depth);
/// Reconnects the selection model change signal when TOC changed.
void reconnectSelectionModel();
/// Disconnects the selection model.
//This is a workaround for a problem of signals blocking.
void disconnectSelectionModel();
/// depth of list shown
int depth_;