diff options
author | Timothy Pearson <[email protected]> | 2014-11-19 23:15:02 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-11-19 23:15:02 -0600 |
commit | ac2a2efee3834bba4eb17228b7f405829242cd96 (patch) | |
tree | 955a74225aaf611e454fb6519c5da883cfa9e09d /kcontrol/access | |
parent | 0a8ecfb93b699a519ad9af9e548279d50c50093b (diff) | |
parent | 3b73654a279458e28f225b2cce77bee098fe1739 (diff) | |
download | tdebase-ac2a2efee3834bba4eb17228b7f405829242cd96.tar.gz tdebase-ac2a2efee3834bba4eb17228b7f405829242cd96.zip |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/access')
-rw-r--r-- | kcontrol/access/kcmaccess.cpp | 28 | ||||
-rw-r--r-- | kcontrol/access/kcmaccess.h | 2 |
2 files changed, 24 insertions, 6 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; |