0014712b | 2014-10-10 14:55:30 | Timothy Pearson |
Add handbookSection support to tabbed "Internet & Network" TDEControl modules This relates to Bug 1850 |
||
M kcontrol/dnssd/kcmdnssd.cpp M kcontrol/dnssd/kcmdnssd.h M kcontrol/konqhtml/main.cpp M kcontrol/konqhtml/main.h M kcontrol/konqhtml/tdehtml_java_js.desktop M kcontrol/samba/main.cpp M kcontrol/tdeio/kcookiesmain.cpp M kcontrol/tdeio/kcookiesmain.h M kcontrol/tdeio/kproxydlg.cpp M kcontrol/tdeio/kproxydlg.h M kcontrol/tdeio/main.cpp M kcontrol/tdeio/main.h M twin/kcmtwin/twindecoration/twindecoration.cpp |
||
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 4bb73aa..65992bb 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -190,5 +190,19 @@ 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 3568c10..b408ca3 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/kcontrol/dnssd/kcmdnssd.h @@ -36,6 +36,7 @@ ~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 2f71a7b..a752a3a 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -175,4 +175,16 @@ "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 2be4963..69a324b 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -47,6 +47,8 @@ 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 409f7f3..65d4910 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 300b805..d5af28c 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -37,6 +37,8 @@ virtual void load(); virtual void save(); + virtual TQString handbookSection() const; + private: TDEConfig config; TQTabWidget tabs; @@ -71,7 +73,7 @@ setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs" " <em>smbstatus</em> and <em>showmount</em>. 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.<p>" @@ -117,3 +119,23 @@ 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 417eb9e..9869c6c 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 @@ "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 @@ " 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 14b202f..99591c8 100644 --- a/kcontrol/tdeio/kcookiesmain.h +++ b/kcontrol/tdeio/kcookiesmain.h @@ -27,11 +27,15 @@ 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 7bd082e..9253916 100644 --- a/kcontrol/tdeio/kproxydlg.cpp +++ b/kcontrol/tdeio/kproxydlg.cpp @@ -44,7 +44,7 @@ :TDECModule (parent, "kcmtdeio") { TQVBoxLayout *layout = new TQVBoxLayout(this); - + mTab = new TQTabWidget(this); layout->addWidget(mTab); @@ -94,6 +94,21 @@ 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 30bdb93..d70921e 100644 --- a/kcontrol/tdeio/kproxydlg.h +++ b/kcontrol/tdeio/kproxydlg.h @@ -44,6 +44,8 @@ virtual void defaults(); ** Diff limit reached (max: 250 lines) ** |