1 files changed, 51 insertions, 60 deletions

diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index d5808b7..8ba1eb7 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -213,10 +213,6 @@ VMemo::VMemo( QWidget *parent, const char *_name )
 
-    odebug << "toggleKey " << toggleKey << "" << oendl;
+    owarn <<"VMemo toggleKey" << toggleKey << oendl;
 
-//     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
-//          systemZaurus=TRUE;
-//     else
-      systemZaurus = FALSE;
+      systemZaurus = false;
 
-//    myChannel = new QCopChannel( "QPE/VMemo", this );
     myChannel = new QCopChannel( "QPE/VMemo", this );
@@ -228,3 +224,4 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     if( toggleKey != -1 ) {
-                odebug << "Register key " << toggleKey << "" << oendl;
+                                owarn << "Register key " << toggleKey << "" << oendl;
+
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
@@ -236,11 +233,9 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     }
-    if(toggleKey == 1)
-        usingIcon = TRUE;
+    if(toggleKey == 0)
+        usingIcon = true;
     else
-        usingIcon = FALSE;
-//     if( vmCfg.readNumEntry("hideIcon",0) == 1)
+        usingIcon = false;
         if (!usingIcon)
                         hide();
-    recording = FALSE;
-    // }
+    recording = false;
 }
@@ -252,3 +247,3 @@ int VMemo::position()
 {
-    return 6;
+    return 1;
 }
@@ -260,6 +255,6 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) {
       if (recording) {
-          fromToggle = TRUE;
+          fromToggle = true;
           stopRecording();
       }  else {
-          fromToggle = TRUE;
+          fromToggle = true;
           startRecording();
@@ -275,14 +270,11 @@ void VMemo::paintEvent( QPaintEvent* ) {
 void VMemo::mousePressEvent( QMouseEvent * /*me*/) {
-  /*  No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
-         mousePressEvent and mouseReleaseEvent with a NULL parameter.  */
-
-//  if (!systemZaurus && me != NULL)
-//        return;
-//    }
 
-  if(!recording)
-       startRecording();
-   else
+                if(!recording) {
+                                if(!startRecording() ){
+                                                QMessageBox::critical(0, "vmemo", "Abort Recording", "Abort Recording");
+                                }
+                }   else {
        stopRecording();
 }
+}
 
@@ -295,16 +287,9 @@ bool VMemo::startRecording() {
 
-  useAlerts = config.readBoolEntry("Alert",1);
-  if(useAlerts) {
-
-    msgLabel = new QLabel( 0, "alertLabel" );
-    msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
-    msgLabel->show();
-  }
 
   odebug << "Start recording engines" << oendl;
-  recording = TRUE;
+  recording = true;
 
   if (openDSP() == -1)  {
-    recording = FALSE;
-    return FALSE;
+                        recording = false;
+                        return false;
   }
@@ -338,2 +323,10 @@ bool VMemo::startRecording() {
   odebug << "filename is " + fileName << oendl;
+
+  useAlerts = config.readBoolEntry("Alert",1);
+  if(useAlerts) {
+    msgLabel = new QLabel( 0, "alertLabel" );
+    msgLabel->setText( tr("<B><P><font size=+2>VMemo-Recording</font></B><p>%1</p>").arg("vm_"+ date));
+    msgLabel->show();
+  }
+        
 // open tmp file here
@@ -349,3 +342,3 @@ bool VMemo::startRecording() {
     ::close(dsp);
-    return FALSE;
+    return false;
   }
@@ -354,3 +347,3 @@ bool VMemo::startRecording() {
   QString cmd;
-  if( fileName.find(".wav",0,TRUE) == -1)
+  if( fileName.find(".wav",0,true) == -1)
       fileName += ".wav";
@@ -373,5 +366,5 @@ bool VMemo::startRecording() {
   l.writeLink();
-  return TRUE;
+  return true;
   } else
-      return FALSE;
+      return false;
 
@@ -382,3 +375,3 @@ void VMemo::stopRecording() {
     odebug << "Stopped recording" << oendl;
-    recording = FALSE;
+    recording = false;
     if(useAlerts) {
@@ -435,3 +428,3 @@ int VMemo::openDSP() {
     perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
-    return -1;
+//    return -1;
   }
@@ -439,3 +432,3 @@ int VMemo::openDSP() {
     perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
-    return -1;
+//    return -1;
   }
@@ -443,3 +436,3 @@ int VMemo::openDSP() {
     perror("ioctl(\"SNDCTL_DSP_SPEED\")");
-    return -1;
+//    return -1;
   }
@@ -447,6 +440,6 @@ int VMemo::openDSP() {
     perror("ioctl(\"SOUND_PCM_READ_RATE\")");
-    return -1;
+//    return -1;
   }
 
-  QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute
+  QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; //mute
 
@@ -508,3 +501,3 @@ bool VMemo::record() {
          if(sRate > 0) {
-                                                t_timer->start( sRate * 1000+1000, TRUE);
+                                t_timer->start( sRate * 1000+1000, true);
                                 }
@@ -530,5 +523,5 @@ bool VMemo::record() {
                                 QMessageBox::message(tr("Note"),tr("error recording"));
-                                recording = FALSE;
+                                                                recording = false;
                                 break;
-                                return FALSE;
+                                                                return false;
                         }
@@ -543,3 +536,3 @@ bool VMemo::record() {
                                 break;
-                                return FALSE;
+                                                                return false;
                         }
@@ -556,5 +549,5 @@ bool VMemo::record() {
                                 QMessageBox::message(tr("Note"),tr("error recording"));
-                                recording = FALSE;
+                                                                recording = false;
                                 break;
-                                return FALSE;
+                                                                return false;
                                                                                                 }
@@ -569,3 +562,3 @@ bool VMemo::record() {
                                         break;
-                                        return FALSE;
+                                                                return false;
                                 }
@@ -575,5 +568,4 @@ bool VMemo::record() {
                         }
-        //                                                                                      odebug << "result is " << result << oendl;
                 }
-                                odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2  << " seconds" << oendl;
+                owarn << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2  << " seconds" << oendl;
 
@@ -588,3 +580,2 @@ bool VMemo::record() {
         track.close();
-        odebug << "Track closed" << oendl;
 
@@ -620,6 +611,6 @@ bool VMemo::record() {
         cfg.setGroup("Volume");
-        QString foo = cfg.readEntry("Mute","TRUE");
-        if(foo.find("TRUE",0,TRUE) != -1)
-                QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
-        return TRUE;
+                QString foo = cfg.readEntry("Mute","true");
+                if(foo.find("true",0,true) != -1)
+                                QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; //mute
+                return true;
 }
@@ -669,3 +660,3 @@ void VMemo::timerBreak() {
 
-//EXPORT_OPIE_APPLET_v1( VMemo )
+EXPORT_OPIE_APPLET_v1( VMemo )