added Portuguese translations from 'covarde_anonimo' on #opie

7 files changed, 108 insertions, 49 deletions

diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro
index dcb606d..d139e58 100644
--- a/core/applets/batteryapplet/batteryapplet.pro
+++ b/core/applets/batteryapplet/batteryapplet.pro
@@ -1,12 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   battery.h batterystatus.h batteryappletimpl.h
         SOURCES=   battery.cpp batterystatus.cpp batteryappletimpl.cpp
         TARGET  = batteryapplet
         DESTDIR         = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts
+TRANSLATIONS  = ../../i18n/pt_BR/libbatteryapplet.ts
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro
index 9832984..f71c787 100644
--- a/core/applets/clipboardapplet/clipboardapplet.pro
+++ b/core/applets/clipboardapplet/clipboardapplet.pro
@@ -1,10 +1,12 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   clipboard.h clipboardappletimpl.h
         SOURCES=   clipboard.cpp clipboardappletimpl.cpp
         TARGET  = clipboardapplet
         DESTDIR         = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
+
+TRANSLATIONS = ../../i18n/pt_BR/libclipboardapplet.ts
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 1392680..0397340 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,12 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   clock.h clockappletimpl.h
         SOURCES=   clock.cpp clockappletimpl.cpp
         TARGET  = clockapplet
         DESTDIR         = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS += ../../i18n/de/libclockapplet.ts
+TRANSLATIONS  = ../../i18n/pt_BR/libclockapplet.ts
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro
index 095cce2..d03bacc 100644
--- a/core/applets/screenshotapplet/screenshotapplet.pro
+++ b/core/applets/screenshotapplet/screenshotapplet.pro
@@ -2,12 +2,13 @@ TEMPLATE  = lib
 CONFIG    += qt warn_on release
 HEADERS =   screenshot.h screenshotappletimpl.h
 SOURCES =   screenshot.cpp screenshotappletimpl.cpp
 TARGET    = screenshotapplet
 DESTDIR   = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
 VERSION   = 1.0.0
 MOC_DIR=opieobj
 OBJECTS_DIR=opieobj
 
+TRANSLATIONS = ../../i18n/pt_BR/libscreenshotapplet.ts
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 48dd193..9d69130 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -4,25 +4,25 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ************************************************************************************/
 
 /*
  * $Id$
  */
