diff options
| author | Timothy Pearson <[email protected]> | 2014-11-25 13:40:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-11-25 13:40:09 -0600 |
| commit | 04837bf9b6a0f94a8497cbc42ee62182e1cfef16 (patch) | |
| tree | c9ff5c18410316d5a966320b59d91957f709f8b2 /kcontrol | |
| parent | d8287f97874be7db0d498f3808f68bdfee902ba3 (diff) | |
| parent | 1bd907fe3d97323c96d7b4a385207dfd8f7a8931 (diff) | |
| download | tdebase-04837bf9b6a0f94a8497cbc42ee62182e1cfef16.tar.gz tdebase-04837bf9b6a0f94a8497cbc42ee62182e1cfef16.zip | |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol')
| -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 |
5 files changed, 39 insertions, 1 deletions
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 |