Load proper handbook section when a TDEControl module is loaded via tdecmshell instead of kcontrol

This relates to Bug 1850

kdoctools/customization/entities/general.entities

@@ -424,3 +424,7 @@
 <!ENTITY quanta "<application>Quanta</application>">
 
 <!ENTITY tde-team "The &tde; Team">
+
+<!ENTITY tde-release-version "R14.0.0 [DEVELOPMENT]">
+<!ENTITY tde-release-date "October  9, 2014">
+<!ENTITY tde-copyright-date "2010-2014">

tdeutils/kcmultidialog.cpp

@@ -186,12 +186,18 @@ void KCMultiDialog::slotHelp()
 
     int curPageIndex = activePageIndex();
     ModuleList::Iterator end = m_modules.end();
-    for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it )
+    for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) {
         if( pageIndex( ( TQWidget * )( *it ).kcm->parent() ) == curPageIndex )
         {
             docPath = ( *it ).kcm->moduleInfo().docPath();
+            TDECModuleProxy * m = ( *it ).kcm;
+            TQString section = m->handbookSection();
+            if (section != "") {
+                docPath = TQString( "%1#%2" ).arg( docPath ).arg( section );
+            }
             break;
         }
+    }
 
     KURL url( KURL("help:/"), docPath );
 

tdeutils/tdecmoduleproxy.cpp

@@ -588,14 +588,26 @@ TQString TDECModuleProxy::quickHelp() const
 
 const TDEAboutData * TDECModuleProxy::aboutData() const
 {
-	if( !d->rootMode )
+	if( !d->rootMode ) {
 		return realModule() ? realModule()->aboutData() : 0;
-	else
+	}
+	else {
 	/* This needs fixing, perhaps cache a TDEAboutData copy
 	 * while in root mode? */
 		return 0;
+	}
+}
 
-
+TQString TDECModuleProxy::handbookSection() const
+{
+	if( !d->rootMode ) {
+		return realModule() ? realModule()->handbookSection() : TQString::null;
+	}
+	else {
+	/* This needs fixing, perhaps cache a TDEAboutData copy
+	 * while in root mode? */
+		return TQString::null;
+	}
 }
 
 int TDECModuleProxy::buttons() const

tdeutils/tdecmoduleproxy.h

@@ -157,6 +157,11 @@ public:
 	 */
 	const TDEAboutData * aboutData() const;
 
+	/**
+	 * @return the module's handbookSection()
+	 */
+	TQString handbookSection() const;
+
 	/**
 	 * @return what buttons the module
 	 * needs