90 files changed, 316 insertions, 165 deletions
@@ -38,7 +38,7 @@ APPS=$(LOCALAPPS) addressbook calculator clock datebook \ todo wordgame embeddedkonsole taskbar sysinfo \ parashoot snake citytime showimg netsetup tableviewer \ qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ - noncore/tictac noncore/opieftp + noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers DOCS = docs/src/opie-policy single: mpegplayer/libmpeg3 diff --git a/apps/Applications/addressbook.desktop b/apps/Applications/addressbook.desktop index 3743752..f6ceb52 100644 --- a/apps/Applications/addressbook.desktop +++ b/apps/Applications/addressbook.desktop @@ -4,6 +4,7 @@ Exec=addressbook Icon=AddressBook Type=Application Name=Contacts +Name[pt_BR]=Endereços Name[no]=Adressebok Name[de]=Adressbuch Name[hu]=Címtár diff --git a/apps/Applications/calculator.desktop b/apps/Applications/calculator.desktop index 6d2988b..481c592 100644 --- a/apps/Applications/calculator.desktop +++ b/apps/Applications/calculator.desktop @@ -4,6 +4,7 @@ Exec=calculator Icon=Calculator Type=Application Name=Calculator +Name[pt_BR]=Calculadora Name[no]=Kalkulator Name[de]=Taschen rechner Name[ja]=電卓 diff --git a/apps/Applications/citytime.desktop b/apps/Applications/citytime.desktop index 9699748..e5be56b 100644 --- a/apps/Applications/citytime.desktop +++ b/apps/Applications/citytime.desktop @@ -4,6 +4,7 @@ Exec=citytime Icon=CityTime Type=Application Name=City Time +Name[pt_BR]=Hora Local Name[no]=Verdensur Name[de]=Weltzeituhr Name[ja]=世界時計 diff --git a/apps/Applications/clock.desktop b/apps/Applications/clock.desktop index 401bdb1..03ce794 100644 --- a/apps/Applications/clock.desktop +++ b/apps/Applications/clock.desktop @@ -4,6 +4,7 @@ Exec=clock Icon=Clock Type=Application Name=Clock +Name[pt_BR]=Relgio Name[no]=Klokke Name[de]=Uhr Name[ja]=時計 diff --git a/apps/Applications/datebook.desktop b/apps/Applications/datebook.desktop index ea7d8c1..22a9400 100644 --- a/apps/Applications/datebook.desktop +++ b/apps/Applications/datebook.desktop @@ -4,6 +4,7 @@ Exec=datebook Icon=DateBook Type=Application Name=Calendar +Name[pt_BR]=Calendário Name[no]=Avtalebok Name[de]=Termin kalender Name[hu]=Naptár diff --git a/apps/Applications/filebrowser.desktop b/apps/Applications/filebrowser.desktop index 6681546..20458e0 100644 --- a/apps/Applications/filebrowser.desktop +++ b/apps/Applications/filebrowser.desktop @@ -4,6 +4,7 @@ Exec = filebrowser File = ../apps/Applications/filebrowser Icon = FileBrowser Name = File Manager +Name[pt_BR] = Gerenciador de Arquivos Name[de] = Datei Manager Name[no] = Filviser Type = Application diff --git a/apps/Applications/helpbrowser.desktop b/apps/Applications/helpbrowser.desktop index 86dfb56..c7a9ded 100644 --- a/apps/Applications/helpbrowser.desktop +++ b/apps/Applications/helpbrowser.desktop @@ -4,6 +4,7 @@ Exec=helpbrowser Icon=HelpBrowser Type=Application Name=Help Browser +Name[pt_BR] = Navegador de Ajuda Name[no]=Hjelp Name[de]=Hilfe Name[hu]=Segítség diff --git a/apps/Applications/keypebble.desktop b/apps/Applications/keypebble.desktop index ee1240d..6efd001 100644 --- a/apps/Applications/keypebble.desktop +++ b/apps/Applications/keypebble.desktop @@ -4,3 +4,4 @@ Exec=keypebble Icon=vnc Type=Application Name=VNC Viewer +Name[pt_BR]=Cliente VNC diff --git a/apps/Applications/mpegplayer.desktop b/apps/Applications/mpegplayer.desktop index 2d59a81..6902ae5 100644 --- a/apps/Applications/mpegplayer.desktop +++ b/apps/Applications/mpegplayer.desktop @@ -6,6 +6,7 @@ Type=Application MimeType=audio/mpeg;video/mpeg;audio/x-wav;application/x-shockwave-flash;playlist/plain MimeTypeIcons=SoundPlayer;MPEGPlayer;Sound;Sound;mpegplayer/playlist2 Name=Media Player +Name[pt_BR] = Reprodutor de Mídia Name[no]=MPEGspiller Name[de]=Medienwiedergabe Name[ja]=MPEGプレイヤー diff --git a/apps/Applications/opieftp.desktop b/apps/Applications/opieftp.desktop index 9eae709..9c3f0f7 100644 --- a/apps/Applications/opieftp.desktop +++ b/apps/Applications/opieftp.desktop @@ -4,4 +4,3 @@ Exec=opieftp Icon=opieftp Type=Application Name=OpieFtp - diff --git a/apps/Applications/showimg.desktop b/apps/Applications/showimg.desktop index 66f9a78..b33d682 100644 --- a/apps/Applications/showimg.desktop +++ b/apps/Applications/showimg.desktop @@ -5,5 +5,6 @@ MimeType=image/* Icon=ImageViewer Type=Application Name=Image Viewer +Name[pt_BR]=Visualizador de Imagens Name[de]=Bildbetrachter Name[hu]=Nézõke diff --git a/apps/Applications/spreadsheet.desktop b/apps/Applications/spreadsheet.desktop index 24c3b20..aa7911b 100644 --- a/apps/Applications/spreadsheet.desktop +++ b/apps/Applications/spreadsheet.desktop @@ -5,6 +5,7 @@ Icon=Spreadsheet Type=Application MimeType=application/x-qpe-ss Name=Spreadsheet +Name[pt_BR]=Planilha Name[no]=Regneark Name[de]=Tabellenkalkulation Name[ja]=表計算 diff --git a/apps/Applications/sysinfo.desktop b/apps/Applications/sysinfo.desktop index bb9abb2..234b637 100644 --- a/apps/Applications/sysinfo.desktop +++ b/apps/Applications/sysinfo.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=System Info +Name[pt_BR]=Informações do Sistema Name[no]=Systeminfo Name[de]=System information Exec=sysinfo diff --git a/apps/Applications/tableviewer.desktop b/apps/Applications/tableviewer.desktop index 40d6d45..3686397 100644 --- a/apps/Applications/tableviewer.desktop +++ b/apps/Applications/tableviewer.desktop @@ -3,4 +3,5 @@ Comment=A table/database viewer Exec=tableviewer Type=Application Name=Table Viewer +Name[pt_BR]=Visualizador de Tabelas Name[hu]=Adatbázis nézõ diff --git a/apps/Applications/textedit.desktop b/apps/Applications/textedit.desktop index 241231f..73b07ed 100644 --- a/apps/Applications/textedit.desktop +++ b/apps/Applications/textedit.desktop @@ -5,6 +5,7 @@ Icon=TextEditor Type=Application MimeType=text/* Name=Text Editor +Name[pt_BR]=Editor de Textos Name[no]=Teksteditor Name[de]=Texteditor Name[ja]=テキストエディタ diff --git a/apps/Applications/today.desktop b/apps/Applications/today.desktop index d51ddea..d8ae596 100644 --- a/apps/Applications/today.desktop +++ b/apps/Applications/today.desktop @@ -4,3 +4,4 @@ Exec=today Icon=today_icon Type=Application Name=Today +Name[pt_BR]=Hoje diff --git a/apps/Applications/todo.desktop b/apps/Applications/todo.desktop index bc0462d..c77472a 100644 --- a/apps/Applications/todo.desktop +++ b/apps/Applications/todo.desktop @@ -4,6 +4,7 @@ Exec=todolist Icon=TodoList Type=Application Name=Todo List +Name[pt_BR]=Afazeres Name[no]=Oppgaveliste Name[de]=Aufgabenliste Name[hu]=Feladatok diff --git a/apps/Games/kcheckers.desktop b/apps/Games/kcheckers.desktop index 4515b3a..1e4b8f8 100644 --- a/apps/Games/kcheckers.desktop +++ b/apps/Games/kcheckers.desktop @@ -4,3 +4,4 @@ Exec=kcheckers Icon=KCheckers Type=Application Name=KCheckers +Name[pt_BR]=Damas diff --git a/apps/Games/minesweep.desktop b/apps/Games/minesweep.desktop index 2b38456..a1c881a 100644 --- a/apps/Games/minesweep.desktop +++ b/apps/Games/minesweep.desktop @@ -4,6 +4,7 @@ Exec=minesweep Icon=MineHunt Type=Application Name=Mine Hunt +Name[pt_BR]=Caca-Minas Name[no]=Minesøk Name[de]=Minenjagd Name[ja]=マインスィープ diff --git a/apps/Games/patience.desktop b/apps/Games/patience.desktop index 4af08b0..a277705 100644 --- a/apps/Games/patience.desktop +++ b/apps/Games/patience.desktop @@ -4,6 +4,7 @@ Exec=patience Icon=Solitaire Type=Application Name=Patience +Name[pt_BR]=Paciencia Name[no]=Kabal Name[de]=Patience Name[ja]=ソリティア diff --git a/apps/Games/snake.desktop b/apps/Games/snake.desktop index 5373a62..bd21fb5 100644 --- a/apps/Games/snake.desktop +++ b/apps/Games/snake.desktop @@ -4,6 +4,7 @@ Exec=snake Icon=Snake Type=Application Name=Snake +Name[pt_BR]=Cobra Name[no]=Slange Name[de]=Schlange Name[hu]=Kígyó diff --git a/apps/Games/tictac.desktop b/apps/Games/tictac.desktop index cef9c75..e2ee7af 100644 --- a/apps/Games/tictac.desktop +++ b/apps/Games/tictac.desktop @@ -3,3 +3,4 @@ Exec=tictac Icon=Tictac Type=Application Name=Tictac +Name[pt_BR]=Jogo da Velha diff --git a/apps/Games/wordgame.desktop b/apps/Games/wordgame.desktop index c48a70f..2474a5f 100644 --- a/apps/Games/wordgame.desktop +++ b/apps/Games/wordgame.desktop @@ -4,6 +4,7 @@ Exec=wordgame Icon=WordGame Type=Application Name=Word Game +Name[pt_BR]=Palavras Cruzadas Name[no]=Kryss-Ord Name[de]=Wortspiel Name[hu]=Szójáték diff --git a/apps/Settings/.directory b/apps/Settings/.directory index c51f0d6..99d7710 100644 --- a/apps/Settings/.directory +++ b/apps/Settings/.directory @@ -4,3 +4,4 @@ Name[no]=Innstillinger Name[de]=Einstellungen Icon=SettingsIcon Name[hu]=Beállítások +Name[pt_BR]=Configuraoes diff --git a/apps/Settings/Appearance.desktop b/apps/Settings/Appearance.desktop index 3588d75..08cbdfe 100644 --- a/apps/Settings/Appearance.desktop +++ b/apps/Settings/Appearance.desktop @@ -3,6 +3,7 @@ Type=Application Exec=appearance Icon=Appearance Name=Appearance +Name[pt_BR]=Aparencia Name[no]=Utseende Name[de]=Erscheinungsbild Name[hu]=Megjelenés diff --git a/apps/Settings/Calibrate.desktop b/apps/Settings/Calibrate.desktop index bf1f36f..ccf5436 100644 --- a/apps/Settings/Calibrate.desktop +++ b/apps/Settings/Calibrate.desktop @@ -3,6 +3,7 @@ Type=Application Exec=calibrate Icon=Calibrate Name=Recalibrate +Name[pt_BR]=Recalibrar Name[de]=Kalibrieren Name[no]=Kalibrer Name[hu]=Kalibráció diff --git a/apps/Settings/Language.desktop b/apps/Settings/Language.desktop index c84c157..41a226e 100644 --- a/apps/Settings/Language.desktop +++ b/apps/Settings/Language.desktop @@ -3,6 +3,7 @@ Type=Application Exec=language Icon=Language Name=Language +Name[pt_BR]=Linguagem Name[no]=Språk Name[de]=Sprache Name[hu]=Nyelv diff --git a/apps/Settings/Light.desktop b/apps/Settings/Light.desktop index b6e8231..1b63f54 100644 --- a/apps/Settings/Light.desktop +++ b/apps/Settings/Light.desktop @@ -3,6 +3,7 @@ Type=Application Exec=light-and-power Icon=Light Name=Light & Power +Name[pt_BR]=Iluminacao e Energia Name[no]=Lys Name[de]=Helligkeit Name[hu]=Fényerõ diff --git a/apps/Settings/Rotation.desktop b/apps/Settings/Rotation.desktop index f91b926..75143bc 100644 --- a/apps/Settings/Rotation.desktop +++ b/apps/Settings/Rotation.desktop @@ -3,6 +3,7 @@ Type=Application Exec=rotation Icon=Rotation Name=Rotation +Name[pt_BR]=Rotao Name[no]=Rotasjon Name[de]=Rotation Name[hu]=Forgatás diff --git a/apps/Settings/Security.desktop b/apps/Settings/Security.desktop index 213c073..dc9bec8 100644 --- a/apps/Settings/Security.desktop +++ b/apps/Settings/Security.desktop @@ -3,4 +3,5 @@ Type=Application Exec=security Icon=Security Name=Security -Name[de]=Sicherheits einstellungen
\ No newline at end of file +Name[de]=Sicherheits einstellungen +Name[pt_BR]=Seguranca diff --git a/apps/Settings/Sound.desktop b/apps/Settings/Sound.desktop index 951f8d4..5791308 100644 --- a/apps/Settings/Sound.desktop +++ b/apps/Settings/Sound.desktop @@ -3,3 +3,4 @@ Type=Application Exec=sound Icon=Sound Name=Sound +Name[pt_BR]=Som diff --git a/apps/Settings/datetime.desktop b/apps/Settings/datetime.desktop index 8888f7f..711cfdb 100644 --- a/apps/Settings/datetime.desktop +++ b/apps/Settings/datetime.desktop @@ -4,6 +4,7 @@ Exec=systemtime Icon=DateTime Type=Application Name=Date/Time +Name[pt_BR]=Data/Hora Name[no]=Dato/Tid Name[de]=Datum/Zeit Name[hu]=Dátum/Idõ diff --git a/apps/Settings/netsetup.desktop b/apps/Settings/netsetup.desktop index b622a15..123117b 100644 --- a/apps/Settings/netsetup.desktop +++ b/apps/Settings/netsetup.desktop @@ -3,4 +3,5 @@ Exec=netsetup Icon=PPPConnect Type=Application Name=Network -Name[de]=Netzwerk
\ No newline at end of file +Name[pt_BR]=Rede +Name[de]=Netzwerk diff --git a/apps/Settings/qipkg.desktop b/apps/Settings/qipkg.desktop index 6ef2202..dda5ce7 100644 --- a/apps/Settings/qipkg.desktop +++ b/apps/Settings/qipkg.desktop @@ -4,5 +4,6 @@ Exec=qipkg MimeType=application/ipkg Icon=Ipkg Name=Add/Remove Software +Name[pt_BR]=Adicionar/Remover Software Name[hu]=Csomag- kezelõ -Name[de]=Software
\ No newline at end of file +Name[de]=Software diff --git a/apps/Settings/quit.desktop b/apps/Settings/quit.desktop index dbc7220..a25fb0b 100644 --- a/apps/Settings/quit.desktop +++ b/apps/Settings/quit.desktop @@ -3,6 +3,7 @@ Type=Application Exec=shutdown Icon=Shutdown Name=Shutdown +Name[pt_BR]=Desligar Name[no]=Skru av Name[de]=Beenden Name[hu]=Leállítás diff --git a/apps/__9quit.desktop b/apps/__9quit.desktop index ed024b0..856097d 100644 --- a/apps/__9quit.desktop +++ b/apps/__9quit.desktop @@ -3,3 +3,4 @@ Type=Application Exec=suspend Icon=Shutdown Name=Suspend +Name[pt_BR]=Suspender 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 @@ -10,3 +10,4 @@ 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 @@ -8,3 +8,5 @@ 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 @@ -10,3 +10,4 @@ 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 @@ -11,3 +11,4 @@ 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 @@ -13,7 +13,7 @@ /* * $Id$ */ - +// Sun 03-17-2002 L.J.Potter <ljp@llornkcor.com> #include <sys/utsname.h> #include <sys/time.h> #include <sys/types.h> @@ -141,29 +141,24 @@ VMemo::VMemo( QWidget *parent, const char *name ) 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) - { - QString release=name.release; - if(release.find("embedix",0,TRUE) !=-1) - systemZaurus=TRUE; - 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()"); - } - } + 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 { + systemZaurus=FALSE; +// 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() @@ -174,12 +169,12 @@ void VMemo::receive( const QCString &msg, const QByteArray &data ) { QDataStream stream( data, IO_ReadOnly ); if (msg == "toggleRecord()") - { - if (recording) - mouseReleaseEvent(NULL); - else - mousePressEvent(NULL); - } + { + if (recording) + mouseReleaseEvent(NULL); + else + mousePressEvent(NULL); + } } void VMemo::paintEvent( QPaintEvent* ) @@ -192,27 +187,27 @@ void VMemo::mousePressEvent( QMouseEvent *me ) { // just to be safe if (recording) - { - recording = FALSE; - return; - } + { + 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. + 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; - } + { + QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); + recording = FALSE; + return; + } Config vmCfg("VMemo"); vmCfg.setGroup("Defaults"); @@ -221,9 +216,9 @@ void VMemo::mousePressEvent( QMouseEvent *me ) QString fileName; if(systemZaurus) - fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs + fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs else - fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); + fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); fileName += "vm_"; fileName += dt.toString(); @@ -236,14 +231,14 @@ void VMemo::mousePressEvent( QMouseEvent *me ) fileName.replace(QRegExp(","),""); if(openWAV(fileName.latin1()) == -1) - { - QString err("Could not open the output file: "); - err += fileName; + { + QString err("Could not open the output file: "); + err += fileName; - QMessageBox::critical(0, "VMemo", err, "Abort"); - close(dsp); - return; - } + QMessageBox::critical(0, "VMemo", err, "Abort"); + close(dsp); + return; + } QArray<int> cats(1); cats[0] = vmCfg.readNumEntry("Category", 0); @@ -272,51 +267,43 @@ int VMemo::openDSP() speed = cfg.readNumEntry("SampleRate", 22050); channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) - if (cfg.readNumEntry("SixteenBit", 1)==1) - { - format = AFMT_S16_LE; - resolution = 16; - } - else - { - format = AFMT_U8; - resolution = 8; - } + if (cfg.readNumEntry("SixteenBit", 1)==1) { + format = AFMT_S16_LE; + resolution = 16; + } +// else { +// format = AFMT_U8; +// resolution = 8; +// } - if(systemZaurus) - { - dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 - channels=1; //zaurus has one input channel - } - else - dsp = open("/dev/dsp", O_RDWR); + if(systemZaurus) { + dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 + channels=1; //zaurus has one input channel + } 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) - { - perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); - return -1; - } - if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) - { - perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); - return -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) - { - perror("ioctl(\"SOUND_PCM_READ_RATE\")"); - return -1; - } + if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { + perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); + return -1; + } + if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { + perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); + return -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) { + perror("ioctl(\"SOUND_PCM_READ_RATE\")"); + return -1; + } return 1; } @@ -324,8 +311,8 @@ int VMemo::openDSP() int VMemo::openWAV(const char *filename) { track.setName(filename); - if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) - return -1; + if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) + return -1; wav=track.handle(); @@ -354,18 +341,81 @@ int VMemo::openWAV(const char *filename) void VMemo::record(void) { int length=0, result, value; - char sound[512]; + qDebug("Recording"); + + if(format==AFMT_S16_LE) { + signed 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); + } + 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(); +// } +// } + + - while(recording) - { - result = read(dsp, sound, 512); // 8192 - 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; +// write(wav, sound, result); +// length += result; - qApp->processEvents(); - } +// 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); @@ -375,8 +425,10 @@ void VMemo::record(void) track.close(); if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) - perror("ioctl(\"SNDCTL_DSP_RESET\")"); + 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 @@ -9,3 +9,4 @@ 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 @@ -10,3 +10,4 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts +TRANSLATIONS = ../../i18n/pt_BR/libvolumeapplet.ts diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index f4e1f2d..b5e72ba 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro @@ -34,3 +34,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe REQUIRES = embeddedkonsole +TRANSLATIONS = ../i18n/pt_BR/embeddedkonsole.ts diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index f6ede8b..05b196f 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro @@ -10,3 +10,4 @@ LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/helpbrowser.ts +TRANSLATIONS = ../i18n/pt_BR/helpbrowser.ts diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index f019bf7..1301aed 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on release DESTDIR = $(OPIEDIR)/bin HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h -SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp +SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include @@ -12,3 +12,4 @@ LIBS += -lqpe TARGET = textedit TRANSLATIONS = ../i18n/de/textedit.ts +TRANSLATIONS = ../i18n/pt_BR/textedit.ts diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index 32cb95f..39df594 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro @@ -25,24 +25,24 @@ HEADERS = background.h \ qcopbridge.h \ packageslave.h \ irserver.h \ - $(OPIEDIR)/rsync/buf.h \ - $(OPIEDIR)/rsync/checksum.h \ - $(OPIEDIR)/rsync/command.h \ - $(OPIEDIR)/rsync/emit.h \ - $(OPIEDIR)/rsync/job.h \ - $(OPIEDIR)/rsync/netint.h \ - $(OPIEDIR)/rsync/protocol.h \ - $(OPIEDIR)/rsync/prototab.h \ - $(OPIEDIR)/rsync/rsync.h \ - $(OPIEDIR)/rsync/search.h \ - $(OPIEDIR)/rsync/stream.h \ - $(OPIEDIR)/rsync/sumset.h \ - $(OPIEDIR)/rsync/trace.h \ - $(OPIEDIR)/rsync/types.h \ - $(OPIEDIR)/rsync/util.h \ - $(OPIEDIR)/rsync/whole.h \ - $(OPIEDIR)/rsync/config_rsync.h \ - $(OPIEDIR)/rsync/qrsync.h + /skiff/opie/rsync/buf.h \ + /skiff/opie/rsync/checksum.h \ + /skiff/opie/rsync/command.h \ + /skiff/opie/rsync/emit.h \ + /skiff/opie/rsync/job.h \ + /skiff/opie/rsync/netint.h \ + /skiff/opie/rsync/protocol.h \ + /skiff/opie/rsync/prototab.h \ + /skiff/opie/rsync/rsync.h \ + /skiff/opie/rsync/search.h \ + /skiff/opie/rsync/stream.h \ + /skiff/opie/rsync/sumset.h \ + /skiff/opie/rsync/trace.h \ + /skiff/opie/rsync/types.h \ + /skiff/opie/rsync/util.h \ + /skiff/opie/rsync/whole.h \ + /skiff/opie/rsync/config_rsync.h \ + /skiff/opie/rsync/qrsync.h # quicklauncher.h \ SOURCES = background.cpp \ @@ -60,39 +60,39 @@ SOURCES = background.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(OPIEDIR)/calibrate/calibrate.cpp \ + /skiff/opie/calibrate/calibrate.cpp \ transferserver.cpp \ packageslave.cpp \ irserver.cpp \ qcopbridge.cpp \ startmenu.cpp \ main.cpp \ - $(OPIEDIR)/rsync/base64.c \ - $(OPIEDIR)/rsync/buf.c \ - $(OPIEDIR)/rsync/checksum.c \ - $(OPIEDIR)/rsync/command.c \ - $(OPIEDIR)/rsync/delta.c \ - $(OPIEDIR)/rsync/emit.c \ - $(OPIEDIR)/rsync/hex.c \ - $(OPIEDIR)/rsync/job.c \ - $(OPIEDIR)/rsync/mdfour.c \ - $(OPIEDIR)/rsync/mksum.c \ - $(OPIEDIR)/rsync/msg.c \ - $(OPIEDIR)/rsync/netint.c \ - $(OPIEDIR)/rsync/patch.c \ - $(OPIEDIR)/rsync/prototab.c \ - $(OPIEDIR)/rsync/readsums.c \ - $(OPIEDIR)/rsync/scoop.c \ - $(OPIEDIR)/rsync/search.c \ - $(OPIEDIR)/rsync/stats.c \ - $(OPIEDIR)/rsync/stream.c \ - $(OPIEDIR)/rsync/sumset.c \ - $(OPIEDIR)/rsync/trace.c \ - $(OPIEDIR)/rsync/tube.c \ - $(OPIEDIR)/rsync/util.c \ - $(OPIEDIR)/rsync/version.c \ - $(OPIEDIR)/rsync/whole.c \ - $(OPIEDIR)/rsync/qrsync.cpp + /skiff/opie/rsync/base64.c \ + /skiff/opie/rsync/buf.c \ + /skiff/opie/rsync/checksum.c \ + /skiff/opie/rsync/command.c \ + /skiff/opie/rsync/delta.c \ + /skiff/opie/rsync/emit.c \ + /skiff/opie/rsync/hex.c \ + /skiff/opie/rsync/job.c \ + /skiff/opie/rsync/mdfour.c \ + /skiff/opie/rsync/mksum.c \ + /skiff/opie/rsync/msg.c \ + /skiff/opie/rsync/netint.c \ + /skiff/opie/rsync/patch.c \ + /skiff/opie/rsync/prototab.c \ + /skiff/opie/rsync/readsums.c \ + /skiff/opie/rsync/scoop.c \ + /skiff/opie/rsync/search.c \ + /skiff/opie/rsync/stats.c \ + /skiff/opie/rsync/stream.c \ + /skiff/opie/rsync/sumset.c \ + /skiff/opie/rsync/trace.c \ + /skiff/opie/rsync/tube.c \ + /skiff/opie/rsync/util.c \ + /skiff/opie/rsync/version.c \ + /skiff/opie/rsync/whole.c \ + /skiff/opie/rsync/qrsync.cpp INTERFACES = shutdown.ui syncdialog.ui @@ -110,3 +110,4 @@ TARGET = qpe LIBS += -lqpe -lcrypt TRANSLATIONS = ../i18n/de/qpe.ts +TRANSLATIONS = ../i18n/pt_BR/qpe.ts diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index 06e19e4..6b75d1f 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro @@ -10,3 +10,5 @@ INCLUDEPATH += $(OPIEDIR)/include .. DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lm VERSION = 1.0.0 + +TRANSLATIONS = ../../i18n/pt_BR/libmadplugin.ts diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro index 5bea541..58cb34b 100644 --- a/core/multimedia/opieplayer/mpegplayer.pro +++ b/core/multimedia/opieplayer/mpegplayer.pro @@ -23,3 +23,4 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include TRANSLATIONS = ../i18n/de/mpegplayer.ts +TRANSLATIONS = ../i18n/pt_BR/mpegplayer.ts diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro index 32e21a2..e1ab94a 100644 --- a/core/pim/addressbook/addressbook.pro +++ b/core/pim/addressbook/addressbook.pro @@ -20,3 +20,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/addressbook.ts +TRANSLATIONS = ../i18n/pt_BR/addressbook.ts diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index bbe07af..416bae0 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro @@ -40,3 +40,4 @@ LIBS += -lqpe TARGET = datebook TRANSLATIONS = ../i18n/de/datebook.ts +TRANSLATIONS = ../i18n/pt_BR/datebook.ts diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 454b3ff..e61480c 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro @@ -10,3 +10,4 @@ LIBS += -lqpe INTERFACES = TARGET = today DESTDIR = $(OPIEDIR)/bin +TRANSLATIONS = ../i18n/pt_BR/today.ts diff --git a/core/pim/todo/todo.pro b/core/pim/todo/todo.pro index 5eb02a2..1cdf795 100644 --- a/core/pim/todo/todo.pro +++ b/core/pim/todo/todo.pro @@ -17,3 +17,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/todolist.ts +TRANSLATIONS = ../i18n/pt_BR/todolist.ts diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro index 3420499..01dc6c9 100644 --- a/core/settings/citytime/citytime.pro +++ b/core/settings/citytime/citytime.pro @@ -11,3 +11,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/citytime.ts +TRANSLATIONS = ../i18n/pt_BR/citytime.ts diff --git a/core/settings/light-and-power/light-and-power.pro b/core/settings/light-and-power/light-and-power.pro index 35b51a7..0465bfb 100644 --- a/core/settings/light-and-power/light-and-power.pro +++ b/core/settings/light-and-power/light-and-power.pro @@ -10,3 +10,4 @@ LIBS += -lqpe TARGET = light-and-power TRANSLATIONS = ../../i18n/de/light-and-power.ts +TRANSLATIONS = ../../i18n/pt_BR/light-and-power.ts diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index f22e7a6..b67fe6d 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro @@ -10,3 +10,4 @@ LIBS += -lqpe TARGET = security TRANSLATIONS = ../../i18n/de/security.ts +TRANSLATIONS = ../../i18n/pt_BR/security.ts diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro index 8d95dcb..9b4f9f5 100644 --- a/inputmethods/dvorak/dvorak.pro +++ b/inputmethods/dvorak/dvorak.pro @@ -16,3 +16,5 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqdvorak.ts +TRANSLATIONS = ../../i18n/pt_BR/libqdvorak.ts + diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro index 9bccbb9..e7705d9 100644 --- a/inputmethods/handwriting/handwriting.pro +++ b/inputmethods/handwriting/handwriting.pro @@ -31,3 +31,5 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqhandwriting.ts +TRANSLATIONS = ../../i18n/pt_BR/libqhandwriting.ts + diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 6e9df79..eb653a7 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro @@ -16,3 +16,5 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqkeyboard.ts +TRANSLATIONS = ../../i18n/pt_BR/libqkeyboard.ts + diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro index ad86370..f57016a 100644 --- a/inputmethods/pickboard/pickboard.pro +++ b/inputmethods/pickboard/pickboard.pro @@ -10,3 +10,4 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqpickboard.ts +TRANSLATIONS = ../../i18n/pt_BR/libqpickboard.ts diff --git a/inputmethods/unikeyboard/unikeyboard.pro b/inputmethods/unikeyboard/unikeyboard.pro index 509db07..bea1ce3 100644 --- a/inputmethods/unikeyboard/unikeyboard.pro +++ b/inputmethods/unikeyboard/unikeyboard.pro @@ -10,3 +10,4 @@ LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts +TRANSLATIONS = ../../i18n/pt_BR/libqunikeyboard.ts diff --git a/library/library.pro b/library/library.pro index e71e5a0..4352e6a 100644 --- a/library/library.pro +++ b/library/library.pro @@ -128,3 +128,4 @@ DESTDIR = $(QTDIR)/lib$(PROJMAK) VERSION = 1.5.0 TRANSLATIONS = ../i18n/de/libqpe.ts +TRANSLATIONS = ../i18n/pt_BR/libqpe.ts diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro index c9d068e..943e3d4 100644 --- a/noncore/apps/tableviewer/tableviewer.pro +++ b/noncore/apps/tableviewer/tableviewer.pro @@ -34,3 +34,5 @@ TARGET = tableviewer INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe + +TRANSLATIONS = ../i18n/pt_BR/tableviewer.ts diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro index c0efc4f..cc6c6e9 100644 --- a/noncore/comm/keypebble/keypebble.pro +++ b/noncore/comm/keypebble/keypebble.pro @@ -36,3 +36,4 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe +TRANSLATIONS = ../i18n/pt_BR/keypebble.ts diff --git a/noncore/games/chess/chess.pro b/noncore/games/chess/chess.pro index 9053809..b246767 100644 --- a/noncore/games/chess/chess.pro +++ b/noncore/games/chess/chess.pro @@ -12,3 +12,5 @@ LIBS += -lqpe DBFILE = chess.db LANGUAGE = C++ CPP_ALWAYS_CREATE_SOURCE = TRUE + +TRANSLATIONS = ../i18n/pt_BR/chess.ts diff --git a/noncore/games/fifteen/fifteen.pro b/noncore/games/fifteen/fifteen.pro index 92072ab..5dfe519 100644 --- a/noncore/games/fifteen/fifteen.pro +++ b/noncore/games/fifteen/fifteen.pro @@ -8,3 +8,5 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = fifteen + +TRANSLATIONS = ../i18n/pt_BR/fifteen.ts diff --git a/noncore/games/go/go.pro b/noncore/games/go/go.pro index b39b5b4..cba2400 100644 --- a/noncore/games/go/go.pro +++ b/noncore/games/go/go.pro @@ -16,4 +16,6 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TARGET = go -TRANSLATIONS = ../i18n/de/go.ts
\ No newline at end of file +TRANSLATIONS = ../i18n/de/go.ts +TRANSLATIONS = ../i18n/pt_BR/go.ts + diff --git a/noncore/games/kcheckers/kcheckers.pro b/noncore/games/kcheckers/kcheckers.pro index 6ed8c1c..fbc12d4 100644 --- a/noncore/games/kcheckers/kcheckers.pro +++ b/noncore/games/kcheckers/kcheckers.pro @@ -17,3 +17,5 @@ INCLUDEPATH += . \ LIBS += -lqpe DESTDIR = $(OPIEDIR)/bin TARGET = kcheckers + +TRANSLATIONS = ../../i18n/pt_BR/kcheckers.ts diff --git a/noncore/games/mindbreaker/mindbreaker.pro b/noncore/games/mindbreaker/mindbreaker.pro index fa7dc0c..95c4b98 100644 --- a/noncore/games/mindbreaker/mindbreaker.pro +++ b/noncore/games/mindbreaker/mindbreaker.pro @@ -10,3 +10,5 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/mindbreaker.ts +TRANSLATIONS = ../i18n/pt_BR/mindbreaker.ts + diff --git a/noncore/games/minesweep/minesweep.pro b/noncore/games/minesweep/minesweep.pro index 85f626a..8a34551 100644 --- a/noncore/games/minesweep/minesweep.pro +++ b/noncore/games/minesweep/minesweep.pro @@ -12,3 +12,4 @@ LIBS += -lqpe INTERFACES = TRANSLATIONS = ../i18n/de/minesweep.ts +TRANSLATIONS = ../i18n/pt_BR/minesweep.ts diff --git a/noncore/games/parashoot/parashoot.pro b/noncore/games/parashoot/parashoot.pro index a7a01b2..ad77985 100644 --- a/noncore/games/parashoot/parashoot.pro +++ b/noncore/games/parashoot/parashoot.pro @@ -9,3 +9,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/parashoot.ts +TRANSLATIONS = ../i18n/pt_BR/parashoot.ts diff --git a/noncore/games/qasteroids/qasteroids.pro b/noncore/games/qasteroids/qasteroids.pro index 2f5b2e4..3f91cdb 100644 --- a/noncore/games/qasteroids/qasteroids.pro +++ b/noncore/games/qasteroids/qasteroids.pro @@ -9,3 +9,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/qasteroids.ts +TRANSLATIONS = ../i18n/pt_BR/qasteroids.ts diff --git a/noncore/games/snake/snake.pro b/noncore/games/snake/snake.pro index 38b4023..dcbf1ee 100644 --- a/noncore/games/snake/snake.pro +++ b/noncore/games/snake/snake.pro @@ -9,3 +9,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/snake.ts +TRANSLATIONS = ../i18n/pt_BR/snake.ts diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro index 1c90c94..698c607 100755 --- a/noncore/games/solitaire/solitaire.pro +++ b/noncore/games/solitaire/solitaire.pro @@ -16,3 +16,4 @@ LIBS += -lqpe REQUIRES = patience TRANSLATIONS = ../i18n/de/patience.ts +TRANSLATIONS = ../i18n/pt_BR/patience.ts diff --git a/noncore/games/tetrix/tetrix.pro b/noncore/games/tetrix/tetrix.pro index 533fab0..9079bc4 100644 --- a/noncore/games/tetrix/tetrix.pro +++ b/noncore/games/tetrix/tetrix.pro @@ -15,3 +15,5 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe INTERFACES = + +TRANSLATIONS = ../i18n/pt_BR/tetrix.ts diff --git a/noncore/games/tictac/tictac.pro b/noncore/games/tictac/tictac.pro index cb65b00..c82e1ca 100644 --- a/noncore/games/tictac/tictac.pro +++ b/noncore/games/tictac/tictac.pro @@ -9,3 +9,5 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe DESTDIR = $(OPIEDIR)/bin + +TRANSLATIONS = ../../i18n/pt_BR/tictac.ts diff --git a/noncore/games/wordgame/wordgame.pro b/noncore/games/wordgame/wordgame.pro index 64f4832..7ae06ad 100644 --- a/noncore/games/wordgame/wordgame.pro +++ b/noncore/games/wordgame/wordgame.pro @@ -11,3 +11,4 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe TRANSLATIONS = ../i18n/de/wordgame.ts +TRANSLATIONS = ../i18n/pt_BR/wordgame.ts diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/multimedia/showimg/showimg.pro index 29da458..f98e0fc 100644 --- a/noncore/multimedia/showimg/showimg.pro +++ b/noncore/multimedia/showimg/showimg.pro @@ -17,3 +17,4 @@ LIBS += -lqpe REQUIRES = showimg TRANSLATIONS = ../i18n/de/showimg.ts +TRANSLATIONS = ../i18n/pt_BR/showimg.ts diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index a3b29a1..814d706 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -487,7 +487,7 @@ void OpieFtp::populateLocalView() } if(fileL !="./") { item = new QListViewItem( Local_View,fileL,fileS, fileDate); - if(isDir) + if(isDir || fileL.find("/",0,TRUE) != -1) item->setPixmap( 0, Resource::loadPixmap( "folder" )); else item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); @@ -527,7 +527,7 @@ bool OpieFtp::populateRemoteView( ) fileDate = fileDate.stripWhiteSpace(); if(fileL.find("total",0,TRUE) == -1) { QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate); - if(s.left(1) == "d") { + if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) { item->setPixmap( 0, Resource::loadPixmap( "folder" )); if(itemDir) item->moveItem(itemDir); @@ -695,8 +695,8 @@ void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &p void OpieFtp::showRemoteMenu(QListViewItem * item) { QPopupMenu m;// = new QPopupMenu( Local_View ); - if(item->text(0).right(1) == "/") - m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); + if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE)) + m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); else m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); @@ -711,7 +711,7 @@ void OpieFtp::showLocalMenu(QListViewItem * item) QPopupMenu m; m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); m.insertSeparator(); - if(item->text(0).right(1) == "/") + if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE)) m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); else m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro index b4d0b4c..f485cdf 100644 --- a/noncore/net/opieftp/opieftp.pro +++ b/noncore/net/opieftp/opieftp.pro @@ -9,3 +9,4 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe +TRANSLATIONS = ../../i18n/pt_BR/opieftp.ts diff --git a/noncore/settings/language/language.pro b/noncore/settings/language/language.pro index c01ffc8..a1d54f8 100644 --- a/noncore/settings/language/language.pro +++ b/noncore/settings/language/language.pro @@ -10,3 +10,4 @@ LIBS += -lqpe TARGET = language TRANSLATIONS = ../../i18n/de/language.ts +TRANSLATIONS = ../../i18n/pt_BR/language.ts diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 44eff44..8b33ff2 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -8,3 +8,5 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound + +TRANSLATIONS = ../../i18n/pt_BR/sound.ts diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index c2bf405..55f6c99 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -47,8 +47,8 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) else if(rate==44100) sampleRate->setCurrentItem(2); - stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); - sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); + stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); + sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1)); connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index f14716e..95278ee 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro @@ -27,3 +27,4 @@ LIBS += -lqpe TARGET = sysinfo TRANSLATIONS = ../i18n/de/sysinfo.ts +TRANSLATIONS = ../i18n/pt_BR/sysinfo.ts diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro index 00e13b7..260c75d 100644 --- a/noncore/tools/calc2/calc.pro +++ b/noncore/tools/calc2/calc.pro @@ -9,3 +9,4 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -Wl,-export-dynamic +TRANSLATIONS = ../i18n/pt_BR/calc.ts diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index 9554d2a..b5d37e1 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro @@ -11,3 +11,4 @@ INTERFACES = calculator.ui TARGET = calculator TRANSLATIONS = ../i18n/de/calculator.ts +TRANSLATIONS = ../i18n/pt_BR/calculator.ts diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 10d375f..cf64517 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -11,3 +11,4 @@ INTERFACES = TARGET = clock TRANSLATIONS = ../i18n/de/clock.ts +TRANSLATIONS = ../i18n/pt_BR/clock.ts diff --git a/noncore/unsupported/filebrowser/filebrowser.pro b/noncore/unsupported/filebrowser/filebrowser.pro index 65e51a5..e9d2b49 100644 --- a/noncore/unsupported/filebrowser/filebrowser.pro +++ b/noncore/unsupported/filebrowser/filebrowser.pro @@ -6,4 +6,6 @@ SOURCES = filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -INTERFACES = +INTERFACES = +TRANSLATIONS = ../i18n/de/filebrowser.ts +TRANSLATIONS = ../i18n/pt_BR/filebrowser.ts diff --git a/noncore/unsupported/oipkg/qipkg.pro b/noncore/unsupported/oipkg/qipkg.pro index 22a37ee..6472fee 100644 --- a/noncore/unsupported/oipkg/qipkg.pro +++ b/noncore/unsupported/oipkg/qipkg.pro @@ -11,3 +11,4 @@ INTERFACES = packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui TARGET = qipkg TRANSLATIONS = ../i18n/de/qipkg.ts +TRANSLATIONS = ../i18n/pt_BR/qipkg.ts |