summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-03-18 01:56:12 (UTC)
committer llornkcor <llornkcor>2002-03-18 01:56:12 (UTC)
commit2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc (patch) (unidiff)
treef14f5f50b091add26e880e6268bde46e836864af
parentc09cb25eb6bbf31bed0d4a415802469cfd1efedf (diff)
downloadopie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.zip
opie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.tar.gz
opie-2ed59c2eb1694b3dda2ab709f54a4ad25a24c6cc.tar.bz2
added Portuguese translations from 'covarde_anonimo' on #opie
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--apps/Applications/addressbook.desktop1
-rw-r--r--apps/Applications/calculator.desktop1
-rw-r--r--apps/Applications/citytime.desktop1
-rw-r--r--apps/Applications/clock.desktop1
-rw-r--r--apps/Applications/datebook.desktop1
-rw-r--r--apps/Applications/filebrowser.desktop1
-rw-r--r--apps/Applications/helpbrowser.desktop1
-rw-r--r--apps/Applications/keypebble.desktop1
-rw-r--r--apps/Applications/mpegplayer.desktop1
-rw-r--r--apps/Applications/opieftp.desktop1
-rw-r--r--apps/Applications/showimg.desktop1
-rw-r--r--apps/Applications/spreadsheet.desktop1
-rw-r--r--apps/Applications/sysinfo.desktop1
-rw-r--r--apps/Applications/tableviewer.desktop1
-rw-r--r--apps/Applications/textedit.desktop1
-rw-r--r--apps/Applications/today.desktop1
-rw-r--r--apps/Applications/todo.desktop1
-rw-r--r--apps/Games/kcheckers.desktop1
-rw-r--r--apps/Games/minesweep.desktop1
-rw-r--r--apps/Games/patience.desktop1
-rw-r--r--apps/Games/snake.desktop1
-rw-r--r--apps/Games/tictac.desktop1
-rw-r--r--apps/Games/wordgame.desktop1
-rw-r--r--apps/Settings/.directory1
-rw-r--r--apps/Settings/Appearance.desktop1
-rw-r--r--apps/Settings/Calibrate.desktop1
-rw-r--r--apps/Settings/Language.desktop1
-rw-r--r--apps/Settings/Light.desktop1
-rw-r--r--apps/Settings/Rotation.desktop1
-rw-r--r--apps/Settings/Security.desktop3
-rw-r--r--apps/Settings/Sound.desktop1
-rw-r--r--apps/Settings/datetime.desktop1
-rw-r--r--apps/Settings/netsetup.desktop3
-rw-r--r--apps/Settings/qipkg.desktop3
-rw-r--r--apps/Settings/quit.desktop1
-rw-r--r--apps/__9quit.desktop1
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro1
-rw-r--r--core/applets/clipboardapplet/clipboardapplet.pro2
-rw-r--r--core/applets/clockapplet/clockapplet.pro1
-rw-r--r--core/applets/screenshotapplet/screenshotapplet.pro1
-rw-r--r--core/applets/vmemo/vmemo.cpp262
-rw-r--r--core/applets/vmemo/vmemo.pro1
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro1
-rwxr-xr-xcore/apps/embeddedkonsole/embeddedkonsole.pro1
-rw-r--r--core/apps/helpbrowser/helpbrowser.pro1
-rw-r--r--core/apps/textedit/textedit.pro3
-rw-r--r--core/launcher/launcher.pro91
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro2
-rw-r--r--core/multimedia/opieplayer/mpegplayer.pro1
-rw-r--r--core/pim/addressbook/addressbook.pro1
-rw-r--r--core/pim/datebook/datebook.pro1
-rw-r--r--core/pim/today/today.pro1
-rw-r--r--core/pim/todo/todo.pro1
-rw-r--r--core/settings/citytime/citytime.pro1
-rw-r--r--core/settings/light-and-power/light-and-power.pro1
-rw-r--r--core/settings/security/security.pro1
-rw-r--r--inputmethods/dvorak/dvorak.pro2
-rw-r--r--inputmethods/handwriting/handwriting.pro2
-rw-r--r--inputmethods/keyboard/keyboard.pro2
-rw-r--r--inputmethods/pickboard/pickboard.pro1
-rw-r--r--inputmethods/unikeyboard/unikeyboard.pro1
-rw-r--r--library/library.pro1
-rw-r--r--noncore/apps/tableviewer/tableviewer.pro2
-rw-r--r--noncore/comm/keypebble/keypebble.pro1
-rw-r--r--noncore/games/chess/chess.pro2
-rw-r--r--noncore/games/fifteen/fifteen.pro2
-rw-r--r--noncore/games/go/go.pro4
-rw-r--r--noncore/games/kcheckers/kcheckers.pro2
-rw-r--r--noncore/games/mindbreaker/mindbreaker.pro2
-rw-r--r--noncore/games/minesweep/minesweep.pro1
-rw-r--r--noncore/games/parashoot/parashoot.pro1
-rw-r--r--noncore/games/qasteroids/qasteroids.pro1
-rw-r--r--noncore/games/snake/snake.pro1
-rwxr-xr-xnoncore/games/solitaire/solitaire.pro1
-rw-r--r--noncore/games/tetrix/tetrix.pro2
-rw-r--r--noncore/games/tictac/tictac.pro2
-rw-r--r--noncore/games/wordgame/wordgame.pro1
-rw-r--r--noncore/multimedia/showimg/showimg.pro1
-rw-r--r--noncore/net/opieftp/opieftp.cpp10
-rw-r--r--noncore/net/opieftp/opieftp.pro1
-rw-r--r--noncore/settings/language/language.pro1
-rw-r--r--noncore/settings/sound/sound.pro2
-rw-r--r--noncore/settings/sound/soundsettings.cpp4
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro1
-rw-r--r--noncore/tools/calc2/calc.pro1
-rw-r--r--noncore/tools/calculator/calculator.pro1
-rw-r--r--noncore/tools/clock/clock.pro1
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.pro4
-rw-r--r--noncore/unsupported/oipkg/qipkg.pro1
90 files changed, 316 insertions, 165 deletions
diff --git a/Makefile b/Makefile
index 132f9a9..677369e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,71 +1,71 @@
1default: dynamic 1default: dynamic
2 2
3all: default docs 3all: default docs
4 4
5LIBS=library libopie 5LIBS=library libopie
6 6
7COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ 7COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \
8 inputmethods/pickboard \ 8 inputmethods/pickboard \
9 inputmethods/handwriting \ 9 inputmethods/handwriting \
10 inputmethods/unikeyboard \ 10 inputmethods/unikeyboard \
11 inputmethods/jumpx \ 11 inputmethods/jumpx \
12 inputmethods/dvorak \ 12 inputmethods/dvorak \
13 taskbar/batteryapplet \ 13 taskbar/batteryapplet \
14 taskbar/volumeapplet \ 14 taskbar/volumeapplet \
15 taskbar/clockapplet \ 15 taskbar/clockapplet \
16 taskbar/netmonapplet \ 16 taskbar/netmonapplet \
17 taskbar/screenshotapplet \ 17 taskbar/screenshotapplet \
18 taskbar/vmemo \ 18 taskbar/vmemo \
19 netsetup/dialup \ 19 netsetup/dialup \
20 netsetup/lan \ 20 netsetup/lan \
21 opiemail/ifaces/pop3 opiemail/ifaces/smtp \ 21 opiemail/ifaces/pop3 opiemail/ifaces/smtp \
22 mpegplayer/libmpeg3 \ 22 mpegplayer/libmpeg3 \
23 mpegplayer/libmad \ 23 mpegplayer/libmad \
24 mpegplayer/wavplugin \ 24 mpegplayer/wavplugin \
25 cardmon \ 25 cardmon \
26 sdmon 26 sdmon
27 27
28APPS=$(LOCALAPPS) addressbook calculator clock datebook \ 28APPS=$(LOCALAPPS) addressbook calculator clock datebook \
29 filebrowser helpbrowser minesweep mpegplayer \ 29 filebrowser helpbrowser minesweep mpegplayer \
30 settings/light-and-power \ 30 settings/light-and-power \
31 settings/language \ 31 settings/language \
32 settings/rotation \ 32 settings/rotation \
33 settings/appearance \ 33 settings/appearance \
34 settings/security \ 34 settings/security \
35 settings/sound \ 35 settings/sound \
36 settings/systemtime \ 36 settings/systemtime \
37 solitaire spreadsheet tetrix textedit \ 37 solitaire spreadsheet tetrix textedit \
38 todo wordgame embeddedkonsole taskbar sysinfo \ 38 todo wordgame embeddedkonsole taskbar sysinfo \
39 parashoot snake citytime showimg netsetup tableviewer \ 39 parashoot snake citytime showimg netsetup tableviewer \
40 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ 40 qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
41 noncore/tictac noncore/opieftp 41 noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers
42 42
43DOCS = docs/src/opie-policy 43DOCS = docs/src/opie-policy
44single: mpegplayer/libmpeg3 44single: mpegplayer/libmpeg3
45 45
46dynamic: $(APPS) 46dynamic: $(APPS)
47 47
48docs: $(DOCS) 48docs: $(DOCS)
49 49
50$(COMPONENTS): $(LIBS) 50$(COMPONENTS): $(LIBS)
51 51
52$(APPS): $(LIBS) $(COMPONENTS) 52$(APPS): $(LIBS) $(COMPONENTS)
53 53
54$(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single: 54$(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single:
55 $(MAKE) -C $@ -f Makefile 55 $(MAKE) -C $@ -f Makefile
56 56
57showcomponents: 57showcomponents:
58 @echo $(LIBS) $(APPS) $(COMPONENTS) single 58 @echo $(LIBS) $(APPS) $(COMPONENTS) single
59 59
60clean: 60clean:
61 $(MAKE) -C single -f Makefile $@ 61 $(MAKE) -C single -f Makefile $@
62 for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 62 for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
63 63
64lupdate: 64lupdate:
65 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 65 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
66 66
67lrelease: 67lrelease:
68 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 68 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
69 69
70 70
71.PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean 71.PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=An Address Book Program 2Comment=An Address Book Program
3Exec=addressbook 3Exec=addressbook
4Icon=AddressBook 4Icon=AddressBook
5Type=Application 5Type=Application
6Name=Contacts 6Name=Contacts
7Name[pt_BR]=Endereços
7Name[no]=Adressebok 8Name[no]=Adressebok
8Name[de]=Adressbuch 9Name[de]=Adressbuch
9Name[hu]=Címtár 10Name[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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Calculator Program 2Comment=A Calculator Program
3Exec=calculator 3Exec=calculator
4Icon=Calculator 4Icon=Calculator
5Type=Application 5Type=Application
6Name=Calculator 6Name=Calculator
7Name[pt_BR]=Calculadora
7Name[no]=Kalkulator 8Name[no]=Kalkulator
8Name[de]=Taschen rechner 9Name[de]=Taschen rechner
9Name[ja]=電卓 10Name[ja]=電卓
10Name[hu]=Számológép 11Name[hu]=Számológép
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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A World Clock and Time Zone Editor 2Comment=A World Clock and Time Zone Editor
3Exec=citytime 3Exec=citytime
4Icon=CityTime 4Icon=CityTime
5Type=Application 5Type=Application
6Name=City Time 6Name=City Time
7Name[pt_BR]=Hora Local
7Name[no]=Verdensur 8Name[no]=Verdensur
8Name[de]=Weltzeituhr 9Name[de]=Weltzeituhr
9Name[ja]=世界時計 10Name[ja]=世界時計
10Name[hu]=Idõzóna 11Name[hu]=Idõzóna
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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Clock Program 2Comment=A Clock Program
3Exec=clock 3Exec=clock
4Icon=Clock 4Icon=Clock
5Type=Application 5Type=Application
6Name=Clock 6Name=Clock
7Name[pt_BR]=Relgio
7Name[no]=Klokke 8Name[no]=Klokke
8Name[de]=Uhr 9Name[de]=Uhr
9Name[ja]=時計 10Name[ja]=時計
10Name[hu]=Óra 11Name[hu]=Óra
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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Calendar and Scheduling Program 2Comment=A Calendar and Scheduling Program
3Exec=datebook 3Exec=datebook
4Icon=DateBook 4Icon=DateBook
5Type=Application 5Type=Application
6Name=Calendar 6Name=Calendar
7Name[pt_BR]=Calendário
7Name[no]=Avtalebok 8Name[no]=Avtalebok
8Name[de]=Termin kalender 9Name[de]=Termin kalender
9Name[hu]=Naptár 10Name[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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment = A File Manager Program 2Comment = A File Manager Program
3Exec = filebrowser 3Exec = filebrowser
4File = ../apps/Applications/filebrowser 4File = ../apps/Applications/filebrowser
5Icon = FileBrowser 5Icon = FileBrowser
6Name = File Manager 6Name = File Manager
7Name[pt_BR] = Gerenciador de Arquivos
7Name[de] = Datei Manager 8Name[de] = Datei Manager
8Name[no] = Filviser 9Name[no] = Filviser
9Type = Application 10Type = Application
10Name[hu]=Intézõ 11Name[hu]=Intézõ
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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A HTML Help Browser Program 2Comment=A HTML Help Browser Program
3Exec=helpbrowser 3Exec=helpbrowser
4Icon=HelpBrowser 4Icon=HelpBrowser
5Type=Application 5Type=Application
6Name=Help Browser 6Name=Help Browser
7Name[pt_BR] = Navegador de Ajuda
7Name[no]=Hjelp 8Name[no]=Hjelp
8Name[de]=Hilfe 9Name[de]=Hilfe
9Name[hu]=Segítség 10Name[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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=Virtual Network Computing (VNC) Viewer 2Comment=Virtual Network Computing (VNC) Viewer
3Exec=keypebble 3Exec=keypebble
4Icon=vnc 4Icon=vnc
5Type=Application 5Type=Application
6Name=VNC Viewer 6Name=VNC Viewer
7Name[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
@@ -1,12 +1,13 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Media Playback Program 2Comment=A Media Playback Program
3Exec=mpegplayer 3Exec=mpegplayer
4Icon=MPEGPlayer 4Icon=MPEGPlayer
5Type=Application 5Type=Application
6MimeType=audio/mpeg;video/mpeg;audio/x-wav;application/x-shockwave-flash;playlist/plain 6MimeType=audio/mpeg;video/mpeg;audio/x-wav;application/x-shockwave-flash;playlist/plain
7MimeTypeIcons=SoundPlayer;MPEGPlayer;Sound;Sound;mpegplayer/playlist2 7MimeTypeIcons=SoundPlayer;MPEGPlayer;Sound;Sound;mpegplayer/playlist2
8Name=Media Player 8Name=Media Player
9Name[pt_BR] = Reprodutor de Mídia
9Name[no]=MPEGspiller 10Name[no]=MPEGspiller
10Name[de]=Medienwiedergabe 11Name[de]=Medienwiedergabe
11Name[ja]=MPEGプレイヤー 12Name[ja]=MPEGプレイヤー
12Name[hu]=MPEG lejátszó 13Name[hu]=MPEG lejátszó
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
@@ -1,7 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=An Ftp Client 2Comment=An Ftp Client
3Exec=opieftp 3Exec=opieftp
4Icon=opieftp 4Icon=opieftp
5Type=Application 5Type=Application
6Name=OpieFtp 6Name=OpieFtp
7
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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=An Image Viewer 2Comment=An Image Viewer
3Exec=showimg 3Exec=showimg
4MimeType=image/* 4MimeType=image/*
5Icon=ImageViewer 5Icon=ImageViewer
6Type=Application 6Type=Application
7Name=Image Viewer 7Name=Image Viewer
8Name[pt_BR]=Visualizador de Imagens
8Name[de]=Bildbetrachter 9Name[de]=Bildbetrachter
9Name[hu]=Nézõke 10Name[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
@@ -1,11 +1,12 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Spread Sheet Program 2Comment=A Spread Sheet Program
3Exec=spreadsheet 3Exec=spreadsheet
4Icon=Spreadsheet 4Icon=Spreadsheet
5Type=Application 5Type=Application
6MimeType=application/x-qpe-ss 6MimeType=application/x-qpe-ss
7Name=Spreadsheet 7Name=Spreadsheet
8Name[pt_BR]=Planilha
8Name[no]=Regneark 9Name[no]=Regneark
9Name[de]=Tabellenkalkulation 10Name[de]=Tabellenkalkulation
10Name[ja]=表計算 11Name[ja]=表計算
11Name[hu]=Táblakezelõ 12Name[hu]=Táblakezelõ
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,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Name=System Info 2Name=System Info
3Name[pt_BR]=Informações do Sistema
3Name[no]=Systeminfo 4Name[no]=Systeminfo
4Name[de]=System information 5Name[de]=System information
5Exec=sysinfo 6Exec=sysinfo
6Type=Application 7Type=Application
7Comment=System Information 8Comment=System Information
8Icon=SystemInfo 9Icon=SystemInfo
9Name[hu]=Rendszerinfó 10Name[hu]=Rendszerinfó
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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A table/database viewer 2Comment=A table/database viewer
3Exec=tableviewer 3Exec=tableviewer
4Type=Application 4Type=Application
5Name=Table Viewer 5Name=Table Viewer
6Name[pt_BR]=Visualizador de Tabelas
6Name[hu]=Adatbázis nézõ 7Name[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
@@ -1,14 +1,15 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Text Editing Program 2Comment=A Text Editing Program
3Exec=textedit 3Exec=textedit
4Icon=TextEditor 4Icon=TextEditor
5Type=Application 5Type=Application
6MimeType=text/* 6MimeType=text/*
7Name=Text Editor 7Name=Text Editor
8Name[pt_BR]=Editor de Textos
8Name[no]=Teksteditor 9Name[no]=Teksteditor
9Name[de]=Texteditor 10Name[de]=Texteditor
10Name[ja]=テキストエディタ 11Name[ja]=テキストエディタ
11Name[zh_CN]=文本编辑器 12Name[zh_CN]=文本编辑器
12Name[zh_TW]=文字編輯器 13Name[zh_TW]=文字編輯器
13Name[ko]=글월 편집기 14Name[ko]=글월 편집기
14Name[hu]=Szöveg- szerkesztõ 15Name[hu]=Szöveg- szerkesztõ
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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=Today App 2Comment=Today App
3Exec=today 3Exec=today
4Icon=today_icon 4Icon=today_icon
5Type=Application 5Type=Application
6Name=Today 6Name=Today
7Name[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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Todo List Program 2Comment=A Todo List Program
3Exec=todolist 3Exec=todolist
4Icon=TodoList 4Icon=TodoList
5Type=Application 5Type=Application
6Name=Todo List 6Name=Todo List
7Name[pt_BR]=Afazeres
7Name[no]=Oppgaveliste 8Name[no]=Oppgaveliste
8Name[de]=Aufgabenliste 9Name[de]=Aufgabenliste
9Name[hu]=Feladatok 10Name[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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Ckeckers Game 2Comment=A Ckeckers Game
3Exec=kcheckers 3Exec=kcheckers
4Icon=KCheckers 4Icon=KCheckers
5Type=Application 5Type=Application
6Name=KCheckers 6Name=KCheckers
7Name[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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=Find the mines 2Comment=Find the mines
3Exec=minesweep 3Exec=minesweep
4Icon=MineHunt 4Icon=MineHunt
5Type=Application 5Type=Application
6Name=Mine Hunt 6Name=Mine Hunt
7Name[pt_BR]=Caca-Minas
7Name[no]=Minesøk 8Name[no]=Minesøk
8Name[de]=Minenjagd 9Name[de]=Minenjagd
9Name[ja]=マインスィープ 10Name[ja]=マインスィープ
10Name[hu]=Aknakeresõ 11Name[hu]=Aknakeresõ
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
@@ -1,10 +1,11 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Game of Patience 2Comment=A Game of Patience
3Exec=patience 3Exec=patience
4Icon=Solitaire 4Icon=Solitaire
5Type=Application 5Type=Application
6Name=Patience 6Name=Patience
7Name[pt_BR]=Paciencia
7Name[no]=Kabal 8Name[no]=Kabal
8Name[de]=Patience 9Name[de]=Patience
9Name[ja]=ソリティア 10Name[ja]=ソリティア
10Name[hu]=Passziánsz 11Name[hu]=Passziánsz
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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Snake Game 2Comment=A Snake Game
3Exec=snake 3Exec=snake
4Icon=Snake 4Icon=Snake
5Type=Application 5Type=Application
6Name=Snake 6Name=Snake
7Name[pt_BR]=Cobra
7Name[no]=Slange 8Name[no]=Slange
8Name[de]=Schlange 9Name[de]=Schlange
9Name[hu]=Kígyó 10Name[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
@@ -1,5 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Exec=tictac 2Exec=tictac
3Icon=Tictac 3Icon=Tictac
4Type=Application 4Type=Application
5Name=Tictac 5Name=Tictac
6Name[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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A word arranging game 2Comment=A word arranging game
3Exec=wordgame 3Exec=wordgame
4Icon=WordGame 4Icon=WordGame
5Type=Application 5Type=Application
6Name=Word Game 6Name=Word Game
7Name[pt_BR]=Palavras Cruzadas
7Name[no]=Kryss-Ord 8Name[no]=Kryss-Ord
8Name[de]=Wortspiel 9Name[de]=Wortspiel
9Name[hu]=Szójáték 10Name[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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Name=Settings 2Name=Settings
3Name[no]=Innstillinger 3Name[no]=Innstillinger
4Name[de]=Einstellungen 4Name[de]=Einstellungen
5Icon=SettingsIcon 5Icon=SettingsIcon
6Name[hu]=Beállítások 6Name[hu]=Beállítások
7Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=appearance 3Exec=appearance
4Icon=Appearance 4Icon=Appearance
5Name=Appearance 5Name=Appearance
6Name[pt_BR]=Aparencia
6Name[no]=Utseende 7Name[no]=Utseende
7Name[de]=Erscheinungsbild 8Name[de]=Erscheinungsbild
8Name[hu]=Megjelenés 9Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=calibrate 3Exec=calibrate
4Icon=Calibrate 4Icon=Calibrate
5Name=Recalibrate 5Name=Recalibrate
6Name[pt_BR]=Recalibrar
6Name[de]=Kalibrieren 7Name[de]=Kalibrieren
7Name[no]=Kalibrer 8Name[no]=Kalibrer
8Name[hu]=Kalibráció 9Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=language 3Exec=language
4Icon=Language 4Icon=Language
5Name=Language 5Name=Language
6Name[pt_BR]=Linguagem
6Name[no]=Språk 7Name[no]=Språk
7Name[de]=Sprache 8Name[de]=Sprache
8Name[hu]=Nyelv 9Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=light-and-power 3Exec=light-and-power
4Icon=Light 4Icon=Light
5Name=Light & Power 5Name=Light & Power
6Name[pt_BR]=Iluminacao e Energia
6Name[no]=Lys 7Name[no]=Lys
7Name[de]=Helligkeit 8Name[de]=Helligkeit
8Name[hu]=Fényerõ 9Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=rotation 3Exec=rotation
4Icon=Rotation 4Icon=Rotation
5Name=Rotation 5Name=Rotation
6Name[pt_BR]=Rotao
6Name[no]=Rotasjon 7Name[no]=Rotasjon
7Name[de]=Rotation 8Name[de]=Rotation
8Name[hu]=Forgatás 9Name[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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=security 3Exec=security
4Icon=Security 4Icon=Security
5Name=Security 5Name=Security
6Name[de]=Sicherheits einstellungen \ No newline at end of file 6Name[de]=Sicherheits einstellungen
7Name[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
@@ -1,5 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=sound 3Exec=sound
4Icon=Sound 4Icon=Sound
5Name=Sound 5Name=Sound
6Name[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
@@ -1,9 +1,10 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=Set date and time 2Comment=Set date and time
3Exec=systemtime 3Exec=systemtime
4Icon=DateTime 4Icon=DateTime
5Type=Application 5Type=Application
6Name=Date/Time 6Name=Date/Time
7Name[pt_BR]=Data/Hora
7Name[no]=Dato/Tid 8Name[no]=Dato/Tid
8Name[de]=Datum/Zeit 9Name[de]=Datum/Zeit
9Name[hu]=Dátum/Idõ 10Name[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
@@ -1,6 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Exec=netsetup 2Exec=netsetup
3Icon=PPPConnect 3Icon=PPPConnect
4Type=Application 4Type=Application
5Name=Network 5Name=Network
6Name[de]=Netzwerk \ No newline at end of file 6Name[pt_BR]=Rede
7Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=qipkg 3Exec=qipkg
4MimeType=application/ipkg 4MimeType=application/ipkg
5Icon=Ipkg 5Icon=Ipkg
6Name=Add/Remove Software 6Name=Add/Remove Software
7Name[pt_BR]=Adicionar/Remover Software
7Name[hu]=Csomag- kezelõ 8Name[hu]=Csomag- kezelõ
8Name[de]=Software \ No newline at end of file 9Name[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
@@ -1,8 +1,9 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=shutdown 3Exec=shutdown
4Icon=Shutdown 4Icon=Shutdown
5Name=Shutdown 5Name=Shutdown
6Name[pt_BR]=Desligar
6Name[no]=Skru av 7Name[no]=Skru av
7Name[de]=Beenden 8Name[de]=Beenden
8Name[hu]=Leállítás 9Name[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
@@ -1,5 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Type=Application 2Type=Application
3Exec=suspend 3Exec=suspend
4Icon=Shutdown 4Icon=Shutdown
5Name=Suspend 5Name=Suspend
6Name[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
@@ -1,12 +1,13 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= battery.h batterystatus.h batteryappletimpl.h 3 HEADERS= battery.h batterystatus.h batteryappletimpl.h
4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp 4 SOURCES= battery.cpp batterystatus.cpp batteryappletimpl.cpp
5 TARGET = batteryapplet 5 TARGET = batteryapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts 12TRANSLATIONS += ../../i18n/de/libbatteryapplet.ts
13TRANSLATIONS = ../../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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= clipboard.h clipboardappletimpl.h 3 HEADERS= clipboard.h clipboardappletimpl.h
4 SOURCES= clipboard.cpp clipboardappletimpl.cpp 4 SOURCES= clipboard.cpp clipboardappletimpl.cpp
5 TARGET = clipboardapplet 5 TARGET = clipboardapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11
12TRANSLATIONS = ../../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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= clock.h clockappletimpl.h 3 HEADERS= clock.h clockappletimpl.h
4 SOURCES= clock.cpp clockappletimpl.cpp 4 SOURCES= clock.cpp clockappletimpl.cpp
5 TARGET = clockapplet 5 TARGET = clockapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libclockapplet.ts 12TRANSLATIONS += ../../i18n/de/libclockapplet.ts
13TRANSLATIONS = ../../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
@@ -1,13 +1,14 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = screenshot.h screenshotappletimpl.h 3HEADERS = screenshot.h screenshotappletimpl.h
4SOURCES = screenshot.cpp screenshotappletimpl.cpp 4SOURCES = screenshot.cpp screenshotappletimpl.cpp
5TARGET = screenshotapplet 5TARGET = screenshotapplet
6DESTDIR = ../../plugins/applets 6DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10VERSION = 1.0.0 10VERSION = 1.0.0
11MOC_DIR=opieobj 11MOC_DIR=opieobj
12OBJECTS_DIR=opieobj 12OBJECTS_DIR=opieobj
13 13
14TRANSLATIONS = ../../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
@@ -1,382 +1,434 @@
1/************************************************************************************ 1/************************************************************************************
2** 2**
3** This file may be distributed and/or modified under the terms of the 3** This file may be distributed and/or modified under the terms of the
4** GNU General Public License version 2 as published by the Free Software 4** GNU General Public License version 2 as published by the Free Software
5** Foundation and appearing in the file LICENSE.GPL included in the 5** Foundation and appearing in the file LICENSE.GPL included in the
6** packaging of this file. 6** packaging of this file.
7** 7**
8** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 8** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
9** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 9** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
10** 10**
11************************************************************************************/ 11************************************************************************************/
12 12
13/* 13/*
14 * $Id$ 14 * $Id$
15 */ 15 */
16 16// Sun 03-17-2002 L.J.Potter <ljp@llornkcor.com>
17#include <sys/utsname.h> 17#include <sys/utsname.h>
18#include <sys/time.h> 18#include <sys/time.h>
19#include <sys/types.h> 19#include <sys/types.h>
20#include <unistd.h> 20#include <unistd.h>
21#include <stdio.h> 21#include <stdio.h>
22#include <sys/stat.h> 22#include <sys/stat.h>
23#include <fcntl.h> 23#include <fcntl.h>
24#include <sys/ioctl.h> 24#include <sys/ioctl.h>
25#include <linux/soundcard.h> 25#include <linux/soundcard.h>
26#include <string.h> 26#include <string.h>
27#include <stdlib.h> 27#include <stdlib.h>
28 28
29typedef struct _waveheader { 29typedef struct _waveheader {
30 u_long main_chunk; /* 'RIFF' */ 30 u_long main_chunk; /* 'RIFF' */
31 u_long length; /* filelen */ 31 u_long length; /* filelen */
32 u_long chunk_type; /* 'WAVE' */ 32 u_long chunk_type; /* 'WAVE' */
33 u_long sub_chunk; /* 'fmt ' */ 33 u_long sub_chunk; /* 'fmt ' */
34 u_long sc_len; /* length of sub_chunk, =16 34 u_long sc_len; /* length of sub_chunk, =16
35 (chunckSize) format len */ 35 (chunckSize) format len */
36 u_short format; /* should be 1 for PCM-code (formatTag) */ 36 u_short format; /* should be 1 for PCM-code (formatTag) */
37 37
38 u_short modus; /* 1 Mono, 2 Stereo (channels) */ 38 u_short modus; /* 1 Mono, 2 Stereo (channels) */
39 u_long sample_fq; /* samples per second (samplesPerSecond) */ 39 u_long sample_fq; /* samples per second (samplesPerSecond) */
40 u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */ 40 u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */
41 u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */ 41 u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */
42 u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ 42 u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */
43 43
44 u_long data_chunk; /* 'data' */ 44 u_long data_chunk; /* 'data' */
45 45
46 u_long data_length;/* samplecount */ 46 u_long data_length;/* samplecount */
47} WaveHeader; 47} WaveHeader;
48 48
49#define RIFF 0x46464952 49#define RIFF 0x46464952
50#define WAVE 0x45564157 50#define WAVE 0x45564157
51#define FMT 0x20746D66 51#define FMT 0x20746D66
52#define DATA 0x61746164 52#define DATA 0x61746164
53#define PCM_CODE 1 53#define PCM_CODE 1
54#define WAVE_MONO 1 54#define WAVE_MONO 1
55#define WAVE_STEREO 2 55#define WAVE_STEREO 2
56 56
57#include "vmemo.h" 57#include "vmemo.h"
58 58
59#include <qpe/qpeapplication.h> 59#include <qpe/qpeapplication.h>
60#include <qpe/resource.h> 60#include <qpe/resource.h>
61#include <qpe/config.h> 61#include <qpe/config.h>
62 62
63#include <qpainter.h> 63#include <qpainter.h>
64#include <qdatetime.h> 64#include <qdatetime.h>
65#include <qsound.h> 65#include <qsound.h>
66#include <qfile.h> 66#include <qfile.h>
67#include <qmessagebox.h> 67#include <qmessagebox.h>
68 68
69int seq = 0; 69int seq = 0;
70 70
71/* XPM */ 71/* XPM */
72static char * vmemo_xpm[] = { 72static char * vmemo_xpm[] = {
73"14 14 47 1", 73"14 14 47 1",
74" c None", 74" c None",
75". c #101010", 75". c #101010",
76"+ c #0D0D0D", 76"+ c #0D0D0D",
77"@ c #0B0B0B", 77"@ c #0B0B0B",
78"# c #393939", 78"# c #393939",
79"$ c #6C6C6C", 79"$ c #6C6C6C",
80"% c #5D5D5D", 80"% c #5D5D5D",
81"& c #4E4E4E", 81"& c #4E4E4E",
82"* c #1C1C1C", 82"* c #1C1C1C",
83"= c #131313", 83"= c #131313",
84"- c #7B7B7B", 84"- c #7B7B7B",
85"; c #303030", 85"; c #303030",
86"> c #383838", 86"> c #383838",
87", c #3F3F3F", 87", c #3F3F3F",
88"' c #343434", 88"' c #343434",
89") c #060606", 89") c #060606",
90"! c #444444", 90"! c #444444",
91"~ c #646464", 91"~ c #646464",
92"{ c #505050", 92"{ c #505050",
93"] c #717171", 93"] c #717171",
94"^ c #1B1B1B", 94"^ c #1B1B1B",
95"/ c #585858", 95"/ c #585858",
96"( c #4C4C4C", 96"( c #4C4C4C",
97"_ c #353535", 97"_ c #353535",
98": c #0E0E0E", 98": c #0E0E0E",
99"< c #080808", 99"< c #080808",
100"[ c #262626", 100"[ c #262626",
101"} c #121212", 101"} c #121212",
102"| c #7F7F7F", 102"| c #7F7F7F",
103"1 c #464646", 103"1 c #464646",
104"2 c #0C0C0C", 104"2 c #0C0C0C",
105"3 c #727272", 105"3 c #727272",
106"4 c #292929", 106"4 c #292929",
107"5 c #656565", 107"5 c #656565",
108"6 c #565656", 108"6 c #565656",
109"7 c #434343", 109"7 c #434343",
110"8 c #272727", 110"8 c #272727",
111"9 c #0F0F0F", 111"9 c #0F0F0F",
112"0 c #3A3A3A", 112"0 c #3A3A3A",
113"a c #090909", 113"a c #090909",
114"b c #535353", 114"b c #535353",
115"c c #545454", 115"c c #545454",
116"d c #494949", 116"d c #494949",
117"e c #7A7A7A", 117"e c #7A7A7A",
118"f c #202020", 118"f c #202020",
119"g c #3D3D3D", 119"g c #3D3D3D",
120"h c #1F1F1F", 120"h c #1F1F1F",
121" .+@ ", 121" .+@ ",
122" #$%&* ", 122" #$%&* ",
123" =-;>,')", 123" =-;>,')",
124" .$;!~,)", 124" .$;!~,)",
125" ;#{]!)", 125" ;#{]!)",
126" ^~/(_)", 126" ^~/(_)",
127" ./:@<[)", 127" ./:@<[)",
128" }. .|]1;;2 ", 128" }. .|]1;;2 ",
129" #-$;^/3&;;4@ ", 129" #-$;^/3&;;4@ ",
130".$;;#5:67;89 ", 130".$;;#5:67;89 ",
131":%;0%&ab;8. ", 131":%;0%&ab;8. ",
132"@cd%e!fg49 ", 132"@cd%e!fg49 ",
133" h0,!_;2@ ", 133" h0,!_;2@ ",
134" ))))) "}; 134" ))))) "};
135 135
136VMemo::VMemo( QWidget *parent, const char *name ) 136VMemo::VMemo( QWidget *parent, const char *name )
137 : QWidget( parent, name ) 137 : QWidget( parent, name )
138{ 138{
139 setFixedHeight( 18 ); 139 setFixedHeight( 18 );
140 setFixedWidth( 14 ); 140 setFixedWidth( 14 );
141 141
142 recording = FALSE; 142 recording = FALSE;
143 143
144 myChannel = new QCopChannel( "QPE/VMemo", this ); 144 struct utsname name; /* check for embedix kernel running on the zaurus*/
145 connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), 145 if (uname(&name) != -1) {
146 this, SLOT(receive(const QCString&, const QByteArray&)) ); 146 QString release=name.release;
147 147 if(release.find("embedix",0,TRUE) !=-1)
148 struct utsname name; /* check for embedix kernel running on the zaurus, if 148 systemZaurus=TRUE;
149 lineo change string, this break 149 else {
150 */ 150 systemZaurus=FALSE;
151 if (uname(&name) != -1) 151// myChannel = new QCopChannel( "QPE/VMemo", this );
152 { 152// connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
153 QString release=name.release; 153// this, SLOT(receive(const QCString&, const QByteArray&)) );
154 if(release.find("embedix",0,TRUE) !=-1) 154
155 systemZaurus=TRUE; 155// // Register the REC key press, for ipaq only
156 else 156// QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)");
157 { 157// e << 4096;
158 systemZaurus=FALSE; 158// e << QString("QPE/VMemo");
159 159// e << QString("toggleRecord()");
160 // Register the REC key press. 160 }
161 QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); 161 }
162 e << 4096;
163 e << QString("QPE/VMemo");
164 e << QString("toggleRecord()");
165 }
166 }
167} 162}
168 163
169VMemo::~VMemo() 164VMemo::~VMemo()
170{ 165{
171} 166}
172 167
173void VMemo::receive( const QCString &msg, const QByteArray &data ) 168void VMemo::receive( const QCString &msg, const QByteArray &data )
174{ 169{
175 QDataStream stream( data, IO_ReadOnly ); 170 QDataStream stream( data, IO_ReadOnly );
176 if (msg == "toggleRecord()") 171 if (msg == "toggleRecord()")
177 { 172 {
178 if (recording) 173 if (recording)
179 mouseReleaseEvent(NULL); 174 mouseReleaseEvent(NULL);
180 else 175 else
181 mousePressEvent(NULL); 176 mousePressEvent(NULL);
182 } 177 }
183} 178}
184 179
185void VMemo::paintEvent( QPaintEvent* ) 180void VMemo::paintEvent( QPaintEvent* )
186{ 181{
187 QPainter p(this); 182 QPainter p(this);
188 p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); 183 p.drawPixmap( 0, 1,( const char** ) vmemo_xpm );
189} 184}
190 185
191void VMemo::mousePressEvent( QMouseEvent *me ) 186void VMemo::mousePressEvent( QMouseEvent *me )
192{ 187{
193 // just to be safe 188 // just to be safe
194 if (recording) 189 if (recording)
195 { 190 {
196 recording = FALSE; 191 recording = FALSE;
197 return; 192 return;
198 } 193 }
199 194
200 /* 195 /*
201 No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions 196 No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
202 mousePressEvent and mouseReleaseEvent with a NULL parameter. 197 mousePressEvent and mouseReleaseEvent with a NULL parameter.
203 */ 198 */
204 if (!systemZaurus && me != NULL) 199// if (!systemZaurus && me != NULL)
205 return; 200// return;
206 201
207 QSound::play(Resource::findSound("vmemob")); 202 QSound::play(Resource::findSound("vmemob"));
208 203 qDebug("Start recording");
209 recording = TRUE; 204 recording = TRUE;
210 if (openDSP() == -1) 205 if (openDSP() == -1)
211 { 206 {
212 QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort"); 207 QMessageBox::critical(0, "VMemo", "Could not open dsp device.", "Abort");
213 recording = FALSE; 208 recording = FALSE;
214 return; 209 return;
215 } 210 }
216 211
217 Config vmCfg("VMemo"); 212 Config vmCfg("VMemo");
218 vmCfg.setGroup("Defaults"); 213 vmCfg.setGroup("Defaults");
219 214
220 QDateTime dt = QDateTime::currentDateTime(); 215 QDateTime dt = QDateTime::currentDateTime();
221 QString fileName; 216 QString fileName;
222 217
223 if(systemZaurus) 218 if(systemZaurus)
224 fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs 219 fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
225 else 220 else
226 fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/"); 221 fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
227 222
228 fileName += "vm_"; 223 fileName += "vm_";
229 fileName += dt.toString(); 224 fileName += dt.toString();
230 fileName += ".wav"; 225 fileName += ".wav";
231 226
232 // No spaces in the filename 227 // No spaces in the filename
233 fileName.replace(QRegExp("'"),""); 228 fileName.replace(QRegExp("'"),"");
234 fileName.replace(QRegExp(" "),"_"); 229 fileName.replace(QRegExp(" "),"_");
235 fileName.replace(QRegExp(":"),"."); 230 fileName.replace(QRegExp(":"),".");
236 fileName.replace(QRegExp(","),""); 231 fileName.replace(QRegExp(","),"");
237 232
238 if(openWAV(fileName.latin1()) == -1) 233 if(openWAV(fileName.latin1()) == -1)
239 { 234 {
240 QString err("Could not open the output file: "); 235 QString err("Could not open the output file: ");
241 err += fileName; 236 err += fileName;
242 237
243 QMessageBox::critical(0, "VMemo", err, "Abort"); 238 QMessageBox::critical(0, "VMemo", err, "Abort");
244 close(dsp); 239 close(dsp);
245 return; 240 return;
246 } 241 }
247 242
248 QArray<int> cats(1); 243 QArray<int> cats(1);
249 cats[0] = vmCfg.readNumEntry("Category", 0); 244 cats[0] = vmCfg.readNumEntry("Category", 0);
250 245
251 QString dlName("vm_"); 246 QString dlName("vm_");
252 dlName += dt.toString(); 247 dlName += dt.toString();
253 DocLnk l; 248 DocLnk l;
254 l.setFile(fileName); 249 l.setFile(fileName);
255 l.setName(dlName); 250 l.setName(dlName);
256 l.setType("audio/x-wav"); 251 l.setType("audio/x-wav");
257 l.setCategories(cats); 252 l.setCategories(cats);
258 l.writeLink(); 253 l.writeLink();
259 254
260 record(); 255 record();
261} 256}
262 257
263void VMemo::mouseReleaseEvent( QMouseEvent * ) 258void VMemo::mouseReleaseEvent( QMouseEvent * )
264{ 259{
265 recording = FALSE; 260 recording = FALSE;
266} 261}
267 262
268int VMemo::openDSP() 263int VMemo::openDSP()
269{ 264{
270 Config cfg("Sound"); 265 Config cfg("Sound");
271 cfg.setGroup("Record"); 266 cfg.setGroup("Record");
272 267
273 speed = cfg.readNumEntry("SampleRate", 22050); 268 speed = cfg.readNumEntry("SampleRate", 22050);
274 channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) 269 channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
275 if (cfg.readNumEntry("SixteenBit", 1)==1) 270 if (cfg.readNumEntry("SixteenBit", 1)==1) {
276 { 271 format = AFMT_S16_LE;
277 format = AFMT_S16_LE; 272 resolution = 16;
278 resolution = 16; 273 }
279 } 274// else {
280 else 275// format = AFMT_U8;
281 { 276// resolution = 8;
282 format = AFMT_U8; 277// }
283 resolution = 8;
284 }
285 278
286 if(systemZaurus) 279 if(systemZaurus) {
287 { 280 dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
288 dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 281 channels=1; //zaurus has one input channel
289 channels=1; //zaurus has one input channel 282 } else {
290 } 283 dsp = open("/dev/dsp", O_RDWR);
291 else 284 }
292 dsp = open("/dev/dsp", O_RDWR);
293 285
294 if(dsp == -1) 286 if(dsp == -1) {
295 {
296 perror("open(\"/dev/dsp\")"); 287 perror("open(\"/dev/dsp\")");
297 return -1; 288 return -1;
298 } 289 }
299 290
300 if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) 291 if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
301 { 292 perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
302 perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); 293 return -1;
303 return -1; 294 }
304 } 295 if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
305 if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) 296 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
306 { 297 return -1;
307 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); 298 }
308 return -1; 299 if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) {
309 } 300 perror("ioctl(\"SNDCTL_DSP_SPEED\")");
310 if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) 301 return -1;
311 { 302 }
312 perror("ioctl(\"SNDCTL_DSP_SPEED\")"); 303 if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) {
313 return -1; 304 perror("ioctl(\"SOUND_PCM_READ_RATE\")");
314 } 305 return -1;
315 if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) 306 }
316 {
317 perror("ioctl(\"SOUND_PCM_READ_RATE\")");
318 return -1;
319 }
320 307
321 return 1; 308 return 1;
322} 309}
323 310
324int VMemo::openWAV(const char *filename) 311int VMemo::openWAV(const char *filename)
325{ 312{
326 track.setName(filename); 313 track.setName(filename);
327 if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) 314 if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
328 return -1; 315 return -1;
329 316
330 wav=track.handle(); 317 wav=track.handle();
331 318
332 WaveHeader wh; 319 WaveHeader wh;
333 320
334 wh.main_chunk = RIFF; 321 wh.main_chunk = RIFF;
335 wh.length=0; 322 wh.length=0;
336 wh.chunk_type = WAVE; 323 wh.chunk_type = WAVE;
337 wh.sub_chunk = FMT; 324 wh.sub_chunk = FMT;
338 wh.sc_len = 16; 325 wh.sc_len = 16;
339 wh.format = PCM_CODE; 326 wh.format = PCM_CODE;
340 wh.modus = channels; 327 wh.modus = channels;
341 wh.sample_fq = speed; 328 wh.sample_fq = speed;
342 wh.byte_p_sec = speed * channels * resolution/8; 329 wh.byte_p_sec = speed * channels * resolution/8;
343 wh.byte_p_spl = channels * (resolution / 8); 330 wh.byte_p_spl = channels * (resolution / 8);
344 wh.bit_p_spl = resolution; 331 wh.bit_p_spl = resolution;
345 wh.data_chunk = DATA; 332 wh.data_chunk = DATA;
346 wh.data_length= 0; 333 wh.data_length= 0;
347 // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" 334 // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d"
348 // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); 335 // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl );
349 write (wav, &wh, sizeof(WaveHeader)); 336 write (wav, &wh, sizeof(WaveHeader));
350 337
351 return 1; 338 return 1;
352} 339}
353 340
354void VMemo::record(void) 341void VMemo::record(void)
355{ 342{
356 int length=0, result, value; 343 int length=0, result, value;
357 char sound[512]; 344 qDebug("Recording");
345
346 if(format==AFMT_S16_LE) {
347 signed short sound[512], monoBuffer[512];
348 while(recording) {
349 result = read(dsp, sound, 512); // 8192
350 qApp->processEvents();
351 int j=0;
352 if(systemZaurus) {
353 for (int i = 0; i < result; i++) { //since Z is mono do normally
354 monoBuffer[i] = sound[i];
355 }
356 qApp->processEvents();
357 length+=write(wav, monoBuffer, result);
358 } else { //ipaq /stereo inputs
359 for (int i = 0; i < result; i+=2) {
360 monoBuffer[j] = (sound[i]+sound[i+1])/2;
361 j++;
362 }
363 qApp->processEvents();
364 length+=write(wav, monoBuffer, result/2);
365 }
366 printf("%d\r",length);
367 fflush(stdout);
368 }
369 }
370 // else { //AFMT_U8 // don't try this yet.. as player doesn't understand
371// 8bit unsigned
372 // unsigned short sound[512], monoBuffer[512];
373// while(recording)
374// {
375// result = read(dsp, sound, 512); // 8192
376// qApp->processEvents();
377// int j=0;
378// if(systemZaurus)
379// {
380// for (int i = 0; i < result; i++) { //since Z is mono do normally
381// monoBuffer[i] = sound[i];
382// }
383// qApp->processEvents();
384// length+=write(wav, monoBuffer, result);
385// } else { //ipaq /stereo inputs
386// for (int i = 0; i < result; i+=2) {
387// monoBuffer[j] = (sound[i]+sound[i+1])/2;
388// j++;
389// }
390// qApp->processEvents();
391// length+=write(wav, monoBuffer, result/2);
392// }
393// // length += result;
394// printf("%d\r",length);
395// fflush(stdout);
396
397// qApp->processEvents();
398// }
399// }
400
401
358 402
359 while(recording) 403// char sound[512]; //char is 8 bit
360 { 404
361 result = read(dsp, sound, 512); // 8192 405// while(recording)
362 qApp->processEvents(); 406// {
407// result = read(dsp, sound, 512); // 8192
408// qApp->processEvents();
363 409
364 write(wav, sound, result); 410// write(wav, sound, result);
365 length += result; 411// length += result;
366 412
367 qApp->processEvents(); 413// qApp->processEvents();
368 } 414// }
415// qDebug("file has length of %d lasting %d seconds",
416// length, (( length / speed) / channels) / 2 );
417// medialplayer states wrong length in secs
418
369 419
370 value = length+36; 420 value = length+36;
371 lseek(wav, 4, SEEK_SET); 421 lseek(wav, 4, SEEK_SET);
372 write(wav, &value, 4); 422 write(wav, &value, 4);
373 lseek(wav, 40, SEEK_SET); 423 lseek(wav, 40, SEEK_SET);
374 write(wav, &length, 4); 424 write(wav, &length, 4);
375 track.close(); 425 track.close();
376 426
377 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) 427 if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
378 perror("ioctl(\"SNDCTL_DSP_RESET\")"); 428 perror("ioctl(\"SNDCTL_DSP_RESET\")");
379 ::close(dsp); 429 ::close(dsp);
430// if(systemZaurus)
431 QMessageBox::message("Vmemo"," Done recording");
380 432
381 QSound::play(Resource::findSound("vmemoe")); 433 QSound::play(Resource::findSound("vmemoe"));
382} 434}
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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= vmemo.h vmemoimpl.h 3 HEADERS= vmemo.h vmemoimpl.h
4 SOURCES= vmemo.cpp vmemoimpl.cpp 4 SOURCES= vmemo.cpp vmemoimpl.cpp
5 TARGET = vmemoapplet 5 TARGET = vmemoapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS = ../../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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= volume.h volumeappletimpl.h 3 HEADERS= volume.h volumeappletimpl.h
4 SOURCES= volume.cpp volumeappletimpl.cpp 4 SOURCES= volume.cpp volumeappletimpl.cpp
5 TARGET = volumeapplet 5 TARGET = volumeapplet
6 DESTDIR = ../../plugins/applets 6 DESTDIR = ../../plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include 8DEPENDPATH += ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts 12TRANSLATIONS += ../../i18n/de/libvolumeapplet.ts
13TRANSLATIONS = ../../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
@@ -1,36 +1,37 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4HEADERS = TEWidget.h \ 4HEADERS = TEWidget.h \
5 TEScreen.h \ 5 TEScreen.h \
6 TECommon.h \ 6 TECommon.h \
7 TEHistory.h \ 7 TEHistory.h \
8 TEmulation.h \ 8 TEmulation.h \
9 TEmuVt102.h \ 9 TEmuVt102.h \
10 session.h \ 10 session.h \
11 keytrans.h \ 11 keytrans.h \
12 konsole.h \ 12 konsole.h \
13 commandeditdialog.h \ 13 commandeditdialog.h \
14 commandeditwidget.h \ 14 commandeditwidget.h \
15 playlistselection.h \ 15 playlistselection.h \
16 MyPty.h 16 MyPty.h
17SOURCES = TEScreen.cpp \ 17SOURCES = TEScreen.cpp \
18 TEWidget.cpp \ 18 TEWidget.cpp \
19 TEHistory.cpp \ 19 TEHistory.cpp \
20 TEmulation.cpp \ 20 TEmulation.cpp \
21 TEmuVt102.cpp \ 21 TEmuVt102.cpp \
22 session.cpp \ 22 session.cpp \
23 keytrans.cpp \ 23 keytrans.cpp \
24 konsole.cpp \ 24 konsole.cpp \
25 commandeditdialog.cpp \ 25 commandeditdialog.cpp \
26 commandeditwidget.cpp \ 26 commandeditwidget.cpp \
27 playlistselection.cpp \ 27 playlistselection.cpp \
28 MyPty.cpp \ 28 MyPty.cpp \
29 main.cpp 29 main.cpp
30INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui 30INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui
31TARGET = embeddedkonsole 31TARGET = embeddedkonsole
32INCLUDEPATH += $(OPIEDIR)/include 32INCLUDEPATH += $(OPIEDIR)/include
33DEPENDPATH += $(OPIEDIR)/include 33DEPENDPATH += $(OPIEDIR)/include
34LIBS += -lqpe 34LIBS += -lqpe
35REQUIRES = embeddedkonsole 35REQUIRES = embeddedkonsole
36 36
37TRANSLATIONS = ../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
@@ -1,12 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = helpbrowser.h 4 HEADERS = helpbrowser.h
5 SOURCES = helpbrowser.cpp \ 5 SOURCES = helpbrowser.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 11
12TRANSLATIONS = ../i18n/de/helpbrowser.ts 12TRANSLATIONS = ../i18n/de/helpbrowser.ts
13TRANSLATIONS = ../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
@@ -1,14 +1,15 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 3
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h 5HEADERS = textedit.h fileBrowser.h fontDialog.h fileSaver.h filePermissions.h inputDialog.h
6SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp 6SOURCES = main.cpp textedit.cpp fileBrowser.cpp fontDialog.cpp fileSaver.cpp filePermissions.cpp inputDialog.cpp
7 7
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TARGET = textedit 12TARGET = textedit
13 13
14TRANSLATIONS = ../i18n/de/textedit.ts 14TRANSLATIONS = ../i18n/de/textedit.ts
15TRANSLATIONS = ../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
@@ -1,112 +1,113 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 4
5 DESTDIR = $(OPIEDIR)/bin 5 DESTDIR = $(OPIEDIR)/bin
6 6
7 HEADERS = background.h \ 7 HEADERS = background.h \
8 desktop.h \ 8 desktop.h \
9 qprocess.h \ 9 qprocess.h \
10 info.h \ 10 info.h \
11 appicons.h \ 11 appicons.h \
12 taskbar.h \ 12 taskbar.h \
13 sidething.h \ 13 sidething.h \
14 mrulist.h \ 14 mrulist.h \
15 stabmon.h \ 15 stabmon.h \
16 inputmethods.h \ 16 inputmethods.h \
17 systray.h \ 17 systray.h \
18 wait.h \ 18 wait.h \
19 shutdownimpl.h \ 19 shutdownimpl.h \
20 launcher.h \ 20 launcher.h \
21 launcherview.h \ 21 launcherview.h \
22 ../calibrate/calibrate.h \ 22 ../calibrate/calibrate.h \
23 startmenu.h \ 23 startmenu.h \
24 transferserver.h \ 24 transferserver.h \
25 qcopbridge.h \ 25 qcopbridge.h \
26 packageslave.h \ 26 packageslave.h \
27 irserver.h \ 27 irserver.h \
28 $(OPIEDIR)/rsync/buf.h \ 28 /skiff/opie/rsync/buf.h \
29 $(OPIEDIR)/rsync/checksum.h \ 29 /skiff/opie/rsync/checksum.h \
30 $(OPIEDIR)/rsync/command.h \ 30 /skiff/opie/rsync/command.h \
31 $(OPIEDIR)/rsync/emit.h \ 31 /skiff/opie/rsync/emit.h \
32 $(OPIEDIR)/rsync/job.h \ 32 /skiff/opie/rsync/job.h \
33 $(OPIEDIR)/rsync/netint.h \ 33 /skiff/opie/rsync/netint.h \
34 $(OPIEDIR)/rsync/protocol.h \ 34 /skiff/opie/rsync/protocol.h \
35 $(OPIEDIR)/rsync/prototab.h \ 35 /skiff/opie/rsync/prototab.h \
36 $(OPIEDIR)/rsync/rsync.h \ 36 /skiff/opie/rsync/rsync.h \
37 $(OPIEDIR)/rsync/search.h \ 37 /skiff/opie/rsync/search.h \
38 $(OPIEDIR)/rsync/stream.h \ 38 /skiff/opie/rsync/stream.h \
39 $(OPIEDIR)/rsync/sumset.h \ 39 /skiff/opie/rsync/sumset.h \
40 $(OPIEDIR)/rsync/trace.h \ 40 /skiff/opie/rsync/trace.h \
41 $(OPIEDIR)/rsync/types.h \ 41 /skiff/opie/rsync/types.h \
42 $(OPIEDIR)/rsync/util.h \ 42 /skiff/opie/rsync/util.h \
43 $(OPIEDIR)/rsync/whole.h \ 43 /skiff/opie/rsync/whole.h \
44 $(OPIEDIR)/rsync/config_rsync.h \ 44 /skiff/opie/rsync/config_rsync.h \
45 $(OPIEDIR)/rsync/qrsync.h 45 /skiff/opie/rsync/qrsync.h
46 # quicklauncher.h \ 46 # quicklauncher.h \
47 47
48 SOURCES = background.cpp \ 48 SOURCES = background.cpp \
49 desktop.cpp \ 49 desktop.cpp \
50 qprocess.cpp qprocess_unix.cpp \ 50 qprocess.cpp qprocess_unix.cpp \
51 info.cpp \ 51 info.cpp \
52 appicons.cpp \ 52 appicons.cpp \
53 taskbar.cpp \ 53 taskbar.cpp \
54 sidething.cpp \ 54 sidething.cpp \
55 mrulist.cpp \ 55 mrulist.cpp \
56 stabmon.cpp \ 56 stabmon.cpp \
57 inputmethods.cpp \ 57 inputmethods.cpp \
58 systray.cpp \ 58 systray.cpp \
59 wait.cpp \ 59 wait.cpp \
60 shutdownimpl.cpp \ 60 shutdownimpl.cpp \
61 launcher.cpp \ 61 launcher.cpp \
62 launcherview.cpp \ 62 launcherview.cpp \
63 $(OPIEDIR)/calibrate/calibrate.cpp \ 63 /skiff/opie/calibrate/calibrate.cpp \
64 transferserver.cpp \ 64 transferserver.cpp \
65 packageslave.cpp \ 65 packageslave.cpp \
66 irserver.cpp \ 66 irserver.cpp \
67 qcopbridge.cpp \ 67 qcopbridge.cpp \
68 startmenu.cpp \ 68 startmenu.cpp \
69 main.cpp \ 69 main.cpp \
70 $(OPIEDIR)/rsync/base64.c \ 70 /skiff/opie/rsync/base64.c \
71 $(OPIEDIR)/rsync/buf.c \ 71 /skiff/opie/rsync/buf.c \
72 $(OPIEDIR)/rsync/checksum.c \ 72 /skiff/opie/rsync/checksum.c \
73 $(OPIEDIR)/rsync/command.c \ 73 /skiff/opie/rsync/command.c \
74 $(OPIEDIR)/rsync/delta.c \ 74 /skiff/opie/rsync/delta.c \
75 $(OPIEDIR)/rsync/emit.c \ 75 /skiff/opie/rsync/emit.c \
76 $(OPIEDIR)/rsync/hex.c \ 76 /skiff/opie/rsync/hex.c \
77 $(OPIEDIR)/rsync/job.c \ 77 /skiff/opie/rsync/job.c \
78 $(OPIEDIR)/rsync/mdfour.c \ 78 /skiff/opie/rsync/mdfour.c \
79 $(OPIEDIR)/rsync/mksum.c \ 79 /skiff/opie/rsync/mksum.c \
80 $(OPIEDIR)/rsync/msg.c \ 80 /skiff/opie/rsync/msg.c \
81 $(OPIEDIR)/rsync/netint.c \ 81 /skiff/opie/rsync/netint.c \
82 $(OPIEDIR)/rsync/patch.c \ 82 /skiff/opie/rsync/patch.c \
83 $(OPIEDIR)/rsync/prototab.c \ 83 /skiff/opie/rsync/prototab.c \
84 $(OPIEDIR)/rsync/readsums.c \ 84 /skiff/opie/rsync/readsums.c \
85 $(OPIEDIR)/rsync/scoop.c \ 85 /skiff/opie/rsync/scoop.c \
86 $(OPIEDIR)/rsync/search.c \ 86 /skiff/opie/rsync/search.c \
87 $(OPIEDIR)/rsync/stats.c \ 87 /skiff/opie/rsync/stats.c \
88 $(OPIEDIR)/rsync/stream.c \ 88 /skiff/opie/rsync/stream.c \
89 $(OPIEDIR)/rsync/sumset.c \ 89 /skiff/opie/rsync/sumset.c \
90 $(OPIEDIR)/rsync/trace.c \ 90 /skiff/opie/rsync/trace.c \
91 $(OPIEDIR)/rsync/tube.c \ 91 /skiff/opie/rsync/tube.c \
92 $(OPIEDIR)/rsync/util.c \ 92 /skiff/opie/rsync/util.c \
93 $(OPIEDIR)/rsync/version.c \ 93 /skiff/opie/rsync/version.c \
94 $(OPIEDIR)/rsync/whole.c \ 94 /skiff/opie/rsync/whole.c \
95 $(OPIEDIR)/rsync/qrsync.cpp 95 /skiff/opie/rsync/qrsync.cpp
96 96
97 INTERFACES= shutdown.ui syncdialog.ui 97 INTERFACES= shutdown.ui syncdialog.ui
98 98
99INCLUDEPATH += $(OPIEDIR)/include 99INCLUDEPATH += $(OPIEDIR)/include
100 DEPENDPATH+= $(OPIEDIR)/include . 100 DEPENDPATH+= $(OPIEDIR)/include .
101 101
102INCLUDEPATH += $(OPIEDIR)/calibrate 102INCLUDEPATH += $(OPIEDIR)/calibrate
103 DEPENDPATH+= $(OPIEDIR)/calibrate 103 DEPENDPATH+= $(OPIEDIR)/calibrate
104 104
105INCLUDEPATH += $(OPIEDIR)/rsync 105INCLUDEPATH += $(OPIEDIR)/rsync
106 DEPENDPATH+= $(OPIEDIR)/rsync 106 DEPENDPATH+= $(OPIEDIR)/rsync
107 107
108 TARGET = qpe 108 TARGET = qpe
109 109
110 LIBS += -lqpe -lcrypt 110 LIBS += -lqpe -lcrypt
111 111
112TRANSLATIONS = ../i18n/de/qpe.ts 112TRANSLATIONS = ../i18n/de/qpe.ts
113TRANSLATIONS = ../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
@@ -1,12 +1,14 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ 3HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h 4 layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
5SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ 5SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp 6 layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
7TARGET = madplugin 7TARGET = madplugin
8DESTDIR = ../../plugins/codecs 8DESTDIR = ../../plugins/codecs
9INCLUDEPATH += $(OPIEDIR)/include .. 9INCLUDEPATH += $(OPIEDIR)/include ..
10DEPENDPATH += ../$(OPIEDIR)/include .. 10DEPENDPATH += ../$(OPIEDIR)/include ..
11LIBS += -lqpe -lm 11LIBS += -lqpe -lm
12VERSION = 1.0.0 12VERSION = 1.0.0
13
14TRANSLATIONS = ../../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
@@ -1,25 +1,26 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3#release 3#release
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ 5HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h inputDialog.h 6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h inputDialog.h
7SOURCES = main.cpp \ 7SOURCES = main.cpp \
8 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ 8 loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
9 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp inputDialog.cpp 9 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp inputDialog.cpp
10TARGET = mpegplayer 10TARGET = mpegplayer
11INCLUDEPATH += $(OPIEDIR)/include 11INCLUDEPATH += $(OPIEDIR)/include
12DEPENDPATH += $(OPIEDIR)/include 12DEPENDPATH += $(OPIEDIR)/include
13LIBS += -lqpe -lpthread 13LIBS += -lqpe -lpthread
14 14
15# INTERFACES = 15# INTERFACES =
16# INCLUDEPATH += $(OPIEDIR)/include 16# INCLUDEPATH += $(OPIEDIR)/include
17# CONFIG+=static 17# CONFIG+=static
18# TMAKE_CXXFLAGS += -DQPIM_STANDALONE 18# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
19# LIBS += libmpeg3/libmpeg3.a -lpthread 19# LIBS += libmpeg3/libmpeg3.a -lpthread
20# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so 20# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
21 21
22INCLUDEPATH += $(OPIEDIR)/include 22INCLUDEPATH += $(OPIEDIR)/include
23DEPENDPATH += $(OPIEDIR)/include 23DEPENDPATH += $(OPIEDIR)/include
24 24
25TRANSLATIONS = ../i18n/de/mpegplayer.ts 25TRANSLATIONS = ../i18n/de/mpegplayer.ts
26TRANSLATIONS = ../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
@@ -1,22 +1,23 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= addressbook.h \ 4 HEADERS= addressbook.h \
5 abeditor.h \ 5 abeditor.h \
6 ablabel.h \ 6 ablabel.h \
7 abtable.h \ 7 abtable.h \
8 addresssettings.h 8 addresssettings.h
9 SOURCES= main.cpp \ 9 SOURCES= main.cpp \
10 addressbook.cpp \ 10 addressbook.cpp \
11 abeditor.cpp \ 11 abeditor.cpp \
12 ablabel.cpp \ 12 ablabel.cpp \
13 abtable.cpp \ 13 abtable.cpp \
14 addresssettings.cpp 14 addresssettings.cpp
15 INTERFACES= addresssettingsbase.ui 15 INTERFACES= addresssettingsbase.ui
16 16
17 TARGET = addressbook 17 TARGET = addressbook
18INCLUDEPATH += $(OPIEDIR)/include 18INCLUDEPATH += $(OPIEDIR)/include
19 DEPENDPATH+= $(OPIEDIR)/include 19 DEPENDPATH+= $(OPIEDIR)/include
20LIBS += -lqpe 20LIBS += -lqpe
21 21
22TRANSLATIONS = ../i18n/de/addressbook.ts 22TRANSLATIONS = ../i18n/de/addressbook.ts
23TRANSLATIONS = ../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
@@ -1,42 +1,43 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 4
5 HEADERS= datebookday.h \ 5 HEADERS= datebookday.h \
6 datebook.h \ 6 datebook.h \
7 dateentryimpl.h \ 7 dateentryimpl.h \
8 datebookdayheaderimpl.h \ 8 datebookdayheaderimpl.h \
9 datebooksettings.h \ 9 datebooksettings.h \
10 datebookweek.h \ 10 datebookweek.h \
11 datebookweeklst.h \ 11 datebookweeklst.h \
12 datebookweekheaderimpl.h \ 12 datebookweekheaderimpl.h \
13 repeatentry.h \ 13 repeatentry.h \
14 clickablelabel.h 14 clickablelabel.h
15 15
16 SOURCES= main.cpp \ 16 SOURCES= main.cpp \
17 datebookday.cpp \ 17 datebookday.cpp \
18 datebook.cpp \ 18 datebook.cpp \
19 dateentryimpl.cpp \ 19 dateentryimpl.cpp \
20 datebookdayheaderimpl.cpp \ 20 datebookdayheaderimpl.cpp \
21 datebooksettings.cpp \ 21 datebooksettings.cpp \
22 datebookweek.cpp \ 22 datebookweek.cpp \
23 datebookweeklst.cpp \ 23 datebookweeklst.cpp \
24 datebookweekheaderimpl.cpp \ 24 datebookweekheaderimpl.cpp \
25 repeatentry.cpp \ 25 repeatentry.cpp \
26 clickablelabel.cpp 26 clickablelabel.cpp
27 27
28 INTERFACES= dateentry.ui \ 28 INTERFACES= dateentry.ui \
29 datebookdayheader.ui \ 29 datebookdayheader.ui \
30 datebooksettingsbase.ui \ 30 datebooksettingsbase.ui \
31 datebookweekheader.ui \ 31 datebookweekheader.ui \
32 datebookweeklstheader.ui \ 32 datebookweeklstheader.ui \
33 datebookweeklstdayhdr.ui \ 33 datebookweeklstdayhdr.ui \
34 repeatentrybase.ui 34 repeatentrybase.ui
35 35
36INCLUDEPATH += $(OPIEDIR)/include 36INCLUDEPATH += $(OPIEDIR)/include
37 DEPENDPATH+= $(OPIEDIR)/include 37 DEPENDPATH+= $(OPIEDIR)/include
38LIBS += -lqpe 38LIBS += -lqpe
39 39
40 TARGET = datebook 40 TARGET = datebook
41 41
42TRANSLATIONS = ../i18n/de/datebook.ts 42TRANSLATIONS = ../i18n/de/datebook.ts
43TRANSLATIONS = ../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
@@ -1,12 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h 4 HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h
5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp 5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp
6 6
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= 10 INTERFACES=
11 TARGET = today 11 TARGET = today
12 DESTDIR = $(OPIEDIR)/bin 12 DESTDIR = $(OPIEDIR)/bin
13TRANSLATIONS = ../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
@@ -1,19 +1,20 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= mainwindow.h \ 4 HEADERS= mainwindow.h \
5 todotable.h \ 5 todotable.h \
6 todoentryimpl.h 6 todoentryimpl.h
7 SOURCES= main.cpp \ 7 SOURCES= main.cpp \
8 mainwindow.cpp \ 8 mainwindow.cpp \
9 todotable.cpp \ 9 todotable.cpp \
10 todoentryimpl.cpp 10 todoentryimpl.cpp
11 11
12 INTERFACES= todoentry.ui 12 INTERFACES= todoentry.ui
13 13
14 TARGET = todolist 14 TARGET = todolist
15INCLUDEPATH += $(OPIEDIR)/include 15INCLUDEPATH += $(OPIEDIR)/include
16 DEPENDPATH+= $(OPIEDIR)/include 16 DEPENDPATH+= $(OPIEDIR)/include
17LIBS += -lqpe 17LIBS += -lqpe
18 18
19TRANSLATIONS = ../i18n/de/todolist.ts 19TRANSLATIONS = ../i18n/de/todolist.ts
20TRANSLATIONS = ../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
@@ -1,13 +1,14 @@
1# $Id$ 1# $Id$
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3TEMPLATE = app 3TEMPLATE = app
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5INTERFACES = citytimebase.ui 5INTERFACES = citytimebase.ui
6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h 6HEADERS = citytime.h zonemap.h sun.h stylusnormalizer.h
7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp 7SOURCES = citytime.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
8TARGET = citytime 8TARGET = citytime
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(OPIEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/citytime.ts 13TRANSLATIONS = ../i18n/de/citytime.ts
14TRANSLATIONS = ../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
@@ -1,12 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = light.cpp main.cpp 5 SOURCES = light.cpp main.cpp
6 INTERFACES= lightsettingsbase.ui 6 INTERFACES= lightsettingsbase.ui
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = light-and-power 10 TARGET = light-and-power
11 11
12TRANSLATIONS = ../../i18n/de/light-and-power.ts 12TRANSLATIONS = ../../i18n/de/light-and-power.ts
13TRANSLATIONS = ../../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
@@ -1,12 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = security.h 4 HEADERS = security.h
5 SOURCES = security.cpp main.cpp 5 SOURCES = security.cpp main.cpp
6 INTERFACES= securitybase.ui 6 INTERFACES= securitybase.ui
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = security 10 TARGET = security
11 11
12TRANSLATIONS = ../../i18n/de/security.ts 12TRANSLATIONS = ../../i18n/de/security.ts
13TRANSLATIONS = ../../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
@@ -1,18 +1,20 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= dvorak.h \ 3 HEADERS= dvorak.h \
4 ../pickboard/pickboardcfg.h \ 4 ../pickboard/pickboardcfg.h \
5 ../pickboard/pickboardpicks.h \ 5 ../pickboard/pickboardpicks.h \
6 dvorakimpl.h 6 dvorakimpl.h
7 SOURCES= dvorak.cpp \ 7 SOURCES= dvorak.cpp \
8 ../pickboard/pickboardcfg.cpp \ 8 ../pickboard/pickboardcfg.cpp \
9 ../pickboard/pickboardpicks.cpp \ 9 ../pickboard/pickboardpicks.cpp \
10 dvorakimpl.cpp 10 dvorakimpl.cpp
11 TARGET = qdvorak 11 TARGET = qdvorak
12 DESTDIR = ../../plugins/inputmethods 12 DESTDIR = ../../plugins/inputmethods
13INCLUDEPATH += $(OPIEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar 14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
15LIBS += -lqpe 15LIBS += -lqpe
16 VERSION = 1.0.0 16 VERSION = 1.0.0
17 17
18TRANSLATIONS += ../../i18n/de/libqdvorak.ts 18TRANSLATIONS += ../../i18n/de/libqdvorak.ts
19TRANSLATIONS = ../../i18n/pt_BR/libqdvorak.ts
20
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
@@ -1,33 +1,35 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= qimpenchar.h \ 3 HEADERS= qimpenchar.h \
4 qimpenprofile.h \ 4 qimpenprofile.h \
5 qimpencombining.h \ 5 qimpencombining.h \
6 qimpenhelp.h \ 6 qimpenhelp.h \
7 qimpeninput.h \ 7 qimpeninput.h \
8 qimpenmatch.h \ 8 qimpenmatch.h \
9 qimpensetup.h \ 9 qimpensetup.h \
10 qimpenstroke.h \ 10 qimpenstroke.h \
11 qimpenwidget.h \ 11 qimpenwidget.h \
12 qimpenwordpick.h \ 12 qimpenwordpick.h \
13 handwritingimpl.h 13 handwritingimpl.h
14 SOURCES= qimpenchar.cpp \ 14 SOURCES= qimpenchar.cpp \
15 qimpenprofile.cpp \ 15 qimpenprofile.cpp \
16 qimpencombining.cpp \ 16 qimpencombining.cpp \
17 qimpenhelp.cpp \ 17 qimpenhelp.cpp \
18 qimpeninput.cpp \ 18 qimpeninput.cpp \
19 qimpenmatch.cpp \ 19 qimpenmatch.cpp \
20 qimpensetup.cpp \ 20 qimpensetup.cpp \
21 qimpenstroke.cpp \ 21 qimpenstroke.cpp \
22 qimpenwidget.cpp \ 22 qimpenwidget.cpp \
23 qimpenwordpick.cpp \ 23 qimpenwordpick.cpp \
24 handwritingimpl.cpp 24 handwritingimpl.cpp
25INTERFACES = qimpenprefbase.ui 25INTERFACES = qimpenprefbase.ui
26 TARGET = qhandwriting 26 TARGET = qhandwriting
27 DESTDIR = ../../plugins/inputmethods 27 DESTDIR = ../../plugins/inputmethods
28INCLUDEPATH += $(OPIEDIR)/include 28INCLUDEPATH += $(OPIEDIR)/include
29DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar 29DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
30LIBS += -lqpe 30LIBS += -lqpe
31 VERSION = 1.0.0 31 VERSION = 1.0.0
32 32
33TRANSLATIONS += ../../i18n/de/libqhandwriting.ts 33TRANSLATIONS += ../../i18n/de/libqhandwriting.ts
34TRANSLATIONS = ../../i18n/pt_BR/libqhandwriting.ts
35
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
@@ -1,18 +1,20 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= keyboard.h \ 3 HEADERS= keyboard.h \
4 ../pickboard/pickboardcfg.h \ 4 ../pickboard/pickboardcfg.h \
5 ../pickboard/pickboardpicks.h \ 5 ../pickboard/pickboardpicks.h \
6 keyboardimpl.h 6 keyboardimpl.h
7 SOURCES= keyboard.cpp \ 7 SOURCES= keyboard.cpp \
8 ../pickboard/pickboardcfg.cpp \ 8 ../pickboard/pickboardcfg.cpp \
9 ../pickboard/pickboardpicks.cpp \ 9 ../pickboard/pickboardpicks.cpp \
10 keyboardimpl.cpp 10 keyboardimpl.cpp
11 TARGET = qkeyboard 11 TARGET = qkeyboard
12 DESTDIR = ../../plugins/inputmethods 12 DESTDIR = ../../plugins/inputmethods
13INCLUDEPATH += $(OPIEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar 14DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
15LIBS += -lqpe 15LIBS += -lqpe
16 VERSION = 1.0.0 16 VERSION = 1.0.0
17 17
18TRANSLATIONS += ../../i18n/de/libqkeyboard.ts 18TRANSLATIONS += ../../i18n/de/libqkeyboard.ts
19TRANSLATIONS = ../../i18n/pt_BR/libqkeyboard.ts
20
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
@@ -1,12 +1,13 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h 3 HEADERS= pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h
4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp 4 SOURCES= pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp
5 TARGET = qpickboard 5 TARGET = qpickboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libqpickboard.ts 12TRANSLATIONS += ../../i18n/de/libqpickboard.ts
13TRANSLATIONS = ../../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
@@ -1,12 +1,13 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= unikeyboard.h unikeyboardimpl.h 3 HEADERS= unikeyboard.h unikeyboardimpl.h
4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp 4 SOURCES= unikeyboard.cpp unikeyboardimpl.cpp
5 TARGET = qunikeyboard 5 TARGET = qunikeyboard
6 DESTDIR = ../../plugins/inputmethods 6 DESTDIR = ../../plugins/inputmethods
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar 8DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar
9LIBS += -lqpe 9LIBS += -lqpe
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts 12TRANSLATIONS += ../../i18n/de/libqunikeyboard.ts
13TRANSLATIONS = ../../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
@@ -1,130 +1,131 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS= calendar.h \ 3 HEADERS= calendar.h \
4 global.h \ 4 global.h \
5 resource.h \ 5 resource.h \
6 xmlreader.h \ 6 xmlreader.h \
7 mimetype.h \ 7 mimetype.h \
8 menubutton.h \ 8 menubutton.h \
9 network.h \ 9 network.h \
10 networkinterface.h \ 10 networkinterface.h \
11 filemanager.h \ 11 filemanager.h \
12 fontmanager.h \ 12 fontmanager.h \
13 qdawg.h \ 13 qdawg.h \
14 datebookmonth.h \ 14 datebookmonth.h \
15 fileselector.h \ 15 fileselector.h \
16 fileselector_p.h \ 16 fileselector_p.h \
17 imageedit.h \ 17 imageedit.h \
18 qcopenvelope_qws.h \ 18 qcopenvelope_qws.h \
19 qpedecoration_qws.h \ 19 qpedecoration_qws.h \
20 qpeapplication.h \ 20 qpeapplication.h \
21 qpestyle.h \ 21 qpestyle.h \
22 qpedialog.h \ 22 qpedialog.h \
23 lightstyle.h \ 23 lightstyle.h \
24 config.h \ 24 config.h \
25 applnk.h \ 25 applnk.h \
26 sound.h \ 26 sound.h \
27 tzselect.h \ 27 tzselect.h \
28 qmath.h \ 28 qmath.h \
29 datebookdb.h \ 29 datebookdb.h \
30 alarmserver.h \ 30 alarmserver.h \
31 process.h \ 31 process.h \
32 password.h \ 32 password.h \
33 timestring.h \ 33 timestring.h \
34 fontfactoryinterface.h \ 34 fontfactoryinterface.h \
35 fontdatabase.h \ 35 fontdatabase.h \
36 power.h \ 36 power.h \
37 storage.h \ 37 storage.h \
38 qpemessagebox.h \ 38 qpemessagebox.h \
39 backend/timeconversion.h \ 39 backend/timeconversion.h \
40 qpedebug.h \ 40 qpedebug.h \
41 qpemenubar.h \ 41 qpemenubar.h \
42 qpetoolbar.h \ 42 qpetoolbar.h \
43 backend/categories.h \ 43 backend/categories.h \
44 backend/stringutil.h \ 44 backend/stringutil.h \
45 backend/palmtopuid.h \ 45 backend/palmtopuid.h \
46 backend/palmtoprecord.h \ 46 backend/palmtoprecord.h \
47 backend/task.h \ 47 backend/task.h \
48 backend/event.h \ 48 backend/event.h \
49 backend/contact.h\ 49 backend/contact.h\
50 categorymenu.h \ 50 categorymenu.h \
51 categoryedit_p.h \ 51 categoryedit_p.h \
52 categoryselect.h \ 52 categoryselect.h \
53 categorywidget.h \ 53 categorywidget.h \
54 ir.h \ 54 ir.h \
55 backend/vobject_p.h \ 55 backend/vobject_p.h \
56 findwidget_p.h \ 56 findwidget_p.h \
57 finddialog.h \ 57 finddialog.h \
58 lnkproperties.h 58 lnkproperties.h
59 59
60 SOURCES= calendar.cpp \ 60 SOURCES= calendar.cpp \
61 global.cpp \ 61 global.cpp \
62 xmlreader.cpp \ 62 xmlreader.cpp \
63 mimetype.cpp \ 63 mimetype.cpp \
64 menubutton.cpp \ 64 menubutton.cpp \
65 network.cpp \ 65 network.cpp \
66 networkinterface.cpp \ 66 networkinterface.cpp \
67 filemanager.cpp \ 67 filemanager.cpp \
68 fontmanager.cpp \ 68 fontmanager.cpp \
69 qdawg.cpp \ 69 qdawg.cpp \
70 datebookmonth.cpp \ 70 datebookmonth.cpp \
71 fileselector.cpp \ 71 fileselector.cpp \
72 imageedit.cpp \ 72 imageedit.cpp \
73 resource.cpp \ 73 resource.cpp \
74 qpedecoration_qws.cpp \ 74 qpedecoration_qws.cpp \
75 qcopenvelope_qws.cpp \ 75 qcopenvelope_qws.cpp \
76 qpeapplication.cpp \ 76 qpeapplication.cpp \
77 qpestyle.cpp \ 77 qpestyle.cpp \
78 qpedialog.cpp \ 78 qpedialog.cpp \
79 lightstyle.cpp \ 79 lightstyle.cpp \
80 config.cpp \ 80 config.cpp \
81 applnk.cpp \ 81 applnk.cpp \
82 sound.cpp \ 82 sound.cpp \
83 tzselect.cpp \ 83 tzselect.cpp \
84 qmath.c \ 84 qmath.c \
85 datebookdb.cpp \ 85 datebookdb.cpp \
86 alarmserver.cpp \ 86 alarmserver.cpp \
87 password.cpp \ 87 password.cpp \
88 process.cpp \ 88 process.cpp \
89 process_unix.cpp \ 89 process_unix.cpp \
90 timestring.cpp \ 90 timestring.cpp \
91 fontdatabase.cpp \ 91 fontdatabase.cpp \
92 power.cpp \ 92 power.cpp \
93 storage.cpp \ 93 storage.cpp \
94 qpemessagebox.cpp \ 94 qpemessagebox.cpp \
95 backend/timeconversion.cpp \ 95 backend/timeconversion.cpp \
96 qpedebug.cpp \ 96 qpedebug.cpp \
97 qpemenubar.cpp \ 97 qpemenubar.cpp \
98 qpetoolbar.cpp \ 98 qpetoolbar.cpp \
99 backend/categories.cpp \ 99 backend/categories.cpp \
100 backend/stringutil.cpp \ 100 backend/stringutil.cpp \
101 backend/palmtoprecord.cpp \ 101 backend/palmtoprecord.cpp \
102 backend/task.cpp \ 102 backend/task.cpp \
103 backend/event.cpp \ 103 backend/event.cpp \
104 backend/contact.cpp \ 104 backend/contact.cpp \
105 categorymenu.cpp \ 105 categorymenu.cpp \
106 categoryedit_p.cpp \ 106 categoryedit_p.cpp \
107 categoryselect.cpp \ 107 categoryselect.cpp \
108 categorywidget.cpp \ 108 categorywidget.cpp \
109 ir.cpp \ 109 ir.cpp \
110 backend/vcc_yacc.cpp \ 110 backend/vcc_yacc.cpp \
111 backend/vobject.cpp \ 111 backend/vobject.cpp \
112 findwidget_p.cpp \ 112 findwidget_p.cpp \
113 finddialog.cpp \ 113 finddialog.cpp \
114 lnkproperties.cpp 114 lnkproperties.cpp
115 115
116# Qt 3 compatibility 116# Qt 3 compatibility
117qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h 117qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
118qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp 118qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
119 119
120INCLUDEPATH += $(OPIEDIR)/include backend 120INCLUDEPATH += $(OPIEDIR)/include backend
121 LIBS += -ldl -lcrypt -lm 121 LIBS += -ldl -lcrypt -lm
122 122
123INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui 123INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
124 124
125 TARGET = qpe 125 TARGET = qpe
126 DESTDIR = $(QTDIR)/lib$(PROJMAK) 126 DESTDIR = $(QTDIR)/lib$(PROJMAK)
127# This is set by configure$(OPIEDIR). 127# This is set by configure$(OPIEDIR).
128 VERSION = 1.5.0 128 VERSION = 1.5.0
129 129
130TRANSLATIONS = ../i18n/de/libqpe.ts 130TRANSLATIONS = ../i18n/de/libqpe.ts
131TRANSLATIONS = ../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
@@ -1,36 +1,38 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on debug 2 CONFIG = qt warn_on debug
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 SUBDIRS = db ui 4 SUBDIRS = db ui
5 HEADERS = tableviewer.h \ 5 HEADERS = tableviewer.h \
6 ui/commonwidgets.h \ 6 ui/commonwidgets.h \
7 ui/tvbrowseview.h \ 7 ui/tvbrowseview.h \
8 ui/tvlistview.h \ 8 ui/tvlistview.h \
9 ui/tvfilterview.h \ 9 ui/tvfilterview.h \
10 ui/tveditview.h \ 10 ui/tveditview.h \
11 ui/browsekeyentry.h \ 11 ui/browsekeyentry.h \
12 ui/filterkeyentry.h \ 12 ui/filterkeyentry.h \
13 ui/tvkeyedit.h \ 13 ui/tvkeyedit.h \
14 db/datacache.h \ 14 db/datacache.h \
15 db/common.h \ 15 db/common.h \
16 db/xmlsource.h \ 16 db/xmlsource.h \
17 db/csvsource.h 17 db/csvsource.h
18 SOURCES = main.cpp \ 18 SOURCES = main.cpp \
19 tableviewer.cpp \ 19 tableviewer.cpp \
20 ui/commonwidgets.cpp \ 20 ui/commonwidgets.cpp \
21 ui/tvbrowseview.cpp \ 21 ui/tvbrowseview.cpp \
22 ui/tvfilterview.cpp \ 22 ui/tvfilterview.cpp \
23 ui/browsekeyentry.cpp \ 23 ui/browsekeyentry.cpp \
24 ui/filterkeyentry.cpp \ 24 ui/filterkeyentry.cpp \
25 ui/tvlistview.cpp \ 25 ui/tvlistview.cpp \
26 ui/tveditview.cpp \ 26 ui/tveditview.cpp \
27 ui/tvkeyedit.cpp \ 27 ui/tvkeyedit.cpp \
28 db/datacache.cpp \ 28 db/datacache.cpp \
29 db/xmlsource.cpp \ 29 db/xmlsource.cpp \
30 db/csvsource.cpp \ 30 db/csvsource.cpp \
31 db/common.cpp 31 db/common.cpp
32 INTERFACES= ui/tvkeyedit_gen.ui 32 INTERFACES= ui/tvkeyedit_gen.ui
33 TARGET = tableviewer 33 TARGET = tableviewer
34INCLUDEPATH += $(OPIEDIR)/include 34INCLUDEPATH += $(OPIEDIR)/include
35DEPENDPATH += $(OPIEDIR)/include 35DEPENDPATH += $(OPIEDIR)/include
36 LIBS += -lqpe 36 LIBS += -lqpe
37
38TRANSLATIONS = ../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
@@ -1,38 +1,39 @@
1TEMPLATE = app 1TEMPLATE = app
2 2
3CONFIG += qt warn_on release 3CONFIG += qt warn_on release
4DESTDIR = ../bin 4DESTDIR = ../bin
5 5
6 HEADERS = d3des.h \ 6 HEADERS = d3des.h \
7 krfbbuffer.h \ 7 krfbbuffer.h \
8 krfbcanvas.h \ 8 krfbcanvas.h \
9 krfbconnection.h \ 9 krfbconnection.h \
10 krfbdecoder.h \ 10 krfbdecoder.h \
11 krfblogin.h \ 11 krfblogin.h \
12 krfboptions.h \ 12 krfboptions.h \
13 krfbserverinfo.h \ 13 krfbserverinfo.h \
14 kvnc.h \ 14 kvnc.h \
15 kvncconnectdlg.h \ 15 kvncconnectdlg.h \
16 kvncoptionsdlg.h \ 16 kvncoptionsdlg.h \
17 version.h \ 17 version.h \
18 vncauth.h 18 vncauth.h
19 19
20 SOURCES = d3des.c \ 20 SOURCES = d3des.c \
21 vncauth.c \ 21 vncauth.c \
22 krfbbuffer.cpp \ 22 krfbbuffer.cpp \
23 krfbcanvas.cpp \ 23 krfbcanvas.cpp \
24 krfbconnection.cpp \ 24 krfbconnection.cpp \
25 krfbdecoder.cpp \ 25 krfbdecoder.cpp \
26 krfblogin.cpp \ 26 krfblogin.cpp \
27 krfboptions.cpp \ 27 krfboptions.cpp \
28 kvnc.cpp \ 28 kvnc.cpp \
29 kvncconnectdlg.cpp \ 29 kvncconnectdlg.cpp \
30 kvncoptionsdlg.cpp \ 30 kvncoptionsdlg.cpp \
31 main.cpp 31 main.cpp
32 INTERFACES= vncoptionsbase.ui 32 INTERFACES= vncoptionsbase.ui
33TARGET = keypebble 33TARGET = keypebble
34 34
35INCLUDEPATH += $(OPIEDIR)/include 35INCLUDEPATH += $(OPIEDIR)/include
36DEPENDPATH += $(OPIEDIR)/include 36DEPENDPATH += $(OPIEDIR)/include
37LIBS += -lqpe 37LIBS += -lqpe
38 38
39TRANSLATIONS = ../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
@@ -1,14 +1,16 @@
1 SOURCES+= chess.cpp main.cpp 1 SOURCES+= chess.cpp main.cpp
2 HEADERS+= chess.h 2 HEADERS+= chess.h
3DESTDIR = ../bin 3DESTDIR = ../bin
4TARGET = chess 4TARGET = chess
5 DEPENDPATH+= $(OPIEDIR)/include 5 DEPENDPATH+= $(OPIEDIR)/include
6INTERFACES = mainwindow.ui 6INTERFACES = mainwindow.ui
7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png 7 IMAGES= images/new.png images/repeat.png images/txt.png images/back.png
8 TEMPLATE=app 8 TEMPLATE=app
9 CONFIG+= qt warn_on release 9 CONFIG+= qt warn_on release
10INCLUDEPATH += $(OPIEDIR)/include 10INCLUDEPATH += $(OPIEDIR)/include
11 LIBS+= -lqpe 11 LIBS+= -lqpe
12 DBFILE= chess.db 12 DBFILE= chess.db
13 LANGUAGE= C++ 13 LANGUAGE= C++
14 CPP_ALWAYS_CREATE_SOURCE= TRUE 14 CPP_ALWAYS_CREATE_SOURCE= TRUE
15
16TRANSLATIONS = ../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
@@ -1,10 +1,12 @@
1 DESTDIR = ../bin 1 DESTDIR = ../bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = fifteen.h 4 HEADERS = fifteen.h
5 SOURCES = fifteen.cpp \ 5 SOURCES = fifteen.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = fifteen 10 TARGET = fifteen
11
12TRANSLATIONS = ../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
@@ -1,19 +1,21 @@
1 DESTDIR = ../bin 1 DESTDIR = ../bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = amigo.h \ 4 HEADERS = amigo.h \
5 go.h \ 5 go.h \
6 goplayutils.h \ 6 goplayutils.h \
7 gowidget.h 7 gowidget.h
8 SOURCES = amigo.c \ 8 SOURCES = amigo.c \
9 goplayer.c \ 9 goplayer.c \
10 goplayutils.c \ 10 goplayutils.c \
11 killable.c \ 11 killable.c \
12 gowidget.cpp \ 12 gowidget.cpp \
13 main.cpp 13 main.cpp
14INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(OPIEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 TARGET = go 17 TARGET = go
18 18
19TRANSLATIONS = ../i18n/de/go.ts \ No newline at end of file 19TRANSLATIONS = ../i18n/de/go.ts
20TRANSLATIONS = ../i18n/pt_BR/go.ts
21
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
@@ -1,19 +1,21 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 HEADERS = checkers.h \ 3 HEADERS = checkers.h \
4 echeckers.h \ 4 echeckers.h \
5 field.h \ 5 field.h \
6 kcheckers.h \ 6 kcheckers.h \
7 rcheckers.h 7 rcheckers.h
8 SOURCES = checkers.cpp \ 8 SOURCES = checkers.cpp \
9 echeckers.cpp \ 9 echeckers.cpp \
10 field.cpp \ 10 field.cpp \
11 kcheckers.cpp \ 11 kcheckers.cpp \
12 main.cpp \ 12 main.cpp \
13 rcheckers.cpp 13 rcheckers.cpp
14 INTERFACES= 14 INTERFACES=
15 INCLUDEPATH+= . \ 15 INCLUDEPATH+= . \
16 $(OPIEDIR)/include 16 $(OPIEDIR)/include
17 LIBS += -lqpe 17 LIBS += -lqpe
18 DESTDIR = $(OPIEDIR)/bin 18 DESTDIR = $(OPIEDIR)/bin
19 TARGET = kcheckers 19 TARGET = kcheckers
20
21TRANSLATIONS = ../../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
@@ -1,12 +1,14 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4 HEADERS = mindbreaker.h 4 HEADERS = mindbreaker.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 mindbreaker.cpp 6 mindbreaker.cpp
7TARGET = mindbreaker 7TARGET = mindbreaker
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TRANSLATIONS = ../i18n/de/mindbreaker.ts 12TRANSLATIONS = ../i18n/de/mindbreaker.ts
13TRANSLATIONS = ../i18n/pt_BR/mindbreaker.ts
14
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
@@ -1,14 +1,15 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = minefield.h \ 4 HEADERS = minefield.h \
5 minesweep.h 5 minesweep.h
6 SOURCES = main.cpp \ 6 SOURCES = main.cpp \
7 minefield.cpp \ 7 minefield.cpp \
8 minesweep.cpp 8 minesweep.cpp
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(OPIEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 INTERFACES= 12 INTERFACES=
13 13
14TRANSLATIONS = ../i18n/de/minesweep.ts 14TRANSLATIONS = ../i18n/de/minesweep.ts
15TRANSLATIONS = ../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
@@ -1,11 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h 4 HEADERS = interface.h man.h cannon.h base.h bullet.h helicopter.h
5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp 5 SOURCES = main.cpp interface.cpp man.cpp cannon.cpp base.cpp bullet.cpp helicopter.cpp
6 TARGET = parashoot 6 TARGET = parashoot
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/parashoot.ts 11TRANSLATIONS = ../i18n/de/parashoot.ts
12TRANSLATIONS = ../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
@@ -1,11 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = ledmeter.h sprites.h toplevel.h view.h 4 HEADERS = ledmeter.h sprites.h toplevel.h view.h
5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp 5 SOURCES = ledmeter.cpp toplevel.cpp view.cpp main.cpp
6 TARGET = qasteroids 6 TARGET = qasteroids
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/qasteroids.ts 11TRANSLATIONS = ../i18n/de/qasteroids.ts
12TRANSLATIONS = ../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
@@ -1,11 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = snake.h target.h obstacle.h interface.h codes.h 4 HEADERS = snake.h target.h obstacle.h interface.h codes.h
5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp 5 SOURCES = snake.cpp target.cpp obstacle.cpp interface.cpp main.cpp
6 TARGET = snake 6 TARGET = snake
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 10
11TRANSLATIONS = ../i18n/de/snake.ts 11TRANSLATIONS = ../i18n/de/snake.ts
12TRANSLATIONS = ../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
@@ -1,18 +1,19 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 2
3 CONFIG += qt warn_on release 3 CONFIG += qt warn_on release
4 DESTDIR = $(OPIEDIR)/bin 4 DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h 6 HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h
7 7
8 SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp 8 SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp
9 9
10 TARGET = patience 10 TARGET = patience
11 11
12INCLUDEPATH += $(OPIEDIR)/include 12INCLUDEPATH += $(OPIEDIR)/include
13 DEPENDPATH+= $(OPIEDIR)/include 13 DEPENDPATH+= $(OPIEDIR)/include
14LIBS += -lqpe 14LIBS += -lqpe
15 15
16 REQUIRES= patience 16 REQUIRES= patience
17 17
18TRANSLATIONS = ../i18n/de/patience.ts 18TRANSLATIONS = ../i18n/de/patience.ts
19TRANSLATIONS = ../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
@@ -1,17 +1,19 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = ../bin 3 DESTDIR = ../bin
4 HEADERS = minefield.h \ 4 HEADERS = minefield.h \
5 gtetrix.h \ 5 gtetrix.h \
6 qtetrix.h \ 6 qtetrix.h \
7 qtetrixb.h \ 7 qtetrixb.h \
8 tpiece.h 8 tpiece.h
9 SOURCES = main.cpp \ 9 SOURCES = main.cpp \
10 gtetrix.cpp \ 10 gtetrix.cpp \
11 qtetrix.cpp \ 11 qtetrix.cpp \
12 qtetrixb.cpp \ 12 qtetrixb.cpp \
13 tpiece.cpp 13 tpiece.cpp
14INCLUDEPATH += $(OPIEDIR)/include 14INCLUDEPATH += $(OPIEDIR)/include
15 DEPENDPATH+= $(OPIEDIR)/include 15 DEPENDPATH+= $(OPIEDIR)/include
16LIBS += -lqpe 16LIBS += -lqpe
17 INTERFACES= 17 INTERFACES=
18
19TRANSLATIONS = ../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
@@ -1,11 +1,13 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = tictac.h 3HEADERS = tictac.h
4SOURCES = main.cpp \ 4SOURCES = main.cpp \
5 tictac.cpp 5 tictac.cpp
6TARGET = tictac 6TARGET = tictac
7REQUIRES=medium-config 7REQUIRES=medium-config
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11DESTDIR = $(OPIEDIR)/bin 11DESTDIR = $(OPIEDIR)/bin
12
13TRANSLATIONS = ../../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
@@ -1,13 +1,14 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = wordgame.h 4 HEADERS = wordgame.h
5 SOURCES = main.cpp \ 5 SOURCES = main.cpp \
6 wordgame.cpp 6 wordgame.cpp
7 INTERFACES= newgamebase.ui rulesbase.ui 7 INTERFACES= newgamebase.ui rulesbase.ui
8 TARGET = wordgame 8 TARGET = wordgame
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10 DEPENDPATH+= $(OPIEDIR)/include 10 DEPENDPATH+= $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe
12 12
13TRANSLATIONS = ../i18n/de/wordgame.ts 13TRANSLATIONS = ../i18n/de/wordgame.ts
14TRANSLATIONS = ../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
@@ -1,19 +1,20 @@
1TEMPLATE = app 1TEMPLATE = app
2 2
3CONFIG += qt warn_on release 3CONFIG += qt warn_on release
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5 5
6 HEADERS = showimg.h 6 HEADERS = showimg.h
7 7
8 SOURCES = main.cpp \ 8 SOURCES = main.cpp \
9 showimg.cpp 9 showimg.cpp
10 10
11TARGET = showimg 11TARGET = showimg
12 12
13INCLUDEPATH += $(OPIEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += $(OPIEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15LIBS += -lqpe 15LIBS += -lqpe
16 16
17REQUIRES = showimg 17REQUIRES = showimg
18 18
19TRANSLATIONS = ../i18n/de/showimg.ts 19TRANSLATIONS = ../i18n/de/showimg.ts
20TRANSLATIONS = ../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
@@ -106,811 +106,811 @@ OpieFtp::OpieFtp( )
106 tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() )); 106 tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
107 tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() )); 107 tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
108 tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() )); 108 tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
109 tabMenu->setCheckable(TRUE); 109 tabMenu->setCheckable(TRUE);
110 110
111 TabWidget = new QTabWidget( this, "TabWidget" ); 111 TabWidget = new QTabWidget( this, "TabWidget" );
112 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 ); 112 layout->addMultiCellWidget( TabWidget, 1, 1, 0, 3 );
113 113
114 TabWidget->setTabShape(QTabWidget::Triangular); 114 TabWidget->setTabShape(QTabWidget::Triangular);
115 115
116 tab = new QWidget( TabWidget, "tab" ); 116 tab = new QWidget( TabWidget, "tab" );
117 tabLayout = new QGridLayout( tab ); 117 tabLayout = new QGridLayout( tab );
118 tabLayout->setSpacing( 2); 118 tabLayout->setSpacing( 2);
119 tabLayout->setMargin( 2); 119 tabLayout->setMargin( 2);
120 120
121 Local_View = new QListView( tab, "Local_View" ); 121 Local_View = new QListView( tab, "Local_View" );
122// Local_View->setResizePolicy( QListView::AutoOneFit ); 122// Local_View->setResizePolicy( QListView::AutoOneFit );
123 Local_View->addColumn( "File",120); 123 Local_View->addColumn( "File",120);
124 Local_View->addColumn( "Size",-1); 124 Local_View->addColumn( "Size",-1);
125 Local_View->setColumnAlignment(1,QListView::AlignRight); 125 Local_View->setColumnAlignment(1,QListView::AlignRight);
126 Local_View->addColumn( "Date",-1); 126 Local_View->addColumn( "Date",-1);
127 Local_View->setColumnAlignment(2,QListView::AlignRight); 127 Local_View->setColumnAlignment(2,QListView::AlignRight);
128 Local_View->setAllColumnsShowFocus(TRUE); 128 Local_View->setAllColumnsShowFocus(TRUE);
129 QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); 129 QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
130 130
131 tabLayout->addWidget( Local_View, 0, 0 ); 131 tabLayout->addWidget( Local_View, 0, 0 );
132 132
133 connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), 133 connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)),
134 this,SLOT( localListClicked(QListViewItem *)) ); 134 this,SLOT( localListClicked(QListViewItem *)) );
135 connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 135 connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
136 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); 136 this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
137 137
138 TabWidget->insertTab( tab, tr( "Local" ) ); 138 TabWidget->insertTab( tab, tr( "Local" ) );
139 139
140 tab_2 = new QWidget( TabWidget, "tab_2" ); 140 tab_2 = new QWidget( TabWidget, "tab_2" );
141 tabLayout_2 = new QGridLayout( tab_2 ); 141 tabLayout_2 = new QGridLayout( tab_2 );
142 tabLayout_2->setSpacing( 2); 142 tabLayout_2->setSpacing( 2);
143 tabLayout_2->setMargin( 2); 143 tabLayout_2->setMargin( 2);
144 144
145 Remote_View = new QListView( tab_2, "Remote_View" ); 145 Remote_View = new QListView( tab_2, "Remote_View" );
146 Remote_View->addColumn( "File",120); 146 Remote_View->addColumn( "File",120);
147 Remote_View->addColumn( "Size",-1); 147 Remote_View->addColumn( "Size",-1);
148 Remote_View->setColumnAlignment(1,QListView::AlignRight); 148 Remote_View->setColumnAlignment(1,QListView::AlignRight);
149 Remote_View->addColumn( "Date",-1); 149 Remote_View->addColumn( "Date",-1);
150 Remote_View->setColumnAlignment(2,QListView::AlignRight); 150 Remote_View->setColumnAlignment(2,QListView::AlignRight);
151 Remote_View->setAllColumnsShowFocus(TRUE); 151 Remote_View->setAllColumnsShowFocus(TRUE);
152 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); 152 QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
153 153
154 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), 154 connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
155 this,SLOT( remoteListClicked(QListViewItem *)) ); 155 this,SLOT( remoteListClicked(QListViewItem *)) );
156 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 156 connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
157 this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); 157 this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) );
158 158
159 tabLayout_2->addWidget( Remote_View, 0, 0 ); 159 tabLayout_2->addWidget( Remote_View, 0, 0 );
160 160
161 TabWidget->insertTab( tab_2, tr( "Remote" ) ); 161 TabWidget->insertTab( tab_2, tr( "Remote" ) );
162 162
163 tab_3 = new QWidget( TabWidget, "tab_3" ); 163 tab_3 = new QWidget( TabWidget, "tab_3" );
164 tabLayout_3 = new QGridLayout( tab_3 ); 164 tabLayout_3 = new QGridLayout( tab_3 );
165 tabLayout_3->setSpacing( 2); 165 tabLayout_3->setSpacing( 2);
166 tabLayout_3->setMargin( 2); 166 tabLayout_3->setMargin( 2);
167 167
168 TextLabel1 = new QLabel( tab_3, "TextLabel1" ); 168 TextLabel1 = new QLabel( tab_3, "TextLabel1" );
169 TextLabel1->setText( tr( "Username" ) ); 169 TextLabel1->setText( tr( "Username" ) );
170 tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 ); 170 tabLayout_3->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
171 171
172 UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" ); 172 UsernameComboBox = new QComboBox( FALSE, tab_3, "UsernameComboBox" );
173 UsernameComboBox->setEditable(TRUE); 173 UsernameComboBox->setEditable(TRUE);
174// UsernameComboBox->lineEdit()->setText("anonymous"); 174// UsernameComboBox->lineEdit()->setText("anonymous");
175 UsernameComboBox->lineEdit()->setText("root"); 175 UsernameComboBox->lineEdit()->setText("root");
176// UsernameComboBox->lineEdit()->setText("llornkcor"); 176// UsernameComboBox->lineEdit()->setText("llornkcor");
177 tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 ); 177 tabLayout_3->addMultiCellWidget( UsernameComboBox, 1, 1, 0, 1 );
178 178
179 TextLabel2 = new QLabel( tab_3, "TextLabel2" ); 179 TextLabel2 = new QLabel( tab_3, "TextLabel2" );
180 TextLabel2->setText( tr( "Password" ) ); 180 TextLabel2->setText( tr( "Password" ) );
181 tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 ); 181 tabLayout_3->addMultiCellWidget( TextLabel2, 0, 0, 2, 3 );
182 182
183 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" ); 183 PasswordEdit = new QLineEdit( "", tab_3, "PasswordComboBox" );
184 PasswordEdit->setEchoMode(QLineEdit::Password); 184 PasswordEdit->setEchoMode(QLineEdit::Password);
185// PasswordEdit->setText( tr( "me@opieftp.org" ) ); 185// PasswordEdit->setText( tr( "me@opieftp.org" ) );
186// PasswordEdit->setText( tr( "" ) ); 186// PasswordEdit->setText( tr( "" ) );
187 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 ); 187 tabLayout_3->addMultiCellWidget( PasswordEdit, 1, 1, 2, 3 );
188 188
189 TextLabel3 = new QLabel( tab_3, "TextLabel3" ); 189 TextLabel3 = new QLabel( tab_3, "TextLabel3" );
190 TextLabel3->setText( tr( "Remote server" ) ); 190 TextLabel3->setText( tr( "Remote server" ) );
191 tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 ); 191 tabLayout_3->addMultiCellWidget( TextLabel3, 2, 2, 0, 1 );
192 192
193 ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" ); 193 ServerComboBox = new QComboBox( FALSE, tab_3, "ServerComboBox" );
194 ServerComboBox->setEditable(TRUE); 194 ServerComboBox->setEditable(TRUE);
195 ServerComboBox->lineEdit()->setText( tr( "" ) ); 195 ServerComboBox->lineEdit()->setText( tr( "" ) );
196 tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 ); 196 tabLayout_3->addMultiCellWidget( ServerComboBox, 3, 3, 0, 1 );
197// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) ); 197// ServerComboBox->lineEdit()->setText( tr( "llornkcor.com" ) );
198 ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) ); 198 ServerComboBox->lineEdit()->setText( tr( "192.168.129.201" ) );
199 199
200 QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" ); 200 QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
201 TextLabel5->setText( tr( "Remote path" ) ); 201 TextLabel5->setText( tr( "Remote path" ) );
202 tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 ); 202 tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 );
203 203
204 remotePath = new QLineEdit( "/", tab_3, "remotePath" ); 204 remotePath = new QLineEdit( "/", tab_3, "remotePath" );
205 remotePath->setText( currentRemoteDir = "/"); 205 remotePath->setText( currentRemoteDir = "/");
206// remotePath->setText( currentRemoteDir = "/home/llornkcor/"); 206// remotePath->setText( currentRemoteDir = "/home/llornkcor/");
207 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 ); 207 tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
208 208
209 TextLabel4 = new QLabel( tab_3, "TextLabel4" ); 209 TextLabel4 = new QLabel( tab_3, "TextLabel4" );
210 TextLabel4->setText( tr( "Port" ) ); 210 TextLabel4->setText( tr( "Port" ) );
211 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 ); 211 tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
212 212
213 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" ); 213 PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
214 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows ); 214 PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
215 PortSpinBox->setMaxValue(32786); 215 PortSpinBox->setMaxValue(32786);
216 PortSpinBox->setValue( 4242); 216 PortSpinBox->setValue( 4242);
217// PortSpinBox->setValue( 21); 217// PortSpinBox->setValue( 21);
218 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1); 218 tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
219 219
220 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); 220 QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
221 tabLayout_3->addItem( spacer, 5, 0 ); 221 tabLayout_3->addItem( spacer, 5, 0 );
222 222
223 TabWidget->insertTab( tab_3, tr( "Config" ) ); 223 TabWidget->insertTab( tab_3, tr( "Config" ) );
224 224
225 connect(TabWidget,SIGNAL(currentChanged(QWidget *)), 225 connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
226 this,SLOT(tabChanged(QWidget*))); 226 this,SLOT(tabChanged(QWidget*)));
227 227
228 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); 228 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
229 currentDir.setPath( QDir::currentDirPath()); 229 currentDir.setPath( QDir::currentDirPath());
230// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 230// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
231 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" ); 231 currentPathEdit = new QLineEdit( "/", this, "currentPathEdit" );
232 layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 ); 232 layout->addMultiCellWidget( currentPathEdit, 3, 3, 0, 3 );
233 233
234 currentPathEdit->setText( currentDir.canonicalPath()); 234 currentPathEdit->setText( currentDir.canonicalPath());
235 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged())); 235 connect( currentPathEdit,SIGNAL(returnPressed()),this,SLOT(currentPathEditChanged()));
236 236
237 ProgressBar = new QProgressBar( this, "ProgressBar" ); 237 ProgressBar = new QProgressBar( this, "ProgressBar" );
238 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 ); 238 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 3 );
239 239
240 filterStr="*"; 240 filterStr="*";
241 b=FALSE; 241 b=FALSE;
242 populateLocalView(); 242 populateLocalView();
243} 243}
244 244
245OpieFtp::~OpieFtp() 245OpieFtp::~OpieFtp()
246{ 246{
247} 247}
248 248
249void OpieFtp::cleanUp() 249void OpieFtp::cleanUp()
250{ 250{
251 if(conn) 251 if(conn)
252 FtpQuit(conn); 252 FtpQuit(conn);
253 QString sfile=QDir::homeDirPath(); 253 QString sfile=QDir::homeDirPath();
254 if(sfile.right(1) != "/") 254 if(sfile.right(1) != "/")
255 sfile+="/._temp"; 255 sfile+="/._temp";
256 else 256 else
257 sfile+="._temp"; 257 sfile+="._temp";
258 QFile file( sfile); 258 QFile file( sfile);
259 if(file.exists()) 259 if(file.exists())
260 file.remove(); 260 file.remove();
261} 261}
262 262
263void OpieFtp::tabChanged(QWidget *w) 263void OpieFtp::tabChanged(QWidget *w)
264{ 264{
265 if (TabWidget->currentPageIndex() == 0) { 265 if (TabWidget->currentPageIndex() == 0) {
266 currentPathEdit->setText( currentDir.canonicalPath()); 266 currentPathEdit->setText( currentDir.canonicalPath());
267 tabMenu->setItemChecked(tabMenu->idAt(0),TRUE); 267 tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
268 tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); 268 tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
269 tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); 269 tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
270 } 270 }
271 if (TabWidget->currentPageIndex() == 1) { 271 if (TabWidget->currentPageIndex() == 1) {
272 currentPathEdit->setText( currentRemoteDir ); 272 currentPathEdit->setText( currentRemoteDir );
273 tabMenu->setItemChecked(tabMenu->idAt(1),TRUE); 273 tabMenu->setItemChecked(tabMenu->idAt(1),TRUE);
274 tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); 274 tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
275 tabMenu->setItemChecked(tabMenu->idAt(2),FALSE); 275 tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
276 } 276 }
277 if (TabWidget->currentPageIndex() == 2) { 277 if (TabWidget->currentPageIndex() == 2) {
278 tabMenu->setItemChecked(tabMenu->idAt(2),TRUE); 278 tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
279 tabMenu->setItemChecked(tabMenu->idAt(0),FALSE); 279 tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
280 tabMenu->setItemChecked(tabMenu->idAt(1),FALSE); 280 tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
281 } 281 }
282} 282}
283 283
284void OpieFtp::localUpload() 284void OpieFtp::localUpload()
285{ 285{
286 int fsz; 286 int fsz;
287 QCopEnvelope ( "QPE/System", "busy()" ); 287 QCopEnvelope ( "QPE/System", "busy()" );
288 qApp->processEvents(); 288 qApp->processEvents();
289 QString strItem = Local_View->currentItem()->text(0); 289 QString strItem = Local_View->currentItem()->text(0);
290 QString localFile = currentDir.canonicalPath()+"/"+strItem; 290 QString localFile = currentDir.canonicalPath()+"/"+strItem;
291 QString remoteFile= currentRemoteDir+strItem; 291 QString remoteFile= currentRemoteDir+strItem;
292 QFileInfo fi(localFile); 292 QFileInfo fi(localFile);
293 if( !fi.isDir()) { 293 if( !fi.isDir()) {
294 fsz=fi.size(); 294 fsz=fi.size();
295 ProgressBar->setTotalSteps(fsz); 295 ProgressBar->setTotalSteps(fsz);
296 296
297 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); 297 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
298 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); 298 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
299 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); 299 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
300 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); 300 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
301 qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); 301 qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
302 302
303 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { 303 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
304 QString msg; 304 QString msg;
305 msg.sprintf("Unable to upload\n%s",FtpLastResponse(conn)); 305 msg.sprintf("Unable to upload\n%s",FtpLastResponse(conn));
306 msg.replace(QRegExp(":"),"\n"); 306 msg.replace(QRegExp(":"),"\n");
307 QMessageBox::message("Note",msg); 307 QMessageBox::message("Note",msg);
308// FtpQuit(conn); 308// FtpQuit(conn);
309 } 309 }
310 ProgressBar->reset(); 310 ProgressBar->reset();
311 nullifyCallBack(); 311 nullifyCallBack();
312 } else { 312 } else {
313 QMessageBox::message("Note","Cannot upload directories"); 313 QMessageBox::message("Note","Cannot upload directories");
314 } 314 }
315 TabWidget->setCurrentPage(1); 315 TabWidget->setCurrentPage(1);
316 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 316 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
317 QCopEnvelope ( "QPE/System", "notBusy()" ); 317 QCopEnvelope ( "QPE/System", "notBusy()" );
318} 318}
319 319
320void OpieFtp::nullifyCallBack() 320void OpieFtp::nullifyCallBack()
321{ 321{
322 FtpOptions(FTPLIB_CALLBACK, NULL, conn); 322 FtpOptions(FTPLIB_CALLBACK, NULL, conn);
323 FtpOptions(FTPLIB_IDLETIME, NULL, conn); 323 FtpOptions(FTPLIB_IDLETIME, NULL, conn);
324 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); 324 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
325 FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); 325 FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn);
326 326
327} 327}
328 328
329void OpieFtp::remoteDownload() 329void OpieFtp::remoteDownload()
330{ 330{
331 int fsz; 331 int fsz;
332 QCopEnvelope ( "QPE/System", "busy()" ); 332 QCopEnvelope ( "QPE/System", "busy()" );
333 qApp->processEvents(); 333 qApp->processEvents();
334 QString strItem = Remote_View->currentItem()->text(0); 334 QString strItem = Remote_View->currentItem()->text(0);
335// strItem=strItem.right(strItem.length()-1); 335// strItem=strItem.right(strItem.length()-1);
336 336
337 QString localFile = currentDir.canonicalPath()+strItem; 337 QString localFile = currentDir.canonicalPath()+strItem;
338// QString localFile = currentDir.canonicalPath()+"/"+strItem; 338// QString localFile = currentDir.canonicalPath()+"/"+strItem;
339 QString remoteFile= currentRemoteDir+strItem; 339 QString remoteFile= currentRemoteDir+strItem;
340 if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn)) 340 if (!FtpSize( remoteFile.latin1(), &fsz, FTPLIB_ASCII, conn))
341 fsz = 0; 341 fsz = 0;
342 QString temp; 342 QString temp;
343 temp.sprintf( remoteFile+" "+" %dkb", fsz); 343 temp.sprintf( remoteFile+" "+" %dkb", fsz);
344 344
345 ProgressBar->setTotalSteps(fsz); 345 ProgressBar->setTotalSteps(fsz);
346 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn); 346 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
347 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn); 347 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
348 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); 348 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
349 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); 349 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
350 qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); 350 qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
351 351
352 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { 352 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
353 QString msg; 353 QString msg;
354 msg.sprintf("Unable to download \n%s",FtpLastResponse(conn)); 354 msg.sprintf("Unable to download \n%s",FtpLastResponse(conn));
355 msg.replace(QRegExp(":"),"\n"); 355 msg.replace(QRegExp(":"),"\n");
356 QMessageBox::message("Note",msg); 356 QMessageBox::message("Note",msg);
357// FtpQuit(conn); 357// FtpQuit(conn);
358 } 358 }
359 ProgressBar->reset(); 359 ProgressBar->reset();
360 nullifyCallBack(); 360 nullifyCallBack();
361 TabWidget->setCurrentPage(0); 361 TabWidget->setCurrentPage(0);
362 populateLocalView(); 362 populateLocalView();
363 QCopEnvelope ( "QPE/System", "notBusy()" ); 363 QCopEnvelope ( "QPE/System", "notBusy()" );
364} 364}
365 365
366 366
367void OpieFtp::newConnection() 367void OpieFtp::newConnection()
368{ 368{
369 TabWidget->setCurrentPage(2); 369 TabWidget->setCurrentPage(2);
370} 370}
371 371
372void OpieFtp::connector() 372void OpieFtp::connector()
373{ 373{
374 QCopEnvelope ( "QPE/System", "busy()" ); 374 QCopEnvelope ( "QPE/System", "busy()" );
375 qApp->processEvents(); 375 qApp->processEvents();
376 currentRemoteDir=remotePath->text(); 376 currentRemoteDir=remotePath->text();
377 if(ServerComboBox->currentText().isEmpty()) { 377 if(ServerComboBox->currentText().isEmpty()) {
378 QMessageBox::warning(this,"Ftp","Please set the server info","Ok",0,0); 378 QMessageBox::warning(this,"Ftp","Please set the server info","Ok",0,0);
379 TabWidget->setCurrentPage(2); 379 TabWidget->setCurrentPage(2);
380 ServerComboBox->setFocus(); 380 ServerComboBox->setFocus();
381 return; 381 return;
382 } 382 }
383 FtpInit(); 383 FtpInit();
384 TabWidget->setCurrentPage(1); 384 TabWidget->setCurrentPage(1);
385 QString ftp_host = ServerComboBox->currentText(); 385 QString ftp_host = ServerComboBox->currentText();
386 QString ftp_user = UsernameComboBox->currentText(); 386 QString ftp_user = UsernameComboBox->currentText();
387 QString ftp_pass = PasswordEdit->text(); 387 QString ftp_pass = PasswordEdit->text();
388 QString port=PortSpinBox->cleanText(); 388 QString port=PortSpinBox->cleanText();
389 port.stripWhiteSpace(); 389 port.stripWhiteSpace();
390 390
391 if(ftp_host.find("ftp://",0, TRUE) != -1 ) 391 if(ftp_host.find("ftp://",0, TRUE) != -1 )
392 ftp_host=ftp_host.right(ftp_host.length()-6); 392 ftp_host=ftp_host.right(ftp_host.length()-6);
393 ftp_host+=":"+port; 393 ftp_host+=":"+port;
394 if (!FtpConnect( ftp_host.latin1(), &conn)) { 394 if (!FtpConnect( ftp_host.latin1(), &conn)) {
395 QMessageBox::message("Note","Unable to connect to\n"+ftp_host); 395 QMessageBox::message("Note","Unable to connect to\n"+ftp_host);
396 return ; 396 return ;
397 } 397 }
398 if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) { 398 if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
399 QString msg; 399 QString msg;
400 msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn)); 400 msg.sprintf("Unable to log in\n%s",FtpLastResponse(conn));
401 msg.replace(QRegExp(":"),"\n"); 401 msg.replace(QRegExp(":"),"\n");
402 QMessageBox::message("Note",msg); 402 QMessageBox::message("Note",msg);
403 FtpQuit(conn); 403 FtpQuit(conn);
404 return ; 404 return ;
405 } 405 }
406 remoteDirList("/") ; 406 remoteDirList("/") ;
407 setCaption(ftp_host); 407 setCaption(ftp_host);
408 QCopEnvelope ( "QPE/System", "notBusy()" ); 408 QCopEnvelope ( "QPE/System", "notBusy()" );
409} 409}
410 410
411void OpieFtp::disConnector() 411void OpieFtp::disConnector()
412{ 412{
413 FtpQuit(conn); 413 FtpQuit(conn);
414 setCaption("OpieFtp"); 414 setCaption("OpieFtp");
415 currentRemoteDir="/"; 415 currentRemoteDir="/";
416 Remote_View->clear(); 416 Remote_View->clear();
417} 417}
418 418
419bool OpieFtp::remoteDirList(const QString &dir) 419bool OpieFtp::remoteDirList(const QString &dir)
420{ 420{
421 QString tmp = QDir::homeDirPath(); 421 QString tmp = QDir::homeDirPath();
422 if(tmp.right(1) != "/") 422 if(tmp.right(1) != "/")
423 tmp+="/._temp"; 423 tmp+="/._temp";
424 else 424 else
425 tmp+="._temp"; 425 tmp+="._temp";
426// qDebug("Listing remote dir "+tmp); 426// qDebug("Listing remote dir "+tmp);
427 QCopEnvelope ( "QPE/System", "busy()" ); 427 QCopEnvelope ( "QPE/System", "busy()" );
428 if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) { 428 if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
429 QString msg; 429 QString msg;
430 msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) ); 430 msg.sprintf("Unable to list the directory\n"+dir+"\n%s",FtpLastResponse(conn) );
431 msg.replace(QRegExp(":"),"\n"); 431 msg.replace(QRegExp(":"),"\n");
432 QMessageBox::message("Note",msg); 432 QMessageBox::message("Note",msg);
433// FtpQuit(conn); 433// FtpQuit(conn);
434 return false; 434 return false;
435 } 435 }
436 populateRemoteView() ; 436 populateRemoteView() ;
437 QCopEnvelope ( "QPE/System", "notBusy()" ); 437 QCopEnvelope ( "QPE/System", "notBusy()" );
438 return true; 438 return true;
439} 439}
440 440
441bool OpieFtp::remoteChDir(const QString &dir) 441bool OpieFtp::remoteChDir(const QString &dir)
442{ 442{
443 QCopEnvelope ( "QPE/System", "busy()" ); 443 QCopEnvelope ( "QPE/System", "busy()" );
444 if (!FtpChdir( dir.latin1(), conn )) { 444 if (!FtpChdir( dir.latin1(), conn )) {
445 QString msg; 445 QString msg;
446 msg.sprintf("Unable to change directories\n"+dir+"\n%s",FtpLastResponse(conn)); 446 msg.sprintf("Unable to change directories\n"+dir+"\n%s",FtpLastResponse(conn));
447 msg.replace(QRegExp(":"),"\n"); 447 msg.replace(QRegExp(":"),"\n");
448 QMessageBox::message("Note",msg); 448 QMessageBox::message("Note",msg);
449 qDebug(msg); 449 qDebug(msg);
450// FtpQuit(conn); 450// FtpQuit(conn);
451 QCopEnvelope ( "QPE/System", "notBusy()" ); 451 QCopEnvelope ( "QPE/System", "notBusy()" );
452 return FALSE; 452 return FALSE;
453 } 453 }
454 QCopEnvelope ( "QPE/System", "notBusy()" ); 454 QCopEnvelope ( "QPE/System", "notBusy()" );
455 return TRUE; 455 return TRUE;
456} 456}
457 457
458void OpieFtp::populateLocalView() 458void OpieFtp::populateLocalView()
459{ 459{
460 Local_View->clear(); 460 Local_View->clear();
461 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 461 currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
462 currentDir.setMatchAllDirs(TRUE); 462 currentDir.setMatchAllDirs(TRUE);
463 currentDir.setNameFilter(filterStr); 463 currentDir.setNameFilter(filterStr);
464 QString fileL, fileS, fileDate; 464 QString fileL, fileS, fileDate;
465 bool isDir=FALSE; 465 bool isDir=FALSE;
466 const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); 466 const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
467 QFileInfoListIterator it(*list); 467 QFileInfoListIterator it(*list);
468 QFileInfo *fi; 468 QFileInfo *fi;
469 while ( (fi=it.current()) ) { 469 while ( (fi=it.current()) ) {
470 if (fi->isSymLink() ){ 470 if (fi->isSymLink() ){
471 QString symLink=fi->readLink(); 471 QString symLink=fi->readLink();
472// qDebug("Symlink detected "+symLink); 472// qDebug("Symlink detected "+symLink);
473 QFileInfo sym( symLink); 473 QFileInfo sym( symLink);
474 fileS.sprintf( "%10li", sym.size() ); 474 fileS.sprintf( "%10li", sym.size() );
475 fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() ); 475 fileL.sprintf( "%s -> %s", sym.fileName().data(),sym.absFilePath().data() );
476 fileDate = sym.lastModified().toString(); 476 fileDate = sym.lastModified().toString();
477 } else { 477 } else {
478// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); 478// qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
479 fileS.sprintf( "%10li", fi->size() ); 479 fileS.sprintf( "%10li", fi->size() );
480 fileL.sprintf( "%s",fi->fileName().data() ); 480 fileL.sprintf( "%s",fi->fileName().data() );
481 fileDate= fi->lastModified().toString(); 481 fileDate= fi->lastModified().toString();
482 if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) { 482 if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
483 fileL+="/"; 483 fileL+="/";
484 isDir=TRUE; 484 isDir=TRUE;
485// qDebug( fileL); 485// qDebug( fileL);
486 } 486 }
487 } 487 }
488 if(fileL !="./") { 488 if(fileL !="./") {
489 item = new QListViewItem( Local_View,fileL,fileS, fileDate); 489 item = new QListViewItem( Local_View,fileL,fileS, fileDate);
490 if(isDir) 490 if(isDir || fileL.find("/",0,TRUE) != -1)
491 item->setPixmap( 0, Resource::loadPixmap( "folder" )); 491 item->setPixmap( 0, Resource::loadPixmap( "folder" ));
492 else 492 else
493 item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); 493 item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
494 } 494 }
495 isDir=FALSE; 495 isDir=FALSE;
496 ++it; 496 ++it;
497 } 497 }
498 Local_View->setSorting( 3,FALSE); 498 Local_View->setSorting( 3,FALSE);
499 currentPathEdit->setText( currentDir.canonicalPath() ); 499 currentPathEdit->setText( currentDir.canonicalPath() );
500} 500}
501 501
502bool OpieFtp::populateRemoteView( ) 502bool OpieFtp::populateRemoteView( )
503{ 503{
504// qDebug("populate remoteview"); 504// qDebug("populate remoteview");
505 QString sfile=QDir::homeDirPath(); 505 QString sfile=QDir::homeDirPath();
506 if(sfile.right(1) != "/") 506 if(sfile.right(1) != "/")
507 sfile+="/._temp"; 507 sfile+="/._temp";
508 else 508 else
509 sfile+="._temp"; 509 sfile+="._temp";
510 QFile file( sfile); 510 QFile file( sfile);
511 Remote_View->clear(); 511 Remote_View->clear();
512 QString s, File_Name; 512 QString s, File_Name;
513 QListViewItem *itemDir=NULL, *itemFile=NULL; 513 QListViewItem *itemDir=NULL, *itemFile=NULL;
514 QString fileL, fileS, fileDate; 514 QString fileL, fileS, fileDate;
515 if ( file.open(IO_ReadOnly)) { 515 if ( file.open(IO_ReadOnly)) {
516 QTextStream t( &file ); // use a text stream 516 QTextStream t( &file ); // use a text stream
517 while ( !t.eof()) { 517 while ( !t.eof()) {
518 s = t.readLine(); 518 s = t.readLine();
519 fileL = s.right(s.length()-55); 519 fileL = s.right(s.length()-55);
520 fileL = fileL.stripWhiteSpace(); 520 fileL = fileL.stripWhiteSpace();
521 if(s.left(1) == "d") 521 if(s.left(1) == "d")
522 fileL = fileL+"/"; 522 fileL = fileL+"/";
523// fileL = "/"+fileL+"/"; 523// fileL = "/"+fileL+"/";
524 fileS = s.mid( 30, 42-30); 524 fileS = s.mid( 30, 42-30);
525 fileS = fileS.stripWhiteSpace(); 525 fileS = fileS.stripWhiteSpace();
526 fileDate = s.mid( 42, 55-42); 526 fileDate = s.mid( 42, 55-42);
527 fileDate = fileDate.stripWhiteSpace(); 527 fileDate = fileDate.stripWhiteSpace();
528 if(fileL.find("total",0,TRUE) == -1) { 528 if(fileL.find("total",0,TRUE) == -1) {
529 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate); 529 QListViewItem * item = new QListViewItem( Remote_View, fileL, fileS, fileDate);
530 if(s.left(1) == "d") { 530 if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
531 item->setPixmap( 0, Resource::loadPixmap( "folder" )); 531 item->setPixmap( 0, Resource::loadPixmap( "folder" ));
532 if(itemDir) 532 if(itemDir)
533 item->moveItem(itemDir); 533 item->moveItem(itemDir);
534 itemDir=item; 534 itemDir=item;
535 } else { 535 } else {
536 item->setPixmap( 0, Resource::loadPixmap( "fileopen" )); 536 item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
537 if(itemFile) 537 if(itemFile)
538 item->moveItem(itemFile); 538 item->moveItem(itemFile);
539 itemFile=item; 539 itemFile=item;
540 } 540 }
541 } 541 }
542 } 542 }
543 QListViewItem * item1 = new QListViewItem( Remote_View, "../"); 543 QListViewItem * item1 = new QListViewItem( Remote_View, "../");
544 item1->setPixmap( 0, Resource::loadPixmap( "folder" )); 544 item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
545 file.close(); 545 file.close();
546 if( file.exists()) 546 if( file.exists())
547 file. remove(); 547 file. remove();
548 } else 548 } else
549 qDebug("temp file not opened successfullly "+sfile); 549 qDebug("temp file not opened successfullly "+sfile);
550 Remote_View->setSorting( 4,TRUE); 550 Remote_View->setSorting( 4,TRUE);
551 551
552 return true; 552 return true;
553} 553}
554 554
555void OpieFtp::remoteListClicked(QListViewItem *selectedItem) 555void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
556{ 556{
557 QCopEnvelope ( "QPE/System", "busy()" ); 557 QCopEnvelope ( "QPE/System", "busy()" );
558 QString oldRemoteCurrentDir = currentRemoteDir; 558 QString oldRemoteCurrentDir = currentRemoteDir;
559 QString strItem=selectedItem->text(0); 559 QString strItem=selectedItem->text(0);
560 strItem=strItem.simplifyWhiteSpace(); 560 strItem=strItem.simplifyWhiteSpace();
561 if(strItem == "../") { // the user wants to go ^ 561 if(strItem == "../") { // the user wants to go ^
562 if( FtpCDUp( conn) == 0) { 562 if( FtpCDUp( conn) == 0) {
563 QString msg; 563 QString msg;
564 msg.sprintf("Unable to cd up\n%s",FtpLastResponse(conn)); 564 msg.sprintf("Unable to cd up\n%s",FtpLastResponse(conn));
565 msg.replace(QRegExp(":"),"\n"); 565 msg.replace(QRegExp(":"),"\n");
566 QMessageBox::message("Note",msg); 566 QMessageBox::message("Note",msg);
567 qDebug(msg); 567 qDebug(msg);
568 } 568 }
569 char path[256]; 569 char path[256];
570 if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string 570 if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string
571 QString msg; 571 QString msg;
572 msg.sprintf("Unable to get working dir\n%s",FtpLastResponse(conn)); 572 msg.sprintf("Unable to get working dir\n%s",FtpLastResponse(conn));
573 msg.replace(QRegExp(":"),"\n"); 573 msg.replace(QRegExp(":"),"\n");
574 QMessageBox::message("Note",msg); 574 QMessageBox::message("Note",msg);
575 qDebug(msg); 575 qDebug(msg);
576 } 576 }
577 currentRemoteDir=path; 577 currentRemoteDir=path;
578 } else { 578 } else {
579 if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers 579 if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers
580 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 ); 580 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 );
581 strItem = strItem.stripWhiteSpace(); 581 strItem = strItem.stripWhiteSpace();
582 currentRemoteDir = strItem; 582 currentRemoteDir = strItem;
583 if( !remoteChDir( (const QString &)strItem)) { 583 if( !remoteChDir( (const QString &)strItem)) {
584 currentRemoteDir = oldRemoteCurrentDir; 584 currentRemoteDir = oldRemoteCurrentDir;
585 strItem=""; 585 strItem="";
586 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 586 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
587 } 587 }
588 } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory 588 } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
589 qDebug("trying directory"); 589 qDebug("trying directory");
590 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { 590 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
591 currentRemoteDir = oldRemoteCurrentDir; 591 currentRemoteDir = oldRemoteCurrentDir;
592 strItem=""; 592 strItem="";
593 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 593 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
594 594
595 } else { 595 } else {
596 currentRemoteDir = currentRemoteDir+strItem; 596 currentRemoteDir = currentRemoteDir+strItem;
597 } 597 }
598 } else { 598 } else {
599 qDebug("download "+strItem); 599 qDebug("download "+strItem);
600 } 600 }
601 } 601 }
602 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 602 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
603 if(currentRemoteDir.right(1) !="/") 603 if(currentRemoteDir.right(1) !="/")
604 currentRemoteDir +="/"; 604 currentRemoteDir +="/";
605 currentPathEdit->setText( currentRemoteDir ); 605 currentPathEdit->setText( currentRemoteDir );
606 QCopEnvelope ( "QPE/System", "notBusy()" ); 606 QCopEnvelope ( "QPE/System", "notBusy()" );
607} 607}
608 608
609void OpieFtp::localListClicked(QListViewItem *selectedItem) 609void OpieFtp::localListClicked(QListViewItem *selectedItem)
610{ 610{
611 QString strItem=selectedItem->text(0); 611 QString strItem=selectedItem->text(0);
612 QString strSize=selectedItem->text(1); 612 QString strSize=selectedItem->text(1);
613 strSize=strSize.stripWhiteSpace(); 613 strSize=strSize.stripWhiteSpace();
614 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink 614 if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
615 // is symlink 615 // is symlink
616 QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); 616 QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
617 if(QDir(strItem2).exists() ) { 617 if(QDir(strItem2).exists() ) {
618 currentDir.cd(strItem2, TRUE); 618 currentDir.cd(strItem2, TRUE);
619 populateLocalView(); 619 populateLocalView();
620 } 620 }
621 } else { // not a symlink 621 } else { // not a symlink
622 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { 622 if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
623 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { 623 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
624 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); 624 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
625 currentDir.cd(strItem,FALSE); 625 currentDir.cd(strItem,FALSE);
626 populateLocalView(); 626 populateLocalView();
627 } else { 627 } else {
628 currentDir.cdUp(); 628 currentDir.cdUp();
629 populateLocalView(); 629 populateLocalView();
630 } 630 }
631 if(QDir(strItem).exists()){ 631 if(QDir(strItem).exists()){
632 currentDir.cd(strItem, TRUE); 632 currentDir.cd(strItem, TRUE);
633 populateLocalView(); 633 populateLocalView();
634 } 634 }
635 } else { 635 } else {
636 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); 636 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
637 if( QFile::exists(strItem ) ) { 637 if( QFile::exists(strItem ) ) {
638 qDebug("upload "+strItem); 638 qDebug("upload "+strItem);
639 } 639 }
640 } //end not symlink 640 } //end not symlink
641 chdir(strItem.latin1()); 641 chdir(strItem.latin1());
642 } 642 }
643} 643}
644 644
645void OpieFtp::doLocalCd() 645void OpieFtp::doLocalCd()
646{ 646{
647 localListClicked( Local_View->currentItem()); 647 localListClicked( Local_View->currentItem());
648} 648}
649 649
650void OpieFtp:: doRemoteCd() 650void OpieFtp:: doRemoteCd()
651{ 651{
652 remoteListClicked( Remote_View->currentItem()); 652 remoteListClicked( Remote_View->currentItem());
653 653
654} 654}
655 655
656void OpieFtp::showHidden() 656void OpieFtp::showHidden()
657{ 657{
658 if (!b) { 658 if (!b) {
659 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 659 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
660 localMenu->setItemChecked(localMenu->idAt(0),TRUE); 660 localMenu->setItemChecked(localMenu->idAt(0),TRUE);
661// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 661// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
662 b=TRUE; 662 b=TRUE;
663 663
664 } else { 664 } else {
665 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); 665 currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
666 localMenu->setItemChecked(localMenu->idAt(0),FALSE); 666 localMenu->setItemChecked(localMenu->idAt(0),FALSE);
667// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 667// currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
668 b=FALSE; 668 b=FALSE;
669 } 669 }
670 populateLocalView(); 670 populateLocalView();
671} 671}
672 672
673void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) 673void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
674{ 674{
675 switch (mouse) { 675 switch (mouse) {
676 case 1: 676 case 1:
677 break; 677 break;
678 case 2: 678 case 2:
679 showLocalMenu(item); 679 showLocalMenu(item);
680 break; 680 break;
681 }; 681 };
682} 682}
683 683
684void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i) 684void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
685{ 685{
686 switch (mouse) { 686 switch (mouse) {
687 case 1: 687 case 1:
688 break; 688 break;
689 case 2: 689 case 2:
690 showRemoteMenu(item); 690 showRemoteMenu(item);
691 break; 691 break;
692 }; 692 };
693} 693}
694 694
695void OpieFtp::showRemoteMenu(QListViewItem * item) 695void OpieFtp::showRemoteMenu(QListViewItem * item)
696{ 696{
697 QPopupMenu m;// = new QPopupMenu( Local_View ); 697 QPopupMenu m;// = new QPopupMenu( Local_View );
698 if(item->text(0).right(1) == "/") 698 if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE))
699 m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() )); 699 m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
700 else 700 else
701 m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() )); 701 m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
702 m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); 702 m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
703 m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() )); 703 m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
704 m.insertSeparator(); 704 m.insertSeparator();
705 m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() )); 705 m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
706 m.exec( QCursor::pos() ); 706 m.exec( QCursor::pos() );
707} 707}
708 708
709void OpieFtp::showLocalMenu(QListViewItem * item) 709void OpieFtp::showLocalMenu(QListViewItem * item)
710{ 710{
711 QPopupMenu m; 711 QPopupMenu m;
712 m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); 712 m.insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() ));
713 m.insertSeparator(); 713 m.insertSeparator();
714 if(item->text(0).right(1) == "/") 714 if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE))
715 m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); 715 m.insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() ));
716 else 716 else
717 m.insertItem( tr( "Upload" ), this, SLOT( localUpload() )); 717 m.insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
718 m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); 718 m.insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
719 m.insertItem( tr( "Rename" ), this, SLOT( localRename() )); 719 m.insertItem( tr( "Rename" ), this, SLOT( localRename() ));
720 m.insertSeparator(); 720 m.insertSeparator();
721 m.insertItem( tr( "Delete" ), this, SLOT( localDelete() )); 721 m.insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
722 m.setCheckable(TRUE); 722 m.setCheckable(TRUE);
723 if (b) 723 if (b)
724 m.setItemChecked(m.idAt(0),TRUE); 724 m.setItemChecked(m.idAt(0),TRUE);
725 else 725 else
726 m.setItemChecked(m.idAt(0),FALSE); 726 m.setItemChecked(m.idAt(0),FALSE);
727 727
728 m.exec( QCursor::pos() ); 728 m.exec( QCursor::pos() );
729} 729}
730 730
731void OpieFtp::localMakDir() 731void OpieFtp::localMakDir()
732{ 732{
733 InputDialog *fileDlg; 733 InputDialog *fileDlg;
734 fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); 734 fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
735 fileDlg->exec(); 735 fileDlg->exec();
736 if( fileDlg->result() == 1 ) { 736 if( fileDlg->result() == 1 ) {
737 QString filename = fileDlg->LineEdit1->text(); 737 QString filename = fileDlg->LineEdit1->text();
738 currentDir.mkdir( currentDir.canonicalPath()+"/"+filename); 738 currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
739 } 739 }
740 populateLocalView(); 740 populateLocalView();
741} 741}
742 742
743void OpieFtp::localDelete() 743void OpieFtp::localDelete()
744{ 744{
745 QString f = Local_View->currentItem()->text(0); 745 QString f = Local_View->currentItem()->text(0);
746 if(QDir(f).exists() ) { 746 if(QDir(f).exists() ) {
747 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+ 747 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+
748 " ?\nIt must be empty","Yes","No",0,0,1) ) { 748 " ?\nIt must be empty","Yes","No",0,0,1) ) {
749 case 0: { 749 case 0: {
750 f=currentDir.canonicalPath()+"/"+f; 750 f=currentDir.canonicalPath()+"/"+f;
751 QString cmd="rmdir "+f; 751 QString cmd="rmdir "+f;
752 system( cmd.latin1()); 752 system( cmd.latin1());
753 populateLocalView(); 753 populateLocalView();
754 } 754 }
755 break; 755 break;
756 case 1: 756 case 1:
757 // exit 757 // exit
758 break; 758 break;
759 }; 759 };
760 760
761 } else { 761 } else {
762 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f 762 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f
763 +" ?","Yes","No",0,0,1) ) { 763 +" ?","Yes","No",0,0,1) ) {
764 case 0: { 764 case 0: {
765 f=currentDir.canonicalPath()+"/"+f; 765 f=currentDir.canonicalPath()+"/"+f;
766 QString cmd="rm "+f; 766 QString cmd="rm "+f;
767 system( cmd.latin1()); 767 system( cmd.latin1());
768 populateLocalView(); 768 populateLocalView();
769 } 769 }
770 break; 770 break;
771 case 1: 771 case 1:
772 // exit 772 // exit
773 break; 773 break;
774 }; 774 };
775 } 775 }
776} 776}
777 777
778void OpieFtp::remoteMakDir() 778void OpieFtp::remoteMakDir()
779{ 779{
780 InputDialog *fileDlg; 780 InputDialog *fileDlg;
781 fileDlg = new InputDialog(this,"Make Directory",TRUE, 0); 781 fileDlg = new InputDialog(this,"Make Directory",TRUE, 0);
782 fileDlg->exec(); 782 fileDlg->exec();
783 if( fileDlg->result() == 1 ) { 783 if( fileDlg->result() == 1 ) {
784 QString filename = fileDlg->LineEdit1->text();//+".playlist"; 784 QString filename = fileDlg->LineEdit1->text();//+".playlist";
785 QString tmp=currentRemoteDir+filename; 785 QString tmp=currentRemoteDir+filename;
786 QCopEnvelope ( "QPE/System", "busy()" ); 786 QCopEnvelope ( "QPE/System", "busy()" );
787 if(FtpMkdir( tmp.latin1(), conn) == 0) { 787 if(FtpMkdir( tmp.latin1(), conn) == 0) {
788 QString msg; 788 QString msg;
789 msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn)); 789 msg.sprintf("Unable to make directory\n%s",FtpLastResponse(conn));
790 msg.replace(QRegExp(":"),"\n"); 790 msg.replace(QRegExp(":"),"\n");
791 QMessageBox::message("Note",msg); 791 QMessageBox::message("Note",msg);
792 } 792 }
793 QCopEnvelope ( "QPE/System", "notBusy()" ); 793 QCopEnvelope ( "QPE/System", "notBusy()" );
794 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 794 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
795 } 795 }
796} 796}
797 797
798void OpieFtp::remoteDelete() 798void OpieFtp::remoteDelete()
799{ 799{
800 QString f = Remote_View->currentItem()->text(0); 800 QString f = Remote_View->currentItem()->text(0);
801 QCopEnvelope ( "QPE/System", "busy()" ); 801 QCopEnvelope ( "QPE/System", "busy()" );
802 if( f.right(1) =="/") { 802 if( f.right(1) =="/") {
803 QString path= currentRemoteDir+f; 803 QString path= currentRemoteDir+f;
804 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?" 804 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?"
805 ,"Yes","No",0,0,1) ) { 805 ,"Yes","No",0,0,1) ) {
806 case 0: { 806 case 0: {
807 f=currentDir.canonicalPath()+"/"+f; 807 f=currentDir.canonicalPath()+"/"+f;
808 if(FtpRmdir( path.latin1(), conn) ==0) { 808 if(FtpRmdir( path.latin1(), conn) ==0) {
809 QString msg; 809 QString msg;
810 msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn)); 810 msg.sprintf("Unable to remove directory\n%s",FtpLastResponse(conn));
811 msg.replace(QRegExp(":"),"\n"); 811 msg.replace(QRegExp(":"),"\n");
812 QMessageBox::message("Note",msg); 812 QMessageBox::message("Note",msg);
813 } 813 }
814 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 814 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
815 815
816 } 816 }
817 break; 817 break;
818 }; 818 };
819 } else { 819 } else {
820 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?" 820 switch ( QMessageBox::warning(this,"Delete","Do you really want to delete\n"+f+"?"
821 ,"Yes","No",0,0,1) ) { 821 ,"Yes","No",0,0,1) ) {
822 case 0: { 822 case 0: {
823 QString path= currentRemoteDir+f; 823 QString path= currentRemoteDir+f;
824 if(FtpDelete( path.latin1(), conn)==0) { 824 if(FtpDelete( path.latin1(), conn)==0) {
825 QString msg; 825 QString msg;
826 msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn)); 826 msg.sprintf("Unable to delete file\n%s",FtpLastResponse(conn));
827 msg.replace(QRegExp(":"),"\n"); 827 msg.replace(QRegExp(":"),"\n");
828 QMessageBox::message("Note",msg); 828 QMessageBox::message("Note",msg);
829 } 829 }
830 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 830 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
831 } 831 }
832 break; 832 break;
833 }; 833 };
834 } 834 }
835 QCopEnvelope ( "QPE/System", "notBusy()" ); 835 QCopEnvelope ( "QPE/System", "notBusy()" );
836} 836}
837 837
838void OpieFtp::remoteRename() 838void OpieFtp::remoteRename()
839{ 839{
840 QString curFile = Remote_View->currentItem()->text(0); 840 QString curFile = Remote_View->currentItem()->text(0);
841 InputDialog *fileDlg; 841 InputDialog *fileDlg;
842 fileDlg = new InputDialog(this,"Rename",TRUE, 0); 842 fileDlg = new InputDialog(this,"Rename",TRUE, 0);
843 fileDlg->inputText = curFile; 843 fileDlg->inputText = curFile;
844 fileDlg->exec(); 844 fileDlg->exec();
845 if( fileDlg->result() == 1 ) { 845 if( fileDlg->result() == 1 ) {
846 QString oldName = currentRemoteDir +"/"+ curFile; 846 QString oldName = currentRemoteDir +"/"+ curFile;
847 QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist"; 847 QString newName = currentRemoteDir +"/"+ fileDlg->LineEdit1->text();//+".playlist";
848 QCopEnvelope ( "QPE/System", "busy()" ); 848 QCopEnvelope ( "QPE/System", "busy()" );
849 if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) { 849 if(FtpRename( oldName.latin1(), newName.latin1(),conn) == 0) {
850 QString msg; 850 QString msg;
851 msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn)); 851 msg.sprintf("Unable to rename file\n%s",FtpLastResponse(conn));
852 msg.replace(QRegExp(":"),"\n"); 852 msg.replace(QRegExp(":"),"\n");
853 QMessageBox::message("Note",msg); 853 QMessageBox::message("Note",msg);
854 } 854 }
855 QCopEnvelope ( "QPE/System", "notBusy()" ); 855 QCopEnvelope ( "QPE/System", "notBusy()" );
856 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 856 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
857 } 857 }
858} 858}
859 859
860void OpieFtp::localRename() 860void OpieFtp::localRename()
861{ 861{
862 QString curFile = Local_View->currentItem()->text(0); 862 QString curFile = Local_View->currentItem()->text(0);
863 InputDialog *fileDlg; 863 InputDialog *fileDlg;
864 fileDlg = new InputDialog(this,"Rename",TRUE, 0); 864 fileDlg = new InputDialog(this,"Rename",TRUE, 0);
865 fileDlg->inputText = curFile; 865 fileDlg->inputText = curFile;
866 fileDlg->exec(); 866 fileDlg->exec();
867 if( fileDlg->result() == 1 ) { 867 if( fileDlg->result() == 1 ) {
868 QString oldname = currentDir.canonicalPath() + "/" + curFile; 868 QString oldname = currentDir.canonicalPath() + "/" + curFile;
869 QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist"; 869 QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
870 if( rename(oldname.latin1(), newName.latin1())== -1) 870 if( rename(oldname.latin1(), newName.latin1())== -1)
871 QMessageBox::message("Note","Could not rename"); 871 QMessageBox::message("Note","Could not rename");
872 } 872 }
873 populateLocalView(); 873 populateLocalView();
874} 874}
875 875
876void OpieFtp::currentPathEditChanged() 876void OpieFtp::currentPathEditChanged()
877{ 877{
878 QString oldRemoteCurrentDir = currentRemoteDir; 878 QString oldRemoteCurrentDir = currentRemoteDir;
879// qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir); 879// qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir);
880 if (TabWidget->currentPageIndex() == 0) { 880 if (TabWidget->currentPageIndex() == 0) {
881 if(QDir( currentPathEdit->text()).exists()) { 881 if(QDir( currentPathEdit->text()).exists()) {
882 currentDir.setPath( currentPathEdit->text() ); 882 currentDir.setPath( currentPathEdit->text() );
883 populateLocalView(); 883 populateLocalView();
884 } else { 884 } else {
885 QMessageBox::message("Note","That directory does not exist"); 885 QMessageBox::message("Note","That directory does not exist");
886 } 886 }
887 } 887 }
888 if (TabWidget->currentPageIndex() == 1) { 888 if (TabWidget->currentPageIndex() == 1) {
889 currentRemoteDir = currentPathEdit->text(); 889 currentRemoteDir = currentPathEdit->text();
890 if(currentRemoteDir.right(1) !="/") { 890 if(currentRemoteDir.right(1) !="/") {
891 currentRemoteDir = currentRemoteDir +"/"; 891 currentRemoteDir = currentRemoteDir +"/";
892 currentPathEdit->setText( currentRemoteDir ); 892 currentPathEdit->setText( currentRemoteDir );
893 } 893 }
894 if( !remoteChDir( (const QString &)currentRemoteDir) ) { 894 if( !remoteChDir( (const QString &)currentRemoteDir) ) {
895 currentRemoteDir = oldRemoteCurrentDir; 895 currentRemoteDir = oldRemoteCurrentDir;
896 currentPathEdit->setText( currentRemoteDir ); 896 currentPathEdit->setText( currentRemoteDir );
897 } 897 }
898 898
899 remoteDirList( (const QString &)currentRemoteDir); 899 remoteDirList( (const QString &)currentRemoteDir);
900 } 900 }
901} 901}
902 902
903void OpieFtp::switchToLocalTab() 903void OpieFtp::switchToLocalTab()
904{ 904{
905 TabWidget->setCurrentPage(0); 905 TabWidget->setCurrentPage(0);
906} 906}
907 907
908void OpieFtp::switchToRemoteTab() 908void OpieFtp::switchToRemoteTab()
909{ 909{
910 TabWidget->setCurrentPage(1); 910 TabWidget->setCurrentPage(1);
911} 911}
912 912
913void OpieFtp::switchToConfigTab() 913void OpieFtp::switchToConfigTab()
914{ 914{
915 TabWidget->setCurrentPage(2); 915 TabWidget->setCurrentPage(2);
916} 916}
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
@@ -1,11 +1,12 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3HEADERS = opieftp.h inputDialog.h ftplib.h 3HEADERS = opieftp.h inputDialog.h ftplib.h
4SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp 4SOURCES = opieftp.cpp inputDialog.cpp ftplib.c main.cpp
5TARGET = opieftp 5TARGET = opieftp
6REQUIRES=medium-config 6REQUIRES=medium-config
7DESTDIR = $(OPIEDIR)/bin 7DESTDIR = $(OPIEDIR)/bin
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe
11 11
12TRANSLATIONS = ../../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
@@ -1,12 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = settings.h 4 HEADERS = settings.h
5 SOURCES = language.cpp main.cpp 5 SOURCES = language.cpp main.cpp
6 INTERFACES= languagesettingsbase.ui 6 INTERFACES= languagesettingsbase.ui
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = language 10 TARGET = language
11 11
12TRANSLATIONS = ../../i18n/de/language.ts 12TRANSLATIONS = ../../i18n/de/language.ts
13TRANSLATIONS = ../../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
@@ -1,10 +1,12 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 DESTDIR = ../../bin 3 DESTDIR = ../../bin
4 HEADERS = soundsettings.h 4 HEADERS = soundsettings.h
5 SOURCES = soundsettings.cpp main.cpp 5 SOURCES = soundsettings.cpp main.cpp
6 INTERFACES= soundsettingsbase.ui 6 INTERFACES= soundsettingsbase.ui
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= ../$(OPIEDIR)/include 8 DEPENDPATH+= ../$(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 TARGET = sound 10 TARGET = sound
11
12TRANSLATIONS = ../../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
@@ -1,132 +1,132 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "soundsettings.h" 20#include "soundsettings.h"
21 21
22#include <qpe/config.h> 22#include <qpe/config.h>
23#include <qpe/qcopenvelope_qws.h> 23#include <qpe/qcopenvelope_qws.h>
24#include <qapplication.h> 24#include <qapplication.h>
25#include <qslider.h> 25#include <qslider.h>
26#include <qcheckbox.h> 26#include <qcheckbox.h>
27#include <qlineedit.h> 27#include <qlineedit.h>
28#include <qcombobox.h> 28#include <qcombobox.h>
29 29
30 30
31SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) 31SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
32 : SoundSettingsBase( parent, name, TRUE, fl ) 32 : SoundSettingsBase( parent, name, TRUE, fl )
33{ 33{
34 Config config( "Sound" ); 34 Config config( "Sound" );
35 config.setGroup( "System" ); 35 config.setGroup( "System" );
36 volume->setValue(100-config.readNumEntry("Volume")); 36 volume->setValue(100-config.readNumEntry("Volume"));
37 mic->setValue(100-config.readNumEntry("Mic")); 37 mic->setValue(100-config.readNumEntry("Mic"));
38 touchsound->setChecked(config.readBoolEntry("Touch")); 38 touchsound->setChecked(config.readBoolEntry("Touch"));
39 keysound->setChecked(config.readBoolEntry("Key")); 39 keysound->setChecked(config.readBoolEntry("Key"));
40 40
41 config.setGroup("Record"); 41 config.setGroup("Record");
42 int rate=config.readNumEntry("SampleRate", 11025); 42 int rate=config.readNumEntry("SampleRate", 11025);
43 if(rate == 11025) 43 if(rate == 11025)
44 sampleRate->setCurrentItem(0); 44 sampleRate->setCurrentItem(0);
45 else if(rate == 22050) 45 else if(rate == 22050)
46 sampleRate->setCurrentItem(1); 46 sampleRate->setCurrentItem(1);
47 else if(rate==44100) 47 else if(rate==44100)
48 sampleRate->setCurrentItem(2); 48 sampleRate->setCurrentItem(2);
49 49
50 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 50 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
51 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 51 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1));
52 52
53 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); 53 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
54 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); 54 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
55 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 55 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
56 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); 56 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
57} 57}
58 58
59void SoundSettings::reject() 59void SoundSettings::reject()
60{ 60{
61 Config config( "Sound" ); 61 Config config( "Sound" );
62 config.setGroup( "System" ); 62 config.setGroup( "System" );
63 setVolume(100-config.readNumEntry("Volume")); 63 setVolume(100-config.readNumEntry("Volume"));
64 setMic(100-config.readNumEntry("Mic")); 64 setMic(100-config.readNumEntry("Mic"));
65 65
66 config.setGroup("Record"); 66 config.setGroup("Record");
67 int rate=config.readNumEntry("SampleRate", 11025); 67 int rate=config.readNumEntry("SampleRate", 11025);
68 if(rate == 11025) 68 if(rate == 11025)
69 sampleRate->setCurrentItem(0); 69 sampleRate->setCurrentItem(0);
70 else if(rate == 22050) 70 else if(rate == 22050)
71 sampleRate->setCurrentItem(1); 71 sampleRate->setCurrentItem(1);
72 else if(rate==44100) 72 else if(rate==44100)
73 sampleRate->setCurrentItem(2); 73 sampleRate->setCurrentItem(2);
74 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); 74 stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0));
75 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); 75 sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0));
76 76
77 QDialog::reject(); 77 QDialog::reject();
78} 78}
79 79
80void SoundSettings::accept() 80void SoundSettings::accept()
81{ 81{
82 Config config( "Sound" ); 82 Config config( "Sound" );
83 config.setGroup( "System" ); 83 config.setGroup( "System" );
84 config.writeEntry("Volume",100-volume->value()); 84 config.writeEntry("Volume",100-volume->value());
85 config.writeEntry("Mic",100-mic->value()); 85 config.writeEntry("Mic",100-mic->value());
86 config.writeEntry("Touch",touchsound->isChecked()); 86 config.writeEntry("Touch",touchsound->isChecked());
87 config.writeEntry("Key",keysound->isChecked()); 87 config.writeEntry("Key",keysound->isChecked());
88 88
89 setVolume(volume->value()); 89 setVolume(volume->value());
90 setMic(mic->value()); 90 setMic(mic->value());
91 91
92 config.setGroup("Record"); 92 config.setGroup("Record");
93 config.writeEntry("SampleRate",sampleRate->currentText()); 93 config.writeEntry("SampleRate",sampleRate->currentText());
94 config.writeEntry("Stereo",stereoCheckBox->isChecked()); 94 config.writeEntry("Stereo",stereoCheckBox->isChecked());
95 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); 95 config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
96 96
97 QDialog::accept(); 97 QDialog::accept();
98} 98}
99 99
100void SoundSettings::setVolume(int v) 100void SoundSettings::setVolume(int v)
101{ 101{
102 Config config( "Sound" ); 102 Config config( "Sound" );
103 config.setGroup( "System" ); 103 config.setGroup( "System" );
104 config.writeEntry("Volume",100-v); 104 config.writeEntry("Volume",100-v);
105#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 105#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
106 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 106 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
107#endif 107#endif
108} 108}
109 109
110void SoundSettings::setMic(int m) 110void SoundSettings::setMic(int m)
111{ 111{
112 Config config( "Sound" ); 112 Config config( "Sound" );
113 config.setGroup( "System" ); 113 config.setGroup( "System" );
114 config.writeEntry("Mic",100-m); 114 config.writeEntry("Mic",100-m);
115#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 115#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
116 QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE; 116 QCopEnvelope( "QPE/System", "micChange(bool)" ) << FALSE;
117#endif 117#endif
118} 118}
119 119
120void SoundSettings::volumeChanged( bool ) 120void SoundSettings::volumeChanged( bool )
121{ 121{
122 Config config( "Sound" ); 122 Config config( "Sound" );
123 config.setGroup( "System" ); 123 config.setGroup( "System" );
124 volume->setValue(100-config.readNumEntry("Volume")); 124 volume->setValue(100-config.readNumEntry("Volume"));
125} 125}
126 126
127void SoundSettings::micChanged( bool ) 127void SoundSettings::micChanged( bool )
128{ 128{
129 Config config( "Sound" ); 129 Config config( "Sound" );
130 config.setGroup( "System" ); 130 config.setGroup( "System" );
131 mic->setValue(100-config.readNumEntry("Mic")); 131 mic->setValue(100-config.readNumEntry("Mic"));
132} 132}
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
@@ -1,29 +1,30 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4HEADERS = memory.h \ 4HEADERS = memory.h \
5 graph.h \ 5 graph.h \
6 load.h \ 6 load.h \
7 storage.h \ 7 storage.h \
8 processinfo.h \ 8 processinfo.h \
9 processdetail.h \ 9 processdetail.h \
10 versioninfo.h \ 10 versioninfo.h \
11 sysinfo.h 11 sysinfo.h
12SOURCES = main.cpp \ 12SOURCES = main.cpp \
13 memory.cpp \ 13 memory.cpp \
14 graph.cpp \ 14 graph.cpp \
15 load.cpp \ 15 load.cpp \
16 storage.cpp \ 16 storage.cpp \
17 processinfo.cpp \ 17 processinfo.cpp \
18 processdetail.cpp \ 18 processdetail.cpp \
19 versioninfo.cpp \ 19 versioninfo.cpp \
20 sysinfo.cpp 20 sysinfo.cpp
21INTERFACES = 21INTERFACES =
22 22
23INCLUDEPATH += $(OPIEDIR)/include 23INCLUDEPATH += $(OPIEDIR)/include
24DEPENDPATH += $(OPIEDIR)/include 24DEPENDPATH += $(OPIEDIR)/include
25LIBS += -lqpe 25LIBS += -lqpe
26 26
27TARGET = sysinfo 27TARGET = sysinfo
28 28
29TRANSLATIONS = ../i18n/de/sysinfo.ts 29TRANSLATIONS = ../i18n/de/sysinfo.ts
30TRANSLATIONS = ../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
@@ -1,11 +1,12 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt release 2CONFIG += qt release
3 3
4# Input 4# Input
5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h 5HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
6SOURCES += calc.cpp main.cpp engine.cpp 6SOURCES += calc.cpp main.cpp engine.cpp
7 7
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe -Wl,-export-dynamic 10LIBS += -lqpe -Wl,-export-dynamic
11 11
12TRANSLATIONS = ../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
@@ -1,13 +1,14 @@
1 DESTDIR = $(OPIEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = calculatorimpl.h 4 HEADERS = calculatorimpl.h
5 SOURCES = calculatorimpl.cpp \ 5 SOURCES = calculatorimpl.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= calculator.ui 10 INTERFACES= calculator.ui
11 TARGET = calculator 11 TARGET = calculator
12 12
13TRANSLATIONS = ../i18n/de/calculator.ts 13TRANSLATIONS = ../i18n/de/calculator.ts
14TRANSLATIONS = ../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
@@ -1,13 +1,14 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3DESTDIR = $(OPIEDIR)/bin 3DESTDIR = $(OPIEDIR)/bin
4HEADERS = clock.h setAlarm.h 4HEADERS = clock.h setAlarm.h
5SOURCES = clock.cpp setAlarm.cpp \ 5SOURCES = clock.cpp setAlarm.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10INTERFACES = 10INTERFACES =
11TARGET = clock 11TARGET = clock
12 12
13TRANSLATIONS = ../i18n/de/clock.ts 13TRANSLATIONS = ../i18n/de/clock.ts
14TRANSLATIONS = ../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
@@ -1,9 +1,11 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS = inlineedit.h filebrowser.h filePermissions.h 4 HEADERS = inlineedit.h filebrowser.h filePermissions.h
5 SOURCES = filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp 5 SOURCES = filebrowser.cpp inlineedit.cpp filePermissions.cpp main.cpp
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 7 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe 8LIBS += -lqpe
9 INTERFACES= 9 INTERFACES=
10TRANSLATIONS = ../i18n/de/filebrowser.ts
11TRANSLATIONS = ../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
@@ -1,13 +1,14 @@
1 DESTDIR = $(OPIEDIR)/bin 1 DESTDIR = $(OPIEDIR)/bin
2 TEMPLATE= app 2 TEMPLATE= app
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = packagemanager.h 4 HEADERS = packagemanager.h
5 SOURCES = packagemanager.cpp \ 5 SOURCES = packagemanager.cpp \
6 main.cpp 6 main.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui 10 INTERFACES= packagemanagerbase.ui pkdesc.ui pkfind.ui pksettings.ui
11 TARGET = qipkg 11 TARGET = qipkg
12 12
13TRANSLATIONS = ../i18n/de/qipkg.ts 13TRANSLATIONS = ../i18n/de/qipkg.ts
14TRANSLATIONS = ../i18n/pt_BR/qipkg.ts