Branch: master

e165344b 2014-11-16 21:31:05 Michele Calgaro
Fixed help handbook sections for Security & Privary -> TDE Wallet. This relates to bug 1850.
M doc/tdewallet/index.docbook
M tdewallet/konfigurator/konfigurator.cpp
M tdewallet/konfigurator/konfigurator.h
M tdewallet/konfigurator/tdewalletconfig.desktop
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 @@
 <chapter id="tdewallet-kcontrol-module">
 <title>Configuring &tdewallet;</title>
 
-<sect1 id="wallet-preferences">
-<title><guilabel>Wallet Preferences</guilabel></title>
+<sect1 id="wallet-preferences-kcm">
+<title>Wallet Preferences Control module</title>
+
+<sect2 id="wallet-preferences">
+<title>Wallet Preferences</title>
 
 <para>&tdewallet; contains a small configuration panel with several options
 that allow you to tune &tdewallet; to your personal preferences.  The
@@ -321,10 +324,10 @@
 
 <para>Finally, there is a button labelled <guibutton>Launch Wallet
 Manager</guibutton>, which does precisely that.</para>
-</sect1>
+</sect2>
 
-<sect1 id="wallet-access-control">
-<title><guilabel>Access Control</guilabel></title>
+<sect2 id="wallet-access-control">
+<title>Access Control</title>
 
 <para>There is only one option on this page:</para>
 
@@ -347,8 +350,8 @@
 context menu that appears, or by simply selecting it and pressing the
 <keycap>Delete</keycap> key.</para>
 
+</sect2>
 </sect1>
-
 </chapter>
 
 <chapter id="advanced-features">
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 <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
+#include <tqtabwidget.h>
 
 typedef KGenericFactory<TDEWalletConfig, TQWidget> TDEWalletFactory;
 K_EXPORT_COMPONENT_FACTORY(kcm_tdewallet, TDEWalletFactory("kcmtdewallet"))
@@ -289,6 +290,16 @@
 	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 @@
 		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