From e165344b256e37a3bdfb92ff68e103f27f498fb7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Nov 2014 12:31:05 +0900 Subject: Fixed help handbook sections for Security & Privary -> TDE Wallet. This relates to bug 1850. --- doc/tdewallet/index.docbook | 15 +++++++++------ tdewallet/konfigurator/konfigurator.cpp | 11 +++++++++++ tdewallet/konfigurator/konfigurator.h | 3 ++- tdewallet/konfigurator/tdewalletconfig.desktop | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/doc/tdewallet/index.docbook b/doc/tdewallet/index.docbook index fe422d6..2e40079 100644 --- a/doc/tdewallet/index.docbook +++ b/doc/tdewallet/index.docbook @@ -241,8 +241,11 @@ locations. Configuring &tdewallet; - -<guilabel>Wallet Preferences</guilabel> + +Wallet Preferences Control module + + +Wallet Preferences &tdewallet; contains a small configuration panel with several options that allow you to tune &tdewallet; to your personal preferences. The @@ -321,10 +324,10 @@ system tray. Finally, there is a button labelled Launch Wallet Manager, which does precisely that. - + - -<guilabel>Access Control</guilabel> + +Access Control There is only one option on this page: @@ -347,8 +350,8 @@ clicking on it and choosing Delete From the context menu that appears, or by simply selecting it and pressing the Delete key. + - diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index ad7c587..43b7732 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -36,6 +36,7 @@ #include #include #include +#include typedef KGenericFactory TDEWalletFactory; K_EXPORT_COMPONENT_FACTORY(kcm_tdewallet, TDEWalletFactory("kcmtdewallet")) @@ -289,6 +290,16 @@ void TDEWalletConfig::save() { emit changed(false); } +TQString TDEWalletConfig::handbookSection() const +{ + int index = _wcw->tabWidget2->currentPageIndex(); + if (index == 0) + return "wallet-preferences"; + else if (index == 1) + return "wallet-access-control"; + else + return TQString::null; +} void TDEWalletConfig::defaults() { load( true ); diff --git a/tdewallet/konfigurator/konfigurator.h b/tdewallet/konfigurator/konfigurator.h index 3e29dd4..f133912 100644 --- a/tdewallet/konfigurator/konfigurator.h +++ b/tdewallet/konfigurator/konfigurator.h @@ -39,7 +39,8 @@ class TDEWalletConfig : public TDECModule { void defaults(); TQString quickHelp() const; - + virtual TQString handbookSection() const; + public slots: void configChanged(); void launchManager(); diff --git a/tdewallet/konfigurator/tdewalletconfig.desktop b/tdewallet/konfigurator/tdewalletconfig.desktop index 0467b4f..c40156f 100644 --- a/tdewallet/konfigurator/tdewalletconfig.desktop +++ b/tdewallet/konfigurator/tdewalletconfig.desktop @@ -2,7 +2,7 @@ Icon=tdewalletmanager Type=Application Exec=tdecmshell tdewalletconfig -X-DocPath=tdewallet/index.html +X-DocPath=tdewallet/tdewallet-kcontrol-module.html X-TDE-ModuleType=Library X-TDE-Library=tdewallet X-TDE-ParentApp=kcontrol -- cgit v1.2.3