#include <QHeaderView>
#include <QMenu>
-#include <QTimer>
#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), update_delay_(0)
-
+ : QWidget(parent), depth_(0), persistent_(false), gui_view_(gui_view),
+ timer_(new QTimer(this))
{
setupUi(this);
- moveOutTB->setIcon(QIcon(getPixmap("images/", "promote", "png")));
- moveInTB->setIcon(QIcon(getPixmap("images/", "demote", "png")));
- moveUpTB->setIcon(QIcon(getPixmap("images/", "up", "png")));
- moveDownTB->setIcon(QIcon(getPixmap("images/", "down", "png")));
- updateTB->setIcon(QIcon(getPixmap("images/", "reload", "png")));
+ moveOutTB->setIcon(QIcon(getPixmap("images/", "outline-out", "svgz,png")));
+ moveInTB->setIcon(QIcon(getPixmap("images/", "outline-in", "svgz,png")));
+ moveUpTB->setIcon(QIcon(getPixmap("images/", "outline-up", "svgz,png")));
+ moveDownTB->setIcon(QIcon(getPixmap("images/", "outline-down", "svgz,png")));
+ updateTB->setIcon(QIcon(getPixmap("images/", "reload", "svgz,png")));
+
+ QSize icon_size = gui_view.iconSize();
+ moveOutTB->setIconSize(icon_size);
+ moveInTB->setIconSize(icon_size);
+ moveUpTB->setIconSize(icon_size);
+ moveDownTB->setIconSize(icon_size);
+ updateTB->setIconSize(icon_size);
// avoid flickering
tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
this, SLOT(showContextMenu(const QPoint &)));
connect(tocTV, SIGNAL(customContextMenuRequested(const QPoint &)),
this, SLOT(showContextMenu(const QPoint &)));
- connect(filterLE, SIGNAL(textEdited(QString)),
+ connect(filterLE, SIGNAL(textEdited(QString)),
this, SLOT(filterContents()));
+ // setting the update timer
+ timer_->setSingleShot(true);
+ connect(timer_, SIGNAL(timeout()), this, SLOT(finishUpdateView()));
+
init(QString());
}
std::string name = "context-toc-" + fromqstr(current_type_);
QMenu * menu = guiApp->menus().menu(toqstr(name), gui_view_);
if (!menu)
- return;
+ return;
menu->exec(mapToGlobal(pos));
}
TocItem const & item =
gui_view_.tocModels().currentItem(current_type_, index);
DocIterator const & dit = item.dit();
-
+
Inset * inset = 0;
- if (current_type_ == "label"
+ if (current_type_ == "label"
|| current_type_ == "graphics"
|| current_type_ == "citation"
|| current_type_ == "child")
else if (current_type_ == "branch"
|| current_type_ == "index"
- || current_type_ == "change")
+ || current_type_ == "change"
+ || current_type_ == "table"
+ || current_type_ == "listing"
+ || current_type_ == "figure")
inset = &dit.inset();
- else if (current_type_ == "table"
- || current_type_ == "listing"
- || current_type_ == "figure") {
- DocIterator tmp_dit(dit);
- tmp_dit.pop_back();
- inset = &tmp_dit.inset();
- }
return inset;
}
case LFUN_OUTLINE_IN:
case LFUN_OUTLINE_OUT:
case LFUN_SECTION_SELECT:
- status.setEnabled(true);
+ status.setEnabled((bool)item.dit());
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.str());
if (inset)
return inset->getStatus(cur, label_copy, status);
+ break;
}
default:
{
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.str());
if (inset)
inset->dispatch(cur, label_copy);
break;
}
-
+
case LFUN_OUTLINE_UP:
case LFUN_OUTLINE_DOWN:
case LFUN_OUTLINE_IN:
if (button & Qt::LeftButton) {
goTo(index);
gui_view_.setFocus();
+ gui_view_.activateWindow();
}
}
void TocWidget::on_sortCB_stateChanged(int state)
{
gui_view_.tocModels().sort(current_type_, state == Qt::Checked);
- updateViewForce();
+ updateViewNow();
}
}
+#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
}
if (index == -1)
return;
current_type_ = typeCO->itemData(index).toString();
- updateViewForce();
+ updateViewNow();
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()) {
tocTV->setModel(0);
depthSL->setMaximum(0);
setEnabled(true);
bool const is_sortable = isSortable();
sortCB->setEnabled(is_sortable);
- bool focus_ = tocTV->hasFocus();
+ bool focus = tocTV->hasFocus();
tocTV->setEnabled(false);
tocTV->setUpdatesEnabled(false);
- QAbstractItemModel * toc_model =
+ QAbstractItemModel * toc_model =
gui_view_.tocModels().model(current_type_);
if (tocTV->model() != toc_model) {
tocTV->setModel(toc_model);
&& gui_view_.tocModels().isSorted(current_type_));
sortCB->blockSignals(false);
- bool const can_navigate_ = canNavigate();
- persistentCB->setEnabled(can_navigate_);
+ persistentCB->setEnabled(canNavigate());
bool controls_enabled = toc_model && toc_model->rowCount() > 0
&& !gui_view_.documentBufferView()->buffer().isReadonly();
depthSL->setMaximum(gui_view_.tocModels().depth(current_type_));
depthSL->setValue(depth_);
- if (!persistent_ && can_navigate_)
- setTreeDepth(depth_);
- if (can_navigate_) {
- persistentCB->setChecked(persistent_);
- select(gui_view_.tocModels().currentIndex(current_type_));
- }
- filterContents();
tocTV->setEnabled(true);
tocTV->setUpdatesEnabled(true);
- if (focus_)
+ if (focus)
tocTV->setFocus();
+
+ // Expensive operations are on a timer. We finish the update immediately
+ // for sparse edition actions, i.e. there was no edition/cursor movement
+ // recently, then every 300ms.
+ if (!timer_->isActive()) {
+ finishUpdateView();
+ timer_->start(300);
+ }
+}
+
+
+void TocWidget::updateViewNow()
+{
+ timer_->stop();
+ updateView();
+}
+
+
+void TocWidget::finishUpdateView()
+{
+ // Profiling shows that this is the expensive stuff in the context of typing
+ // text and moving with arrows. For bigger operations, this is negligible,
+ // and outweighted by TocModels::reset() anyway.
+ if (canNavigate()) {
+ if (!persistent_)
+ setTreeDepth(depth_);
+ persistentCB->setChecked(persistent_);
+ // select the item at current cursor location
+ if (gui_view_.documentBufferView()) {
+ DocIterator const & dit = gui_view_.documentBufferView()->cursor();
+ select(gui_view_.tocModels().currentIndex(current_type_, dit));
+ }
+ }
+ filterContents();
}
filterLE->text(), Qt::CaseInsensitive);
tocTV->setRowHidden(index.row(), index.parent(), !matches);
}
- // recursively unhide parents of unhidden children
+ // 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())
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"))
typeCO->blockSignals(true);
typeCO->setCurrentIndex(new_index);
typeCO->blockSignals(false);
-
- // no delay when the whole outliner is reseted.
- update_delay_ = 0;
+ updateViewNow();
}
} // namespace frontend
projects / lyx.git / blobdiff