From 48fe5507cdaa620625441c7e1f70eb98b7ca78e5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Nov 2014 11:57:00 +0900 Subject: Fixed help handbook sections for TDE Components. This relates to bug 1850. --- kcontrol/kcontrol/helpwidget.cpp | 13 +++++++------ kcontrol/kcontrol/proxywidget.cpp | 8 ++++++++ kcontrol/kcontrol/proxywidget.h | 1 + kcontrol/konq/behaviour.cpp | 5 +++++ kcontrol/konq/behaviour.h | 1 + kcontrol/konq/browser.cpp | 22 ++++++++++++++++++++++ kcontrol/konq/browser.h | 2 ++ kcontrol/konq/fontopts.cpp | 5 +++++ kcontrol/konq/fontopts.h | 1 + kcontrol/konq/previews.cpp | 5 +++++ kcontrol/konq/previews.h | 1 + 11 files changed, 58 insertions(+), 6 deletions(-) (limited to 'kcontrol') 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; diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 4f256b71c..d662d6af7 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -291,6 +291,11 @@ void KBehaviourOptions::save() kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", data ); } +TQString KBehaviourOptions::handbookSection() const +{ + return "fileman-behav"; +} + void KBehaviourOptions::updateWinPixmap(bool b) { if (b) diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index 2e011f2d2..bb6421be3 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -43,6 +43,7 @@ public: virtual void load( bool useDefaults ); virtual void save(); virtual void defaults(); + virtual TQString handbookSection() const; protected slots: diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index dc6c20b73..49587f2dc 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -95,6 +95,28 @@ void KBrowserOptions::save() kuick->save(); } +TQString KBrowserOptions::handbookDocPath() const +{ + int index = m_tab->currentPageIndex(); + if (kuick && index == 3) + return "konq-plugins/kuick/index.html"; + else + return TQString::null; +} + +TQString KBrowserOptions::handbookSection() const +{ + int index = m_tab->currentPageIndex(); + if (index == 0) + return "fileman-appearance"; + else if (index == 1) + return "fileman-behav"; + else if (index == 2) + return "fileman-previews"; + else + return TQString::null; +} + TQString KBrowserOptions::quickHelp() const { TQWidget *w = m_tab->currentPage(); diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 928fc6eeb..0e0cee35c 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -37,6 +37,8 @@ public: virtual void save(); virtual void defaults(); virtual TQString quickHelp() const; + virtual TQString handbookDocPath() const; + virtual TQString handbookSection() const; private: diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 9a325966e..a12b02069 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -344,6 +344,11 @@ void KonqFontOptions::save() kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); } +TQString KonqFontOptions::handbookSection() const +{ + return "fileman-appearance"; +} + void KonqFontOptions::slotTextBackgroundClicked() { m_pTextBackground->setEnabled( m_cbTextBackground->isChecked() ); diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index c163deb70..69ffa4af5 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -60,6 +60,7 @@ public: virtual void load( bool readDefaults ); virtual void save(); virtual void defaults(); + virtual TQString handbookSection() const; public slots: void slotFontSize(int i); diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 107270eca..1f7bf85c4 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -211,6 +211,11 @@ void KPreviewOptions::save() kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data ); } +TQString KPreviewOptions::handbookSection() const +{ + return "fileman-previews"; +} + void KPreviewOptions::changed() { emit TDECModule::changed(true); diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index a1b4772bf..d76b28560 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -48,6 +48,7 @@ public: virtual void load(); virtual void save(); virtual void defaults(); + virtual TQString handbookSection() const; protected: void load(bool useDefaults); -- cgit v1.2.3