From 0014712b085cecda712bbbdd31e618a1ada2a4e3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 10 Oct 2014 14:55:30 -0500 Subject: Add handbookSection support to tabbed "Internet & Network" TDEControl modules This relates to Bug 1850 --- kcontrol/dnssd/kcmdnssd.cpp | 14 +++++++++++++ kcontrol/dnssd/kcmdnssd.h | 1 + kcontrol/konqhtml/main.cpp | 14 ++++++++++++- kcontrol/konqhtml/main.h | 2 ++ kcontrol/konqhtml/tdehtml_java_js.desktop | 2 +- kcontrol/samba/main.cpp | 24 +++++++++++++++++++++- kcontrol/tdeio/kcookiesmain.cpp | 25 ++++++++++++++++++++++- kcontrol/tdeio/kcookiesmain.h | 4 ++++ kcontrol/tdeio/kproxydlg.cpp | 17 +++++++++++++++- kcontrol/tdeio/kproxydlg.h | 2 ++ kcontrol/tdeio/main.cpp | 33 +++++++++++++++++++++++++++++++ kcontrol/tdeio/main.h | 5 +++++ 12 files changed, 138 insertions(+), 5 deletions(-) (limited to 'kcontrol') diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 4bb73aa63..65992bb09 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -190,5 +190,19 @@ bool KCMDnssd::saveMdnsd() kill(pid,SIGHUP); return true; } + +TQString KCMDnssd::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; + } +} #include "kcmdnssd.moc" diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h index 3568c1088..b408ca3f6 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/kcontrol/dnssd/kcmdnssd.h @@ -36,6 +36,7 @@ public: ~KCMDnssd(); virtual void save(); virtual void load(); + virtual TQString handbookSection() const; private slots: void wdchanged(); void enableZeroconfChanged(bool); diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 2f71a7bc5..a752a3a88 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -175,4 +175,16 @@ TQString KJSParts::quickHelp() const "JavaScript programs." ); } - +TQString KJSParts::handbookSection() const +{ + int index = tab->currentPageIndex(); + if (index == 0) { + return "kbrowse-java"; + } + else if (index == 1) { + return "kbrowse-javascript"; + } + else { + return TQString::null; + } +} diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h index 2be4963fb..69a324be8 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -47,6 +47,8 @@ public: void defaults(); TQString quickHelp() const; + virtual TQString handbookSection() const; + private: TQTabWidget *tab; diff --git a/kcontrol/konqhtml/tdehtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop index 409f7f313..65d4910c2 100644 --- a/kcontrol/konqhtml/tdehtml_java_js.desktop +++ b/kcontrol/konqhtml/tdehtml_java_js.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/tdehtml/index.html#kbrowse-java +DocPath=kcontrol/tdehtml/index.html Icon=konqueror Exec=tdecmshell tdehtml_java_js diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 300b805fe..d5af28c1a 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -37,6 +37,8 @@ class SambaContainer:public TDECModule virtual void load(); virtual void save(); + virtual TQString handbookSection() const; + private: TDEConfig config; TQTabWidget tabs; @@ -71,7 +73,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs" " smbstatus and showmount. Smbstatus reports on current" " Samba connections, and is part of the suite of Samba tools, which" - " implements the SMB (Session Message Block) protocol, also called the" + " implements the SMB (Server Message Block) protocol, also called the" " NetBIOS or LanManager protocol. This protocol can be used to provide" " printer sharing or drive sharing services on a network including" " machines running the various flavors of Microsoft Windows.

