summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-11-14 22:29:12 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-11-14 22:29:12 +0900
commit8858fc1159edf35efa400315c11c095008536802 (patch)
tree249287984780e2e2339c532ce1140f5eb5ff743c /kcontrol
parentf8903b3564659e9ff2e8779610e56da6efaca4f0 (diff)
downloadtdebase-8858fc1159edf35efa400315c11c095008536802.tar.gz
tdebase-8858fc1159edf35efa400315c11c095008536802.zip
Fixed help handbook sections for Regional & Accessibility. This relates to bug 1850.
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/access/kcmaccess.cpp28
-rw-r--r--kcontrol/access/kcmaccess.h2
-rw-r--r--kcontrol/keys/main.cpp6
-rw-r--r--kcontrol/locale/toplevel.cpp17
-rw-r--r--kcontrol/locale/toplevel.h5
5 files changed, 46 insertions, 12 deletions
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 534dc692c..485c7b80a 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -235,8 +235,8 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
setAboutData( about );
TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
- TQTabWidget *tab = new TQTabWidget(this);
- main->addWidget(tab);
+ tabWidget = new TQTabWidget(this);
+ main->addWidget(tabWidget);
// bell settings ---------------------------------------
TQWidget *bell = new TQWidget(this);
@@ -341,7 +341,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
// -----------------------------------------------------
- tab->addTab(bell, i18n("&Bell"));
+ tabWidget->addTab(bell, i18n("&Bell"));
// modifier key settings -------------------------------
@@ -404,7 +404,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox->addStretch();
- tab->addTab(modifiers, i18n("&Modifier Keys"));
+ tabWidget->addTab(modifiers, i18n("&Modifier Keys"));
// key filter settings ---------------------------------
TQWidget *filters = new TQWidget(this);
@@ -480,7 +480,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox->addStretch();
- tab->addTab(filters, i18n("&Keyboard Filters"));
+ tabWidget->addTab(filters, i18n("&Keyboard Filters"));
// gestures --------------------------------------------
TQWidget *features = new TQWidget(this);
@@ -551,7 +551,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
vbox->addStretch();
- tab->addTab(features, i18n("Activation Gestures"));
+ tabWidget->addTab(features, i18n("Activation Gestures"));
load();
}
@@ -731,6 +731,22 @@ void KAccessConfig::save()
}
+TQString KAccessConfig::handbookSection() const
+{
+ int index = tabWidget->currentPageIndex();
+ if (index == 0)
+ return "accessibility-intro";
+ else if (index == 1)
+ return "modifier-keys";
+ else if (index == 2)
+ return "keyboard-filters";
+ else if (index == 3)
+ return "action-gestures";
+ else
+ return TQString::null;
+}
+
+
void KAccessConfig::defaults()
{
load( true );
diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h
index 14a441a59..4eb8af45d 100644
--- a/kcontrol/access/kcmaccess.h
+++ b/kcontrol/access/kcmaccess.h
@@ -70,6 +70,7 @@ public:
void load(bool useDefaults);
void save();
void defaults();
+ virtual TQString handbookSection() const;
protected slots:
@@ -83,6 +84,7 @@ protected slots:
private:
+ TQTabWidget* tabWidget;
TQCheckBox *systemBell, *customBell, *visibleBell;
TQRadioButton *invertScreen, *flashScreen;
TQLabel *soundLabel, *colorLabel;
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 5fda60ca3..d002b667f 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -129,12 +129,10 @@ TQString KeyModule::handbookSection() const
{
int index = m_pTab->currentPageIndex();
if (index == 0) {
- //return "key-bindings-intro";
- return TQString::null;
+ return "key-bindings-intro";
}
else if (index == 1) {
- //return "key-bindings-use";
- return TQString::null;
+ return "key-bindings-shortcuts";
}
else if (index == 2) {
return "key-bindings-modifiers";
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;