summaryrefslogtreecommitdiffabout
path: root/kmicromail
authorzautrix <zautrix>2004-09-10 15:30:01 (UTC)
committer zautrix <zautrix>2004-09-10 15:30:01 (UTC)
commit4af018e98a29e859df1b28a437c4965bb9676394 (patch) (unidiff)
treeac71fa15fdd2eca263730493de378482952d8c80 /kmicromail
parent14056eb4ec076bc243dcb9f600999eb437fb8afd (diff)
downloadkdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.zip
kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.gz
kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.bz2
path fixes for kopiemail
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/kmicromail.desktop2
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp2
-rw-r--r--kmicromail/libmailwrapper/settings.cpp20
-rw-r--r--kmicromail/main.cpp8
-rw-r--r--kmicromail/mainwindow.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/kmicromail/kmicromail.desktop b/kmicromail/kmicromail.desktop
index a23420a..e3efcc6 100644
--- a/kmicromail/kmicromail.desktop
+++ b/kmicromail/kmicromail.desktop
@@ -1,15 +1,15 @@
1[Desktop Entry] 1[Desktop Entry]
2CanFastload=1 2CanFastload=1
3Comment=OM/PI 3Comment=OM/PI
4Comment[de]=KM/PI 4Comment[de]=KM/PI
5Display=640x480/144dpi,480x640/144dpi 5Display=640x480/144dpi,480x640/144dpi
6Exec=ompi 6Exec=ompi
7GenericName= 7GenericName=
8GenericName[de]= 8GenericName[de]=
9Icon=kdepim/kmicromail/kmicromail 9Icon=kdepim/kopiemail/kmicromail
10MimeType= 10MimeType=
11Name=OM/Pi 11Name=OM/Pi
12StartupNotify=true 12StartupNotify=true
13Terminal=false 13Terminal=false
14TerminalOptions= 14TerminalOptions=
15Type=Application 15Type=Application
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 3b0ca1f..cef4e97 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -97,65 +97,65 @@ QString AbstractMail::convert_String(const char*text)
97 /* due a bug in libetpan it isn't usable this moment */ 97 /* due a bug in libetpan it isn't usable this moment */
98/* int err = mailmime_encoded_phrase_parse("iso-8859-1", 98/* int err = mailmime_encoded_phrase_parse("iso-8859-1",
99 text, strlen(text),&index, "iso-8859-1",&res);*/ 99 text, strlen(text),&index, "iso-8859-1",&res);*/
100 //odebug << "Input: " << text << "" << oendl; 100 //odebug << "Input: " << text << "" << oendl;
101 if (err == MAILIMF_NO_ERROR && res && strlen(res)) { 101 if (err == MAILIMF_NO_ERROR && res && strlen(res)) {
102// result = QString(res); 102// result = QString(res);
103// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; 103// odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl;
104 } 104 }
105 if (res) free(res); 105 if (res) free(res);
106 return result; 106 return result;
107} 107}
108 108
109/* cp & paste from launcher */ 109/* cp & paste from launcher */
110QString AbstractMail::gen_attachment_id() 110QString AbstractMail::gen_attachment_id()
111{ 111{
112 QFile file( "/proc/sys/kernel/random/uuid" ); 112 QFile file( "/proc/sys/kernel/random/uuid" );
113 if (!file.open(IO_ReadOnly ) ) 113 if (!file.open(IO_ReadOnly ) )
114 return QString::null; 114 return QString::null;
115 115
116 QTextStream stream(&file); 116 QTextStream stream(&file);
117 117
118 return "{" + stream.read().stripWhiteSpace() + "}"; 118 return "{" + stream.read().stripWhiteSpace() + "}";
119} 119}
120 120
121int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) 121int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
122{ 122{
123 return 0; 123 return 0;
124} 124}
125 125
126QString AbstractMail::defaultLocalfolder() 126QString AbstractMail::defaultLocalfolder()
127{ 127{
128 // QString f = getenv( "HOME" ); 128 // QString f = getenv( "HOME" );
129 QString f = locateLocal( "data", "kmicromail/localmail"); 129 QString f = locateLocal( "data", "kopiemail/localmail");
130 // f += "/Applications/opiemail/localmail"; 130 // f += "/Applications/opiemail/localmail";
131 return f; 131 return f;
132} 132}
133 133
134QString AbstractMail::draftFolder() 134QString AbstractMail::draftFolder()
135{ 135{
136 return QString("Drafts"); 136 return QString("Drafts");
137} 137}
138 138
139/* temporary - will be removed when implemented in all classes */ 139/* temporary - will be removed when implemented in all classes */
140void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &) 140void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
141{ 141{
142} 142}
143void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) 143void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
144{ 144{
145 //qDebug("AbstractMail::deleteMailList:: Please reimplement! "); 145 //qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
146 // this is currently re-implemented in pop3wrapper and imapwrapper 146 // this is currently re-implemented in pop3wrapper and imapwrapper
147 int iii = 0; 147 int iii = 0;
148 int count = target.count(); 148 int count = target.count();
149 QProgressBar bar( count,0 ); 149 QProgressBar bar( count,0 );
150 bar.setCaption (("Removing mails - close to abort!") ); 150 bar.setCaption (("Removing mails - close to abort!") );
151 int w = 300; 151 int w = 300;
152 if ( QApplication::desktop()->width() < 320 ) 152 if ( QApplication::desktop()->width() < 320 )
153 w = 220; 153 w = 220;
154 int h = bar.sizeHint().height() ; 154 int h = bar.sizeHint().height() ;
155 int dw = QApplication::desktop()->width(); 155 int dw = QApplication::desktop()->width();
156 int dh = QApplication::desktop()->height(); 156 int dh = QApplication::desktop()->height();
157 bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 157 bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
158 bar.show(); 158 bar.show();
159 int modulo = (count/10)+1; 159 int modulo = (count/10)+1;
160 int incCounter = 0; 160 int incCounter = 0;
161 while (iii < count ) { 161 while (iii < count ) {
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index bdb2a25..b0a539e 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -1,91 +1,91 @@
1#include <stdlib.h> 1#include <stdlib.h>
2#include <qdir.h> 2#include <qdir.h>
3 3
4//#include <opie2/odebug.h> 4//#include <opie2/odebug.h>
5#include <qpe/config.h> 5#include <qpe/config.h>
6 6
7#include <kstandarddirs.h> 7#include <kstandarddirs.h>
8#include "settings.h" 8#include "settings.h"
9//#include "defines.h" 9//#include "defines.h"
10 10
11#define IMAP_PORT "143" 11#define IMAP_PORT "143"
12#define IMAP_SSL_PORT "993" 12#define IMAP_SSL_PORT "993"
13#define SMTP_PORT "25" 13#define SMTP_PORT "25"
14#define SMTP_SSL_PORT "465" 14#define SMTP_SSL_PORT "465"
15#define POP3_PORT "110" 15#define POP3_PORT "110"
16#define POP3_SSL_PORT "995" 16#define POP3_SSL_PORT "995"
17#define NNTP_PORT "119" 17#define NNTP_PORT "119"
18#define NNTP_SSL_PORT "563" 18#define NNTP_SSL_PORT "563"
19 19
20 20
21Settings::Settings() 21Settings::Settings()
22 : QObject() 22 : QObject()
23{ 23{
24 updateAccounts(); 24 updateAccounts();
25} 25}
26 26
27void Settings::checkDirectory() 27void Settings::checkDirectory()
28{ 28{
29 qDebug("Settings::checkDirectory() "); 29 qDebug("Settings::checkDirectory() ");
30 return; 30 return;
31 locateLocal("data", "kmicromail" ); 31 locateLocal("data", "kopiemail" );
32 /* 32 /*
33 if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { 33 if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) {
34 system( "mkdir -p $HOME/Applications/opiemail" ); 34 system( "mkdir -p $HOME/Applications/opiemail" );
35 qDebug("$HOME/Applications/opiemail created "); 35 qDebug("$HOME/Applications/opiemail created ");
36 } 36 }
37 */ 37 */
38} 38}
39 39
40QList<Account> Settings::getAccounts() 40QList<Account> Settings::getAccounts()
41{ 41{
42 return accounts; 42 return accounts;
43} 43}
44 44
45void Settings::addAccount( Account *account ) 45void Settings::addAccount( Account *account )
46{ 46{
47 accounts.append( account ); 47 accounts.append( account );
48} 48}
49 49
50void Settings::delAccount( Account *account ) 50void Settings::delAccount( Account *account )
51{ 51{
52 accounts.remove( account ); 52 accounts.remove( account );
53 account->remove(); 53 account->remove();
54} 54}
55 55
56void Settings::updateAccounts() 56void Settings::updateAccounts()
57{ 57{
58 accounts.clear(); 58 accounts.clear();
59 QDir dir( locateLocal("data", "kmicromail" ) ); 59 QDir dir( locateLocal("data", "kopiemail" ) );
60 QStringList::Iterator it; 60 QStringList::Iterator it;
61 61
62 QStringList imap = dir.entryList( "imap-*" ); 62 QStringList imap = dir.entryList( "imap-*" );
63 for ( it = imap.begin(); it != imap.end(); it++ ) { 63 for ( it = imap.begin(); it != imap.end(); it++ ) {
64 IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); 64 IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") );
65 accounts.append( account ); 65 accounts.append( account );
66 } 66 }
67 67
68 QStringList pop3 = dir.entryList( "pop3-*" ); 68 QStringList pop3 = dir.entryList( "pop3-*" );
69 for ( it = pop3.begin(); it != pop3.end(); it++ ) { 69 for ( it = pop3.begin(); it != pop3.end(); it++ ) {
70 POP3account *account = new POP3account( (*it).replace(0, 5, "") ); 70 POP3account *account = new POP3account( (*it).replace(0, 5, "") );
71 accounts.append( account ); 71 accounts.append( account );
72 } 72 }
73 73
74 QStringList smtp = dir.entryList( "smtp-*" ); 74 QStringList smtp = dir.entryList( "smtp-*" );
75 for ( it = smtp.begin(); it != smtp.end(); it++ ) { 75 for ( it = smtp.begin(); it != smtp.end(); it++ ) {
76 SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); 76 SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") );
77 accounts.append( account ); 77 accounts.append( account );
78 } 78 }
79 79
80 QStringList nntp = dir.entryList( "nntp-*" ); 80 QStringList nntp = dir.entryList( "nntp-*" );
81 for ( it = nntp.begin(); it != nntp.end(); it++ ) { 81 for ( it = nntp.begin(); it != nntp.end(); it++ ) {
82 NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); 82 NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") );
83 accounts.append( account ); 83 accounts.append( account );
84 } 84 }
85 85
86 readAccounts(); 86 readAccounts();
87} 87}
88 88
89void Settings::saveAccounts() 89void Settings::saveAccounts()
90{ 90{
91 checkDirectory(); 91 checkDirectory();
@@ -119,322 +119,322 @@ void Account::remove()
119{ 119{
120 QFile file( getFileName() ); 120 QFile file( getFileName() );
121 file.remove(); 121 file.remove();
122} 122}
123 123
124IMAPaccount::IMAPaccount() 124IMAPaccount::IMAPaccount()
125 : Account() 125 : Account()
126{ 126{
127 file = IMAPaccount::getUniqueFileName(); 127 file = IMAPaccount::getUniqueFileName();
128 accountName = "New IMAP Account"; 128 accountName = "New IMAP Account";
129 ssl = false; 129 ssl = false;
130 connectionType = 1; 130 connectionType = 1;
131 type = MAILLIB::A_IMAP; 131 type = MAILLIB::A_IMAP;
132 port = IMAP_PORT; 132 port = IMAP_PORT;
133} 133}
134 134
135IMAPaccount::IMAPaccount( QString filename ) 135IMAPaccount::IMAPaccount( QString filename )
136 : Account() 136 : Account()
137{ 137{
138 file = filename; 138 file = filename;
139 accountName = "New IMAP Account"; 139 accountName = "New IMAP Account";
140 ssl = false; 140 ssl = false;
141 connectionType = 1; 141 connectionType = 1;
142 type = MAILLIB::A_IMAP; 142 type = MAILLIB::A_IMAP;
143 port = IMAP_PORT; 143 port = IMAP_PORT;
144} 144}
145 145
146QString IMAPaccount::getUniqueFileName() 146QString IMAPaccount::getUniqueFileName()
147{ 147{
148 int num = 0; 148 int num = 0;
149 QString unique; 149 QString unique;
150 150
151 QDir dir( locateLocal("data", "kmicromail" ) ); 151 QDir dir( locateLocal("data", "kopiemail" ) );
152 152
153 QStringList imap = dir.entryList( "imap-*" ); 153 QStringList imap = dir.entryList( "imap-*" );
154 do { 154 do {
155 unique.setNum( num++ ); 155 unique.setNum( num++ );
156 } while ( imap.contains( "imap-" + unique ) > 0 ); 156 } while ( imap.contains( "imap-" + unique ) > 0 );
157 157
158 return unique; 158 return unique;
159} 159}
160 160
161void IMAPaccount::read() 161void IMAPaccount::read()
162{ 162{
163 Config *conf = new Config( getFileName(), Config::File ); 163 Config *conf = new Config( getFileName(), Config::File );
164 conf->setGroup( "IMAP Account" ); 164 conf->setGroup( "IMAP Account" );
165 accountName = conf->readEntry( "Account","" ); 165 accountName = conf->readEntry( "Account","" );
166 if (accountName.isNull()) accountName = ""; 166 if (accountName.isNull()) accountName = "";
167 server = conf->readEntry( "Server","" ); 167 server = conf->readEntry( "Server","" );
168 if (server.isNull()) server=""; 168 if (server.isNull()) server="";
169 port = conf->readEntry( "Port","" ); 169 port = conf->readEntry( "Port","" );
170 if (port.isNull()) port="143"; 170 if (port.isNull()) port="143";
171 connectionType = conf->readNumEntry( "ConnectionType" ); 171 connectionType = conf->readNumEntry( "ConnectionType" );
172 ssl = conf->readBoolEntry( "SSL",false ); 172 ssl = conf->readBoolEntry( "SSL",false );
173 user = conf->readEntry( "User","" ); 173 user = conf->readEntry( "User","" );
174 if (user.isNull()) user = ""; 174 if (user.isNull()) user = "";
175 password = conf->readEntryCrypt( "Password","" ); 175 password = conf->readEntryCrypt( "Password","" );
176 if (password.isNull()) password = ""; 176 if (password.isNull()) password = "";
177 prefix = conf->readEntry("MailPrefix",""); 177 prefix = conf->readEntry("MailPrefix","");
178 if (prefix.isNull()) prefix = ""; 178 if (prefix.isNull()) prefix = "";
179 offline = conf->readBoolEntry("Offline",false); 179 offline = conf->readBoolEntry("Offline",false);
180 delete conf; 180 delete conf;
181} 181}
182 182
183void IMAPaccount::save() 183void IMAPaccount::save()
184{ 184{
185 qDebug("saving %s ",getFileName().latin1() ); 185 qDebug("saving %s ",getFileName().latin1() );
186 Settings::checkDirectory(); 186 Settings::checkDirectory();
187 187
188 Config *conf = new Config( getFileName(), Config::File ); 188 Config *conf = new Config( getFileName(), Config::File );
189 conf->setGroup( "IMAP Account" ); 189 conf->setGroup( "IMAP Account" );
190 conf->writeEntry( "Account", accountName ); 190 conf->writeEntry( "Account", accountName );
191 conf->writeEntry( "Server", server ); 191 conf->writeEntry( "Server", server );
192 conf->writeEntry( "Port", port ); 192 conf->writeEntry( "Port", port );
193 conf->writeEntry( "SSL", ssl ); 193 conf->writeEntry( "SSL", ssl );
194 conf->writeEntry( "ConnectionType", connectionType ); 194 conf->writeEntry( "ConnectionType", connectionType );
195 conf->writeEntry( "User", user ); 195 conf->writeEntry( "User", user );
196 conf->writeEntryCrypt( "Password", password ); 196 conf->writeEntryCrypt( "Password", password );
197 conf->writeEntry( "MailPrefix",prefix); 197 conf->writeEntry( "MailPrefix",prefix);
198 conf->writeEntry( "Offline",offline); 198 conf->writeEntry( "Offline",offline);
199 conf->write(); 199 conf->write();
200 delete conf; 200 delete conf;
201} 201}
202 202
203 203
204QString IMAPaccount::getFileName() 204QString IMAPaccount::getFileName()
205{ 205{
206 return locateLocal("data", "kmicromail" ) +"/imap-" + file; 206 return locateLocal("data", "kopiemail" ) +"/imap-" + file;
207} 207}
208 208
209POP3account::POP3account() 209POP3account::POP3account()
210 : Account() 210 : Account()
211{ 211{
212 file = POP3account::getUniqueFileName(); 212 file = POP3account::getUniqueFileName();
213 accountName = "New POP3 Account"; 213 accountName = "New POP3 Account";
214 ssl = false; 214 ssl = false;
215 connectionType = 1; 215 connectionType = 1;
216 type = MAILLIB::A_POP3; 216 type = MAILLIB::A_POP3;
217 port = POP3_PORT; 217 port = POP3_PORT;
218} 218}
219 219
220POP3account::POP3account( QString filename ) 220POP3account::POP3account( QString filename )
221 : Account() 221 : Account()
222{ 222{
223 file = filename; 223 file = filename;
224 accountName = "New POP3 Account"; 224 accountName = "New POP3 Account";
225 ssl = false; 225 ssl = false;
226 connectionType = 1; 226 connectionType = 1;
227 type = MAILLIB::A_POP3; 227 type = MAILLIB::A_POP3;
228 port = POP3_PORT; 228 port = POP3_PORT;
229} 229}
230 230
231QString POP3account::getUniqueFileName() 231QString POP3account::getUniqueFileName()
232{ 232{
233 int num = 0; 233 int num = 0;
234 QString unique; 234 QString unique;
235 235
236 QDir dir( locateLocal("data", "kmicromail" ) ); 236 QDir dir( locateLocal("data", "kopiemail" ) );
237 237
238 QStringList imap = dir.entryList( "pop3-*" ); 238 QStringList imap = dir.entryList( "pop3-*" );
239 do { 239 do {
240 unique.setNum( num++ ); 240 unique.setNum( num++ );
241 } while ( imap.contains( "pop3-" + unique ) > 0 ); 241 } while ( imap.contains( "pop3-" + unique ) > 0 );
242 242
243 return unique; 243 return unique;
244} 244}
245 245
246void POP3account::read() 246void POP3account::read()
247{ 247{
248 Config *conf = new Config( getFileName(), Config::File ); 248 Config *conf = new Config( getFileName(), Config::File );
249 conf->setGroup( "POP3 Account" ); 249 conf->setGroup( "POP3 Account" );
250 accountName = conf->readEntry( "Account" ); 250 accountName = conf->readEntry( "Account" );
251 server = conf->readEntry( "Server" ); 251 server = conf->readEntry( "Server" );
252 port = conf->readEntry( "Port" ); 252 port = conf->readEntry( "Port" );
253 ssl = conf->readBoolEntry( "SSL" ); 253 ssl = conf->readBoolEntry( "SSL" );
254 connectionType = conf->readNumEntry( "ConnectionType" ); 254 connectionType = conf->readNumEntry( "ConnectionType" );
255 user = conf->readEntry( "User" ); 255 user = conf->readEntry( "User" );
256 password = conf->readEntryCrypt( "Password" ); 256 password = conf->readEntryCrypt( "Password" );
257 offline = conf->readBoolEntry("Offline",false); 257 offline = conf->readBoolEntry("Offline",false);
258 delete conf; 258 delete conf;
259} 259}
260 260
261void POP3account::save() 261void POP3account::save()
262{ 262{
263 Settings::checkDirectory(); 263 Settings::checkDirectory();
264 264
265 Config *conf = new Config( getFileName(), Config::File ); 265 Config *conf = new Config( getFileName(), Config::File );
266 conf->setGroup( "POP3 Account" ); 266 conf->setGroup( "POP3 Account" );
267 conf->writeEntry( "Account", accountName ); 267 conf->writeEntry( "Account", accountName );
268 conf->writeEntry( "Server", server ); 268 conf->writeEntry( "Server", server );
269 conf->writeEntry( "Port", port ); 269 conf->writeEntry( "Port", port );
270 conf->writeEntry( "SSL", ssl ); 270 conf->writeEntry( "SSL", ssl );
271 conf->writeEntry( "ConnectionType", connectionType ); 271 conf->writeEntry( "ConnectionType", connectionType );
272 conf->writeEntry( "User", user ); 272 conf->writeEntry( "User", user );
273 conf->writeEntryCrypt( "Password", password ); 273 conf->writeEntryCrypt( "Password", password );
274 conf->writeEntry( "Offline",offline); 274 conf->writeEntry( "Offline",offline);
275 conf->write(); 275 conf->write();
276 delete conf; 276 delete conf;
277} 277}
278 278
279 279
280QString POP3account::getFileName() 280QString POP3account::getFileName()
281{ 281{
282 return locateLocal("data", "kmicromail" ) +"/pop3-" + file; 282 return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
283} 283}
284 284
285SMTPaccount::SMTPaccount() 285SMTPaccount::SMTPaccount()
286 : Account() 286 : Account()
287{ 287{
288 file = SMTPaccount::getUniqueFileName(); 288 file = SMTPaccount::getUniqueFileName();
289 accountName = "New SMTP Account"; 289 accountName = "New SMTP Account";
290 ssl = false; 290 ssl = false;
291 connectionType = 1; 291 connectionType = 1;
292 login = false; 292 login = false;
293 useCC = false; 293 useCC = false;
294 useBCC = false; 294 useBCC = false;
295 useReply = false; 295 useReply = false;
296 type = MAILLIB::A_SMTP; 296 type = MAILLIB::A_SMTP;
297 port = SMTP_PORT; 297 port = SMTP_PORT;
298} 298}
299 299
300SMTPaccount::SMTPaccount( QString filename ) 300SMTPaccount::SMTPaccount( QString filename )
301 : Account() 301 : Account()
302{ 302{
303 file = filename; 303 file = filename;
304 accountName = "New SMTP Account"; 304 accountName = "New SMTP Account";
305 ssl = false; 305 ssl = false;
306 connectionType = 1; 306 connectionType = 1;
307 login = false; 307 login = false;
308 type = MAILLIB::A_SMTP; 308 type = MAILLIB::A_SMTP;
309 port = SMTP_PORT; 309 port = SMTP_PORT;
310} 310}
311 311
312QString SMTPaccount::getUniqueFileName() 312QString SMTPaccount::getUniqueFileName()
313{ 313{
314 int num = 0; 314 int num = 0;
315 QString unique; 315 QString unique;
316 316
317 QDir dir( locateLocal("data", "kmicromail" ) ); 317 QDir dir( locateLocal("data", "kopiemail" ) );
318 318
319 QStringList imap = dir.entryList( "smtp-*" ); 319 QStringList imap = dir.entryList( "smtp-*" );
320 do { 320 do {
321 unique.setNum( num++ ); 321 unique.setNum( num++ );
322 } while ( imap.contains( "smtp-" + unique ) > 0 ); 322 } while ( imap.contains( "smtp-" + unique ) > 0 );
323 323
324 return unique; 324 return unique;
325} 325}
326 326
327void SMTPaccount::read() 327void SMTPaccount::read()
328{ 328{
329 Config *conf = new Config( getFileName(), Config::File ); 329 Config *conf = new Config( getFileName(), Config::File );
330 conf->setGroup( "SMTP Account" ); 330 conf->setGroup( "SMTP Account" );
331 accountName = conf->readEntry( "Account" ); 331 accountName = conf->readEntry( "Account" );
332 server = conf->readEntry( "Server" ); 332 server = conf->readEntry( "Server" );
333 port = conf->readEntry( "Port" ); 333 port = conf->readEntry( "Port" );
334 ssl = conf->readBoolEntry( "SSL" ); 334 ssl = conf->readBoolEntry( "SSL" );
335 connectionType = conf->readNumEntry( "ConnectionType" ); 335 connectionType = conf->readNumEntry( "ConnectionType" );
336 login = conf->readBoolEntry( "Login" ); 336 login = conf->readBoolEntry( "Login" );
337 user = conf->readEntry( "User" ); 337 user = conf->readEntry( "User" );
338 password = conf->readEntryCrypt( "Password" ); 338 password = conf->readEntryCrypt( "Password" );
339 delete conf; 339 delete conf;
340} 340}
341 341
342void SMTPaccount::save() 342void SMTPaccount::save()
343{ 343{
344 Settings::checkDirectory(); 344 Settings::checkDirectory();
345 345
346 Config *conf = new Config( getFileName(), Config::File ); 346 Config *conf = new Config( getFileName(), Config::File );
347 conf->setGroup( "SMTP Account" ); 347 conf->setGroup( "SMTP Account" );
348 conf->writeEntry( "Account", accountName ); 348 conf->writeEntry( "Account", accountName );
349 conf->writeEntry( "Server", server ); 349 conf->writeEntry( "Server", server );
350 conf->writeEntry( "Port", port ); 350 conf->writeEntry( "Port", port );
351 conf->writeEntry( "SSL", ssl ); 351 conf->writeEntry( "SSL", ssl );
352 conf->writeEntry( "ConnectionType", connectionType ); 352 conf->writeEntry( "ConnectionType", connectionType );
353 conf->writeEntry( "Login", login ); 353 conf->writeEntry( "Login", login );
354 conf->writeEntry( "User", user ); 354 conf->writeEntry( "User", user );
355 conf->writeEntryCrypt( "Password", password ); 355 conf->writeEntryCrypt( "Password", password );
356 conf->write(); 356 conf->write();
357 delete conf; 357 delete conf;
358} 358}
359 359
360 360
361QString SMTPaccount::getFileName() 361QString SMTPaccount::getFileName()
362{ 362{
363 return locateLocal("data", "kmicromail" ) +"/smtp-" + file; 363 return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
364} 364}
365 365
366NNTPaccount::NNTPaccount() 366NNTPaccount::NNTPaccount()
367 : Account() 367 : Account()
368{ 368{
369 file = NNTPaccount::getUniqueFileName(); 369 file = NNTPaccount::getUniqueFileName();
370 accountName = "New NNTP Account"; 370 accountName = "New NNTP Account";
371 ssl = false; 371 ssl = false;
372 login = false; 372 login = false;
373 type = MAILLIB::A_NNTP; 373 type = MAILLIB::A_NNTP;
374 port = NNTP_PORT; 374 port = NNTP_PORT;
375} 375}
376 376
377NNTPaccount::NNTPaccount( QString filename ) 377NNTPaccount::NNTPaccount( QString filename )
378 : Account() 378 : Account()
379{ 379{
380 file = filename; 380 file = filename;
381 accountName = "New NNTP Account"; 381 accountName = "New NNTP Account";
382 ssl = false; 382 ssl = false;
383 login = false; 383 login = false;
384 type = MAILLIB::A_NNTP; 384 type = MAILLIB::A_NNTP;
385 port = NNTP_PORT; 385 port = NNTP_PORT;
386} 386}
387 387
388QString NNTPaccount::getUniqueFileName() 388QString NNTPaccount::getUniqueFileName()
389{ 389{
390 int num = 0; 390 int num = 0;
391 QString unique; 391 QString unique;
392 392
393 QDir dir( locateLocal("data", "kmicromail" ) ); 393 QDir dir( locateLocal("data", "kopiemail" ) );
394 394
395 QStringList imap = dir.entryList( "nntp-*" ); 395 QStringList imap = dir.entryList( "nntp-*" );
396 do { 396 do {
397 unique.setNum( num++ ); 397 unique.setNum( num++ );
398 } while ( imap.contains( "nntp-" + unique ) > 0 ); 398 } while ( imap.contains( "nntp-" + unique ) > 0 );
399 399
400 return unique; 400 return unique;
401} 401}
402 402
403void NNTPaccount::read() 403void NNTPaccount::read()
404{ 404{
405 Config *conf = new Config( getFileName(), Config::File ); 405 Config *conf = new Config( getFileName(), Config::File );
406 conf->setGroup( "NNTP Account" ); 406 conf->setGroup( "NNTP Account" );
407 accountName = conf->readEntry( "Account" ); 407 accountName = conf->readEntry( "Account" );
408 server = conf->readEntry( "Server" ); 408 server = conf->readEntry( "Server" );
409 port = conf->readEntry( "Port" ); 409 port = conf->readEntry( "Port" );
410 ssl = conf->readBoolEntry( "SSL" ); 410 ssl = conf->readBoolEntry( "SSL" );
411 login = conf->readBoolEntry( "Login" ); 411 login = conf->readBoolEntry( "Login" );
412 user = conf->readEntry( "User" ); 412 user = conf->readEntry( "User" );
413 password = conf->readEntryCrypt( "Password" ); 413 password = conf->readEntryCrypt( "Password" );
414 subscribedGroups = conf->readListEntry( "Subscribed", ',' ); 414 subscribedGroups = conf->readListEntry( "Subscribed", ',' );
415 delete conf; 415 delete conf;
416} 416}
417 417
418void NNTPaccount::save() 418void NNTPaccount::save()
419{ 419{
420 Settings::checkDirectory(); 420 Settings::checkDirectory();
421 421
422 Config *conf = new Config( getFileName(), Config::File ); 422 Config *conf = new Config( getFileName(), Config::File );
423 conf->setGroup( "NNTP Account" ); 423 conf->setGroup( "NNTP Account" );
424 conf->writeEntry( "Account", accountName ); 424 conf->writeEntry( "Account", accountName );
425 conf->writeEntry( "Server", server ); 425 conf->writeEntry( "Server", server );
426 conf->writeEntry( "Port", port ); 426 conf->writeEntry( "Port", port );
427 conf->writeEntry( "SSL", ssl ); 427 conf->writeEntry( "SSL", ssl );
428 conf->writeEntry( "Login", login ); 428 conf->writeEntry( "Login", login );
429 conf->writeEntry( "User", user ); 429 conf->writeEntry( "User", user );
430 conf->writeEntryCrypt( "Password", password ); 430 conf->writeEntryCrypt( "Password", password );
431 conf->writeEntry( "Subscribed" , subscribedGroups, ',' ); 431 conf->writeEntry( "Subscribed" , subscribedGroups, ',' );
432 conf->write(); 432 conf->write();
433 delete conf; 433 delete conf;
434} 434}
435 435
436 436
437QString NNTPaccount::getFileName() 437QString NNTPaccount::getFileName()
438{ 438{
439 return locateLocal("data", "kmicromail" ) +"/nntp-" + file; 439 return locateLocal("data", "kopiemail" ) +"/nntp-" + file;
440} 440}
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index 30637e2..db29ff3 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -1,61 +1,61 @@
1// CHANGED 2004-08-06 Lutz Rogowski 1// CHANGED 2004-08-06 Lutz Rogowski
2 2
3 3
4#ifndef DESKTOP_VERSION 4#ifndef DESKTOP_VERSION
5#include <qpe/qpeapplication.h> 5#include <qpe/qpeapplication.h>
6#include <libkdepim/externalapphandler.h> 6#include <libkdepim/externalapphandler.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#else 8#else
9#include <qapplication.h> 9#include <qapplication.h>
10#include <qstring.h> 10#include <qstring.h>
11#include <qwindowsstyle.h> 11#include <qwindowsstyle.h>
12#include <qplatinumstyle.h> 12#include <qplatinumstyle.h>
13#include <qsgistyle.h> 13#include <qsgistyle.h>
14#endif 14#endif
15#include "opiemail.h" 15#include "opiemail.h"
16#include <qdir.h> 16#include <qdir.h>
17#include <kstandarddirs.h> 17#include <kstandarddirs.h>
18#include <kglobal.h> 18#include <kglobal.h>
19#include <stdio.h> 19#include <stdio.h>
20#include "mainwindow.h" 20#include "mainwindow.h"
21 21
22//using namespace Opie::Core; 22//using namespace Opie::Core;
23int main( int argc, char **argv ) { 23int main( int argc, char **argv ) {
24 24
25#ifndef DESKTOP_VERSION 25#ifndef DESKTOP_VERSION
26 QPEApplication a( argc, argv ); 26 QPEApplication a( argc, argv );
27 a.setKeepRunning (); 27 a.setKeepRunning ();
28#else 28#else
29 QApplication a( argc, argv ); 29 QApplication a( argc, argv );
30 QApplication::setStyle( new QPlatinumStyle ()); 30 QApplication::setStyle( new QPlatinumStyle ());
31#endif 31#endif
32 32
33 KGlobal::setAppName( "kmicromail" ); 33 KGlobal::setAppName( "kopiemail" );
34 QString fileName ; 34 QString fileName ;
35#ifndef DESKTOP_VERSION 35#ifndef DESKTOP_VERSION
36 fileName = getenv("QPEDIR"); 36 fileName = getenv("QPEDIR");
37 if ( QApplication::desktop()->width() > 320 ) 37 if ( QApplication::desktop()->width() > 320 )
38 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); 38 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/");
39 else 39 else
40 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); 40 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/");
41#else 41#else
42 fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; 42 fileName = qApp->applicationDirPath () + "/kdepim/kopiemail/";
43 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 43 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
44#endif 44#endif
45 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); 45 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
46 OpieMail mw; 46 OpieMail mw;
47#ifndef DESKTOP_VERSION 47#ifndef DESKTOP_VERSION
48 //qDebug("CONNECT "); 48 //qDebug("CONNECT ");
49 QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); 49 QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& )));
50 // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 50 // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
51 a.showMainWidget(&mw ); 51 a.showMainWidget(&mw );
52#else 52#else
53 a.setMainWidget(&mw ); 53 a.setMainWidget(&mw );
54 mw.show(); 54 mw.show();
55 //m.resize( 800, 600 ); 55 //m.resize( 800, 600 );
56 QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); 56 QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
57#endif 57#endif
58 int rv = a.exec(); 58 int rv = a.exec();
59 return rv; 59 return rv;
60 60
61} 61}
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 5793a58..21edfd2 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -178,65 +178,65 @@ void MainWindow::showLicence()
178} 178}
179void MainWindow::showAbout() 179void MainWindow::showAbout()
180{ 180{
181 QString version; 181 QString version;
182#include <../version> 182#include <../version>
183 183
184 QString cap = "About KOpieMail/Pi"; 184 QString cap = "About KOpieMail/Pi";
185 QString text =i18n("KOpieMail/Platform-independent\n") + 185 QString text =i18n("KOpieMail/Platform-independent\n") +
186 "(OM/Pi) " + version + " - " 186 "(OM/Pi) " + version + " - "
187 187
188#ifdef DESKTOP_VERSION 188#ifdef DESKTOP_VERSION
189 "Desktop Edition\n" 189 "Desktop Edition\n"
190#else 190#else
191 "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" 191 "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n"
192#endif 192#endif
193 "www.pi-sync.net\n\n" 193 "www.pi-sync.net\n\n"
194 194
195 195
196 196
197"Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n" 197"Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n"
198 "KOpieMail/Pi is based on Opie Mail\n" 198 "KOpieMail/Pi is based on Opie Mail\n"
199 "Copyright (c) Rajko Albrecht and the Opie team\n" 199 "Copyright (c) Rajko Albrecht and the Opie team\n"
200 "KOpieMail/Pi is licensed under the GPL\n" 200 "KOpieMail/Pi is licensed under the GPL\n"
201 "\n" 201 "\n"
202 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" 202 "KOpieMail/Pi uses LibEtPan - a mail stuff library\n"
203 "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" 203 "Copyright (C) 2001, 2002 - DINH Viet Hoa\n"
204 "libEtPan has its own licence - see LibEtPan licence\n"; 204 "libEtPan has its own licence - see LibEtPan licence\n";
205 205
206 KApplication::showText( cap, text ); 206 KApplication::showText( cap, text );
207} 207}
208void MainWindow::showEtpanLicence() 208void MainWindow::showEtpanLicence()
209{ 209{
210 KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" ); 210 KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
211 211
212} 212}
213void MainWindow::appMessage(const QCString &, const QByteArray &) 213void MainWindow::appMessage(const QCString &, const QByteArray &)
214{ 214{
215 qDebug("appMessage implemented by subclass"); 215 qDebug("appMessage implemented by subclass");
216} 216}
217 217
218void MainWindow::slotAdjustLayout() { 218void MainWindow::slotAdjustLayout() {
219 219
220 /* 220 /*
221 QWidget *d = QApplication::desktop(); 221 QWidget *d = QApplication::desktop();
222 222
223 if ( d->width() < d->height() ) { 223 if ( d->width() < d->height() ) {
224 layout->setDirection( QBoxLayout::TopToBottom ); 224 layout->setDirection( QBoxLayout::TopToBottom );
225 } else { 225 } else {
226 layout->setDirection( QBoxLayout::LeftToRight ); 226 layout->setDirection( QBoxLayout::LeftToRight );
227 } 227 }
228 */ 228 */
229} 229}
230 230
231void MainWindow::slotAdjustColumns() 231void MainWindow::slotAdjustColumns()
232{ 232{
233 bool hidden = folderView->isHidden(); 233 bool hidden = folderView->isHidden();
234 if ( hidden ) folderView->show(); 234 if ( hidden ) folderView->show();
235 folderView->setColumnWidth( 0, folderView->visibleWidth() ); 235 folderView->setColumnWidth( 0, folderView->visibleWidth() );
236 if ( hidden ) folderView->hide(); 236 if ( hidden ) folderView->hide();
237 237
238 mailView->setColumnWidth( 0, 10 ); 238 mailView->setColumnWidth( 0, 10 );
239 mailView->setColumnWidth( 1, 100 ); 239 mailView->setColumnWidth( 1, 100 );
240 mailView->setColumnWidth( 2, 100 ); 240 mailView->setColumnWidth( 2, 100 );
241 mailView->setColumnWidth( 3, 50 ); 241 mailView->setColumnWidth( 3, 50 );
242 mailView->setColumnWidth( 4, 120 ); 242 mailView->setColumnWidth( 4, 120 );