summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-11-27 11:57:00 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-11-27 11:57:00 +0900
commit48fe5507cdaa620625441c7e1f70eb98b7ca78e5 (patch)
tree19f74df23d81ec7dd56166b0666c742abc659c5b
parent1bd907fe3d97323c96d7b4a385207dfd8f7a8931 (diff)
downloadtdebase-48fe5507cdaa620625441c7e1f70eb98b7ca78e5.tar.gz
tdebase-48fe5507cdaa620625441c7e1f70eb98b7ca78e5.zip
Fixed help handbook sections for TDE Components. This relates to bug 1850.
-rw-r--r--doc/kcontrol/filemanager/index.docbook15
-rw-r--r--kcontrol/kcontrol/helpwidget.cpp13
-rw-r--r--kcontrol/kcontrol/proxywidget.cpp8
-rw-r--r--kcontrol/kcontrol/proxywidget.h1
-rw-r--r--kcontrol/konq/behaviour.cpp5
-rw-r--r--kcontrol/konq/behaviour.h1
-rw-r--r--kcontrol/konq/browser.cpp22
-rw-r--r--kcontrol/konq/browser.h2
-rw-r--r--kcontrol/konq/fontopts.cpp5
-rw-r--r--kcontrol/konq/fontopts.h1
-rw-r--r--kcontrol/konq/previews.cpp5
-rw-r--r--kcontrol/konq/previews.h1
12 files changed, 63 insertions, 16 deletions
diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index 110f3177f..6c2634064 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -32,9 +32,6 @@
url="help:/kcontrol/tdehtml/index.html">own configuration
modules</ulink>.</para></note>
-<sect2 id="fileman-use">
-<title>Use</title>
-
<para> The configuration options for the file manager are
organized under tabs as follows:</para>
@@ -61,7 +58,7 @@ previews.</para>
</varlistentry>
</variablelist>
-<sect3 id="fileman-appearance">
+<sect2 id="fileman-appearance">
<title>Appearance</title>
<para>The following settings determine how text and colors are displayed in
@@ -129,9 +126,9 @@ size.</para>
</listitem>
</varlistentry>
</variablelist>
-</sect3>
+</sect2>
-<sect3 id="fileman-behav">
+<sect2 id="fileman-behav">
<title>Behavior</title>
<variablelist>
@@ -232,9 +229,9 @@ folder you will be shown.</para>
window. If any box is checked, &konqueror; asks for confirmation before
performing the corresponding action.</para>
-</sect3>
+</sect2>
-<sect3>
+<sect2 id="fileman-previews">
<title>Previews</title>
<para>&konqueror; has a
@@ -288,8 +285,6 @@ of these. This will save time waiting for thumbnails to be created
when viewing a folder full of images you have not previously seen in
&konqueror;.</para>
-</sect3>
-
</sect2>
</sect1>
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);