From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 11 Apr 2006 09:56:56 +0000 (+0000)
Subject: Transfered closePB handlling (GUI code) from QToc.C to QTocDialog.C
X-Git-Tag: 1.6.10~13359
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=107356b43901da17546b79f68e82a4cfed8fb4a3;p=features.git

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 f5918da769..b43dbb124c 100644
--- 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 53c513bf62..3284f5c912 100644
--- 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