author | llornkcor <llornkcor> | 2002-08-29 23:28:09 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-29 23:28:09 (UTC) |
commit | c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff (patch) (unidiff) | |
tree | bf090bfc613bf84852b1a389877a8180af061595 /noncore | |
parent | 598b2f4c404c2e12f59c2abc765f58bb8d0862a3 (diff) | |
download | opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.zip opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.tar.gz opie-c4af3c78c9f6f073c1e0b11b331a2e24df80b9ff.tar.bz2 |
fix for opie restart. not a checkbox to activate restart on close of vmemo sound settings. does not remember, and default is to not restart
-rw-r--r-- | noncore/settings/sound/opie-sound.control | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 54 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 6 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 2 |
5 files changed, 48 insertions, 34 deletions
diff --git a/noncore/settings/sound/opie-sound.control b/noncore/settings/sound/opie-sound.control deleted file mode 100644 index 3d42ca0..0000000 --- a/noncore/settings/sound/opie-sound.control +++ b/dev/null | |||
@@ -1,10 +0,0 @@ | |||
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 20f0dab..dd341c0 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -29,25 +29,27 @@ | |||
29 | #include <qmessagebox.h> | 29 | #include <qmessagebox.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | #include <qslider.h> | 31 | #include <qslider.h> |
32 | #include <qcheckbox.h> | 32 | #include <qcheckbox.h> |
33 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | #include <qlabel.h> | ||
35 | 36 | ||
36 | #include <sys/utsname.h> | 37 | #include <sys/utsname.h> |
37 | #include <sys/time.h> | 38 | #include <sys/time.h> |
38 | #include <sys/types.h> | 39 | #include <sys/types.h> |
39 | #include <unistd.h> | 40 | #include <unistd.h> |
40 | #include <stdio.h> | 41 | #include <stdio.h> |
41 | #include <sys/stat.h> | 42 | #include <sys/stat.h> |
42 | 43 | ||
44 | |||
43 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
44 | : SoundSettingsBase( parent, objname, TRUE, fl ) | 46 | : SoundSettingsBase( parent, objname, TRUE, fl ) |
45 | { | 47 | { |
46 | keyReset=FALSE; | 48 | keyReset=FALSE; |
47 | 49 | noWarning=false; | |
48 | Config config( "qpe"); | 50 | Config config( "qpe"); |
49 | config.setGroup( "Volume" ); | 51 | config.setGroup( "Volume" ); |
50 | Config cfg("Vmemo"); | 52 | Config cfg("Vmemo"); |
51 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 53 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
52 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); | 54 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); |
53 | 55 | ||
@@ -61,16 +63,18 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
61 | sampleRate->setCurrentItem(2); | 63 | sampleRate->setCurrentItem(2); |
62 | else if(rate == 33075) | 64 | else if(rate == 33075) |
63 | sampleRate->setCurrentItem(3); | 65 | sampleRate->setCurrentItem(3); |
64 | else if(rate==44100) | 66 | else if(rate==44100) |
65 | sampleRate->setCurrentItem(4); | 67 | sampleRate->setCurrentItem(4); |
66 | 68 | ||
67 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only | 69 | stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); |
70 | //TODO hide if zaurus- mono only | ||
68 | 71 | ||
69 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) //since ipaq and zaurus have particular | 72 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) |
70 | //devices | 73 | //since ipaq and zaurus have particular |
74 | //devices | ||
71 | bool systemZaurus=FALSE; | 75 | bool systemZaurus=FALSE; |
72 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 76 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
73 | if (uname(&name) != -1) {// TODO change this here,... | 77 | if (uname(&name) != -1) {// TODO change this here,... |
74 | QString release=name.release; | 78 | QString release=name.release; |
75 | if( release.find("embedix",0,TRUE) != -1) { | 79 | if( release.find("embedix",0,TRUE) != -1) { |
76 | qDebug("IS System Zaurus"); | 80 | qDebug("IS System Zaurus"); |
@@ -103,15 +107,20 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
103 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); | 107 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); |
104 | 108 | ||
105 | cfg.setGroup("Defaults"); | 109 | cfg.setGroup("Defaults"); |
106 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 110 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); |
107 | 111 | ||
108 | updateStorageCombo(); | 112 | updateStorageCombo(); |
109 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); | 113 | connect( LocationComboBox,SIGNAL(activated(const QString &)), this, |
110 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT( setKeyButton(const QString &))); | 114 | SLOT( setLocation(const QString &))); |
111 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT( setSizeLimitButton(const QString &))); | 115 | connect( keyComboBox,SIGNAL(activated( int)), this, |
116 | SLOT( setKeyButton( int))); | ||
117 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)), this, | ||
118 | SLOT( setSizeLimitButton(const QString &))); | ||
119 | connect( restartCheckBox,SIGNAL( toggled( bool)), this, | ||
120 | SLOT( restartOpie( bool))); | ||
112 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 121 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
113 | } | 122 | } |
114 | 123 | ||
115 | void SoundSettings::updateStorageCombo() { | 124 | void SoundSettings::updateStorageCombo() { |
116 | 125 | ||
117 | Config config( "Vmemo" ); | 126 | Config config( "Vmemo" ); |
@@ -131,13 +140,13 @@ void SoundSettings::updateStorageCombo() { | |||
131 | const QString name = (*it)->name(); | 140 | const QString name = (*it)->name(); |
132 | const QString path = (*it)->path(); | 141 | const QString path = (*it)->path(); |
133 | qDebug("storage name "+name +" storage path is "+path); | 142 | qDebug("storage name "+name +" storage path is "+path); |
134 | list << name + ": " +path; | 143 | list << name + ": " +path; |
135 | if( loc.find( path,0,TRUE) != -1) | 144 | if( loc.find( path,0,TRUE) != -1) |
136 | set = i; | 145 | set = i; |
137 | // if(dit.current()->file().find(path) != -1 ) storage=name; | 146 | // if(dit.current()->file().find(path) != -1 ) storage=name; |
138 | i++; | 147 | i++; |
139 | } | 148 | } |
140 | 149 | ||
141 | LocationComboBox->insertStringList(list); | 150 | LocationComboBox->insertStringList(list); |
142 | qDebug("set item %d", set); | 151 | qDebug("set item %d", set); |
143 | LocationComboBox->setCurrentItem(set); | 152 | LocationComboBox->setCurrentItem(set); |
@@ -157,34 +166,30 @@ void SoundSettings::cleanUp() { | |||
157 | 166 | ||
158 | cfg.setGroup("Record"); | 167 | cfg.setGroup("Record"); |
159 | cfg.writeEntry("SampleRate",sampleRate->currentText()); | 168 | cfg.writeEntry("SampleRate",sampleRate->currentText()); |
160 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); | 169 | cfg.writeEntry("Stereo",stereoCheckBox->isChecked()); |
161 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); | 170 | cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); |
162 | 171 | ||
163 | if(keyReset) { | 172 | if(keyReset && noWarning) { |
164 | switch ( QMessageBox::warning(this,tr("Restart"), | 173 | QCopEnvelope ("QPE/System", "restart()"); |
165 | tr("To implement a new key switch\nOpie will have to be restarted./n<B>Restart</B> Opie now?"), | ||
166 | tr("Yes"),tr("No"),0,1,1) ) { | ||
167 | case 0: | ||
168 | QCopEnvelope ("QPE/System", "restart()"); | ||
169 | break; | ||
170 | }; | ||
171 | } | 174 | } |
172 | } | 175 | } |
173 | 176 | ||
174 | void SoundSettings::setKeyButton(const QString &name) { | 177 | void SoundSettings::setKeyButton( int index) { |
175 | Config cfg("Vmemo"); | 178 | Config cfg("Vmemo"); |
176 | cfg.setGroup("Defaults"); | 179 | cfg.setGroup("Defaults"); |
177 | cfg.writeEntry( "toggleKey", keyComboBox->currentItem() ); | 180 | cfg.writeEntry( "toggleKey", index ); |
178 | keyReset = TRUE; | 181 | keyReset = TRUE; |
179 | if(keyComboBox->currentItem() == 1) | 182 | if( index == 1) { |
180 | cfg.writeEntry( "hideIcon", 0 ); | 183 | cfg.writeEntry( "hideIcon", 0 ); |
181 | else | 184 | keyLabel->setText(tr("Shows icon")); |
185 | } | ||
186 | else { | ||
182 | cfg.writeEntry( "hideIcon", 1); | 187 | cfg.writeEntry( "hideIcon", 1); |
183 | 188 | keyLabel->setText(tr("Hides icon")); | |
184 | 189 | } | |
185 | cfg.write(); | 190 | cfg.write(); |
186 | } | 191 | } |
187 | 192 | ||
188 | void SoundSettings::updateLocationCombo() { | 193 | void SoundSettings::updateLocationCombo() { |
189 | 194 | ||
190 | } | 195 | } |
@@ -196,6 +201,11 @@ void SoundSettings::setSizeLimitButton(const QString &index) { | |||
196 | if(index.find("Unlimited",0,TRUE) != -1) | 201 | if(index.find("Unlimited",0,TRUE) != -1) |
197 | cfg.writeEntry("SizeLimit", -1); | 202 | cfg.writeEntry("SizeLimit", -1); |
198 | else | 203 | else |
199 | cfg.writeEntry("SizeLimit", index); | 204 | cfg.writeEntry("SizeLimit", index); |
200 | cfg.write(); | 205 | cfg.write(); |
201 | } | 206 | } |
207 | |||
208 | void SoundSettings::restartOpie(bool b) { | ||
209 | noWarning=b; | ||
210 | } | ||
211 | |||
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 6b8b835..0f3605e 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -29,21 +29,23 @@ class SoundSettings : public SoundSettingsBase | |||
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | 33 | ||
34 | protected: | 34 | protected: |
35 | bool noWarning; | ||
35 | /* void accept(); */ | 36 | /* void accept(); */ |
36 | /* void reject(); */ | 37 | /* void reject(); */ |
37 | void updateStorageCombo(); | 38 | void updateStorageCombo(); |
38 | void updateLocationCombo(); | 39 | void updateLocationCombo(); |
39 | 40 | ||
40 | private slots: | 41 | private slots: |
41 | void setKeyButton(const QString &); | 42 | void setKeyButton( int); |
42 | void setSizeLimitButton(const QString &); | 43 | void setSizeLimitButton(const QString &); |
43 | void setLocation(const QString &); | 44 | void setLocation(const QString &); |
44 | void cleanUp(); | 45 | void cleanUp(); |
46 | void restartOpie(bool); | ||
45 | }; | 47 | }; |
46 | 48 | ||
47 | 49 | ||
48 | #endif // SOUNDSETTINGS_H | 50 | #endif // SOUNDSETTINGS_H |
49 | 51 | ||
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 05b4b7e..1a60109 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -144,12 +144,15 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
144 | keyComboBox->insertItem( tr( "Key_Calender" ) ); | 144 | keyComboBox->insertItem( tr( "Key_Calender" ) ); |
145 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); | 145 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); |
146 | keyComboBox->insertItem( tr( "Key_Menu" ) ); | 146 | keyComboBox->insertItem( tr( "Key_Menu" ) ); |
147 | keyComboBox->insertItem( tr( "Key_Mail" ) ); | 147 | keyComboBox->insertItem( tr( "Key_Mail" ) ); |
148 | SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 0 ,1); | 148 | SoundSettingsBaseLayout->addMultiCellWidget( keyComboBox , 6, 6, 0, 0 ,1); |
149 | 149 | ||
150 | keyLabel= new QLabel( this, "keyLabel" ); | ||
151 | SoundSettingsBaseLayout->addMultiCellWidget( keyLabel , 6, 6, 0, 2, 3); | ||
152 | |||
150 | QLabel *timeLimitLabel; | 153 | QLabel *timeLimitLabel; |
151 | timeLimitLabel= new QLabel( this, "timeLimitLabel" ); | 154 | timeLimitLabel= new QLabel( this, "timeLimitLabel" ); |
152 | timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) ); | 155 | timeLimitLabel->setText( tr( "Recording Limit in seconds:" ) ); |
153 | SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0, 1); | 156 | SoundSettingsBaseLayout->addMultiCellWidget( timeLimitLabel , 7, 7, 0, 0, 1); |
154 | 157 | ||
155 | timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" ); | 158 | timeLimitComboBox = new QComboBox( FALSE, this, "timeLimitComboBox" ); |
@@ -159,12 +162,19 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
159 | timeLimitComboBox->insertItem( tr( "10" ) ); | 162 | timeLimitComboBox->insertItem( tr( "10" ) ); |
160 | timeLimitComboBox->insertItem( tr( "5" ) ); | 163 | timeLimitComboBox->insertItem( tr( "5" ) ); |
161 | timeLimitComboBox->insertItem( tr( "Unlimited" ) ); | 164 | timeLimitComboBox->insertItem( tr( "Unlimited" ) ); |
162 | 165 | ||
163 | SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1); | 166 | SoundSettingsBaseLayout->addMultiCellWidget(timeLimitComboBox , 8, 8, 0, 0, 1); |
164 | 167 | ||
168 | |||
169 | restartCheckBox= new QCheckBox( this, "restartCheck" ); | ||
170 | restartCheckBox->setText( tr( "Restart Opie if needed" ) ); | ||
171 | |||
172 | SoundSettingsBaseLayout->addMultiCellWidget( restartCheckBox , 9, 9, 0, 0, 1); | ||
173 | |||
174 | |||
165 | QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); | 175 | QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); |
166 | SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); | 176 | SoundSettingsBaseLayout->addItem( spacer4, 9, 0 ); |
167 | } | 177 | } |
168 | 178 | ||
169 | /* | 179 | /* |
170 | * Destroys the object and frees any allocated resources | 180 | * Destroys the object and frees any allocated resources |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 30f32ca..e6bc186 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -29,12 +29,13 @@ class SoundSettingsBase : public QMainWindow | |||
29 | public: | 29 | public: |
30 | SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 30 | SoundSettingsBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
31 | ~SoundSettingsBase(); | 31 | ~SoundSettingsBase(); |
32 | 32 | ||
33 | QLabel* PixmapLabel1_2; | 33 | QLabel* PixmapLabel1_2; |
34 | QLabel* TextLabel1_2; | 34 | QLabel* TextLabel1_2; |
35 | QLabel *keyLabel; | ||
35 | /* QLabel* volLabel; */ | 36 | /* QLabel* volLabel; */ |
36 | /* QLabel* micLabel; */ | 37 | /* QLabel* micLabel; */ |
37 | /* QSlider* volume; */ | 38 | /* QSlider* volume; */ |
38 | /* QSlider* mic; */ | 39 | /* QSlider* mic; */ |
39 | /* QLabel* PixmapLabel2_2; */ | 40 | /* QLabel* PixmapLabel2_2; */ |
40 | /* QLabel* TextLabel2_2; */ | 41 | /* QLabel* TextLabel2_2; */ |
@@ -45,12 +46,13 @@ public: | |||
45 | QCheckBox* sixteenBitCheckBox; | 46 | QCheckBox* sixteenBitCheckBox; |
46 | QCheckBox* AlertCheckBox; | 47 | QCheckBox* AlertCheckBox; |
47 | QLabel* TextLabel1; | 48 | QLabel* TextLabel1; |
48 | QComboBox* LocationComboBox; | 49 | QComboBox* LocationComboBox; |
49 | QComboBox* keyComboBox; | 50 | QComboBox* keyComboBox; |
50 | QComboBox* timeLimitComboBox; | 51 | QComboBox* timeLimitComboBox; |
52 | QCheckBox *restartCheckBox; | ||
51 | bool keyReset; | 53 | bool keyReset; |
52 | protected: | 54 | protected: |
53 | QGridLayout* SoundSettingsBaseLayout; | 55 | QGridLayout* SoundSettingsBaseLayout; |
54 | protected slots: | 56 | protected slots: |
55 | 57 | ||
56 | }; | 58 | }; |