diff options
author | Michele Calgaro <[email protected]> | 2014-11-27 11:51:59 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2014-11-27 11:51:59 +0900 |
commit | 01d88b2886ada398c883a44410827b11b907e512 (patch) | |
tree | a293fc2e5c18385408a922ea6544052b9b9bb103 /tdeutils | |
parent | d4b2ca0550eeacd278c638664b43464239342244 (diff) | |
download | tdelibs-01d88b2886ada398c883a44410827b11b907e512.tar.gz tdelibs-01d88b2886ada398c883a44410827b11b907e512.zip |
Added support for handbookDocPath(). This relates to bug 1850.
Diffstat (limited to 'tdeutils')
-rw-r--r-- | tdeutils/kcmultidialog.cpp | 10 | ||||
-rw-r--r-- | tdeutils/tdecmoduleproxy.cpp | 12 | ||||
-rw-r--r-- | tdeutils/tdecmoduleproxy.h | 5 |
3 files changed, 24 insertions, 3 deletions
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index 0ba07fe6b..cbdffaa7d 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -189,10 +189,14 @@ void KCMultiDialog::slotHelp() 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; + TDECModuleProxy *m = (*it).kcm; + + docPath = m->handbookDocPath(); + if (docPath == TQString::null) + docPath = m->moduleInfo().docPath(); + TQString section = m->handbookSection(); - if (section != "") { + if (section != TQString::null) { docPath = TQString( "%1#%2" ).arg( docPath ).arg( section ); } break; diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 75da38e02..d074b8c02 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -598,6 +598,18 @@ const TDEAboutData * TDECModuleProxy::aboutData() const } } +TQString TDECModuleProxy::handbookDocPath() const +{ + if( !d->rootMode ) { + return realModule() ? realModule()->handbookDocPath() : TQString::null; + } + else { + /* This needs fixing, perhaps cache a handbookSection() copy + * while in root mode? */ + return TQString::null; + } +} + TQString TDECModuleProxy::handbookSection() const { if( !d->rootMode ) { diff --git a/tdeutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h index 3d2b1ca82..f5b570125 100644 --- a/tdeutils/tdecmoduleproxy.h +++ b/tdeutils/tdecmoduleproxy.h @@ -158,6 +158,11 @@ public: const TDEAboutData * aboutData() const; /** + * @return the module's handbookDocPath() + */ + TQString handbookDocPath() const; + + /** * @return the module's handbookSection() */ TQString handbookSection() const; |