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

[tfry at users.sourceforge.net]

Revision: 1098
          http://svn.sourceforge.net/rkward/?rev=1098&view=rev
Author:   tfry
Date:     2007-01-08 08:23:28 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
Cleanups

Modified Paths:
--------------
    trunk/rkward/rkward/pages/rkward_for_new_users.rkh
    trunk/rkward/rkward/pages/rkward_for_r_users.rkh
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/rkward/pages/rkward_for_new_users.rkh
===================================================================
--- trunk/rkward/rkward/pages/rkward_for_new_users.rkh	2007-01-08 16:10:08 UTC (rev 1097)
+++ trunk/rkward/rkward/pages/rkward_for_new_users.rkh	2007-01-08 16:23:28 UTC (rev 1098)
@@ -2,7 +2,7 @@
 <document>
 	<title>RKWard for new Users</title>
 	<summary>
-	This page has not yet been written. Therefore, you may want to refer to <link href="rkward://pages/rkward_for_r_users"/> instead, for now.
+	This page has not yet been written. Therefore, you may want to refer to <link href="rkward://page/rkward_for_r_users"/> instead, for now.
 	</summary>
 
 	<related>

Modified: trunk/rkward/rkward/pages/rkward_for_r_users.rkh
===================================================================
--- trunk/rkward/rkward/pages/rkward_for_r_users.rkh	2007-01-08 16:10:08 UTC (rev 1097)
+++ trunk/rkward/rkward/pages/rkward_for_r_users.rkh	2007-01-08 16:23:28 UTC (rev 1098)
@@ -54,5 +54,7 @@
 
 	<related>
 		<link href="rkward://page/rkward_for_new_users"/>
+
+		TODO: Each of the above sections should eventually get a dedicated page of its own with more detailed information
 	</related>
 </document>

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2007-01-08 16:10:08 UTC (rev 1097)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2007-01-08 16:23:28 UTC (rev 1098)
@@ -423,7 +423,7 @@
 
 			help_file_name = help_base_dir + url.path () + ".rkh";
 		}
-		qDebug ("%s", help_file_name.latin1 ());
+		RK_DO (qDebug ("rendering help page for local file %s", help_file_name.latin1 ()), APP, DL_DEBUG);
 
 		// open help file
 		QDomElement help_doc_element = help_xml->openXMLFile (help_file_name, DL_ERROR);
@@ -472,6 +472,7 @@
 			khtmlpart->write (renderHelpFragment (*it));
 		}
 
+		// the section "settings" is the most complicated, as the labels of the individual GUI items has to be fetched from the component description. Of course it is only meaningful for component help, and not rendered for top level help pages.
 		if (for_component) {
 			element = help_xml->getChildElement (help_doc_element, "settings", DL_INFO);
 			if (!element.isNull ()) {
@@ -555,10 +556,6 @@
 			if (url.host () == "component") {
 				RKComponentHandle *chandle = componentPathToHandle (url.path ());
 				if (chandle) text = chandle->getLabel ();
-				else {
-					text = i18n ("BROKEN REFERENCE");
-					RK_DO (qDebug ("Broken component reference to %s", url.path ().latin1 ()), APP, DL_WARNING);
-				}
 			} else if (url.host () == "rhelp") {
 				text = i18n ("R Reference on '%1'").arg (url.path ().mid (1));
 			} else if (url.host () == "page") {
@@ -573,6 +570,12 @@
 
 				delete xml;
 			}
+
+			if (text.isEmpty ()) {
+				text = i18n ("BROKEN REFERENCE");
+				RK_DO (qDebug ("Broken reference to %s", url.path ().latin1 ()), APP, DL_WARNING);
+			}
+
 			link_element->appendChild (link_element->ownerDocument ().createTextNode (text));
 		}
 	}


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