" @@ -117,3 +119,23 @@ void SambaContainer::save() config.sync(); } +TQString SambaContainer::handbookSection() const +{ + int index = tabs.currentPageIndex(); + if (index == 0) { + //return "smb-exports"; + return TQString::null; + } + else if (index == 1) { + return "smb-imports"; + } + else if (index == 2) { + return "smb-log"; + } + else if (index == 3) { + return "smb-statistics"; + } + else { + return TQString::null; + } +} diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp index 417eb9e46..9869c6c92 100644 --- a/kcontrol/tdeio/kcookiesmain.cpp +++ b/kcontrol/tdeio/kcookiesmain.cpp @@ -19,6 +19,10 @@ KCookiesMain::KCookiesMain(TQWidget *parent) : TDECModule(parent, "kcmtdeio") { + int currentTabNumber = 0; + policiesTabNumber = -1; + managementTabNumber = -1; + management = 0; bool managerOK = true; @@ -33,19 +37,23 @@ KCookiesMain::KCookiesMain(TQWidget *parent) "You will not be able to manage the cookies that " "are stored on your computer.")); } - + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); layout->addWidget(tab); policies = new KCookiesPolicies(this); tab->addTab(policies, i18n("&Policy")); + policiesTabNumber = currentTabNumber; + currentTabNumber++; connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); if( managerOK ) { management = new KCookiesManagement(this); tab->addTab(management, i18n("&Management")); + managementTabNumber = currentTabNumber; + currentTabNumber++; connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); } } @@ -96,4 +104,19 @@ TQString KCookiesMain::quickHelp() const " every time TDE receives a cookie." ); } +TQString KCookiesMain::handbookSection() const +{ + int index = tab->currentPageIndex(); + if (index == policiesTabNumber) { + //return "cookie-policy"; + return TQString::null; + } + else if (index == managementTabNumber) { + return "cookie-management"; + } + else { + return TQString::null; + } +} + #include "kcookiesmain.moc" diff --git a/kcontrol/tdeio/kcookiesmain.h b/kcontrol/tdeio/kcookiesmain.h index 14b202ff4..99591c8ad 100644 --- a/kcontrol/tdeio/kcookiesmain.h +++ b/kcontrol/tdeio/kcookiesmain.h @@ -27,11 +27,15 @@ public: virtual void defaults(); virtual TQString quickHelp() const; + virtual TQString handbookSection() const; + private: TQTabWidget* tab; KCookiesPolicies* policies; KCookiesManagement* management; + int policiesTabNumber; + int managementTabNumber; }; #endif // __KCOOKIESMAIN_H diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp index 7bd082eda..9253916d7 100644 --- a/kcontrol/tdeio/kproxydlg.cpp +++ b/kcontrol/tdeio/kproxydlg.cpp @@ -44,7 +44,7 @@ KProxyOptions::KProxyOptions (TQWidget* parent ) :TDECModule (parent, "kcmtdeio") { TQVBoxLayout *layout = new TQVBoxLayout(this); - + mTab = new TQTabWidget(this); layout->addWidget(mTab); @@ -94,6 +94,21 @@ TQString KProxyOptions::quickHelp() const return TQString::null; } +TQString KProxyOptions::handbookSection() const +{ + int index = mTab->currentPageIndex(); + if (index == 0) { + //return "proxies-intro"; + return TQString::null; + } + else if (index == 1) { + return "socks"; + } + else { + return TQString::null; + } +} + KProxyDialog::KProxyDialog( TQWidget* parent) :TDECModule( parent, "kcmtdeio" ) diff --git a/kcontrol/tdeio/kproxydlg.h b/kcontrol/tdeio/kproxydlg.h index 30bdb935b..d70921ef9 100644 --- a/kcontrol/tdeio/kproxydlg.h +++ b/kcontrol/tdeio/kproxydlg.h @@ -44,6 +44,8 @@ public: virtual void defaults(); virtual TQString quickHelp() const; + virtual TQString handbookSection() const; + private: TDECModule* mProxy; TDECModule* mSocks; diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp index 878624393..7fb9b4394 100644 --- a/kcontrol/tdeio/main.cpp +++ b/kcontrol/tdeio/main.cpp @@ -81,7 +81,12 @@ LanBrowser::LanBrowser(TQWidget *parent) :TDECModule(parent,"kcmtdeio") ,layout(this) ,tabs(this) +,smbPageTabNumber(-1) +,lisaPageTabNumber(-1) +,tdeioLanPageTabNumber(-1) { + int currentTabNumber = 0; + setQuickHelp( i18n("

Local Network Browsing

Here you setup your " "\"Network Neighborhood\". You " "can use either the LISa daemon and the lan:/ ioslave, or the " @@ -103,12 +108,16 @@ LanBrowser::LanBrowser(TQWidget *parent) smbPage = create_smb(&tabs, 0); tabs.addTab(smbPage, i18n("&Windows Shares")); + smbPageTabNumber = currentTabNumber; + currentTabNumber++; connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() )); lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs); if (lisaPage) { tabs.addTab(lisaPage,i18n("&LISa Daemon")); + lisaPageTabNumber = currentTabNumber; + currentTabNumber++; connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); } @@ -123,6 +132,8 @@ LanBrowser::LanBrowser(TQWidget *parent) if (tdeioLanPage) { tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve")); + tdeioLanPageTabNumber = currentTabNumber; + currentTabNumber++; connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); } @@ -154,5 +165,27 @@ void LanBrowser::save() emit changed(false); } +TQString LanBrowser::handbookSection() const +{ + int index = tabs.currentPageIndex(); + if (index == smbPageTabNumber) { + //return "windows-shares"; + return TQString::null; + } + else if (index == lisaPageTabNumber) { + // FIXME + // Documentation does not yet exist! + return ""; + } + else if (index == tdeioLanPageTabNumber) { + // FIXME + // Documentation does not yet exist! + return ""; + } + else { + return TQString::null; + } +} + #include "main.moc" diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h index 23451b2b7..3f1fb4d47 100644 --- a/kcontrol/tdeio/main.h +++ b/kcontrol/tdeio/main.h @@ -34,6 +34,8 @@ class LanBrowser:public TDECModule virtual void load(); virtual void save(); + virtual TQString handbookSection() const; + private: TQVBoxLayout layout; TQTabWidget tabs; @@ -41,6 +43,9 @@ class LanBrowser:public TDECModule TDECModule *lisaPage; // TDECModule *resLisaPage; TDECModule *tdeioLanPage; + int smbPageTabNumber; + int lisaPageTabNumber; + int tdeioLanPageTabNumber; }; #endif -- cgit v1.2.3