summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-27 08:29:50 (UTC)
committer zautrix <zautrix>2005-01-27 08:29:50 (UTC)
commit3cc7fcfca62701f39c2626d48286b949a43313da (patch) (unidiff)
tree5c16e322d8d1c18b47fa825c64cc9d7b6db6fea0
parent5b73e9576949ec5123dbd34fd0fe94828af97f49 (diff)
downloadkdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.zip
kdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.tar.gz
kdepimpi-3cc7fcfca62701f39c2626d48286b949a43313da.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt7
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt6
-rw-r--r--kmicromail/mainwindow.cpp39
-rw-r--r--kmicromail/mainwindow.h3
-rw-r--r--version2
5 files changed, 51 insertions, 6 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 5b23488..9b70a36 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,202 +1,205 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 1.9.21 ************ 3********** VERSION 2.0.0 ************
4
5Stable release 2.0.0!
4 6
5KO/Pi: 7KO/Pi:
6Fixed problem in edit dialog recreation at startup. 8Fixed problem in edit dialog recreation at startup.
7Made "toggle view*" menu items enabled context sensitive. 9Made "toggle view*" menu items enabled context sensitive.
8Changed agenda size menu to items 1-10. 10Changed agenda size menu to items 1-10.
9Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down. 11Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
10 12OM/Pi:
13Added three info lines to display subject, from and to of selected mails.
11 14
12********** VERSION 1.9.20 ************ 15********** VERSION 1.9.20 ************
13 16
14KO/Pi: 17KO/Pi:
15Added for the "dislplay one day" agenda mode 18Added for the "dislplay one day" agenda mode
16info in the caption and in the day lables: 19info in the caption and in the day lables:
17Now it is displayed, if the selected day is from "day before yesterday" 20Now it is displayed, if the selected day is from "day before yesterday"
18to "day after tomorrow". 21to "day after tomorrow".
19Made it possible to delete a Todo, which has sub-todos. 22Made it possible to delete a Todo, which has sub-todos.
20Fixed two small problems in the todo view. 23Fixed two small problems in the todo view.
21Added missing German translation for filter edit and print dialog. 24Added missing German translation for filter edit and print dialog.
22Made search dialog closeable by cancel key. 25Made search dialog closeable by cancel key.
23 26
24Made it possible to select in the date picker the (ligt grey ) 27Made it possible to select in the date picker the (ligt grey )
25dates of the prev./next month with the mouse. 28dates of the prev./next month with the mouse.
26 29
27OM/Pi: 30OM/Pi:
28"Delete mail" icon in main window now deletes all selected mails. 31"Delete mail" icon in main window now deletes all selected mails.
29Fixed the problem, that the state flag of imap mails was ignored. 32Fixed the problem, that the state flag of imap mails was ignored.
30Now mails with "FLAG_SEEN" on the imap server get no icon in the list view 33Now mails with "FLAG_SEEN" on the imap server get no icon in the list view
31to indecate that they are already seen. 34to indecate that they are already seen.
32Fixed the problem that the body of some mails was not displayed in the 35Fixed the problem that the body of some mails was not displayed in the
33mail viewer when fetching them from the imap server directly to read them. 36mail viewer when fetching them from the imap server directly to read them.
34Made it (configurable) possible to show the "To:" field in the list view. 37Made it (configurable) possible to show the "To:" field in the list view.
35Added to the mail viewer the option "View Source" to make it possible to see the raw mail data. 38Added to the mail viewer the option "View Source" to make it possible to see the raw mail data.
36Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the 39Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the
37local storage folder (specified in account settings) of the account of the mail. 40local storage folder (specified in account settings) of the account of the mail.
38Removed some memory leaks in OM/Pi. 41Removed some memory leaks in OM/Pi.
39 42
40 43
41********** VERSION 1.9.19 ************ 44********** VERSION 1.9.19 ************
42 45
43Added a lot of missing translations to KA/Pi, 46Added a lot of missing translations to KA/Pi,
44Added some missing translations to KO/Pi and OM/Pi. 47Added some missing translations to KO/Pi and OM/Pi.
45 48
46Fixed some minor problems in KA/Pi + KO/Pi. 49Fixed some minor problems in KA/Pi + KO/Pi.
47 50
48Fixed a crash when closing PwM/Pi. 51Fixed a crash when closing PwM/Pi.
49Added German translation for PwM/Pi. 52Added German translation for PwM/Pi.
50 53
51Made view change and Month View update faster in KO/Pi. 54Made view change and Month View update faster in KO/Pi.
52 55
53 56
54********** VERSION 1.9.18 ************ 57********** VERSION 1.9.18 ************
55 58
56FYI: The VERSION 1.9.17 was a testing release only. 59FYI: The VERSION 1.9.17 was a testing release only.
57Please read the changelog of VERSION 1.9.17 as well. 60Please read the changelog of VERSION 1.9.17 as well.
58 61
59Cleaned up the syncing config dialog. 62Cleaned up the syncing config dialog.
60Added sync config options for date range for events. 63Added sync config options for date range for events.
61Added sync config options for filters on incoming data. 64Added sync config options for filters on incoming data.
62Added sync config options for filters on outgoing data. 65Added sync config options for filters on outgoing data.
63Please read the updated SyncHowTo about the new filter settings. 66Please read the updated SyncHowTo about the new filter settings.
64These filter settings make it now possible to sync with shared 67These filter settings make it now possible to sync with shared
65calendars without writing back private or confidential data 68calendars without writing back private or confidential data
66(via the outgoing filters). 69(via the outgoing filters).
67To sync only with particular parts of a shared calendar, 70To sync only with particular parts of a shared calendar,
68the incoming filter settings can be used. 71the incoming filter settings can be used.
69An example can be found in the SyncHowTo. 72An example can be found in the SyncHowTo.
70Same for shared addressbooks. 73Same for shared addressbooks.
71 74
72Added a setting for the global kdepim data storage. 75Added a setting for the global kdepim data storage.
73Usually the data is stored in (yourhomedir/kdepim). 76Usually the data is stored in (yourhomedir/kdepim).
74Now you can set in the Global config dialog TAB, subTAB "Data storage path" 77Now you can set in the Global config dialog TAB, subTAB "Data storage path"
75a directory where all the kdepim data is stored. 78a directory where all the kdepim data is stored.
76That makes it easy to save all kdepim data on a SD card on the Z, for example. 79That makes it easy to save all kdepim data on a SD card on the Z, for example.
77 80
78KO/Pi: 81KO/Pi:
79The timeedit input has a pulldown list for times. 82The timeedit input has a pulldown list for times.
80If opened, this pulldown list should now has the right time highlighted. 83If opened, this pulldown list should now has the right time highlighted.
81Added the possibility to exclude events/todos/journals in a filter. 84Added the possibility to exclude events/todos/journals in a filter.
82You should exclude journals, if you do not want them to sync with a public calendar. 85You should exclude journals, if you do not want them to sync with a public calendar.
83 86
84KA/Pi: 87KA/Pi:
85Added the possibility to in/exclude public/private/confidential contacts to a filter. 88Added the possibility to in/exclude public/private/confidential contacts to a filter.
86If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ... 89If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ...
87Added printing of card view and details view on desktop. 90Added printing of card view and details view on desktop.
88Printing of list view is not working... 91Printing of list view is not working...
89Added button for removing pictures in contact editor. 92Added button for removing pictures in contact editor.
90Parsing data fix of KA/Pi version 1.9.17. 93Parsing data fix of KA/Pi version 1.9.17.
91Fixed the "parse name automatically" problem of KA/Pi version 1.9.17. 94Fixed the "parse name automatically" problem of KA/Pi version 1.9.17.
92Fixed some syncing merging problems. 95Fixed some syncing merging problems.
93 96
94 97
95********** VERSION 1.9.17 ************ 98********** VERSION 1.9.17 ************
96 99
97KO/Pi: 100KO/Pi:
98Fixed that tooltips were not updated after moving an item in agenda view. 101Fixed that tooltips were not updated after moving an item in agenda view.
99Fixed a bug in sorting start date for recurring events in list view. 102Fixed a bug in sorting start date for recurring events in list view.
100Changed the left button in todo viewer from "Agenda" to "Set completed". 103Changed the left button in todo viewer from "Agenda" to "Set completed".
101This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View. 104This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
102Added more info in the todo viewer: Startdate, parent/sub todos. 105Added more info in the todo viewer: Startdate, parent/sub todos.
103 106
104 107
105KA/Pi: 108KA/Pi:
106All fields search does now actually search all the (possible) fields, 109All fields search does now actually search all the (possible) fields,
107not only those listed in the contact list. 110not only those listed in the contact list.
108Made is possible to inline a picture in a vcard on the Z. 111Made is possible to inline a picture in a vcard on the Z.
109This was only possible on the desktop, now is it possible on the Z as well. 112This was only possible on the desktop, now is it possible on the Z as well.
110Fixed of missing save settings after filter configuration. 113Fixed of missing save settings after filter configuration.
111Made saving of addressbook much faster. 114Made saving of addressbook much faster.
112Fixed extension widget layout problem. 115Fixed extension widget layout problem.
113Fixed saving of default formatted name settings. 116Fixed saving of default formatted name settings.
114Fixed formatted name handling in edit dialog. 117Fixed formatted name handling in edit dialog.
115Added an option for changing formatted names of many contacts 118Added an option for changing formatted names of many contacts
116(menu: File - Change - Set formatted name). 119(menu: File - Change - Set formatted name).
117 120
118QWhatsThis was not working on the Z ( only black rectangle was shown). 121QWhatsThis was not working on the Z ( only black rectangle was shown).
119This is Fixed. 122This is Fixed.
120 123
121KDE-Sync: 124KDE-Sync:
122Now readonly KDE resources are synced as well. 125Now readonly KDE resources are synced as well.
123(They are not changed in KDE itself, of course). 126(They are not changed in KDE itself, of course).
124 127
125 128
126 129
127********** VERSION 1.9.16 ************ 130********** VERSION 1.9.16 ************
128 131
129KO/Pi: 132KO/Pi:
130Fixed search dialog size on Z 6000 (480x640 display). 133Fixed search dialog size on Z 6000 (480x640 display).
131Added setting to hide/show time in agenda items. 134Added setting to hide/show time in agenda items.
132Added setting to hide not running todos in todo view. 135Added setting to hide not running todos in todo view.
133Added columns for start date/time in todo view. 136Added columns for start date/time in todo view.
134Replaced the solid half-hour lines in agenda view by dot lines. 137Replaced the solid half-hour lines in agenda view by dot lines.
135Added possibility of printing the What's Next View on the desktop 138Added possibility of printing the What's Next View on the desktop
136(i.e. Windows and Linux). 139(i.e. Windows and Linux).
137Fixed a crash in KO/Pi when starting KO/Pi with What's Next view. 140Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
138Added tooltips in month view.(Tooltips only available on desktop) 141Added tooltips in month view.(Tooltips only available on desktop)
139 142
140Fixed a strange problem in KO/Pi alarm applet. 143Fixed a strange problem in KO/Pi alarm applet.
141Did not find the actual problem, 144Did not find the actual problem,
142such that now Qtopia reboots again if deinstalling the alarm applet. 145such that now Qtopia reboots again if deinstalling the alarm applet.
143But the alarm applet should work again. 146But the alarm applet should work again.
144 147
145KA/Pi: 148KA/Pi:
146Fixed the problem, that internal pictures were not saved. 149Fixed the problem, that internal pictures were not saved.
147 150
148Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes. 151Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
149 152
150Fixed some minor problems. (Like word wrap in help text windows). 153Fixed some minor problems. (Like word wrap in help text windows).
151 154
152Fixed a compiling problem in microkde/kresources. 155Fixed a compiling problem in microkde/kresources.
153 156
154KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM. 157KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM.
155This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9) 158This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9)
156such that now syncing KO/Pi with Sharp DTM should work on the 159such that now syncing KO/Pi with Sharp DTM should work on the
157Zaurus C 3000 model. 160Zaurus C 3000 model.
158 161
159********** VERSION 1.9.15 ************ 162********** VERSION 1.9.15 ************
160 163
161Usebilty enhancements in KO/Pi: 164Usebilty enhancements in KO/Pi:
162When clicking on the date in a month view cell, the day view is shown. 165When clicking on the date in a month view cell, the day view is shown.
163Old behaviour was, that the "new event" dialog popped up. 166Old behaviour was, that the "new event" dialog popped up.
164 167
165Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 168Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu).
166That means, you can restore the latest 169That means, you can restore the latest
167event/todo/journal you have deleted. 170event/todo/journal you have deleted.
168A journal is deleted, if you clear all the text of the journal. 171A journal is deleted, if you clear all the text of the journal.
169 172
170Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14. 173Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
171 174
172KA/Pi starting in 480x640 resolution: 175KA/Pi starting in 480x640 resolution:
173Hide the filter action in toolbar 176Hide the filter action in toolbar
174and added icons for undo/delete/redo in toolbar. 177and added icons for undo/delete/redo in toolbar.
175 178
176Change in OM/Pi ViewMail dialog: 179Change in OM/Pi ViewMail dialog:
177When clicking on the "delete" icon the mail is deleted after confirmation as usual. 180When clicking on the "delete" icon the mail is deleted after confirmation as usual.
178But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any). 181But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
179 182
180Fixed a crash when deleting mail-accounts in OM/Pi. 183Fixed a crash when deleting mail-accounts in OM/Pi.
181 184
182 185
183********** VERSION 1.9.14 ************ 186********** VERSION 1.9.14 ************
184 187
185Fixed some problems with the dialog sizes when switching 188Fixed some problems with the dialog sizes when switching
186portrait/landscape mode on 640x480 PDA display. 189portrait/landscape mode on 640x480 PDA display.
187 190
188Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi. 191Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
189 192
190Fixed an ugly bug in KOpieMail: 193Fixed an ugly bug in KOpieMail:
191KOpieMail was not able to write files (mails) to MSDOS file system, 194KOpieMail was not able to write files (mails) to MSDOS file system,
192like on an usual preformatted SD card. That should work now. 195like on an usual preformatted SD card. That should work now.
193To save your mail data on the Sd card do the following: 196To save your mail data on the Sd card do the following:
194Create a dir on the SD card: 197Create a dir on the SD card:
195mkdir /mnt/card/localmail 198mkdir /mnt/card/localmail
196Go to your home dir: 199Go to your home dir:
197cd 200cd
198Go to kopiemail data storage dir: 201Go to kopiemail data storage dir:
199cd kdepim/apps/kopiemail 202cd kdepim/apps/kopiemail
200Create a symlink to the SD card: 203Create a symlink to the SD card:
201ls -s /mnt/card/localmail 204ls -s /mnt/card/localmail
202Now KOpieMail will store all mails on the SD card. 205Now KOpieMail will store all mails on the SD card.
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 6ebaafe..86819b7 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -64,197 +64,201 @@
64{ "Tuesday","Dienstag" }, 64{ "Tuesday","Dienstag" },
65{ "Wednesday","Mittwoch" }, 65{ "Wednesday","Mittwoch" },
66{ "Thursday","Donnerstag" }, 66{ "Thursday","Donnerstag" },
67{ "Friday","Freitag" }, 67{ "Friday","Freitag" },
68{ "Saturday","Samstag" }, 68{ "Saturday","Samstag" },
69{ "Sunday","Sonntag" }, 69{ "Sunday","Sonntag" },
70{ "Daylight end:","Sommerzeit Ende:" }, 70{ "Daylight end:","Sommerzeit Ende:" },
71{ "Time Zone","Zeitzone" }, 71{ "Time Zone","Zeitzone" },
72{ "Used Mail Client","Benutzter Mail Client" }, 72{ "Used Mail Client","Benutzter Mail Client" },
73{ "Channel:","Channel:" }, 73{ "Channel:","Channel:" },
74{ "Message:","Message:" }, 74{ "Message:","Message:" },
75{ "Parameters:","Parameter:" }, 75{ "Parameters:","Parameter:" },
76{ "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" }, 76{ "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
77{ "extra Message:","extra Message:" }, 77{ "extra Message:","extra Message:" },
78{ "extra Parameters:","extra Parameter:" }, 78{ "extra Parameters:","extra Parameter:" },
79{ "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" }, 79{ "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
80{ "External Apps.","Externe Appl." }, 80{ "External Apps.","Externe Appl." },
81{ "General","Allgemein" }, 81{ "General","Allgemein" },
82{ "Full &name:","Vor- und &Nachname:" }, 82{ "Full &name:","Vor- und &Nachname:" },
83{ "E&mail address:","E&mail Adresse:" }, 83{ "E&mail address:","E&mail Adresse:" },
84{ "Fonts","Schriftart" }, 84{ "Fonts","Schriftart" },
85{ "Choose...","Wähle..." }, 85{ "Choose...","Wähle..." },
86{ "Used %1 Client","Benutzter %1 Client" }, 86{ "Used %1 Client","Benutzter %1 Client" },
87{ "No email client installed","Kein Email Klient installiert" }, 87{ "No email client installed","Kein Email Klient installiert" },
88{ "Userdefined email client","Benutzerdef. Email Klient" }, 88{ "Userdefined email client","Benutzerdef. Email Klient" },
89{ "OM/Pi email client","OM/Pi Email Klient" }, 89{ "OM/Pi email client","OM/Pi Email Klient" },
90{ "Delete","Löschen" }, 90{ "Delete","Löschen" },
91{ "New","Neu" }, 91{ "New","Neu" },
92{ "Edit","Bearbeite" }, 92{ "Edit","Bearbeite" },
93{ "Close","Schließen" }, 93{ "Close","Schließen" },
94{ "Size","Größe" }, 94{ "Size","Größe" },
95{ "Date","Datum" }, 95{ "Date","Datum" },
96{ "Please set at","Bitte einstellen in" }, 96{ "Please set at","Bitte einstellen in" },
97{ "Settings@General TAB","Einstellungen@Allgemein TAB" }, 97{ "Settings@General TAB","Einstellungen@Allgemein TAB" },
98{ "KOpieMail/Pi","KOpieMail/Pi" }, 98{ "KOpieMail/Pi","KOpieMail/Pi" },
99{ "Mail","Mail" }, 99{ "Mail","Mail" },
100{ "Settings","Konfig" }, 100{ "Settings","Konfig" },
101{ "Get all new mails","Hole alle neuen Mails" }, 101{ "Get all new mails","Hole alle neuen Mails" },
102{ "Get new messages","Hole neue mails" }, 102{ "Get new messages","Hole neue mails" },
103{ "Compose new mail","Schreibe neue Mail" }, 103{ "Compose new mail","Schreibe neue Mail" },
104{ "Send queued mails","Sende gespeicherte Mails" }, 104{ "Send queued mails","Sende gespeicherte Mails" },
105{ "Show/Hide folders","Zeige Verzeichnisse" }, 105{ "Show/Hide folders","Zeige Verzeichnisse" },
106{ "Delete Mail","Lösche Mail" }, 106{ "Delete Mail","Lösche Mail" },
107{ "Edit settings","Ändere Einstellungen" }, 107{ "Edit settings","Ändere Einstellungen" },
108{ "Configure accounts","Konfiguriere Zugänge" }, 108{ "Configure accounts","Konfiguriere Zugänge" },
109{ "Mailbox","Mailbox" }, 109{ "Mailbox","Mailbox" },
110{ "Subject","Betreff" }, 110{ "Subject","Betreff" },
111{ "Sender","Sender" }, 111{ "Sender","Sender" },
112{ "Size","Größe" }, 112{ "Size","Größe" },
113{ "Date","Datum" }, 113{ "Date","Datum" },
114{ "Close","Schliessen" }, 114{ "Close","Schliessen" },
115{ "Help","Hilfe" }, 115{ "Help","Hilfe" },
116{ "About","Über" }, 116{ "About","Über" },
117{ "Licence","Lizenz" }, 117{ "Licence","Lizenz" },
118{ "LibEtPan Licence","LibEtPan Lizenz" }, 118{ "LibEtPan Licence","LibEtPan Lizenz" },
119{ "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" }, 119{ "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" },
120{ "HINT: Separate multiple\neMail addresses by ";"","Hinweis:Trenne mehrere\nAddressen mit einem ";"" }, 120{ "HINT: Separate multiple\neMail addresses by ";"","Hinweis:Trenne mehrere\nAddressen mit einem ";"" },
121{ "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich"\nstattdessen!" }, 121{ "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich"\nstattdessen!" },
122{ "View mail as html","Zeige Mails als html" }, 122{ "View mail as html","Zeige Mails als html" },
123{ "Send mails later","Sende Mails später" }, 123{ "Send mails later","Sende Mails später" },
124{ "Application(nr)","Applikation(nr)" }, 124{ "Application(nr)","Applikation(nr)" },
125{ "OK","OK" }, 125{ "OK","OK" },
126{ "Compose mail:","Verfasse Mail:" }, 126{ "Compose mail:","Verfasse Mail:" },
127{ "Dear Mr.","Hallo Herr" }, 127{ "Dear Mr.","Hallo Herr" },
128{ "Read mail:","Lese Mail:" }, 128{ "Read mail:","Lese Mail:" },
129{ "Hello","Hallo" }, 129{ "Hello","Hallo" },
130{ "Configure Accounts","Konfigure Zugänge" }, 130{ "Configure Accounts","Konfigure Zugänge" },
131{ "Name of the Account","Name des Zugangs" }, 131{ "Name of the Account","Name des Zugangs" },
132{ "News","News" }, 132{ "News","News" },
133{ "Account","Zugang" }, 133{ "Account","Zugang" },
134{ "Type","Typ" }, 134{ "Type","Typ" },
135{ "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" }, 135{ "<p>Please select an account.</p>","<p>Bitte wähle einen Zugang.</p>" },
136{ "Error","Fehler" }, 136{ "Error","Fehler" },
137{ "Configure NNTP","Konfiguriere News" }, 137{ "Configure NNTP","Konfiguriere News" },
138{ "Port","Port" }, 138{ "Port","Port" },
139{ "Server","Server" }, 139{ "Server","Server" },
140{ "Use SSL","Benutze SSL" }, 140{ "Use SSL","Benutze SSL" },
141{ "User","Benutzer" }, 141{ "User","Benutzer" },
142{ "Password","Passwort" }, 142{ "Password","Passwort" },
143{ "Use Login","Benutze Login" }, 143{ "Use Login","Benutze Login" },
144{ "Newsgroup","Newsgroup" }, 144{ "Newsgroup","Newsgroup" },
145{ "Get newsgroup list from server","Hole Newsgroup Liste vom Server" }, 145{ "Get newsgroup list from server","Hole Newsgroup Liste vom Server" },
146{ "Filter:","Filter:" }, 146{ "Filter:","Filter:" },
147{ "Show subscribed","Zeige abbonnierte" }, 147{ "Show subscribed","Zeige abbonnierte" },
148{ "Groups","NewsGroups" }, 148{ "Groups","NewsGroups" },
149{ "Configure IMAP","Konfiguriere IMAP" }, 149{ "Configure IMAP","Konfiguriere IMAP" },
150{ "Use secure sockets:","Benutze sichere Verbindung:" }, 150{ "Use secure sockets:","Benutze sichere Verbindung:" },
151{ "ssh $SERVER exec","ssh $SERVER exec" }, 151{ "ssh $SERVER exec","ssh $SERVER exec" },
152{ "Prefix","Prefix" }, 152{ "Prefix","Prefix" },
153{ "Local storage folder:","Lokales Verzeichnis:" }, 153{ "Local storage folder:","Lokales Verzeichnis:" },
154{ "Get only messages smaller","Hole nur Nachrichten kleiner" }, 154{ "Get only messages smaller","Hole nur Nachrichten kleiner" },
155{ "kB","kB" }, 155{ "kB","kB" },
156{ "Leave Messages on Server","Belasse Nachrichten auf dem Server" }, 156{ "Leave Messages on Server","Belasse Nachrichten auf dem Server" },
157{ "Configure POP3","Konfiguriere POP3" }, 157{ "Configure POP3","Konfiguriere POP3" },
158{ "ssh $SERVER exec imapd","ssh $SERVER exec imapd" }, 158{ "ssh $SERVER exec imapd","ssh $SERVER exec imapd" },
159{ "Configure SMTP","Konfiguriere SMTP" }, 159{ "Configure SMTP","Konfiguriere SMTP" },
160{ "Name of the SMTP Server","Name des SMTP Servers" }, 160{ "Name of the SMTP Server","Name des SMTP Servers" },
161{ "Port of the SMTP Server","Port des SMTP Servers" }, 161{ "Port of the SMTP Server","Port des SMTP Servers" },
162{ "Fetching folder list","Hole Verzeichnis Liste" }, 162{ "Fetching folder list","Hole Verzeichnis Liste" },
163{ "Fetch ","Hole " }, 163{ "Fetch ","Hole " },
164{ "Fetching header list","Hole Titel Liste" }, 164{ "Fetching header list","Hole Titel Liste" },
165{ "Mailbox has %1 mails","Mailbox hat %1 Mails" }, 165{ "Mailbox has %1 mails","Mailbox hat %1 Mails" },
166{ "Read this mail","Lies diese Mail" }, 166{ "Read this mail","Lies diese Mail" },
167{ "Move/Copy this mail","Verschiebe/kopiere diese Mail" }, 167{ "Move/Copy this mail","Verschiebe/kopiere diese Mail" },
168{ "Delete this mail","Lösche diese Mail" }, 168{ "Delete this mail","Lösche diese Mail" },
169{ "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" }, 169{ "Move/Copy all selected mail","Verschiebe/kopiere selektierte Mails" },
170{ "Delete all selected mails","Lösche alle selektierten Mails" }, 170{ "Delete all selected mails","Lösche alle selektierten Mails" },
171{ "Clear selection","Selektion aufheben" }, 171{ "Clear selection","Selektion aufheben" },
172{ "Reply","Antworten" }, 172{ "Reply","Antworten" },
173{ "Forward","Weiterleiten" }, 173{ "Forward","Weiterleiten" },
174{ "Attachments","Anhang" }, 174{ "Attachments","Anhang" },
175{ "Show Html","Zeige in html" }, 175{ "Show Html","Zeige in html" },
176{ "Description","Beschreibung" }, 176{ "Description","Beschreibung" },
177{ "Filename","Dateiname" }, 177{ "Filename","Dateiname" },
178{ "E-Mail by %1","E-Mail von %1" }, 178{ "E-Mail by %1","E-Mail von %1" },
179{ "Cc","Kopie" }, 179{ "Cc","Kopie" },
180{ "To","An" }, 180{ "To","An" },
181{ "From","Von" }, 181{ "From","Von" },
182{ "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" }, 182{ "<p>Do you really want to delete this mail? <br><br>","<p>Wollen Sie diese Mail wirklich löschen? <br><br>" },
183{ "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" }, 183{ "Mailbox has %1 mail(s)","Mailbox hat %1 Mail(s)" },
184{ "Move/Copie all mails","Verschiebe/kopiere alle Mails" }, 184{ "Move/Copie all mails","Verschiebe/kopiere alle Mails" },
185{ "Delete all mails","Lösche alle Mails" }, 185{ "Delete all mails","Lösche alle Mails" },
186{ "Create new subfolder","Neues Unterverzeichnis" }, 186{ "Create new subfolder","Neues Unterverzeichnis" },
187{ "Delete folder","Lösche Verzeichnis" }, 187{ "Delete folder","Lösche Verzeichnis" },
188{ "Refresh folder list","Aktualisiere Liste" }, 188{ "Refresh folder list","Aktualisiere Liste" },
189{ "Create new folder","Neues Verzeichnis" }, 189{ "Create new folder","Neues Verzeichnis" },
190{ "Disconnect","Diskonnect" }, 190{ "Disconnect","Diskonnect" },
191{ "Set offline","Gehe offline" }, 191{ "Set offline","Gehe offline" },
192{ "Select target box","Wähle Ziel Box" }, 192{ "Select target box","Wähle Ziel Box" },
193{ "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" }, 193{ "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" },
194{ "Folder:","Verzeichnis:" }, 194{ "Folder:","Verzeichnis:" },
195{ "Account:","Zugang:" }, 195{ "Account:","Zugang:" },
196{ "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" }, 196{ "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" },
197{ "Move mail(s)","Verschiebe Mail(s)" }, 197{ "Move mail(s)","Verschiebe Mail(s)" },
198{ "only mails smaller","nur Mails kleiner" }, 198{ "only mails smaller","nur Mails kleiner" },
199{ " kB"," kB" }, 199{ " kB"," kB" },
200{ " message %1 of %2"," Nachricht %1 von %2" }, 200{ " message %1 of %2"," Nachricht %1 von %2" },
201{ "Copying...","Am Kopieren..." }, 201{ "Copying...","Am Kopieren..." },
202{ "Copy message %1 of %2","Kopiere Nachricht %1 von %2" }, 202{ "Copy message %1 of %2","Kopiere Nachricht %1 von %2" },
203{ "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" }, 203{ "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" },
204{ "Delete All Mails","Lösche alle Mails" }, 204{ "Delete All Mails","Lösche alle Mails" },
205{ "Deleting ...","Am Löschen..." }, 205{ "Deleting ...","Am Löschen..." },
206{ "Delete message %1 of %2","Lösche Nachricht %1 von %2" }, 206{ "Delete message %1 of %2","Lösche Nachricht %1 von %2" },
207{ "Compose Message","Verfasse Nachricht" }, 207{ "Compose Message","Verfasse Nachricht" },
208{ "Reply-To","Antwort-An" }, 208{ "Reply-To","Antwort-An" },
209{ "BCC","BCC" }, 209{ "BCC","BCC" },
210{ "Signature","Signatur" }, 210{ "Signature","Signatur" },
211{ "CC","Kopie" }, 211{ "CC","Kopie" },
212{ "Options","Optionen" }, 212{ "Options","Optionen" },
213{ "Delete File","Lösche Datei" }, 213{ "Delete File","Lösche Datei" },
214{ "Add File","Füge Datei hinzu" }, 214{ "Add File","Füge Datei hinzu" },
215{ "Attachment","Anhang" }, 215{ "Attachment","Anhang" },
216{ "send later","sende später" }, 216{ "send later","sende später" },
217{ "use:","via:" }, 217{ "use:","via:" },
218{ "Save","Speichern" }, 218{ "Save","Speichern" },
219{ "Name","Name" }, 219{ "Name","Name" },
220{ "No Receiver spezified","Kein Empfänger angegeben" }, 220{ "No Receiver spezified","Kein Empfänger angegeben" },
221{ "Sending mail","Sende Mail" }, 221{ "Sending mail","Sende Mail" },
222{ "No","Nein" }, 222{ "No","Nein" },
223{ "Yes","Ja" }, 223{ "Yes","Ja" },
224{ "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" }, 224{ "Store message into drafts?\n","Speichere Nachricht in Entwürfe?\n" },
225{ "Store message?","Nachricht speichern?" }, 225{ "Store message?","Nachricht speichern?" },
226{ "Select Type","Selektiere Typ" }, 226{ "Select Type","Selektiere Typ" },
227{ "Select Account Type","Wähle Art des Zugangs" }, 227{ "Select Account Type","Wähle Art des Zugangs" },
228{ "IMAP","IMAP (online lesen)" }, 228{ "IMAP","IMAP (online lesen)" },
229{ "POP3","POP3 (holen)" }, 229{ "POP3","POP3 (holen)" },
230{ "SMTP","SMTP (senden)" }, 230{ "SMTP","SMTP (senden)" },
231{ "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" }, 231{ "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" },
232{ "Question","Eine Frage..." }, 232{ "Question","Eine Frage..." },
233{ "Send this message?","Nachricht wirklich senden?" }, 233{ "Send this message?","Nachricht wirklich senden?" },
234{ "Stop editing message","Stop editing message" }, 234{ "Stop editing message","Stop editing message" },
235{ "Sending mail %1 of %2","Sende Mail %1 von %2" }, 235{ "Sending mail %1 of %2","Sende Mail %1 von %2" },
236{ "%1 of %2 bytes send","%1 von %2 Bytes gesendet" }, 236{ "%1 of %2 bytes send","%1 von %2 Bytes gesendet" },
237{ "Refresh header list","Aktualisiere Titel Liste" }, 237{ "Refresh header list","Aktualisiere Titel Liste" },
238{ "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" }, 238{ "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" },
239{ "Mail queue flushed","Gespeicherte Mails gesendet!" }, 239{ "Mail queue flushed","Gespeicherte Mails gesendet!" },
240{ "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" }, 240{ "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" },
241{ "Show next mail","Zeige nächste Mail" }, 241{ "Show next mail","Zeige nächste Mail" },
242{ "End of List","Ende der Liste" }, 242{ "End of List","Ende der Liste" },
243{ "Language","Sprache" }, 243{ "Language","Sprache" },
244{ "Time Format","Zeit Format" }, 244{ "Time Format","Zeit Format" },
245{ "%1 groups subscribed","%1 Guppen abboniert" }, 245{ "%1 groups subscribed","%1 Guppen abboniert" },
246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" }, 246{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Ihr gerade genutztes Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverzeichnis)/apps/kopiemail/localmail" },
247{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" }, 247{ "<b>Set new data storage dir:</b>","<b>Setze neues Datenspeicherverzeichnis:</b>" },
248{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" }, 248{ "Not existing dirs are created automatically","Nicht existierende Verzeichnisse werden erstellt" },
249{ "Save settings","Speichere Einstellungen" }, 249{ "Save settings","Speichere Einstellungen" },
250{ "Save standard","Speichere Standard" }, 250{ "Save standard","Speichere Standard" },
251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, 251{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
252{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" }, 252{ "The settings of the storage\ndir is saved in the file\n%1","Die Einstellungen des Speicherverzeichnisses\nwerden in folgender Datei gespeichert:\n%1" },
253{ "Data storage path","Daten Speicherpfad" }, 253{ "Data storage path","Daten Speicherpfad" },
254{ "userdefined","benutzerdefiniert" }, 254{ "userdefined","benutzerdefiniert" },
255{ "Reply to this mail","Beantworte diese Mail" }, 255{ "Reply to this mail","Beantworte diese Mail" },
256{ "","" }, 256{ "Su:","Be:" },
257{ "Fr:","Vo:" },
258{ "To:","An:" },
259{ "Download Mail","Mail runterladen" },
260{ "View Source","Zeige Source" },
257{ "","" }, 261{ "","" },
258{ "","" }, 262{ "","" },
259{ "","" }, 263{ "","" },
260{ "","" }, 264{ "","" },
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 875ab77..250d114 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,359 +1,394 @@
1 1
2// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
3#include <qlabel.h> 3#include <qlabel.h>
4#include <qvbox.h> 4#include <qvbox.h>
5#include <qheader.h> 5#include <qheader.h>
6#include <qtimer.h> 6#include <qtimer.h>
7#include <qlayout.h> 7#include <qlayout.h>
8//#include <kdialog.h> 8//#include <kdialog.h>
9#include <kiconloader.h> 9#include <kiconloader.h>
10#include <kapplication.h> 10#include <kapplication.h>
11 11
12#ifdef DESKTOP_VERSION 12#ifdef DESKTOP_VERSION
13#include <qapplication.h> 13#include <qapplication.h>
14#include <qstatusbar.h> 14#include <qstatusbar.h>
15#include <kabc/stdaddressbook.h> 15#include <kabc/stdaddressbook.h>
16extern QStatusBar* globalSstatusBarMainWindow; 16extern QStatusBar* globalSstatusBarMainWindow;
17#else 17#else
18#include <qpe/qpeapplication.h> 18#include <qpe/qpeapplication.h>
19#include <klocale.h> 19#include <klocale.h>
20#endif 20#endif
21#include "defines.h" 21#include "defines.h"
22#include "mainwindow.h" 22#include "mainwindow.h"
23#include "mailistviewitem.h"
23#include <KDGanttMinimizeSplitter.h> 24#include <KDGanttMinimizeSplitter.h>
24 25
25#include "koprefs.h" 26#include "koprefs.h"
26 27
27MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 28MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
28 : QMainWindow( parent, name ) //, flags ) 29 : QMainWindow( parent, name ) //, flags )
29{ 30{
30#ifdef DESKTOP_VERSION 31#ifdef DESKTOP_VERSION
31 globalSstatusBarMainWindow = statusBar(); 32 globalSstatusBarMainWindow = statusBar();
32#endif 33#endif
33 setCaption( i18n( "KOpieMail/Pi" ) ); 34 setCaption( i18n( "KOpieMail/Pi" ) );
34 setToolBarsMovable( false ); 35 setToolBarsMovable( false );
35 //KABC::StdAddressBook::self(); 36 //KABC::StdAddressBook::self();
36 toolBar = new QToolBar( this ); 37 toolBar = new QToolBar( this );
37 menuBar = new QPEMenuBar( toolBar ); 38 menuBar = new QPEMenuBar( toolBar );
38 mailMenu = new QPopupMenu( menuBar ); 39 mailMenu = new QPopupMenu( menuBar );
39 menuBar->insertItem( i18n( "Mail" ), mailMenu ); 40 menuBar->insertItem( i18n( "Mail" ), mailMenu );
40 settingsMenu = new QPopupMenu( menuBar ); 41 settingsMenu = new QPopupMenu( menuBar );
41 menuBar->insertItem( i18n( "Settings" ), settingsMenu ); 42 menuBar->insertItem( i18n( "Settings" ), settingsMenu );
42 43
43 addToolBar( toolBar ); 44 addToolBar( toolBar );
44 toolBar->setHorizontalStretchable( true ); 45 toolBar->setHorizontalStretchable( true );
45 QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"), 46 QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
46 0, 0, this ); 47 0, 0, this );
47 connect(getMail, SIGNAL( activated() ), 48 connect(getMail, SIGNAL( activated() ),
48 SLOT( slotGetAllMail() ) ); 49 SLOT( slotGetAllMail() ) );
49 getMail->addTo( mailMenu ); 50 getMail->addTo( mailMenu );
50 51
51 getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"), 52 getMail = new QAction( i18n( "Get new messages" ), SmallIcon("add"),
52 0, 0, this ); 53 0, 0, this );
53 getMail->addTo( toolBar ); 54 getMail->addTo( toolBar );
54 getMail->addTo( mailMenu ); 55 getMail->addTo( mailMenu );
55 connect(getMail, SIGNAL( activated() ), 56 connect(getMail, SIGNAL( activated() ),
56 SLOT( slotGetMail() ) ); 57 SLOT( slotGetMail() ) );
57 58
58 composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"), 59 composeMail = new QAction( i18n( "Compose new mail" ), SmallIcon("composemail"),
59 0, 0, this ); 60 0, 0, this );
60 composeMail->addTo( toolBar ); 61 composeMail->addTo( toolBar );
61 composeMail->addTo( mailMenu ); 62 composeMail->addTo( mailMenu );
62 63
63 sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") , 64 sendQueued = new QAction( i18n( "Send queued mails" ), SmallIcon("sendqueued") ,
64 0, 0, this ); 65 0, 0, this );
65 sendQueued->addTo( toolBar ); 66 sendQueued->addTo( toolBar );
66 sendQueued->addTo( mailMenu ); 67 sendQueued->addTo( mailMenu );
67 68
68 /* 69 /*
69 syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC, 70 syncFolders = new QAction( i18n( "Sync mailfolders" ), ICON_SYNC,
70 0, 0, this ); 71 0, 0, this );
71 syncFolders->addTo( toolBar ); 72 syncFolders->addTo( toolBar );
72 syncFolders->addTo( mailMenu ); 73 syncFolders->addTo( mailMenu );
73 */ 74 */
74 75
75 showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") , 76 showFolders = new QAction( i18n( "Show/Hide folders" ), SmallIcon("showfolders") ,
76 0, 0, this, 0, true ); 77 0, 0, this, 0, true );
77 showFolders->addTo( toolBar ); 78 showFolders->addTo( toolBar );
78 showFolders->addTo( mailMenu ); 79 showFolders->addTo( mailMenu );
79 showFolders->setOn( true ); 80 showFolders->setOn( true );
80 connect(showFolders, SIGNAL( toggled(bool) ), 81 connect(showFolders, SIGNAL( toggled(bool) ),
81 SLOT( slotShowFolders(bool) ) ); 82 SLOT( slotShowFolders(bool) ) );
82 83
83 /* 84 /*
84 searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ), 85 searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
85 0, 0, this ); 86 0, 0, this );
86 searchMails->addTo( toolBar ); 87 searchMails->addTo( toolBar );
87 searchMails->addTo( mailMenu ); 88 searchMails->addTo( mailMenu );
88 */ 89 */
89 90
90 deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this); 91 deleteMails = new QAction(i18n("Delete Mail"), SmallIcon("trash"), 0, 0, this);
91 deleteMails->addTo( toolBar ); 92 deleteMails->addTo( toolBar );
92 deleteMails->addTo( mailMenu ); 93 deleteMails->addTo( mailMenu );
93 connect( deleteMails, SIGNAL( activated() ), 94 connect( deleteMails, SIGNAL( activated() ),
94 SLOT( slotDeleteAllMail() ) ); 95 SLOT( slotDeleteAllMail() ) );
95 96
96 editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") , 97 editSettings = new QAction( i18n( "Edit settings" ), SmallIcon("SettingsIcon") ,
97 0, 0, this ); 98 0, 0, this );
98 editSettings->addTo( settingsMenu ); 99 editSettings->addTo( settingsMenu );
99 connect( editSettings, SIGNAL( activated() ), 100 connect( editSettings, SIGNAL( activated() ),
100 SLOT( slotEditSettings() ) ); 101 SLOT( slotEditSettings() ) );
101 editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") , 102 editAccounts = new QAction( i18n( "Configure accounts" ), SmallIcon("editaccounts") ,
102 0, 0, this ); 103 0, 0, this );
103 editAccounts->addTo( settingsMenu ); 104 editAccounts->addTo( settingsMenu );
104 codecMenu = new QPopupMenu( menuBar ); 105 codecMenu = new QPopupMenu( menuBar );
105 codecMenu->insertItem( "Western (iso-8859-1)",0,0); 106 codecMenu->insertItem( "Western (iso-8859-1)",0,0);
106 codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1); 107 codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
107 codecMenu->insertItem( "Western (iso-8859-15)",2,2); 108 codecMenu->insertItem( "Western (iso-8859-15)",2,2);
108 codecMenu->insertItem( "Chinese (big-5)",3,3); 109 codecMenu->insertItem( "Chinese (big-5)",3,3);
109 codecMenu->insertItem( "Unicode (utf-8)",4,4); 110 codecMenu->insertItem( "Unicode (utf-8)",4,4);
110 codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5); 111 codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
111 //disabled 112 //disabled
112 //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu); 113 //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
113 //setCentralWidget( view ); 114 //setCentralWidget( view );
114 115
115 QVBox* wrapperBox = new QVBox( this ); 116 QVBox* wrapperBox = new QVBox( this );
116 setCentralWidget( wrapperBox ); 117 setCentralWidget( wrapperBox );
117 118
118 // QWidget *view = new QWidget( wrapperBox ); 119 // QWidget *view = new QWidget( wrapperBox );
119 KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, wrapperBox); 120 KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox);
121 splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down);
122 KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor);
120 split->setMinimizeDirection( KDGanttMinimizeSplitter::Left); 123 split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
121 //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight ); 124 //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
122 125 QWidget* infoBox = new QWidget( splithor );
126 QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
127 griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
128 griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
129 griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
130 griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
131 griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
132 griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
133 infoBox->setMaximumHeight( infoBox->sizeHint().height() );
123 folderView = new AccountView( split ); 134 folderView = new AccountView( split );
124 folderView->header()->hide(); 135 folderView->header()->hide();
125 folderView->setRootIsDecorated( false ); 136 folderView->setRootIsDecorated( false );
126 folderView->addColumn( i18n( "Mailbox" ) ); 137 folderView->addColumn( i18n( "Mailbox" ) );
127 138
128 //layout->addWidget( folderView ); 139 //layout->addWidget( folderView );
129 140
130 mailView = new QListView( split ); 141 mailView = new QListView( split );
131 mailView->addColumn( i18n( " " ) ); 142 mailView->addColumn( i18n( " " ) );
132 mailView->addColumn( i18n( "Subject" ),QListView::Manual ); 143 mailView->addColumn( i18n( "Subject" ),QListView::Manual );
133 mailView->addColumn( i18n( "Sender" ),QListView::Manual ); 144 mailView->addColumn( i18n( "Sender" ),QListView::Manual );
134 mailView->addColumn( i18n( "Size" ),QListView::Manual); 145 mailView->addColumn( i18n( "Size" ),QListView::Manual);
135 mailView->addColumn( i18n( "Date" ),QListView::Manual); 146 mailView->addColumn( i18n( "Date" ),QListView::Manual);
136 if ( KOPrefs::instance()->mShowToField ) 147 if ( KOPrefs::instance()->mShowToField )
137 mailView->addColumn( i18n( "To" ),QListView::Manual); 148 mailView->addColumn( i18n( "To" ),QListView::Manual);
138 mailView->setAllColumnsShowFocus(true); 149 mailView->setAllColumnsShowFocus(true);
139 //mailView->setSorting(-1); 150 //mailView->setSorting(-1);
140 mailView->setRootIsDecorated( false ); 151 mailView->setRootIsDecorated( false );
141 statusWidget = new StatusWidget( wrapperBox ); 152 statusWidget = new StatusWidget( wrapperBox );
142 statusWidget->hide(); 153 statusWidget->hide();
143 154
144 //layout->addWidget( mailView ); 155 //layout->addWidget( mailView );
145 //layout->setStretchFactor( folderView, 1 ); 156 //layout->setStretchFactor( folderView, 1 );
146 //layout->setStretchFactor( mailView, 2 ); 157 //layout->setStretchFactor( mailView, 2 );
147 158
148 slotAdjustLayout(); 159 slotAdjustLayout();
149#ifndef DESKTOP_VERSION 160#ifndef DESKTOP_VERSION
150 QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); 161 QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
151 QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); 162 QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
163 QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
164 QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
165 QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
152#endif 166#endif
153 connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, 167 connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this,
154 SLOT( mailLeftClicked(QListViewItem*) ) ); 168 SLOT( mailLeftClicked(QListViewItem*) ) );
155 connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, 169 connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this,
156 SLOT( mailLeftClicked(QListViewItem*) ) ); 170 SLOT( mailLeftClicked(QListViewItem*) ) );
157 connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, 171 connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
158 SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); 172 SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
159 connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), 173 connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
160 this,SLOT(refreshMailView(const QValueList<RecMailP>&))); 174 this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
175
176 connect( mailView, SIGNAL( currentChanged (QListViewItem* )),this,
177 SLOT( setInfoFields(QListViewItem*) ) );
178
161 connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); 179 connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
162 connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); 180 connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
163// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); 181// connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
164 connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); 182 connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
165 //mailView->setMultiSelection ( true ); 183 //mailView->setMultiSelection ( true );
166 mailView->setSelectionMode( QListView::Extended ); 184 mailView->setSelectionMode( QListView::Extended );
167 QValueList<int> list; 185 QValueList<int> list;
168 int fw = 100; 186 int fw = 100;
169 if ( QApplication::desktop()->width() > 320 ) 187 if ( QApplication::desktop()->width() > 320 )
170 fw = 50; 188 fw = 50;
171 list.append( fw ); 189 list.append( fw );
172 list.append( 100 ); 190 list.append( 100 );
173 split->setSizes( list ); 191 split->setSizes( list );
174 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); 192 QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
175 mailView->setShowSortIndicator ( true ); 193 mailView->setShowSortIndicator ( true );
176 QLabel *spacer = new QLabel( toolBar ); 194 QLabel *spacer = new QLabel( toolBar );
177 spacer->setBackgroundMode( QWidget::PaletteButton ); 195 spacer->setBackgroundMode( QWidget::PaletteButton );
178 toolBar->setStretchableWidget( spacer ); 196 toolBar->setStretchableWidget( spacer );
179 197
180 QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); 198 QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
181 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); 199 connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
182 if ( QApplication::desktop()->width() > 320 ) 200 if ( QApplication::desktop()->width() > 320 )
183 closeMail->addTo(toolBar); 201 closeMail->addTo(toolBar);
184 closeMail->addTo(mailMenu); 202 closeMail->addTo(mailMenu);
185 203
186 204
187 QPopupMenu* helpMenu = new QPopupMenu( menuBar ); 205 QPopupMenu* helpMenu = new QPopupMenu( menuBar );
188 menuBar->insertItem( i18n( "Help" ), helpMenu ); 206 menuBar->insertItem( i18n( "Help" ), helpMenu );
189 QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 207 QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this);
190 connect( li, SIGNAL( activated() ), SLOT( showAbout()) ); 208 connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
191 li->addTo(helpMenu); 209 li->addTo(helpMenu);
192 li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 210 li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this);
193 connect( li, SIGNAL( activated() ), SLOT( showLicence()) ); 211 connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
194 li->addTo(helpMenu); 212 li->addTo(helpMenu);
195 li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 213 li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this);
196 connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) ); 214 connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
197 li->addTo(helpMenu); 215 li->addTo(helpMenu);
198 connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) ); 216 connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
199 slotSetCodec( KOPrefs::instance()->mCurrentCodec ); 217 slotSetCodec( KOPrefs::instance()->mCurrentCodec );
200#ifdef DESKTOP_VERSION 218#ifdef DESKTOP_VERSION
201 resize ( 640, 480 ); 219 resize ( 640, 480 );
202#endif 220#endif
203} 221}
204 222
205MainWindow::~MainWindow() 223MainWindow::~MainWindow()
206{ 224{
207} 225}
208 226
227void MainWindow::setInfoFields(QListViewItem* item )
228{
229 if ( item == 0) {
230 subLE->setText("");
231 fromLE->setText("");
232 toLE->setText("");
233 return;
234 }
235 RecMailP mail = ((MailListViewItem*)item)->data();
236 subLE->setText(mail->getSubject());
237 fromLE->setText(mail->getFrom());
238 toLE->setText(mail->To().join(";" ));
239 subLE->setCursorPosition(0);
240 fromLE->setCursorPosition(0);
241 toLE->setCursorPosition(0);
242
243}
209void MainWindow::slotSetCodec( int codec ) 244void MainWindow::slotSetCodec( int codec )
210{ 245{
211 codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false ); 246 codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false );
212 //qDebug("codec %d ", codec); 247 //qDebug("codec %d ", codec);
213 KOPrefs::instance()->mCurrentCodec = codec; 248 KOPrefs::instance()->mCurrentCodec = codec;
214 KOPrefs::instance()->isDirty = true; 249 KOPrefs::instance()->isDirty = true;
215 QString name; 250 QString name;
216 switch ( codec ) { 251 switch ( codec ) {
217 case 0: 252 case 0:
218 name = "iso-8859-1"; 253 name = "iso-8859-1";
219 break; 254 break;
220 case 1: 255 case 1:
221 name = "iso-8859-5"; 256 name = "iso-8859-5";
222 break; 257 break;
223 case 2: 258 case 2:
224 name = "iso-8859-15"; 259 name = "iso-8859-15";
225 break; 260 break;
226 case 3: 261 case 3:
227 name = "big-5"; 262 name = "big-5";
228 break; 263 break;
229 case 4: 264 case 4:
230 name = "utf-8"; 265 name = "utf-8";
231 break; 266 break;
232 case 5: 267 case 5:
233 name = KOPrefs::instance()->mSendCodec.lower(); 268 name = KOPrefs::instance()->mSendCodec.lower();
234 break; 269 break;
235 } 270 }
236 KOPrefs::instance()->mCurrentCodeName = name ; 271 KOPrefs::instance()->mCurrentCodeName = name ;
237 codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")"); 272 codecMenu->changeItem ( 5, "Userdefined ("+KOPrefs::instance()->mSendCodec+")");
238 codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true ); 273 codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, true );
239} 274}
240void MainWindow::showLicence() 275void MainWindow::showLicence()
241{ 276{
242 KApplication::showLicence(); 277 KApplication::showLicence();
243} 278}
244void MainWindow::showAbout() 279void MainWindow::showAbout()
245{ 280{
246 QString version; 281 QString version;
247#include <../version> 282#include <../version>
248 283
249 QString cap = "About KOpieMail/Pi"; 284 QString cap = "About KOpieMail/Pi";
250 QString text =i18n("KOpieMail/Platform-independent\n") + 285 QString text =i18n("KOpieMail/Platform-independent\n") +
251 "(OM/Pi) " + version + " - " 286 "(OM/Pi) " + version + " - "
252 287
253#ifdef DESKTOP_VERSION 288#ifdef DESKTOP_VERSION
254 "Desktop Edition\n" 289 "Desktop Edition\n"
255#else 290#else
256 "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" 291 "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
257#endif 292#endif
258 "www.pi-sync.net\n\n" 293 "www.pi-sync.net\n\n"
259 294
260 295
261 296
262"Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n" 297"Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
263 "KOpieMail/Pi is based on Opie Mail\n" 298 "KOpieMail/Pi is based on Opie Mail\n"
264 "Copyright (c) Rajko Albrecht and the Opie team\n" 299 "Copyright (c) Rajko Albrecht and the Opie team\n"
265 "KOpieMail/Pi is licensed under the GPL\n" 300 "KOpieMail/Pi is licensed under the GPL\n"
266 "\n" 301 "\n"
267 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" 302 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
268 "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" 303 "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
269 "libEtPan has its own licence - see LibEtPan licence\n"; 304 "libEtPan has its own licence - see LibEtPan licence\n";
270 305
271 KApplication::showText( cap, text ); 306 KApplication::showText( cap, text );
272} 307}
273void MainWindow::showEtpanLicence() 308void MainWindow::showEtpanLicence()
274{ 309{
275 KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); 310 KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
276 311
277} 312}
278void MainWindow::appMessage(const QCString &, const QByteArray &) 313void MainWindow::appMessage(const QCString &, const QByteArray &)
279{ 314{
280 qDebug("appMessage implemented by subclass"); 315 qDebug("appMessage implemented by subclass");
281} 316}
282 317
283void MainWindow::slotAdjustLayout() { 318void MainWindow::slotAdjustLayout() {
284 319
285 /* 320 /*
286 QWidget *d = QApplication::desktop(); 321 QWidget *d = QApplication::desktop();
287 322
288 if ( d->width() < d->height() ) { 323 if ( d->width() < d->height() ) {
289 layout->setDirection( QBoxLayout::TopToBottom ); 324 layout->setDirection( QBoxLayout::TopToBottom );
290 } else { 325 } else {
291 layout->setDirection( QBoxLayout::LeftToRight ); 326 layout->setDirection( QBoxLayout::LeftToRight );
292 } 327 }
293 */ 328 */
294} 329}
295 330
296void MainWindow::slotAdjustColumns() 331void MainWindow::slotAdjustColumns()
297{ 332{
298 bool hidden = folderView->isHidden(); 333 bool hidden = folderView->isHidden();
299 if ( hidden ) folderView->show(); 334 if ( hidden ) folderView->show();
300 folderView->setColumnWidth( 0, folderView->visibleWidth() ); 335 folderView->setColumnWidth( 0, folderView->visibleWidth() );
301 if ( hidden ) folderView->hide(); 336 if ( hidden ) folderView->hide();
302 337
303 mailView->setColumnWidth( 0, 10 ); 338 mailView->setColumnWidth( 0, 10 );
304 mailView->setColumnWidth( 1, 100 ); 339 mailView->setColumnWidth( 1, 100 );
305 mailView->setColumnWidth( 2, 100 ); 340 mailView->setColumnWidth( 2, 100 );
306 mailView->setColumnWidth( 3, 50 ); 341 mailView->setColumnWidth( 3, 50 );
307 mailView->setColumnWidth( 4, 120 ); 342 mailView->setColumnWidth( 4, 120 );
308 if ( KOPrefs::instance()->mShowToField ) 343 if ( KOPrefs::instance()->mShowToField )
309 mailView->setColumnWidth( 5, 100 ); 344 mailView->setColumnWidth( 5, 100 );
310} 345}
311 346
312void MainWindow::slotEditSettings() 347void MainWindow::slotEditSettings()
313{ 348{
314} 349}
315 350
316void MainWindow::slotShowFolders( bool ) 351void MainWindow::slotShowFolders( bool )
317{ 352{
318 qDebug("not implemented: "); 353 qDebug("not implemented: ");
319} 354}
320 355
321void MainWindow::refreshMailView(const QValueList<RecMailP>&) 356void MainWindow::refreshMailView(const QValueList<RecMailP>&)
322{ 357{
323 qDebug("not implemented: "); 358 qDebug("not implemented: ");
324} 359}
325 360
326void MainWindow::mailLeftClicked(QListViewItem * ) 361void MainWindow::mailLeftClicked(QListViewItem * )
327{ 362{
328 qDebug("not implemented: "); 363 qDebug("not implemented: ");
329} 364}
330 365
331void MainWindow::displayMail() 366void MainWindow::displayMail()
332{ 367{
333 qDebug("not implemented: "); 368 qDebug("not implemented: ");
334} 369}
335 370
336void MainWindow::slotDeleteMail() 371void MainWindow::slotDeleteMail()
337{ 372{
338 qDebug("not implemented: "); 373 qDebug("not implemented: ");
339} 374}
340 375
341void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) 376void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int )
342{ 377{
343 qDebug("not implemented: "); 378 qDebug("not implemented: ");
344} 379}
345 380
346void MainWindow::slotSendQueued() 381void MainWindow::slotSendQueued()
347{ 382{
348 qDebug("not implemented: "); 383 qDebug("not implemented: ");
349} 384}
350 385
351void MainWindow::slotEditAccounts() 386void MainWindow::slotEditAccounts()
352{ 387{
353 qDebug("not implemented: "); 388 qDebug("not implemented: ");
354} 389}
355 390
356void MainWindow::slotComposeMail() 391void MainWindow::slotComposeMail()
357{ 392{
358 qDebug("not implemented: "); 393 qDebug("not implemented: ");
359} 394}
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 016e44c..ddb3fca 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,70 +1,73 @@
1 1
2// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
3#ifndef MAINWINDOW_H 3#ifndef MAINWINDOW_H
4#define MAINWINDOW_H 4#define MAINWINDOW_H
5 5
6#include <qmainwindow.h> 6#include <qmainwindow.h>
7#include <qlistview.h> 7#include <qlistview.h>
8#include <qaction.h> 8#include <qaction.h>
9#include <qlineedit.h>
9 10
10#include <qtoolbar.h> 11#include <qtoolbar.h>
11#ifdef DESKTOP_VERSION 12#ifdef DESKTOP_VERSION
12#include <qmenubar.h> 13#include <qmenubar.h>
13#define QPEMenuBar QMenuBar 14#define QPEMenuBar QMenuBar
14#else 15#else
15#include <qpe/qpemenubar.h> 16#include <qpe/qpemenubar.h>
16#endif 17#endif
17 18
18#include "accountview.h" 19#include "accountview.h"
19#include "statuswidget.h" 20#include "statuswidget.h"
20 21
21#include <libmailwrapper/mailtypes.h> 22#include <libmailwrapper/mailtypes.h>
22#include <opie2/osmartpointer.h> 23#include <opie2/osmartpointer.h>
23 24
24class RecMail; 25class RecMail;
25 26
26class MainWindow : public QMainWindow 27class MainWindow : public QMainWindow
27{ 28{
28 Q_OBJECT 29 Q_OBJECT
29 30
30public: 31public:
31 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); 32 MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
32 virtual ~MainWindow(); 33 virtual ~MainWindow();
33 34
34public slots: 35public slots:
35 virtual void slotAdjustColumns(); 36 virtual void slotAdjustColumns();
36 virtual void appMessage(const QCString &msg, const QByteArray &data); 37 virtual void appMessage(const QCString &msg, const QByteArray &data);
37 virtual void slotComposeMail(); 38 virtual void slotComposeMail();
38 39
39protected slots: 40protected slots:
41 virtual void setInfoFields(QListViewItem* );
40 virtual void slotSendQueued(); 42 virtual void slotSendQueued();
41 virtual void slotEditAccounts(); 43 virtual void slotEditAccounts();
42 virtual void slotShowFolders( bool show ); 44 virtual void slotShowFolders( bool show );
43 virtual void refreshMailView(const QValueList<RecMailP>&); 45 virtual void refreshMailView(const QValueList<RecMailP>&);
44 virtual void displayMail(); 46 virtual void displayMail();
45 virtual void slotGetMail() = 0; 47 virtual void slotGetMail() = 0;
46 virtual void slotGetAllMail() = 0; 48 virtual void slotGetAllMail() = 0;
47 virtual void slotDeleteMail(); 49 virtual void slotDeleteMail();
48 virtual void slotDeleteAllMail() = 0; 50 virtual void slotDeleteAllMail() = 0;
49 virtual void slotSetCodec(int); 51 virtual void slotSetCodec(int);
50 virtual void mailHold(int, QListViewItem *,const QPoint&,int); 52 virtual void mailHold(int, QListViewItem *,const QPoint&,int);
51 virtual void slotAdjustLayout(); 53 virtual void slotAdjustLayout();
52 virtual void slotEditSettings(); 54 virtual void slotEditSettings();
53 virtual void mailLeftClicked( QListViewItem * ); 55 virtual void mailLeftClicked( QListViewItem * );
54 void showLicence(); 56 void showLicence();
55 void showAbout(); 57 void showAbout();
56 void showEtpanLicence(); 58 void showEtpanLicence();
57 59
58protected: 60protected:
59 QToolBar *toolBar; 61 QToolBar *toolBar;
60 StatusWidget *statusWidget; 62 StatusWidget *statusWidget;
61 QPEMenuBar *menuBar; 63 QPEMenuBar *menuBar;
62 QPopupMenu *mailMenu, *settingsMenu, *codecMenu; 64 QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
63 QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, 65 QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
64 *editSettings, *editAccounts, *syncFolders; 66 *editSettings, *editAccounts, *syncFolders;
65 AccountView *folderView; 67 AccountView *folderView;
66 QListView *mailView; 68 QListView *mailView;
69 QLineEdit* toLE,*fromLE,*subLE;
67 //QBoxLayout *layout; 70 //QBoxLayout *layout;
68}; 71};
69 72
70#endif 73#endif
diff --git a/version b/version
index 02b0fb1..b972ae7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.20"; version = "2.0.0";