author | zautrix <zautrix> | 2004-09-11 16:02:52 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-11 16:02:52 (UTC) |
commit | 53e10fa5e66620ff1eba1c9d17738103ad511c91 (patch) (unidiff) | |
tree | c9ed39ce780dc3e8b9b7138781d77db793defdc9 /kmicromail/libmailwrapper/genericwrapper.cpp | |
parent | 32f9963a39236d08718a36d5adad2a0c5c4e2602 (diff) | |
download | kdepimpi-53e10fa5e66620ff1eba1c9d17738103ad511c91.zip kdepimpi-53e10fa5e66620ff1eba1c9d17738103ad511c91.tar.gz kdepimpi-53e10fa5e66620ff1eba1c9d17738103ad511c91.tar.bz2 |
More mail enh.
Diffstat (limited to 'kmicromail/libmailwrapper/genericwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 2b04847..ed591fc 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp | |||
@@ -43,22 +43,32 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date ) | |||
43 | kon.readNumEntry( "DaylightsavingEnd",304) ); | 43 | kon.readNumEntry( "DaylightsavingEnd",304) ); |
44 | KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); | 44 | KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); |
45 | 45 | ||
46 | init = true; | 46 | init = true; |
47 | 47 | ||
48 | } | 48 | } |
49 | QDateTime dt (QDate(date->dt_year,date->dt_month, date->dt_day ),QTime(date->dt_hour, date->dt_min, date->dt_sec ) ); | 49 | QDate da (date->dt_year,date->dt_month, date->dt_day ); |
50 | QTime ti ( date->dt_hour, date->dt_min, date->dt_sec ); | ||
51 | QDateTime dt ( da ,ti ); | ||
50 | int off = KGlobal::locale()->localTimeOffset( dt ); | 52 | int off = KGlobal::locale()->localTimeOffset( dt ); |
51 | dt = dt.addSecs( off*60 ); | 53 | //dt = dt.addSecs( off*60 ); |
52 | QString ret = KGlobal::locale()->formatDateTime( dt,true,true); | 54 | QString ret; |
55 | if ( da == QDate::currentDate () ) | ||
56 | ret = KGlobal::locale()->formatTime( ti,true); | ||
57 | |||
58 | else { | ||
59 | ret = KGlobal::locale()->formatDateTime( dt,true,true); | ||
60 | } | ||
61 | #if 0 | ||
53 | if ( off < 0 ) | 62 | if ( off < 0 ) |
54 | ret += " -"; | 63 | ret += " -"; |
55 | else | 64 | else |
56 | ret += " +"; | 65 | ret += " +"; |
57 | ret += QString::number( off / 60 ); | 66 | ret += QString::number( off / 60 ); |
58 | ret += "h"; | 67 | ret += "h"; |
68 | #endif | ||
59 | #if 0 | 69 | #if 0 |
60 | char tmp[23]; | 70 | char tmp[23]; |
61 | 71 | ||
62 | // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", | 72 | // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i", |
63 | // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); | 73 | // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone ); |
64 | snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i", | 74 | snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i", |