author | llornkcor <llornkcor> | 2002-06-23 18:33:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-23 18:33:17 (UTC) |
commit | b50f663aabaf51821a35a94354237a3387954e79 (patch) (unidiff) | |
tree | c2dc2879fc7d6964aea4201995927e967f3bade3 | |
parent | f0e656b51a2dcee1dec594636cbc1ba8d4b11eef (diff) | |
download | opie-b50f663aabaf51821a35a94354237a3387954e79.zip opie-b50f663aabaf51821a35a94354237a3387954e79.tar.gz opie-b50f663aabaf51821a35a94354237a3387954e79.tar.bz2 |
added recording time limit
-rw-r--r-- | noncore/settings/sound/sound.pro | 2 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 3 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.cpp | 28 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.h | 1 |
5 files changed, 46 insertions, 9 deletions
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 28c8b0d..a5c6cea 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -2,13 +2,13 @@ TEMPLATE = app | |||
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = soundsettings.h soundsettingsbase.h | 4 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 6 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = sound | 10 | TARGET = sound |
11 | 11 | ||
12 | TRANSLATIONS = ../../i18n/pt_BR/sound.ts | 12 | TRANSLATIONS = ../../i18n/pt_BR/sound.ts |
13 | TRANSLATIONS += ../../i18n/es/sound.ts | 13 | TRANSLATIONS += ../../i18n/es/sound.ts |
14 | TRANSLATIONS += ../../i18n/pt/sound.ts | 14 | TRANSLATIONS += ../../i18n/pt/sound.ts |
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 672548f..3ceaf0c 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp | |||
@@ -73,12 +73,24 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
73 | 73 | ||
74 | if( release.find("embedix",0,TRUE) !=-1) | 74 | if( release.find("embedix",0,TRUE) !=-1) |
75 | stereoCheckBox->hide(); | 75 | stereoCheckBox->hide(); |
76 | } | 76 | } |
77 | // else | 77 | // else |
78 | // stereoCheckBox->hide(); | 78 | // stereoCheckBox->hide(); |
79 | int sRate=config.readNumEntry("SizeLimit", 30); | ||
80 | if(sRate ==30) | ||
81 | timeLimitComboBox->setCurrentItem(0); | ||
82 | else if(sRate==20) | ||
83 | timeLimitComboBox->setCurrentItem(1); | ||
84 | else if(sRate == 15) | ||
85 | timeLimitComboBox->setCurrentItem(2); | ||
86 | else if(sRate == 10) | ||
87 | |||
88 | timeLimitComboBox->setCurrentItem(3); | ||
89 | else | ||
90 | timeLimitComboBox->setCurrentItem(4); | ||
79 | 91 | ||
80 | 92 | ||
81 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); | 93 | sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); |
82 | 94 | ||
83 | cfg.setGroup("Defaults"); | 95 | cfg.setGroup("Defaults"); |
84 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); | 96 | keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); |
@@ -88,12 +100,13 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl ) | |||
88 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); | 100 | connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); |
89 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); | 101 | connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); |
90 | connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); | 102 | connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); |
91 | connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); | 103 | connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); |
92 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); | 104 | connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); |
93 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT(setKeyButton(const QString &))); | 105 | connect( keyComboBox,SIGNAL(activated(const QString &)),this,SLOT(setKeyButton(const QString &))); |
106 | connect( timeLimitComboBox,SIGNAL(activated( const QString &)),this,SLOT(setSizeLimitButton(const QString &))); | ||
94 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 107 | // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
95 | } | 108 | } |
96 | 109 | ||
97 | // void SoundSettings::reject() | 110 | // void SoundSettings::reject() |
98 | // { | 111 | // { |
99 | // qDebug("reject"); | 112 | // qDebug("reject"); |
@@ -245,6 +258,14 @@ void SoundSettings::setKeyButton(const QString &name) { | |||
245 | cfg.write(); | 258 | cfg.write(); |
246 | } | 259 | } |
247 | 260 | ||
248 | void SoundSettings::updateLocationCombo() { | 261 | void SoundSettings::updateLocationCombo() { |
249 | 262 | ||
250 | } | 263 | } |
264 | |||
265 | void SoundSettings::setSizeLimitButton(const QString &index) { | ||
266 | |||
267 | Config cfg("Vmemo"); | ||
268 | cfg.setGroup("Record"); | ||
269 | cfg.writeEntry("SizeLimit", index); | ||
270 | cfg.write(); | ||
271 | } | ||
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 0676e12..94d5d48 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -35,13 +35,14 @@ protected: | |||
35 | /* void accept(); */ | 35 | /* void accept(); */ |
36 | /* void reject(); */ | 36 | /* void reject(); */ |
37 | void updateStorageCombo(); | 37 | void updateStorageCombo(); |
38 | void updateLocationCombo(); | 38 | void updateLocationCombo(); |
39 | 39 | ||
40 | private slots: | 40 | private slots: |
41 | void setKeyButton(const QString &); | 41 | void setKeyButton(const QString &); |
42 | void setSizeLimitButton(const QString &); | ||
42 | void setLocation(const QString &); | 43 | void setLocation(const QString &); |
43 | void cleanUp(); | 44 | void cleanUp(); |
44 | void setVolume(int); | 45 | void setVolume(int); |
45 | void setMic(int); | 46 | void setMic(int); |
46 | 47 | ||
47 | void volumeChanged( bool muted ); | 48 | void volumeChanged( bool muted ); |
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp index 6cb4f89..8be1b3d 100644 --- a/noncore/settings/sound/soundsettingsbase.cpp +++ b/noncore/settings/sound/soundsettingsbase.cpp | |||
@@ -192,13 +192,14 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
192 | Layout12_2->setMargin( 2 ); | 192 | Layout12_2->setMargin( 2 ); |
193 | 193 | ||
194 | GroupBox1 = new QGroupBox( this, "GroupBox1" ); | 194 | GroupBox1 = new QGroupBox( this, "GroupBox1" ); |
195 | GroupBox1->setTitle( tr( "Vmemo" ) ); | 195 | GroupBox1->setTitle( tr( "Vmemo" ) ); |
196 | 196 | ||
197 | QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); | 197 | QWidget* privateLayoutWidget = new QWidget( GroupBox1, "Layout11" ); |
198 | privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 169 ) ); | 198 | privateLayoutWidget->setGeometry( QRect( 5, 16, 96, 230 ) ); |
199 | |||
199 | Layout11 = new QVBoxLayout( privateLayoutWidget ); | 200 | Layout11 = new QVBoxLayout( privateLayoutWidget ); |
200 | Layout11->setSpacing( 2 ); | 201 | Layout11->setSpacing( 2 ); |
201 | Layout11->setMargin( 0 ); | 202 | Layout11->setMargin( 0 ); |
202 | 203 | ||
203 | sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); | 204 | sampleRateLabel = new QLabel( privateLayoutWidget, "sampleRateLabel" ); |
204 | sampleRateLabel->setText( tr( "Sample Rate" ) ); | 205 | sampleRateLabel->setText( tr( "Sample Rate" ) ); |
@@ -233,32 +234,45 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m | |||
233 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); | 234 | LocationComboBox = new QComboBox( FALSE, privateLayoutWidget, "LocationComboBox" ); |
234 | Layout11->addWidget( LocationComboBox ); | 235 | Layout11->addWidget( LocationComboBox ); |
235 | 236 | ||
236 | QLabel *TextLabelKey; | 237 | QLabel *TextLabelKey; |
237 | TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" ); | 238 | TextLabelKey = new QLabel( privateLayoutWidget, "TextLabelKey" ); |
238 | TextLabelKey->setText( tr( "Record Key:" ) ); | 239 | TextLabelKey->setText( tr( "Record Key:" ) ); |
240 | Layout11->addWidget( TextLabelKey ); | ||
239 | 241 | ||
240 | keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" ); | 242 | keyComboBox = new QComboBox( FALSE, privateLayoutWidget, "keyComboBox" ); |
241 | keyComboBox->insertItem( tr( "" ) ); | 243 | keyComboBox->insertItem( tr( "" ) ); |
242 | keyComboBox->insertItem( tr( "Taskbar Icon" ) ); | 244 | keyComboBox->insertItem( tr( "Taskbar Icon" ) ); |
243 | keyComboBox->insertItem( tr( "Key_Escape" ) ); | 245 | keyComboBox->insertItem( tr( "Key_Escape" ) ); |
244 | keyComboBox->insertItem( tr( "Key_Space" ) ); | 246 | keyComboBox->insertItem( tr( "Key_Space" ) ); |
245 | keyComboBox->insertItem( tr( "Key_Home" ) ); | 247 | keyComboBox->insertItem( tr( "Key_Home" ) ); |
246 | keyComboBox->insertItem( tr( "Key_Calender" ) ); | 248 | keyComboBox->insertItem( tr( "Key_Calender" ) ); |
247 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); | 249 | keyComboBox->insertItem( tr( "Key_Contacts" ) ); |
248 | keyComboBox->insertItem( tr( "Key_Menu" ) ); | 250 | keyComboBox->insertItem( tr( "Key_Menu" ) ); |
249 | keyComboBox->insertItem( tr( "Key_Mail" ) ); | 251 | keyComboBox->insertItem( tr( "Key_Mail" ) ); |
250 | 252 | ||
251 | Layout11->addWidget( TextLabelKey ); | ||
252 | |||
253 | Layout11->addWidget( keyComboBox ); | 253 | Layout11->addWidget( keyComboBox ); |
254 | 254 | ||
255 | QSpacerItem* spacer_9 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | 255 | QLabel *timeLimitLabel; |
256 | Layout11->addItem( spacer_9 ); | 256 | timeLimitLabel= new QLabel( privateLayoutWidget, "timeLimitLabel" ); |
257 | 257 | timeLimitLabel->setText( tr( "Recording Limit:" ) ); | |
258 | 258 | Layout11->addWidget( timeLimitLabel ); | |
259 | |||
260 | timeLimitComboBox = new QComboBox( FALSE, privateLayoutWidget, "timeLimitComboBox" ); | ||
261 | timeLimitComboBox->insertItem( tr( "30" ) ); | ||
262 | timeLimitComboBox->insertItem( tr( "20" ) ); | ||
263 | timeLimitComboBox->insertItem( tr( "15" ) ); | ||
264 | timeLimitComboBox->insertItem( tr( "10" ) ); | ||
265 | timeLimitComboBox->insertItem( tr( "5" ) ); | ||
266 | |||
267 | Layout11->addWidget(timeLimitComboBox); | ||
268 | QLabel *timeLimitLabel2; | ||
269 | timeLimitLabel2= new QLabel( privateLayoutWidget, "timeLimitLabel2" ); | ||
270 | timeLimitLabel2->setText( tr( "seconds" ) ); | ||
271 | Layout11->addWidget( timeLimitLabel2 ); | ||
272 | |||
259 | Layout12_2->addWidget( GroupBox1 ); | 273 | Layout12_2->addWidget( GroupBox1 ); |
260 | // // touchsound = new QCheckBox( this, "touchsound" ); | 274 | // // touchsound = new QCheckBox( this, "touchsound" ); |
261 | // // touchsound->setText( tr( "Screen sounds" ) ); | 275 | // // touchsound->setText( tr( "Screen sounds" ) ); |
262 | // // Layout12_2->addWidget( touchsound ); | 276 | // // Layout12_2->addWidget( touchsound ); |
263 | 277 | ||
264 | // // keysound = new QCheckBox( this, "keysound" ); | 278 | // // keysound = new QCheckBox( this, "keysound" ); |
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h index 20d1c2c..5622b70 100644 --- a/noncore/settings/sound/soundsettingsbase.h +++ b/noncore/settings/sound/soundsettingsbase.h | |||
@@ -45,12 +45,13 @@ public: | |||
45 | QCheckBox* stereoCheckBox; | 45 | QCheckBox* stereoCheckBox; |
46 | QCheckBox* sixteenBitCheckBox; | 46 | QCheckBox* sixteenBitCheckBox; |
47 | QCheckBox* AlertCheckBox; | 47 | QCheckBox* AlertCheckBox; |
48 | QLabel* TextLabel1; | 48 | QLabel* TextLabel1; |
49 | QComboBox* LocationComboBox; | 49 | QComboBox* LocationComboBox; |
50 | QComboBox* keyComboBox; | 50 | QComboBox* keyComboBox; |
51 | QComboBox* timeLimitComboBox; | ||
51 | bool keyReset; | 52 | bool keyReset; |
52 | protected: | 53 | protected: |
53 | QGridLayout* SoundSettingsBaseLayout; | 54 | QGridLayout* SoundSettingsBaseLayout; |
54 | QVBoxLayout* GroupBox3Layout; | 55 | QVBoxLayout* GroupBox3Layout; |
55 | QVBoxLayout* Layout10; | 56 | QVBoxLayout* Layout10; |
56 | QHBoxLayout* Layout16; | 57 | QHBoxLayout* Layout16; |