#include <vector>
+#define DELAY_UPDATE_VIEW
+
using namespace std;
namespace lyx {
namespace frontend {
TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
- : QWidget(parent), depth_(0), persistent_(false), gui_view_(gui_view)
+ : QWidget(parent), depth_(0), persistent_(false), gui_view_(gui_view), update_delay_(0)
+
{
setupUi(this);
// Only one item selected at a time.
tocTV->setSelectionMode(QAbstractItemView::SingleSelection);
+ setFocusProxy(tocTV);
// The toc types combo won't change its model.
typeCO->setModel(gui_view_.tocModels().nameModel());
TocItem const & item =
gui_view_.tocModels().currentItem(current_type_, index);
- switch (cmd.action)
+ switch (cmd.action())
{
case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT:
case LFUN_OUTLINE_IN:
case LFUN_OUTLINE_OUT:
case LFUN_SECTION_SELECT:
- status.setEnabled(true);
+ status.setEnabled(item.dit() != 0);
return true;
- case LFUN_LABEL_COPY_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REFERENCE: {
// For labels in math, we need to supply the label as a string
- FuncRequest label_copy(LFUN_LABEL_COPY_AS_REF, item.asString());
+ FuncRequest label_copy(LFUN_LABEL_COPY_AS_REFERENCE, item.asString());
if (inset)
return inset->getStatus(cur, label_copy, status);
}
// Start an undo group.
cur.beginUndoGroup();
- switch (cmd.action)
+ switch (cmd.action())
{
case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT:
+ dispatch(item.action());
+ cur.dispatch(tmpcmd);
+ break;
+
case LFUN_SECTION_SELECT:
dispatch(item.action());
cur.dispatch(tmpcmd);
+ // necessary to get the selection drawn.
+ cur.buffer()->changed(true);
+ gui_view_.setFocus();
break;
- case LFUN_LABEL_COPY_AS_REF: {
+ case LFUN_LABEL_COPY_AS_REFERENCE: {
// For labels in math, we need to supply the label as a string
- FuncRequest label_copy(LFUN_LABEL_COPY_AS_REF, item.asString());
+ FuncRequest label_copy(LFUN_LABEL_COPY_AS_REFERENCE, item.asString());
if (inset)
inset->dispatch(cur, label_copy);
break;
}
-
+
case LFUN_OUTLINE_UP:
case LFUN_OUTLINE_DOWN:
case LFUN_OUTLINE_IN:
case LFUN_OUTLINE_OUT:
- outline(cmd.action);
+ outline(cmd.action());
break;
default:
// The backend update can take some time so we disable
// the controls while waiting.
enableControls(false);
- gui_view_.tocModels().updateBackend();
+ gui_view_.currentBufferView()->buffer().updateBuffer();
}
void TocWidget::on_sortCB_stateChanged(int state)
{
gui_view_.tocModels().sort(current_type_, state == Qt::Checked);
- updateView();
+ updateViewForce();
}
}
+#if 0
/* FIXME (Ugras 17/11/06):
I have implemented a indexDepth function to get the model indices. In my
opinion, somebody should derive a new qvariant class for tocModelItem
return index.parent() == QModelIndex()
? depth : indexDepth(index.parent(), depth);
}
-
+#endif
void TocWidget::on_depthSL_valueChanged(int depth)
{
if (!tocTV->model())
return;
-#if QT_VERSION >= 0x040300
- // this should be faster than our own code below
if (depth == 0)
tocTV->collapseAll();
else
tocTV->expandToDepth(depth - 1);
-#else
- // expanding and then collapsing is probably better,
- // but my qt 4.1.2 doesn't have expandAll()..
- //tocTV->expandAll();
- 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];
- tocTV->setExpanded(index, indexDepth(index) < depth_);
- }
-#endif
}
void TocWidget::on_typeCO_currentIndexChanged(int index)
{
+ if (index == -1)
+ return;
current_type_ = typeCO->itemData(index).toString();
- updateView();
- // 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.
+ updateViewForce();
if (typeCO->hasFocus())
gui_view_.setFocus();
}
void TocWidget::updateView()
{
+// Enable if you dont want the delaying business, cf #7138.
+#ifndef DELAY_UPDATE_VIEW
+ updateViewForce();
+ return;
+#endif
+ // already scheduled?
+ if (update_delay_ == -1)
+ return;
+ QTimer::singleShot(update_delay_, this, SLOT(updateViewForce()));
+ // Subtler optimization for having the delay more UI invisible.
+ // We trigger update immediately for sparse editation actions,
+ // i.e. there was no editation/cursor movement in last 2 sec.
+ // At worst there will be +1 redraw after 2s in a such "calm" mode.
+ if (update_delay_ != 0)
+ updateViewForce();
+ update_delay_ = -1;
+}
+
+void TocWidget::updateViewForce()
+{
+ update_delay_ = 2000;
if (!gui_view_.documentBufferView()) {
- enableControls(false);
- typeCO->setEnabled(false);
tocTV->setModel(0);
- tocTV->setEnabled(false);
depthSL->setMaximum(0);
depthSL->setValue(0);
- persistentCB->setEnabled(false);
- sortCB->setEnabled(false);
- depthSL->setEnabled(false);
+ setEnabled(false);
return;
}
+ setEnabled(true);
bool const is_sortable = isSortable();
sortCB->setEnabled(is_sortable);
- depthSL->setEnabled(true);
- typeCO->setEnabled(true);
+ bool focus_ = tocTV->hasFocus();
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);
filterContents();
tocTV->setEnabled(true);
tocTV->setUpdatesEnabled(true);
+ if (focus_)
+ tocTV->setFocus();
}
QModelIndex index = indices[i];
bool const matches =
index.data().toString().contains(
- filterLE->text(), Qt::CaseSensitive);
+ filterLE->text(), Qt::CaseInsensitive);
tocTV->setRowHidden(index.row(), index.parent(), !matches);
}
// recursively unhide parents of unhidden children
static QString decodeType(QString const & str)
{
QString type = str;
- if (type.contains("tableofcontents")) {
+ if (type.contains("tableofcontents"))
type = "tableofcontents";
- } else if (type.contains("floatlist")) {
+ else if (type.contains("lstlistoflistings"))
+ type = "listing";
+ else if (type.contains("floatlist")) {
if (type.contains("\"figure"))
type = "figure";
else if (type.contains("\"table"))
new_index = typeCO->findData(decodeType(str));
// If everything else fails, settle on the table of contents which is
- // guaranted to exist.
+ // guaranteed to exist.
if (new_index == -1) {
current_type_ = "tableofcontents";
new_index = typeCO->findData(current_type_);
typeCO->blockSignals(true);
typeCO->setCurrentIndex(new_index);
typeCO->blockSignals(false);
+
+ // no delay when the whole outliner is reseted.
+ update_delay_ = 0;
}
} // namespace frontend
projects / lyx.git / blobdiff