#include "TocModel.h"
#include "Buffer.h"
+#include "BufferView.h"
#include "CutAndPaste.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "Menus.h"
#include "TocBackend.h"
this, SLOT(showContextMenu(const QPoint &)));
connect(tocTV, SIGNAL(customContextMenuRequested(const QPoint &)),
this, SLOT(showContextMenu(const QPoint &)));
+ connect(filterLE, SIGNAL(textEdited(QString)),
+ this, SLOT(filterContents()));
init(QString());
}
TocItem const & item =
gui_view_.tocModels().currentItem(current_type_, index);
+ // Start an undo group.
+ cur.beginUndoGroup();
+
switch (cmd.action)
{
case LFUN_CHANGE_ACCEPT:
if (inset)
inset->dispatch(cur, tmpcmd);
}
+ cur.endUndoGroup();
}
{
current_type_ = typeCO->itemData(index).toString();
updateView();
- gui_view_.setFocus();
+ // In Qt 4.6.x, we can end up here programmatically, when the
+ // model is rebuilt. But the Buffer may not be ready for us to
+ // reset focus, start the cursor, etc. So we check to see if the
+ // combo box has focus. It will, if the user has changed the
+ // value.
+ if (typeCO->hasFocus())
+ gui_view_.setFocus();
}
-void TocWidget::outline(int func_code)
+void TocWidget::outline(FuncCode func_code)
{
- enableControls(false);
QModelIndexList const & list = tocTV->selectionModel()->selectedIndexes();
if (list.isEmpty())
return;
enableControls(false);
goTo(list[0]);
- dispatch(FuncRequest(static_cast<FuncCode>(func_code)));
+ dispatch(FuncRequest(func_code));
enableControls(true);
gui_view_.setFocus();
}
}
-/// Test whether outlining operation is possible
-static bool canOutline(QString const & type)
-{
- return type == "tableofcontents";
-}
-
-
void TocWidget::enableControls(bool enable)
{
updateTB->setEnabled(enable);
- if (!canOutline(current_type_))
+ if (!canOutline())
enable = false;
moveUpTB->setEnabled(enable);
}
-/// Test whether synchronized navigation is possible
-static bool canNavigate(QString const & type)
-{
- // It is not possible to have synchronous navigation in a correct
- // and efficient way with the label and change type because Toc::item()
- // does a linear search. Even when fixed, it might even not be desirable
- // to do so if we want to support drag&drop of labels and references.
- return type != "label" && type != "change";
-}
-
-
-/// Test whether sorting is possible
-static bool isSortable(QString const & type)
-{
- return type != "tableofcontents";
-}
-
-
void TocWidget::updateView()
{
- if (!gui_view_.view()) {
+ if (!gui_view_.documentBufferView()) {
enableControls(false);
typeCO->setEnabled(false);
tocTV->setModel(0);
depthSL->setEnabled(false);
return;
}
- sortCB->setEnabled(isSortable(current_type_));
+ bool const is_sortable = isSortable();
+ sortCB->setEnabled(is_sortable);
depthSL->setEnabled(true);
typeCO->setEnabled(true);
tocTV->setEnabled(false);
tocTV->setUpdatesEnabled(false);
- QAbstractItemModel * toc_model = gui_view_.tocModels().model(current_type_);
+ QAbstractItemModel * toc_model =
+ gui_view_.tocModels().model(current_type_);
if (tocTV->model() != toc_model) {
tocTV->setModel(toc_model);
tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
}
sortCB->blockSignals(true);
- sortCB->setChecked(isSortable(current_type_)
+ sortCB->setChecked(is_sortable
&& gui_view_.tocModels().isSorted(current_type_));
sortCB->blockSignals(false);
-
- bool const can_navigate_ = canNavigate(current_type_);
+ bool const can_navigate_ = canNavigate();
persistentCB->setEnabled(can_navigate_);
bool controls_enabled = toc_model && toc_model->rowCount() > 0
- && !gui_view_.buffer()->isReadonly();
+ && !gui_view_.documentBufferView()->buffer().isReadonly();
enableControls(controls_enabled);
depthSL->setMaximum(gui_view_.tocModels().depth(current_type_));
persistentCB->setChecked(persistent_);
select(gui_view_.tocModels().currentIndex(current_type_));
}
+ filterContents();
tocTV->setEnabled(true);
tocTV->setUpdatesEnabled(true);
}
+void TocWidget::filterContents()
+{
+ if (!tocTV->model())
+ return;
+
+ QModelIndexList indices = tocTV->model()->match(
+ tocTV->model()->index(0, 0),
+ Qt::DisplayRole, "*", -1,
+ Qt::MatchFlags(Qt::MatchWildcard|Qt::MatchRecursive));
+
+ int size = indices.size();
+ for (int i = 0; i < size; i++) {
+ QModelIndex index = indices[i];
+ bool const matches =
+ index.data().toString().contains(
+ filterLE->text(), Qt::CaseSensitive);
+ tocTV->setRowHidden(index.row(), index.parent(), !matches);
+ }
+ // recursively unhide parents of unhidden children
+ for (int i = size - 1; i >= 0; i--) {
+ QModelIndex index = indices[i];
+ if (!tocTV->isRowHidden(index.row(), index.parent())
+ && index.parent() != QModelIndex())
+ tocTV->setRowHidden(index.parent().row(),
+ index.parent().parent(), false);
+ }
+}
+
+
static QString decodeType(QString const & str)
{
QString type = str;