On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / TocWidget.cpp

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index f67d39119c13bc0cf11d50429ef9d2017e6a90c8..83ac1bf12c2e3202860a463c951372dd4a3da701 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -152,12 +152,12 @@ bool TocWidget::getStatus(Cursor & cur, FuncRequest const & cmd,
        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);
        }
@@ -187,19 +187,26 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
        {
        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:
@@ -245,7 +252,7 @@ void TocWidget::on_updateTB_clicked()
        // 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();
 }
 
 
@@ -262,6 +269,7 @@ void TocWidget::on_persistentCB_stateChanged(int state)
 }
 
 
+#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
@@ -274,7 +282,7 @@ static int indexDepth(QModelIndex const & index, int depth = -1)
        return index.parent() == QModelIndex()
                ? depth : indexDepth(index.parent(), depth);
 }
-
+#endif
 
 void TocWidget::on_depthSL_valueChanged(int depth)
 {
@@ -291,27 +299,10 @@ void TocWidget::setTreeDepth(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
 }
 
 
@@ -401,6 +392,12 @@ void TocWidget::updateView()
        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;
 }
 
@@ -490,9 +487,11 @@ void TocWidget::filterContents()
 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"))