-rw-r--r-- | kmicromail/libmailwrapper/settings.cpp | 46 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.h | 6 |
2 files changed, 51 insertions, 1 deletions
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp index 19093b1..8f909f9 100644 --- a/kmicromail/libmailwrapper/settings.cpp +++ b/kmicromail/libmailwrapper/settings.cpp | |||
@@ -2,4 +2,8 @@ | |||
2 | #include <qdir.h> | 2 | #include <qdir.h> |
3 | 3 | ||
4 | #include <qtextcodec.h> | ||
5 | #include <qtextstream.h> | ||
6 | #include <qfile.h> | ||
7 | |||
4 | //#include <opie2/odebug.h> | 8 | //#include <opie2/odebug.h> |
5 | #include <kconfig.h> | 9 | #include <kconfig.h> |
@@ -367,4 +371,43 @@ SMTPaccount::SMTPaccount( QString filename ) | |||
367 | } | 371 | } |
368 | 372 | ||
373 | QString SMTPaccount::getSignature() | ||
374 | { | ||
375 | QFileInfo fi ( signature ); | ||
376 | if ( ! fi.exists() ) | ||
377 | return QString(); | ||
378 | |||
379 | QFile file( signature ); | ||
380 | if (!file.open( IO_ReadOnly ) ) { | ||
381 | return QString(); | ||
382 | |||
383 | } | ||
384 | QTextStream ts( &file ); | ||
385 | ts.setCodec( QTextCodec::codecForName("utf8") ); | ||
386 | QString text = ts.read(); | ||
387 | file.close(); | ||
388 | |||
389 | return text; | ||
390 | |||
391 | } | ||
392 | void SMTPaccount::setSignature( QString b ) | ||
393 | { | ||
394 | |||
395 | QFileInfo fi ( signature ); | ||
396 | if ( ! fi.exists() ) { | ||
397 | QString filedir( locateLocal("data", "kopiemail" ) ); | ||
398 | signature = filedir+ "/" + getAccountName() +".sig"; | ||
399 | qDebug("new sig %s ", signature.latin1()); | ||
400 | save(); | ||
401 | } | ||
402 | QFile fileIn( signature ); | ||
403 | if (!fileIn.open( IO_WriteOnly ) ) { | ||
404 | qDebug("OM: Cannot write signature file %s ", signature.latin1() ); | ||
405 | return ; | ||
406 | } | ||
407 | QTextStream tsIn( &fileIn ); | ||
408 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | ||
409 | tsIn << b ; | ||
410 | fileIn.close(); | ||
411 | } | ||
369 | QString SMTPaccount::getUniqueFileName() | 412 | QString SMTPaccount::getUniqueFileName() |
370 | { | 413 | { |
@@ -393,5 +436,5 @@ void SMTPaccount::read() | |||
393 | login = conf->readBoolEntry( "Login" ); | 436 | login = conf->readBoolEntry( "Login" ); |
394 | user = conf->readEntry( "User" ); | 437 | user = conf->readEntry( "User" ); |
395 | //password = conf->readEntryCrypt( "Password" ); | 438 | signature = conf->readEntry( "SigFile" ); |
396 | setPasswordList( conf->readListEntry( "FolderHistory")); | 439 | setPasswordList( conf->readListEntry( "FolderHistory")); |
397 | delete conf; | 440 | delete conf; |
@@ -411,4 +454,5 @@ void SMTPaccount::save() | |||
411 | conf->writeEntry( "Login", login ); | 454 | conf->writeEntry( "Login", login ); |
412 | conf->writeEntry( "User", user ); | 455 | conf->writeEntry( "User", user ); |
456 | conf->writeEntry( "SigFile", signature ); | ||
413 | //conf->writeEntryCrypt( "Password", password ); | 457 | //conf->writeEntryCrypt( "Password", password ); |
414 | conf->writeEntry( "FolderHistory",getPasswordList() ); | 458 | conf->writeEntry( "FolderHistory",getPasswordList() ); |
diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h index c996fe0..a6e95fe 100644 --- a/kmicromail/libmailwrapper/settings.h +++ b/kmicromail/libmailwrapper/settings.h | |||
@@ -128,4 +128,10 @@ public: | |||
128 | bool getLogin() { return login; } | 128 | bool getLogin() { return login; } |
129 | 129 | ||
130 | void setSigFile( QString b ) { signature = b; } | ||
131 | QString getSigFile() { return signature; } | ||
132 | |||
133 | QString getSignature(); | ||
134 | void setSignature( QString b ); | ||
135 | |||
130 | private: | 136 | private: |
131 | QString file, name, mail, org, cc, bcc, reply, signature; | 137 | QString file, name, mail, org, cc, bcc, reply, signature; |