diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-11-27 11:57:00 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-11-27 11:57:00 +0900 |
commit | 48fe5507cdaa620625441c7e1f70eb98b7ca78e5 (patch) | |
tree | 19f74df23d81ec7dd56166b0666c742abc659c5b /kcontrol/kcontrol | |
parent | 1bd907fe3d97323c96d7b4a385207dfd8f7a8931 (diff) | |
download | tdebase-48fe5507cdaa620625441c7e1f70eb98b7ca78e5.tar.gz tdebase-48fe5507cdaa620625441c7e1f70eb98b7ca78e5.zip |
Fixed help handbook sections for TDE Components. This relates to bug 1850.
Diffstat (limited to 'kcontrol/kcontrol')
-rw-r--r-- | kcontrol/kcontrol/helpwidget.cpp | 13 | ||||
-rw-r--r-- | kcontrol/kcontrol/proxywidget.cpp | 8 | ||||
-rw-r--r-- | kcontrol/kcontrol/proxywidget.h | 1 |
3 files changed, 16 insertions, 6 deletions
diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 0bcf82796..f21c03c71 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/kcontrol/kcontrol/helpwidget.cpp @@ -65,13 +65,14 @@ TQString HelpWidget::text() const bool HelpWidget::clicked(const TQString & _url) { TQString textUrl = _url; - - if ( textUrl.isNull() ) { - return true; - } - ConfigModule* dockModule = _dock->module(); - if ( dockModule) { + if (dockModule) { + TQString localDocPath = dockModule->module()->handbookDocPath(); + if (localDocPath != "") + textUrl = localDocPath; + if (textUrl.isNull()) + return true; + TQString section = dockModule->module()->handbookSection(); if (section != "") { textUrl = TQString( "%1#%2" ).arg( textUrl ).arg( section ); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 94c1b5dd4..b00741751 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -320,6 +320,14 @@ void ProxyWidget::clientChanged(bool state) emit changed(state); } +TQString ProxyWidget::handbookDocPath() const +{ + if (_client) + return _client->handbookDocPath(); + else + return TQString::null; +} + TQString ProxyWidget::handbookSection() const { if (_client) diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index 874d30d4f..804803c51 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -46,6 +46,7 @@ public: ~ProxyWidget(); TQString quickHelp() const; + TQString handbookDocPath() const; TQString handbookSection() const; const TDEAboutData *aboutData() const; |