[rkward-cvs] SF.net SVN: rkward: [880] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 880
          http://svn.sourceforge.net/rkward/?rev=880&view=rev
Author:   tfry
Date:     2006-10-17 11:26:28 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
Make sure the khtmlpart gets deleted at the appropriate moment

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/TODO
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2006-10-17 16:10:19 UTC (rev 879)
+++ trunk/rkward/ChangeLog	2006-10-17 18:26:28 UTC (rev 880)
@@ -1,3 +1,4 @@
+- fixed: back / forward buttons would sometimes remain after closing a help window 
 - fix some focus problems
 - provide close buttons in tab bar
 

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2006-10-17 16:10:19 UTC (rev 879)
+++ trunk/rkward/TODO	2006-10-17 18:26:28 UTC (rev 880)
@@ -43,8 +43,6 @@
 			- this will be very hard to do with the current Qt. We'd really need several checkboxes *within* a QListViewItem. Tackle this when/after porting to Qt4
 	- RObjectListView
 		- use better icons to mark up the different base types
-	- Workplace
-		- use KTabBar for tabs with close icon?
 	- RKConsole:
 		- Console should start a command chain when submitting a batch of pasted commands
 		- Better yet, the commands might be autosplit in the backend. Need to think about how to design this correctly, though
@@ -60,6 +58,10 @@
 	- RKHelpDlg:
 		- in the mid term, this should probably be renamed and moved to windows
 		- call .rk.get.installed.packages, and update package selection drop down on every show, but not on startup? Really? Maybe both.
+	- RKVarslot:
+		- allow "save as" selection mode (i.e. new object names, or selection of existing symbol)
+	- RKVarselector:
+		- pop-up-able selectors (maybe more generic, not only for varselectors)
 	- RKwatch:
 		- optionally keep a file log!
 	- hot-key/permanent icon to cancel current command / hold processing. Perhaps in the busy/idle indicator?

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2006-10-17 16:10:19 UTC (rev 879)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2006-10-17 18:26:28 UTC (rev 880)
@@ -48,7 +48,7 @@
 	setFocusProxy (khtmlpart->widget ());
 	
 	khtmlpart->widget ()->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
-	QHBoxLayout *pLayout = new QHBoxLayout (this, 0, -1, "layout");
+	QHBoxLayout *pLayout = new QHBoxLayout (this);
 	pLayout->addWidget (khtmlpart->widget ());
 
 	// We have to connect this in order to allow browsing.
@@ -61,6 +61,9 @@
 
 RKHTMLWindow::~RKHTMLWindow () {
 	RK_TRACE (APP);
+
+	delete khtmlpart;
+	khtmlpart = 0;	// in case we try to redelete in a parent class
 }
 
 QString RKHTMLWindow::getRDescription () {
@@ -203,6 +206,9 @@
 	if (this == current_output) {
 		current_output = 0;
 	}
+
+	delete khtmlpart;
+	khtmlpart = 0;	// in case we try to redelete in a parent class
 }
 
 QString RKOutputWindow::getRDescription () {
@@ -316,6 +322,8 @@
 
 RKHelpWindow::~RKHelpWindow () {
 	RK_TRACE (APP);
+	delete khtmlpart;
+	khtmlpart = 0;	// in case we try to redelete in a parent class
 }
 
 #include "rkhtmlwindow.moc"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.