Use QFontMetrics information for underlines (and friends) width and position

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

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 3619e6c3b49ffaacdaee976ba6cbd51e7eb57510..c3b9e034ac3edd90ea730b08ceba94c996c0e679 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -52,11 +52,11 @@ TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
 {
        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")));
 
        // avoid flickering
        tocTV->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
@@ -187,9 +187,16 @@ 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_REFERENCE: {