Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase

2 files changed, 20 insertions, 2 deletions

diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index a7a85e72f..d2a17ca74 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -206,6 +206,23 @@ void TDELocaleApplication::save()
   emit changed(false);
 }
 
+TQString TDELocaleApplication::handbookSection() const
+{
+ 	int index = m_tab->currentPageIndex();
+ 	if (index == 0)
+		return "locale-locale";
+	else if (index == 1)
+		return "locale-numbers";
+	else if (index == 2)
+		return "locale-money";
+	else if (index == 3)
+		return "locale-datetime";
+	else if (index == 4)
+		return "locale-other";
+ 	else
+ 		return TQString::null;
+}
+
 void TDELocaleApplication::defaults()
 {
 	load( true );
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index e381d6749..abc1a47f9 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -53,6 +53,7 @@ public:
   virtual void save();
   virtual void defaults();
   virtual TQString quickHelp() const;
+  virtual TQString handbookSection() const;
 
 signals:
   void languageChanged();
@@ -68,14 +69,14 @@ public slots:
 private:
   TDELocale *m_locale;
 
-  TQTabWidget          *m_tab;
+  TQTabWidget           *m_tab;
   TDELocaleConfig       *m_localemain;
   TDELocaleConfigNumber *m_localenum;
   TDELocaleConfigMoney  *m_localemon;
   TDELocaleConfigTime   *m_localetime;
   TDELocaleConfigOther  *m_localeother;
 
-  TQGroupBox           *m_gbox;
+  TQGroupBox            *m_gbox;
   TDELocaleSample       *m_sample;
 
   TDEConfig * m_globalConfig;