author | llornkcor <llornkcor> | 2005-02-18 08:35:49 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-02-18 08:35:49 (UTC) |
commit | 0f1ae1478122e2f65f8d477d9baad8de15df1eb2 (patch) (unidiff) | |
tree | 903fe5a875bfd9fda0fccf7d8ba4b8eda9a3a07c /noncore/settings | |
parent | 436a26541402c85a24eaf9ffb3ab2e866631000c (diff) | |
download | opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.zip opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.tar.gz opie-0f1ae1478122e2f65f8d477d9baad8de15df1eb2.tar.bz2 |
change to dialog so user can cancel
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 71 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 5 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 5 |
4 files changed, 50 insertions, 34 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index d55a751..df3def5 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -45,5 +45,5 @@ using namespace Opie::Core; | |||
45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | 45 | SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) |
46 | : SoundSettingsBase( parent, objname, TRUE, fl ) | 46 | : SoundSettingsBase( parent, objname, true, fl ) |
47 | { | 47 | { |
48 | keyReset=FALSE; | 48 | keyReset=false; |
49 | noWarning=false; | 49 | noWarning=false; |
@@ -52,4 +52,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
52 | Config cfg("Vmemo"); | 52 | Config cfg("Vmemo"); |
53 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 53 | |
54 | AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); | 54 | |
55 | // connect(qApp,SIGNAL(aboutToQuit()),SLOT(cleanUp())); | ||
56 | |||
57 | AlertCheckBox->setChecked( cfg.readBoolEntry("Alert", 1)); | ||
55 | 58 | ||
@@ -74,3 +77,3 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
74 | //devices | 77 | //devices |
75 | bool systemZaurus=FALSE; | 78 | bool systemZaurus=false; |
76 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 79 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
@@ -78,5 +81,5 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
78 | QString release=name.release; | 81 | QString release=name.release; |
79 | if( release.find("embedix",0,TRUE) != -1) { | 82 | if( release.find("embedix",0,true) != -1) { |
80 | odebug << "IS System Zaurus" << oendl; | 83 | odebug << "IS System Zaurus" << oendl; |
81 | systemZaurus=TRUE; | 84 | systemZaurus=true; |
82 | } | 85 | } |
@@ -84,6 +87,6 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
84 | if(!systemZaurus) { | 87 | if(!systemZaurus) { |
85 | stereoCheckBox->setChecked(TRUE); | 88 | stereoCheckBox->setChecked(true); |
86 | } | 89 | } |
87 | stereoCheckBox->setEnabled(FALSE); | 90 | stereoCheckBox->setEnabled(false); |
88 | sixteenBitCheckBox->setEnabled(FALSE); | 91 | sixteenBitCheckBox->setEnabled(false); |
89 | #else | 92 | #else |
@@ -109,3 +112,4 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
109 | cfg.setGroup("Defaults"); | 112 | cfg.setGroup("Defaults"); |
110 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 113 | recordKey = cfg.readNumEntry("toggleKey"); |
114 | keyComboBox->setCurrentItem( recordKey); | ||
111 | 115 | ||
@@ -117,12 +121,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
117 | 121 | ||
118 | connect( LocationComboBox,SIGNAL(activated(const QString&)), this, | 122 | connect(LocationComboBox,SIGNAL(activated(const QString&)),this,SLOT(setLocation(const QString&))); |
119 | SLOT( setLocation(const QString&))); | 123 | connect(keyComboBox,SIGNAL(activated(int)),this,SLOT(setKeyButton(int))); |
120 | connect( keyComboBox,SIGNAL(activated(int)), this, | 124 | connect(timeLimitComboBox,SIGNAL(activated(const QString&)),this,SLOT(setSizeLimitButton(const QString&))); |
121 | SLOT( setKeyButton(int))); | 125 | connect(restartCheckBox,SIGNAL( toggled(bool)),this,SLOT(restartOpie(bool))); |
122 | connect( timeLimitComboBox,SIGNAL(activated(const QString&)), this, | 126 | connect(adpcmCheckBox,SIGNAL( toggled(bool)),this,SLOT(slotAdpcm(bool))); |
123 | SLOT( setSizeLimitButton(const QString&))); | ||
124 | connect( restartCheckBox,SIGNAL( toggled(bool)), this, | ||
125 | SLOT( restartOpie(bool))); | ||
126 | connect( adpcmCheckBox,SIGNAL( toggled(bool)), this, | ||
127 | SLOT( slotAdpcm(bool))); | ||
128 | 127 | ||
@@ -151,3 +150,3 @@ void SoundSettings::updateStorageCombo() { | |||
151 | list << name + ": " +path; | 150 | list << name + ": " +path; |
152 | if( loc.find( path,0,TRUE) != -1) | 151 | if( loc.find( path,0,true) != -1) |
153 | set = i; | 152 | set = i; |
@@ -170,3 +169,10 @@ void SoundSettings::setLocation(const QString & string) { | |||
170 | 169 | ||
170 | void SoundSettings::accept() { | ||
171 | cleanUp(); | ||
172 | qApp->quit(); | ||
173 | } | ||
174 | |||
175 | |||
171 | void SoundSettings::cleanUp() { | 176 | void SoundSettings::cleanUp() { |
177 | |||
172 | Config cfg("Vmemo"); | 178 | Config cfg("Vmemo"); |
@@ -181,2 +187,11 @@ void SoundSettings::cleanUp() { | |||
181 | } | 187 | } |
188 | cfg.setGroup("Defaults"); | ||
189 | cfg.writeEntry( "toggleKey", recordKey); | ||
190 | if( recordKey == 1) { | ||
191 | cfg.writeEntry( "hideIcon", 0 ); | ||
192 | } | ||
193 | else { | ||
194 | cfg.writeEntry( "hideIcon", 1); | ||
195 | } | ||
196 | cfg.write(); | ||
182 | } | 197 | } |
@@ -184,8 +199,6 @@ void SoundSettings::cleanUp() { | |||
184 | void SoundSettings::setKeyButton( int index) { | 199 | void SoundSettings::setKeyButton( int index) { |
185 | Config cfg("Vmemo"); | 200 | recordKey = index; |
186 | cfg.setGroup("Defaults"); | 201 | restartCheckBox->setChecked(true); |
187 | cfg.writeEntry( "toggleKey", index ); | 202 | keyReset = true; |
188 | keyReset = TRUE; | ||
189 | if( index == 1) { | 203 | if( index == 1) { |
190 | cfg.writeEntry( "hideIcon", 0 ); | ||
191 | keyLabel->setText(tr("Shows icon")); | 204 | keyLabel->setText(tr("Shows icon")); |
@@ -193,6 +206,4 @@ void SoundSettings::setKeyButton( int index) { | |||
193 | else { | 206 | else { |
194 | cfg.writeEntry( "hideIcon", 1); | ||
195 | keyLabel->setText(tr("Hides icon")); | 207 | keyLabel->setText(tr("Hides icon")); |
196 | } | 208 | } |
197 | cfg.write(); | ||
198 | } | 209 | } |
@@ -207,3 +218,3 @@ void SoundSettings::setSizeLimitButton(const QString &index) { | |||
207 | cfg.setGroup("Record"); | 218 | cfg.setGroup("Record"); |
208 | if(index.find("Unlimited",0,TRUE) != -1) | 219 | if(index.find("Unlimited",0,true) != -1) |
209 | cfg.writeEntry("SizeLimit", -1); | 220 | cfg.writeEntry("SizeLimit", -1); |
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 57a360f..9db664a 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -33,6 +33,8 @@ public: | |||
33 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
34 | // ~SoundSettings(); | ||
34 | 35 | ||
35 | protected: | 36 | protected: |
37 | int recordKey, hideIt; | ||
36 | bool noWarning; | 38 | bool noWarning; |
37 | /* void accept(); */ | 39 | void accept(); |
38 | /* void reject(); */ | 40 | /* void reject(); */ |
@@ -42,2 +44,3 @@ protected: | |||
42 | private slots: | 44 | private slots: |
45 | //void closeEvent(QCloseEvent * ); | ||
43 | void setKeyButton( int); | 46 | void setKeyButton( int); |
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 84187d2..2d894c6 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -70,3 +70,4 @@ static const char* const image1_data[] = { | |||
70 | SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl ) | 70 | SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool modal, WFlags fl ) |
71 | : QMainWindow( parent, name, fl ) | 71 | : QDialog( parent, name, fl ) |
72 | // : QMainWindow( parent, name, fl ) | ||
72 | { | 73 | { |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 48c31e8..0234925 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -13,3 +13,3 @@ | |||
13 | #include <qdialog.h> | 13 | #include <qdialog.h> |
14 | #include <qmainwindow.h> | 14 | //#include <qmainwindow.h> |
15 | 15 | ||
@@ -24,3 +24,4 @@ class QSlider; | |||
24 | 24 | ||
25 | class SoundSettingsBase : public QMainWindow | 25 | class SoundSettingsBase : public QDialog |
26 | //class SoundSettingsBase : public QMainWindow | ||
26 | { | 27 | { |