-
+// Sun 03-17-2002  L.J.Potter <ljp@llornkcor.com>
 #include <sys/utsname.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/soundcard.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -132,45 +132,40 @@ static char * vmemo_xpm[] = {
 "@cd%e!fg49    ",
 " h0,!_;2@     ",
 "  )))))       "};
 
 VMemo::VMemo( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
   setFixedHeight( 18 );
   setFixedWidth( 14 );
   
   recording = FALSE;
   
-  myChannel = new QCopChannel( "QPE/VMemo", this );
-  connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-                   this, SLOT(receive(const QCString&, const QByteArray&)) );
-  
-  struct utsname name; /* check for embedix kernel running on the zaurus, if 
-                                                  lineo change string, this break
-                                           */
-  if (uname(&name) != -1)
-        {
+  struct utsname name; /* check for embedix kernel running on the zaurus*/
+  if (uname(&name) != -1) {
           QString release=name.release;
           if(release.find("embedix",0,TRUE) !=-1)
                 systemZaurus=TRUE;
-          else
-                {
+      else {
                   systemZaurus=FALSE;
-                  
-                  // Register the REC key press.
-                  QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
-                  e << 4096;
-                  e << QString("QPE/VMemo");
-                  e << QString("toggleRecord()");
+//            myChannel = new QCopChannel( "QPE/VMemo", this );
+//            connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
+//                     this, SLOT(receive(const QCString&, const QByteArray&)) );
+      
+//              // Register the REC key press, for ipaq only
+//            QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
+//            e << 4096;
+//            e << QString("QPE/VMemo");
+//            e << QString("toggleRecord()");
                 }
         }
 }
 
 VMemo::~VMemo()
 {
 }
 
 void VMemo::receive( const QCString &msg, const QByteArray &data )
 {
   QDataStream stream( data, IO_ReadOnly );
   if (msg == "toggleRecord()")
@@ -192,29 +187,29 @@ void VMemo::mousePressEvent( QMouseEvent *me )
 {
   // just to be safe
   if (recording)
         {
           recording = FALSE;
           return;
         }
 
   /* 
          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 (!systemZaurus && me != NULL)
+//        return;
   
   QSound::play(Resource::findSound("vmemob"));
-  
+  qDebug("Start recording");
   recording = TRUE;
   if (openDSP() == -1)
         {
           QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
           recording = FALSE;
           return;
         }
   
   Config vmCfg("VMemo");
   vmCfg.setGroup("Defaults");
   
   QDateTime dt = QDateTime::currentDateTime();
@@ -263,66 +258,58 @@ void VMemo::mousePressEvent( QMouseEvent *me )
 void VMemo::mouseReleaseEvent( QMouseEvent * )
 {
   recording = FALSE;
 }
 
 int VMemo::openDSP()
 {
   Config cfg("Sound");
   cfg.setGroup("Record");
   
   speed = cfg.readNumEntry("SampleRate", 22050);
   channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
-  if (cfg.readNumEntry("SixteenBit", 1)==1)
-        {
+  if (cfg.readNumEntry("SixteenBit", 1)==1)  {
           format = AFMT_S16_LE;
           resolution = 16;
         }
-  else
-        {
-          format = AFMT_U8;
-          resolution = 8;
-        }
+//    else  {
+//      format = AFMT_U8;
+//      resolution = 8;
+//    }
   
-  if(systemZaurus) 
-        {
+  if(systemZaurus) {
           dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
           channels=1; //zaurus has one input channel
-        }
-  else 
+  }  else {
         dsp = open("/dev/dsp", O_RDWR);
+  }
   
-  if(dsp == -1)
-        {
+  if(dsp == -1)  {
       perror("open(\"/dev/dsp\")");
       return -1;
         }
   
-  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)
-        {
+  if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1)  {
           perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
           return -1;
         }
-  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)
-        {
+  if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1)  {
           perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
           return -1;
         }
-  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)
-        {
+  if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1)  {
           perror("ioctl(\"SNDCTL_DSP_SPEED\")");
           return -1;
         }
-  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)
-        {
+  if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1)  {
           perror("ioctl(\"SOUND_PCM_READ_RATE\")");
           return -1;
         }
   
   return 1;
 }
 
 int VMemo::openWAV(const char *filename)
 {
   track.setName(filename);
   if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
           return -1;
@@ -345,38 +332,103 @@ int VMemo::openWAV(const char *filename)
   wh.data_chunk = DATA;
   wh.data_length= 0; 
   //    qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
   //           , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
   write (wav, &wh, sizeof(WaveHeader));
   
   return 1;
 }
 
 void VMemo::record(void)
 {
   int length=0, result, value;
-  char sound[512];
+  qDebug("Recording");
   
-  while(recording)
-        {
+  if(format==AFMT_S16_LE)  {
+    signed short sound[512], monoBuffer[512];
+    while(recording)   {
           result = read(dsp, sound, 512); // 8192
           qApp->processEvents();
-
-          write(wav, sound, result);
-          length += result;
-
+      int j=0;
+       if(systemZaurus) {
+             for (int i = 0; i < result; i++) { //since Z is mono do normally
+               monoBuffer[i] = sound[i];
+             }
+             qApp->processEvents();
+             length+=write(wav, monoBuffer, result);
+         } else { //ipaq /stereo inputs
+            for (int i = 0; i < result; i+=2) {
+                monoBuffer[j] = (sound[i]+sound[i+1])/2;
+                j++;
+            }
           qApp->processEvents();
+            length+=write(wav, monoBuffer, result/2);
+        }
+     printf("%d\r",length);
+     fflush(stdout);
         }
+  }
+  // else { //AFMT_U8 // don't try this yet.. as player doesn't understand
+// 8bit unsigned
+ //       unsigned short sound[512], monoBuffer[512];
+//       while(recording)
+//   {
+//     result = read(dsp, sound, 512); // 8192
+//     qApp->processEvents();
+//     int j=0;
+//       if(systemZaurus) 
+//         {
+//             for (int i = 0; i < result; i++) { //since Z is mono do normally
+//               monoBuffer[i] = sound[i];
+//           }
+//             qApp->processEvents();
+//             length+=write(wav, monoBuffer, result);
+//         } else { //ipaq /stereo inputs
+//             for (int i = 0; i < result; i+=2) {
+//                 monoBuffer[j] = (sound[i]+sound[i+1])/2;
+//                 j++;
+//             }
+//             qApp->processEvents();
+//             length+=write(wav, monoBuffer, result/2);
+//         }
+// //    length += result;
+//     printf("%d\r",length);
+//     fflush(stdout);
+
+//      qApp->processEvents();
+//    }
+//  }
+
+
+  
+//   char sound[512]; //char is 8 bit
+  
+//   while(recording)
+//  {
+//    result = read(dsp, sound, 512); // 8192
+//    qApp->processEvents();
+
+//    write(wav, sound, result);
+//    length += result;
+
+//    qApp->processEvents();
+//  }
+//  qDebug("file has length of %d lasting %d seconds",
+//         length, (( length / speed) / channels) / 2 );
+// medialplayer states wrong length in secs
+  
   
   value = length+36;
   lseek(wav, 4, SEEK_SET);
   write(wav, &value, 4);
   lseek(wav, 40, SEEK_SET);
   write(wav, &length, 4);
   track.close();
   
   if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
         perror("ioctl(\"SNDCTL_DSP_RESET\")");
   ::close(dsp);
+//  if(systemZaurus)
+        QMessageBox::message("Vmemo"," Done recording");
   
   QSound::play(Resource::findSound("vmemoe"));
 }
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro
index bf9af4b..29f99fb 100644
--- a/core/applets/vmemo/vmemo.pro
+++ b/core/applets/vmemo/vmemo.pro
@@ -1,11 +1,12 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   vmemo.h vmemoimpl.h
         SOURCES=   vmemo.cpp vmemoimpl.cpp
         TARGET  = vmemoapplet
         DESTDIR         = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
+TRANSLATIONS = ../../i18n/pt_BR/libvmemoapplet.ts
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro
index fedaed7..c5b764b 100644
--- a/core/applets/volumeapplet/volumeapplet.pro
+++ b/core/applets/volumeapplet/volumeapplet.pro
@@ -1,12 +1,13 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   volume.h volumeappletimpl.h
         SOURCES=   volume.cpp volumeappletimpl.cpp
         TARGET  = volumeapplet
         DESTDIR         = ../../plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts
+TRANSLATIONS  = ../../i18n/pt_BR/libvolumeapplet.ts