diff options
author | Timothy Pearson <[email protected]> | 2014-11-19 23:15:02 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2014-11-19 23:16:52 -0600 |
commit | f4eb973eac3a9f0f5e9137752f9b2061a6a7e1f0 (patch) | |
tree | 955a74225aaf611e454fb6519c5da883cfa9e09d /kcontrol/arts | |
parent | 0a8ecfb93b699a519ad9af9e548279d50c50093b (diff) | |
parent | 3b73654a279458e28f225b2cce77bee098fe1739 (diff) | |
download | tdebase-f4eb973eac3a9f0f5e9137752f9b2061a6a7e1f0.tar.gz tdebase-f4eb973eac3a9f0f5e9137752f9b2061a6a7e1f0.zip |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/arts')
-rw-r--r-- | kcontrol/arts/arts.cpp | 13 | ||||
-rw-r--r-- | kcontrol/arts/arts.h | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 02e8af03c..388776bc1 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -152,7 +152,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) initAudioIOList(); TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - TQTabWidget *tab = new TQTabWidget(this); + tab = new TQTabWidget(this); layout->addWidget(tab); general = new generalTab(tab); @@ -412,6 +412,17 @@ void KArtsModule::save() emit changed( false ); } +TQString KArtsModule::handbookSection() const +{ + int index = tab->currentPageIndex(); + if (index == 0) + return "sndserver-general"; + else if (index == 1) + return "sndserver-soundio"; + else + return TQString::null; +} + int KArtsModule::userSavedChanges() { int reply; diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 6306b2411..5eebd4ba1 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -60,7 +60,8 @@ public: void load( bool useDefaults ); void save(); void defaults(); - + virtual TQString handbookSection() const; + bool artsdIsRunning(); private slots: @@ -88,6 +89,7 @@ private: TQLineEdit *deviceName; TQSpinBox *samplingRate; KIntNumInput *suspendTime; + TQTabWidget *tab; generalTab *general; hardwareTab *hardware; TDEConfig *config; |