author | llornkcor <llornkcor> | 2002-08-26 23:42:26 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-26 23:42:26 (UTC) |
commit | fd60f8aac384983daf7999c20bf827a8bacf8f8f (patch) (unidiff) | |
tree | 0a29acacdc405c965027c28dfd57c33a37d1a8af /noncore/settings | |
parent | 2182c3985c78662c0ce422508d23d3b10399583d (diff) | |
download | opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.zip opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.tar.gz opie-fd60f8aac384983daf7999c20bf827a8bacf8f8f.tar.bz2 |
added user message to restart opie or not on key switch change and changed control name
-rw-r--r-- | noncore/settings/sound/opie-vmemo-settings.control | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 13 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 1 |
3 files changed, 21 insertions, 3 deletions
diff --git a/noncore/settings/sound/opie-vmemo-settings.control b/noncore/settings/sound/opie-vmemo-settings.control new file mode 100644 index 0000000..3d42ca0 --- a/dev/null +++ b/noncore/settings/sound/opie-vmemo-settings.control | |||
@@ -0,0 +1,10 @@ | |||
1 | Files: bin/sound apps/Settings/Sound.desktop | ||
2 | Priority: optional | ||
3 | Section: opie/settings | ||
4 | Maintainer: L.J. Potter | ||
5 | Architecture: arm | ||
6 | Arch: iPAQ | ||
7 | Version: $QPE_VERSION-$SUB_VERSION.2 | ||
8 | Depends: opie-base ($QPE_VERSION) | ||
9 | Description: Sound settings dialog | ||
10 | For the Opie environment. | ||
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index cddb478..8b97e4d 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -17,6 +17,7 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // parts copyright 2002 L.J. Potter | ||
20 | 21 | ||
21 | #include "soundsettings.h" | 22 | #include "soundsettings.h" |
22 | 23 | ||
@@ -109,6 +110,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
109 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &))); | 110 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &))); |
110 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 111 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
111 | } | 112 | } |
113 | |||
112 | void SoundSettings::updateStorageCombo() { | 114 | void SoundSettings::updateStorageCombo() { |
113 | 115 | ||
114 | Config config( "Vmemo" ); | 116 | Config config( "Vmemo" ); |
@@ -157,8 +159,15 @@ void SoundSettings::cleanUp() { | |||
157 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 159 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
158 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 160 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
159 | 161 | ||
160 | if(keyReset) QCopEnvelope ("QPE/System", "restart()"); | 162 | if(keyReset) { |
161 | 163 | switch ( QMessageBox::warning(this,tr("Restart"), | |
164 | tr("To implement a new key switch\nOpie will have to be restarted./n<B>Restart</B> Opie now?"), | ||
165 | tr("Yes"),tr("No"),0,1,1) ) { | ||
166 | case 0: | ||
167 | QCopEnvelope ("QPE/System", "restart()"); | ||
168 | break; | ||
169 | }; | ||
170 | } | ||
162 | } | 171 | } |
163 | 172 | ||
164 | void SoundSettings::setKeyButton(const QString &name) { | 173 | void SoundSettings::setKeyButton(const QString &name) { |
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 3c98362..05b4b7e 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -162,7 +162,6 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
162 | 162 | ||
163 | SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1); | 163 | SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1); |
164 | 164 | ||
165 | |||
166 | QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 165 | QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
167 | SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); | 166 | SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); |
168 | } | 167 | } |