Transfered closePB handlling (GUI code) from QToc.C to QTocDialog.C

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13641 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index f5918da769d45470ad33e41cdc355f1e87256943..b43dbb124c4e65a4ba2ce8b1636e0c82a3b7fe11 100644 (file)
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -39,9 +39,6 @@ QToc::QToc(Dialog & parent)
 void QToc::build_dialog()
 {
        dialog_.reset(new QTocDialog(this));
-
-       // Manage the cancel/close button
-       bcview().setCancel(dialog_->closePB);
 }
 
 

diff --git a/src/frontends/qt4/QTocDialog.C b/src/frontends/qt4/QTocDialog.C
index 53c513bf6237d66ba5ddd0eae9c3e299a2c3f4e2..3284f5c91240f58195f5a4f4c3bfb7cc6b12140d 100644 (file)
--- a/src/frontends/qt4/QTocDialog.C
+++ b/src/frontends/qt4/QTocDialog.C
@@ -13,6 +13,7 @@
 
 #include "QTocDialog.h"
 #include "QToc.h"
+#include "Qt2BC.h"
 #include "qt_helpers.h"
 #include "controllers/ControlToc.h"
 
@@ -41,6 +42,9 @@ QTocDialog::QTocDialog(QToc * form)
 {
        setupUi(this);
 
+       // Manage the cancel/close button
+       form_->bcview().setCancel(closePB);
+
        // disable sorting
        tocTW->setSortingEnabled(false);
        tocTW->setColumnCount(1);
@@ -64,8 +68,6 @@ void QTocDialog::on_tocTW_currentItemChanged(QTreeWidgetItem * current,
                                                                 QTreeWidgetItem * previous)
 {
        form_->select(fromqstr(current->text(0)));
-               lyxerr[Debug::GUI]
-                       << fromqstr(current->text(0)) << " selected" << endl;
 }
 
 void QTocDialog::on_closePB_clicked()
@@ -227,7 +229,8 @@ void QTocDialog::populateItem(QTreeWidgetItem * parentItem, toc::Toc::const_iter
                item->setText(0, toqstr(iter->str));
 
                if (iter->depth < depth_) tocTW->collapseItem(item);
-//             else tocTW->expandItem(item);
+               else tocTW->expandItem(item);
+
                lyxerr[Debug::GUI]
                        << "Table of contents: Added item " << iter->str
                        << " at depth " << iter->depth