summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-29 23:28:09 (UTC)
committer llornkcor <llornkcor>2002-08-29 23:28:09 (UTC)
commitc4af3c78c9f6f073c1e0b11b331a2e24df80b9ff (patch) (unidiff)
treebf090bfc613bf84852b1a389877a8180af061595
parent598b2f4c404c2e12f59c2abc765f58bb8d0862a3 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/opie-sound.control10
-rw-r--r--noncore/settings/sound/soundsettings.cpp54
-rw-r--r--noncore/settings/sound/soundsettings.h6
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp10
-rw-r--r--noncore/settings/sound/soundsettingsbase.h2
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 @@
1Files: bin/sound apps/Settings/Sound.desktop
2Priority: optional
3Section: opie/settings
4Maintainer: L.J. Potter
5Architecture: arm
6Arch: iPAQ
7Version: $QPE_VERSION-$SUB_VERSION.2
8Depends: opie-base ($QPE_VERSION)
9Description: 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
@@ -33,4 +33,5 @@
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>
@@ -41,9 +42,10 @@
41#include <sys/stat.h> 42#include <sys/stat.h>
42 43
44
43SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) 45SoundSettings::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" );
@@ -65,8 +67,10 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
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*/
@@ -107,7 +111,12 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
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}
@@ -135,5 +144,5 @@ void SoundSettings::updateStorageCombo() {
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 }
@@ -161,26 +170,22 @@ void SoundSettings::cleanUp() {
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
174void SoundSettings::setKeyButton(const QString &name) { 177void 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}
@@ -200,2 +205,7 @@ void SoundSettings::setSizeLimitButton(const QString &index) {
200 cfg.write(); 205 cfg.write();
201} 206}
207
208void 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
@@ -33,4 +33,5 @@ public:
33 33
34protected: 34protected:
35 bool noWarning;
35/* void accept(); */ 36/* void accept(); */
36/* void reject(); */ 37/* void reject(); */
@@ -39,8 +40,9 @@ protected:
39 40
40private slots: 41private 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
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
@@ -148,4 +148,7 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
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" );
@@ -163,4 +166,11 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
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 );
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
@@ -33,4 +33,5 @@ public:
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; */
@@ -49,4 +50,5 @@ public:
49 QComboBox* keyComboBox; 50 QComboBox* keyComboBox;
50 QComboBox* timeLimitComboBox; 51 QComboBox* timeLimitComboBox;
52 QCheckBox *restartCheckBox;
51 bool keyReset; 53 bool keyReset;
52protected: 54protected: