Add handbookSection support to tabbed "Internet & Network" TDEControl modules

This relates to Bug 1850

9 files changed, 105 insertions, 25 deletions

diff --git a/doc/krfb/index.docbook b/doc/krfb/index.docbook
index d91a6399..85f46665 100644
--- a/doc/krfb/index.docbook
+++ b/doc/krfb/index.docbook
@@ -349,6 +349,9 @@ screenshot below:
 </screenshot>
 </para>
 
+<sect2 id="rfb-access">
+<title><guilabel>Access</guilabel></title>
+
 <para>
 The <guilabel>Access</guilabel> tab allows you configure settings
 related to access to the &krfb; server.
@@ -395,6 +398,11 @@ password is securely guarded.
 </para>
 </note>
 
+</sect2>
+
+<sect2 id="rfb-session">
+<title><guilabel>Session</guilabel></title>
+
 <para>
 &krfb; allows you to control whether the background image is passed to
 the client, or not. This is controlled using a checkbox in the
@@ -424,6 +432,11 @@ image. If you leave it blank, it is up to the client whether the
 background image is transferred or not transferred.
 </para>
 
+</sect2>
+
+<sect2 id="rfb-network">
+<title><guilabel>Network</guilabel></title>
+
 <para>
 The <guilabel>Network</guilabel> tab allows control over the port that
 &krfb; uses, as shown below.
@@ -457,6 +470,8 @@ Protocol is turned on, this will automatically deal with identifying
 the correct port.
 </para>
 
+</sect2>
+
 </sect1>
 
 <sect1 id="krfb-connection">
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 6af9fb71..2b490c9e 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -1428,6 +1428,20 @@ TQString KcmSambaConf::quickHelp() const
   return i18n("<h1>Samba Configuration</h1> here you can configure your SAMBA server.");
 }
 
+TQString KcmSambaConf::handbookSection() const
+{
+	// FIXME
+	// No context-sensitive help documentation currently exists for this module!
+	int index = _interface->mainTab->currentPageIndex();
+	if (index == 0) {
+		//return "";
+		return TQString::null;
+	}
+	else {
+		return TQString::null;
+	}
+}
+
 // ------------------------------------------------------------------------
 
 extern "C"
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
index c5f25e94..e55917f3 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
@@ -4,7 +4,7 @@
     begin                : Mon Apr  8 13:35:56 CEST 2002
     copyright            : (C) 2002 by Christian Nitschkowski
     email                : segfault_ii@web.de
-    copyright            : (C) 2002-2003 by Jan Schäfer
+    copyright            : (C) 2002-2003 by Jan Sch�fer
     email                : janschaefer@users.sourceforge.net
 ***************************************************************************/
 
@@ -80,6 +80,8 @@ class KcmSambaConf: public TDECModule
     int buttons();
     TQString quickHelp() const;
 
+    virtual TQString handbookSection() const;
+
   public slots:
     void configChanged();
 
diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 6d6861ab..0c51ea4a 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -25,6 +25,7 @@
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
+#include <tqtabwidget.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tdeapplication.h>
@@ -177,4 +178,20 @@ TQString KcmKRfb::quickHelp() const
 	            " the TDE desktop sharing.");
 }
 
-
+TQString KcmKRfb::handbookSection() const
+{
+	int index = m_confWidget->TabWidget2->currentPageIndex();
+	if (index == 0) {
+		//return "rfb-access";
+		return TQString::null;
+	}
+	else if (index == 1) {
+		return "rfb-session";
+	}
+	else if (index == 2) {
+		return "rfb-network";
+	}
+	else {
+		return TQString::null;
+	}
+}
diff --git a/krfb/kcm_krfb/kcm_krfb.h b/krfb/kcm_krfb/kcm_krfb.h
index 1f9d6aa0..996379c6 100644
--- a/krfb/kcm_krfb/kcm_krfb.h
+++ b/krfb/kcm_krfb/kcm_krfb.h
@@ -39,6 +39,8 @@ public:
 	void save();
 	void defaults();
 	TQString quickHelp() const;
+
+	virtual TQString handbookSection() const;
 private slots:
 	void setInvitationNum(int num);
 	void configChanged();
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 89bf8db5..29c4cbf2 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -86,6 +86,20 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *)
 	tab->setGeometry(0,0,width(),height());
 }
 
+TQString KTalkdConfigModule::handbookSection() const
+{
+	// FIXME
+	// No context-sensitive help documentation currently exists for this module!
+	int index = tab->currentPageIndex();
+	if (index == 0) {
+		//return "";
+		return TQString::null;
+	}
+	else {
+		return TQString::null;
+	}
+}
+
 extern "C"
 {
 	KDE_EXPORT TDECModule *create_ktalkd(TQWidget *parent, const char *)
diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h
index 1b55b425..5e5a3f43 100644
--- a/ktalkd/kcmktalkd/main.h
+++ b/ktalkd/kcmktalkd/main.h
@@ -35,30 +35,30 @@ class KForwmachPageConfig;
 class KTalkdConfigModule : public TDECModule
 {
 	Q_OBJECT
-  
-
-public:
-
-    KTalkdConfigModule(TQWidget *parent, const char *name);
-    virtual ~KTalkdConfigModule();
-    
-    //void init();
-    void load();
-    void save();
-    void defaults();
-    
-protected:
-	void resizeEvent(TQResizeEvent *);
-
-private:
-	KSimpleConfig *config;
-	KSimpleConfig *announceconfig;
 
-	TQTabWidget *tab;
+	public:
+	
+		KTalkdConfigModule(TQWidget *parent, const char *name);
+		virtual ~KTalkdConfigModule();
+	
+		//void init();
+		void load();
+		void save();
+		void defaults();
+	
+		virtual TQString handbookSection() const;
+	protected:
+		void resizeEvent(TQResizeEvent *);
+	
+	private:
+		KSimpleConfig *config;
+		KSimpleConfig *announceconfig;
 	
-    KSoundPageConfig *soundpage;
-    KAnswmachPageConfig *answmachpage;
-    KForwmachPageConfig *forwmachpage;
+		TQTabWidget *tab;
+		
+		KSoundPageConfig *soundpage;
+		KAnswmachPageConfig *answmachpage;
+		KForwmachPageConfig *forwmachpage;
 };
 
 #endif
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index f26a2774..e35dae27 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -370,6 +370,20 @@ if (!failedParts.empty()) KMessageBox::informationList(0,i18n("The following set
 
 }
 
+TQString KCMWifi::handbookSection() const
+{
+	// FIXME
+	// No context-sensitive help documentation currently exists for this module!
+	int index = tabs->currentPageIndex();
+	if (index == 0) {
+		//return "";
+		return TQString::null;
+	}
+	else {
+		return TQString::null;
+	}
+}
+
 extern "C"
 {
   void init_wifi()
diff --git a/wifi/kcmwifi/kcmwifi.h b/wifi/kcmwifi/kcmwifi.h
index 88c2e60d..c4f08f3a 100644
--- a/wifi/kcmwifi/kcmwifi.h
+++ b/wifi/kcmwifi/kcmwifi.h
@@ -47,7 +47,9 @@ public:
   IfConfigPage* addConfigTab( int count, bool vendor );
   void delConfigTab( int count );
 
-  static const int vendorBase = 10; 
+  static const int vendorBase = 10;
+
+  virtual TQString handbookSection() const;
 
 protected slots:
   void slotActivate();