diff options
| -rw-r--r-- | doc/tdm/index.docbook | 2 | ||||
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 17 | ||||
| -rw-r--r-- | kcontrol/displayconfig/displayconfig.h | 1 | ||||
| -rw-r--r-- | kcontrol/tdm/main.cpp | 19 | ||||
| -rw-r--r-- | kcontrol/tdm/main.h | 1 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm.desktop | 2 |
6 files changed, 40 insertions, 2 deletions
diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook index 036541a6a..0859e5282 100644 --- a/doc/tdm/index.docbook +++ b/doc/tdm/index.docbook @@ -667,7 +667,7 @@ stretched to fit all four corners.</para> </listitem> </sect2> <sect2 id="tdmconfig-shutdown"> -<title><guilabel>Shutdown</guilabel></title> +<title>Shutdown</title> <para><guilabel>Allow Shutdown</guilabel></para> <para>Use this drop down box to choose who is allowed to shut down:</para> diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 835b2598b..dacb5cc88 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -2034,6 +2034,23 @@ void KDisplayConfig::defaults() load( true ); } +TQString KDisplayConfig::handbookSection() const +{ + int index = base->mainTabContainerWidget->currentPageIndex(); + if (index == 0) + return "displayconfig-global"; + else if (index == 1) + return "displayconfig-resolution"; + else if (index == 2) + return "displayconfig-brightness"; + else if (index == 3) + return "displayconfig-power"; + else if (index == 4) + return "displayconfig-colors"; + else + return TQString::null; +} + TQString KDisplayConfig::quickHelp() const { return i18n("<h1>Monitor & Display Configuration</h1> This module allows you to configure monitors attached to your" diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 92fa1f421..dce061003 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -67,6 +67,7 @@ public: void load( bool useDefaults); void save(); void defaults(); + virtual TQString handbookSection() const; TQString quickHelp() const; diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 4a2c8e3ec..2a5f72895 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -274,6 +274,25 @@ void TDModule::defaults() } } +TQString TDModule::handbookSection() const +{ + int index = tab->currentPageIndex(); + if (index == 0) + return "tdmconfig-appearance"; + else if (index == 1) + return "tdmconfig-font"; + else if (index == 2) + return "tdmconfig-background"; + else if (index == 3) + return "tdmconfig-shutdown"; + else if (index == 4) + return "tdmconfig-users"; + else if (index == 5) + return "tdmconfig-convenience"; + else + return TQString::null; +} + void TDModule::propagateUsers() { groupmap.clear(); diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index 144d1db20..48cfa5b22 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -48,6 +48,7 @@ public: void load(); void save(); void defaults(); + virtual TQString handbookSection() const; public slots: diff --git a/kcontrol/tdm/tdm.desktop b/kcontrol/tdm/tdm.desktop index 349ec8709..de9039385 100644 --- a/kcontrol/tdm/tdm.desktop +++ b/kcontrol/tdm/tdm.desktop @@ -2,7 +2,7 @@ Exec=tdecmshell tdm Icon=tdmconfig Type=Application -X-DocPath=tdm/index.html +X-DocPath=tdm/configuring-tdm.html X-TDE-SubstituteUID=true |