From f059b01e2c8c5c8da540c3188b7cba18fac1a6e9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 20 Nov 2014 13:38:16 +0900 Subject: Fixed help handbook sections for Sound & Multimedia -> AudioCDs / CDDB Retrieval. This relates to bug 1850. --- libkcddb/kcmcddb/kcmcddb.cpp | 13 +++++++++++++ libkcddb/kcmcddb/kcmcddb.h | 3 ++- tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp | 11 +++++++++++ tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h | 3 ++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 8dc35a3e..62e043b4 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -127,6 +128,18 @@ CDDBModule::load() updateWidgetsFromConfig(config); } +TQString CDDBModule::handbookSection() const +{ + int index = widget_->tabWidget2->currentPageIndex(); + if (index == 0) + return "cddb-lookup"; + else if (index == 1) + return "cddb-submit"; + else + return TQString::null; +} + + // vim:tabstop=2:shiftwidth=2:expandtab:cinoptions=(s,U1,m1 #include "kcmcddb.moc" diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h index 3bdb98c8..3f983d82 100644 --- a/libkcddb/kcmcddb/kcmcddb.h +++ b/libkcddb/kcmcddb/kcmcddb.h @@ -41,7 +41,8 @@ class CDDBModule : public TDECModule void defaults(); void save(); void load(); - + virtual TQString handbookSection() const; + protected: void checkSettings() const; diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index 8e73ce26..1954422c 100644 --- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -216,6 +216,17 @@ void KAudiocdModule::load(bool useDefaults) { emit changed( useDefaults ); } +TQString KAudiocdModule::handbookSection() const +{ + int index = tabWidget->currentPageIndex(); + if (index == 0) + return "audiocd-general"; + else if (index == 1) + return "audiocd-names"; + else + return TQString::null; +} + void KAudiocdModule::slotModuleChanged() { TDEConfigDialogManager *widget; for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){ diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h index c9ec1bc7..f89ef32f 100644 --- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h @@ -46,7 +46,8 @@ public slots: void save(); void load(); void load(bool useDefaults); - + virtual TQString handbookSection() const; + private slots: void updateExample(); void slotConfigChanged(); -- cgit v1.2.1