1bd907fe | 2014-11-24 03:52:20 | Michele Calgaro |
Fixed help handbook sections for System Administration. This relates to bug 1850. |
||
M doc/tdm/index.docbook M kcontrol/displayconfig/displayconfig.cpp M kcontrol/displayconfig/displayconfig.h M kcontrol/tdm/main.cpp M kcontrol/tdm/main.h M kcontrol/tdm/tdm.desktop |
||
diff --git a/doc/tdm/index.docbook b/doc/tdm/index.docbook index 036541a..0859e52 100644 --- a/doc/tdm/index.docbook +++ b/doc/tdm/index.docbook @@ -667,7 +667,7 @@ </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 835b259..dacb5cc 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -2034,6 +2034,23 @@ 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 92fa1f4..dce0610 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -67,6 +67,7 @@ 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 4a2c8e3..2a5f728 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -274,6 +274,25 @@ } } +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 144d1db..48cfa5b 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -48,6 +48,7 @@ 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 349ec87..de90393 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 |