summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 4b398ad..2130438 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -221,137 +221,139 @@ VMemo::VMemo( QWidget *parent, const char *_name )
221 QString release=name.release; 221 QString release=name.release;
222 222
223 Config vmCfg("Vmemo"); 223 Config vmCfg("Vmemo");
224 vmCfg.setGroup("Defaults"); 224 vmCfg.setGroup("Defaults");
225 int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); 225 int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
226 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); 226 useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
227 227
228 qDebug("toggleKey %d", toggleKey); 228 qDebug("toggleKey %d", toggleKey);
229 229
230 if(release.find("embedix",0,TRUE) !=-1) 230 if(release.find("embedix",0,TRUE) !=-1)
231 systemZaurus=TRUE; 231 systemZaurus=TRUE;
232 else 232 else
233 systemZaurus=FALSE; 233 systemZaurus=FALSE;
234 234
235 myChannel = new QCopChannel( "QPE/VMemo", this ); 235 myChannel = new QCopChannel( "QPE/VMemo", this );
236 connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), 236 connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
237 this, SLOT(receive(const QCString&, const QByteArray&)) ); 237 this, SLOT(receive(const QCString&, const QByteArray&)) );
238 238
239 if( toggleKey != -1 ) { 239 if( toggleKey != -1 ) {
240 // QPEApplication::grabKeyboard(); 240 // QPEApplication::grabKeyboard();
241 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); 241 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
242 // e << 4096; // Key_Escape 242 // e << 4096; // Key_Escape
243 // e << Key_F5; //4148 243 // e << Key_F5; //4148
244 e << toggleKey; 244 e << toggleKey;
245 e << QString("QPE/VMemo"); 245 e << QString("QPE/VMemo");
246 e << QString("toggleRecord()"); 246 e << QString("toggleRecord()");
247 } 247 }
248 if(toggleKey == 1) 248 if(toggleKey == 1)
249 usingIcon=TRUE; 249 usingIcon=TRUE;
250 else 250 else
251 usingIcon=FALSE; 251 usingIcon=FALSE;
252 if( vmCfg.readNumEntry("hideIcon",0) == 1) 252 if( vmCfg.readNumEntry("hideIcon",0) == 1)
253 hide(); 253 hide();
254 } 254 }
255} 255}
256 256
257VMemo::~VMemo() { 257VMemo::~VMemo() {
258} 258}
259 259
260void VMemo::receive( const QCString &msg, const QByteArray &data ) { 260void VMemo::receive( const QCString &msg, const QByteArray &data ) {
261 qDebug("receive"); 261 qDebug("receive");
262 QDataStream stream( data, IO_ReadOnly ); 262 QDataStream stream( data, IO_ReadOnly );
263 263
264 if (msg == "toggleRecord()") { 264 if (msg == "toggleRecord()") {
265 265
266 if (recording) { 266 if (recording) {
267 fromToggle = TRUE; 267 fromToggle = TRUE;
268 mouseReleaseEvent(NULL); 268 mouseReleaseEvent(NULL);
269 stopRecording(); 269 stopRecording();
270 } else { 270 } else {
271 fromToggle = TRUE; 271 fromToggle = TRUE;
272 // mousePressEvent(NULL); 272 // mousePressEvent(NULL);
273 startRecording(); 273 startRecording();
274 } 274 }
275 } 275 }
276} 276}
277 277
278void VMemo::paintEvent( QPaintEvent* ) { 278void VMemo::paintEvent( QPaintEvent* ) {
279 QPainter p(this); 279 QPainter p(this);
280 p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); 280 p.drawPixmap( 0, 1,( const char** ) vmemo_xpm );
281} 281}
282 282
283void VMemo::mousePressEvent( QMouseEvent * me) { 283void VMemo::mousePressEvent( QMouseEvent * me) {
284 // just to be safe 284 // just to be safe
285 if (recording) { 285 if (recording) {
286 recording = FALSE; 286 recording = FALSE;
287 return; 287 return;
288 } 288 }
289 /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions 289 /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
290 mousePressEvent and mouseReleaseEvent with a NULL parameter. */ 290 mousePressEvent and mouseReleaseEvent with a NULL parameter. */
291 if ( me->button() != LeftButton || me != NULL) 291 if ( me->button() != LeftButton && me != NULL /*&& !systemZaurus*/) {
292
292 // if (!systemZaurus && me != NULL) 293 // if (!systemZaurus && me != NULL)
293 return; 294 return;
295 }
294 296
295 if(!recording) 297 if(!recording)
296 startRecording(); 298 startRecording();
297 else 299 else
298 stopRecording(); 300 stopRecording();
299} 301}
300 302
301void VMemo::mouseReleaseEvent( QMouseEvent * ) { 303void VMemo::mouseReleaseEvent( QMouseEvent * ) {
302// if(usingIcon && !recording) 304// if(usingIcon && !recording)
303// stopRecording(); 305// stopRecording();
304} 306}
305 307
306bool VMemo::startRecording() { 308bool VMemo::startRecording() {
307 309
308 if ( recording) 310 if ( recording)
309 return FALSE; 311 return FALSE;
310 312
311 Config config( "Vmemo" ); 313 Config config( "Vmemo" );
312 config.setGroup( "System" ); 314 config.setGroup( "System" );
313 315
314 useAlerts = config.readBoolEntry("Alert",1); 316 useAlerts = config.readBoolEntry("Alert",1);
315 if(useAlerts) { 317 if(useAlerts) {
316 318
317 msgLabel = new QLabel( 0, "alertLabel" ); 319 msgLabel = new QLabel( 0, "alertLabel" );
318 msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>"); 320 msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
319 msgLabel->show(); 321 msgLabel->show();
320 } 322 }
321 323
322 // if(useAlerts) 324 // if(useAlerts)
323 // QMessageBox::message("VMemo","Really Record?");//) ==1) 325 // QMessageBox::message("VMemo","Really Record?");//) ==1)
324 // return; 326 // return;
325 // } else { 327 // } else {
326 // if (!systemZaurus ) 328 // if (!systemZaurus )
327 // QSound::play(Resource::findSound("vmemob")); 329 // QSound::play(Resource::findSound("vmemob"));
328 // } 330 // }
329 qDebug("Start recording engines"); 331 qDebug("Start recording engines");
330 recording = TRUE; 332 recording = TRUE;
331 333
332 if (openDSP() == -1) { 334 if (openDSP() == -1) {
333 // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort"); 335 // QMessageBox::critical(0, "vmemo", "Could not open dsp device.\n"+errorMsg, "Abort");
334 // delete msgLabel; 336 // delete msgLabel;
335 recording = FALSE; 337 recording = FALSE;
336 msgLabel=0; 338 msgLabel=0;
337 delete msgLabel; 339 delete msgLabel;
338 340
339 return FALSE; 341 return FALSE;
340 } 342 }
341 343
342 config.setGroup("Defaults"); 344 config.setGroup("Defaults");
343 345
344 QDateTime dt = QDateTime::currentDateTime(); 346 QDateTime dt = QDateTime::currentDateTime();
345 347
346 QString fName; 348 QString fName;
347 config.setGroup( "System" ); 349 config.setGroup( "System" );
348 fName = QPEApplication::documentDir() ; 350 fName = QPEApplication::documentDir() ;
349 fileName = config.readEntry("RecLocation", fName); 351 fileName = config.readEntry("RecLocation", fName);
350 352
351 int s; 353 int s;
352 s=fileName.find(':'); 354 s=fileName.find(':');
353 if(s) 355 if(s)
354 fileName=fileName.right(fileName.length()-s-2); 356 fileName=fileName.right(fileName.length()-s-2);
355 qDebug("pathname will be "+fileName); 357 qDebug("pathname will be "+fileName);
356 358
357 if( fileName.left(1).find('/') == -1) 359 if( fileName.left(1).find('/') == -1)