| -rw-r--r-- | kmicromail/libmailwrapper/mailtypes.cpp | 5 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/mailtypes.h | 18 |
2 files changed, 18 insertions, 5 deletions
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp index 96d55e6..70a0ab5 100644 --- a/kmicromail/libmailwrapper/mailtypes.cpp +++ b/kmicromail/libmailwrapper/mailtypes.cpp @@ -29,8 +29,8 @@ static bool stringCompareRec( const QString& s1, const QString& s2 ) return true; return s1 == s2; } - -const QString RecMail::MsgsizeString() const +#if 0 +QString RecMail::MsgsizeString() const { double s = msg_size; @@ -47,6 +47,7 @@ const QString RecMail::MsgsizeString() const fsize += "MB" ; return fsize; } +#endif bool RecMail::isEqual( RecMail* r1 ) { if ( !stringCompareRec( isodate, r1->isodate ) ) { diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h index 39c0bac..97f10d7 100644 --- a/kmicromail/libmailwrapper/mailtypes.h +++ b/kmicromail/libmailwrapper/mailtypes.h @@ -55,9 +55,21 @@ public: const QString&Replyto()const{return replyto;} void setMsgsize(unsigned int size){msg_size = size;} const unsigned int Msgsize()const{return msg_size;} - const QString MsgsizeString()const; - - + const QString MsgsizeString()const { + double s = msg_size; + int w = 0; + s/=1024; + if (s>999.0) { + s/=1024.0; + ++w; + } + QString fsize = QString::number( s, 'f', 2 ); + if ( w == 0 ) { + fsize += "kB" ; + } else + fsize += "MB" ; + return fsize; + }; void setTo(const QStringList&list); const QStringList&To()const; void setCC(const QStringList&list); |