Welcome to Mailreader %1

Mailread is a proof of concept reader for the Akonadi/KMime framework.

+ */ +#ifndef MAILREADERVIEW_H +#define MAILREADERVIEW_H + +#include + +#include "ui_mailreaderview.h" + +class QPainter; +class KUrl; + +namespace MessageViewer { + class Viewer; +} + +namespace Akonadi { + class Item; +} + +/** + * This is the main view class for mailreader. Most of the non-menu, + * non-toolbar, and non-statusbar (e.g., non frame) GUI code should go + * here. + * + * @short Main view + * @author Andras Mantia + * @version 0.1 + */ + +class mailreaderView : public QWidget, public Ui::mailreaderview +{ + Q_OBJECT +public: + /** + * Default constructor + */ + mailreaderView(QWidget *parent); + + /** + * Destructor + */ + virtual ~mailreaderView(); + + void showItem(const Akonadi::Item& item); + void showAboutPage(); + +private: + void displayAboutPage(); + + Ui::mailreaderview ui_mailreaderview; + MessageViewer::Viewer *m_readerWin; + +public slots: + void slotConfigure(); + +signals: + /** + * Use this signal to change the content of the statusbar + */ + void signalChangeStatusbar(const QString& text); + + /** + * Use this signal to change the content of the caption + */ + void signalChangeCaption(const QString& text); + +private slots: + void switchColors(); + void settingsChanged(); + void urlClicked( const KUrl& url, int button); +}; + +#endif // mailreaderVIEW_H diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/mailreaderview.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/mailreaderview.ui --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/mailreaderview.ui 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/mailreaderview.ui 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,16 @@ + + + mailreaderview + + + + 0 + 0 + 400 + 300 + + + + + + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/main.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/main.cpp --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/main.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/main.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,53 @@ +#include "mailreader.h" +#include +#include +#include +#include + +static const char description[] = + I18N_NOOP("A KDE 4 Application"); + +static const char version[] = "0.1"; + +int main(int argc, char **argv) +{ + KAboutData about("mailreader", 0, ki18n("mailreader"), version, ki18n(description), + KAboutData::License_GPL, ki18n("(C) 2007 Andras Mantia"), KLocalizedString(), 0, "amantia@kde.org"); + about.addAuthor( ki18n("Andras Mantia"), KLocalizedString(), "amantia@kde.org" ); + KCmdLineArgs::init(argc, argv, &about); + + KCmdLineOptions options; + options.add("+[URL]", ki18n( "Document to open" )); + KCmdLineArgs::addCmdLineOptions(options); + KApplication app; + + mailreader *widget = new mailreader; + + // see if we are starting with session management + if (app.isSessionRestored()) + { + RESTORE(mailreader); + } + else + { + // no session.. just start up normally + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + if (args->count() == 0) + { + //mailreader *widget = new mailreader; + widget->show(); + } + else + { + int i = 0; + for (; i < args->count(); i++) + { + //mailreader *widget = new mailreader; + widget->show(); + } + } + args->clear(); + } + + return app.exec(); +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/Messages.sh /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/Messages.sh --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/Messages.sh 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,4 @@ +#! /usr/bin/env bash +$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp +$XGETTEXT *.cpp -o $podir/mailreader.pot +rm -f *.cpp diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/prefs_base.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/prefs_base.ui --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/prefs_base.ui 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/prefs_base.ui 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,153 @@ + + prefs_base + + + + 0 + 0 + 282 + 156 + + + + + + + Background color: + + + false + + + + + + + Choose a new background color + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">background</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html> + + + + + + + + + + Project age: + + + false + + + + + + + Foreground color: + + + false + + + + + + + Choose a new foreground color + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">foreground</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html> + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 41 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 41 + 20 + + + + + + + + Set the project age (in days) + + + Change the project age (in days) by choosing a new number of days. + + + 1 + + + 2 + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 41 + 20 + + + + + + + + + KColorButton + QPushButton +

kcolorbutton.h

+ + + + kcolorbutton.h + + + + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/prefs_messagelist.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/prefs_messagelist.ui --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/prefs_messagelist.ui 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/prefs_messagelist.ui 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,331 @@ + + + MessageListConfig + + + + 0 + 0 + 573 + 565 + + + + + + + General + + + + + + Display tooltips for messages and group headers + + + + + + + Hide tab bar when only one tab is open + + + + + + + + + + Colors + + + + + + + + Use default colors + + + + + + + New messages: + + + + + + + + + + Unread messages: + + + + + + + + + + Important messages: + + + + + + + + + + Action messages: + + + + + + + + + + + + + + + Fonts + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Use default fonts + + + + + + + Message list: + + + + + + + New messages: + + + + + + + Unread messages: + + + + + + + Important messages: + + + + + + + Action messages: + + + + + + + + + + + + + + + + + + + + + + + + + + + + KFontRequester + QWidget +

kfontrequester.h

+ + + KColorButton + QPushButton +

kcolorbutton.h

+ + + + + + kcfg_UseDefaultColors + toggled(bool) + kcfg_NewMessageColor + setDisabled(bool) + + + 66 + 141 + + + 170 + 177 + + + + + kcfg_UseDefaultColors + toggled(bool) + kcfg_UnreadMessageColor + setDisabled(bool) + + + 37 + 141 + + + 163 + 205 + + + + + kcfg_UseDefaultColors + toggled(bool) + kcfg_ImportantMessageColor + setDisabled(bool) + + + 107 + 143 + + + 158 + 231 + + + + + kcfg_UseDefaultColors + toggled(bool) + kcfg_TodoMessageColor + setDisabled(bool) + + + 83 + 147 + + + 159 + 263 + + + + + kcfg_UseDefaultFonts + toggled(bool) + kcfg_MessageListFont + setDisabled(bool) + + + 75 + 373 + + + 186 + 405 + + + + + kcfg_UseDefaultFonts + toggled(bool) + kcfg_NewMessageFont + setDisabled(bool) + + + 54 + 376 + + + 158 + 434 + + + + + kcfg_UseDefaultFonts + toggled(bool) + kcfg_UnreadMessageFont + setDisabled(bool) + + + 35 + 379 + + + 157 + 462 + + + + + kcfg_UseDefaultFonts + toggled(bool) + kcfg_ImportantMessageFont + setDisabled(bool) + + + 21 + 376 + + + 158 + 492 + + + + + kcfg_UseDefaultFonts + toggled(bool) + kcfg_TodoMessageFont + setDisabled(bool) + + + 94 + 374 + + + 155 + 517 + + + + + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.cpp --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,51 @@ +// This file is generated by kconfig_compiler from mailreader.kcfg. +// All changes you do to this file will be lost. + +#include "settings.h" + +#include +#include + +class SettingsHelper +{ + public: + SettingsHelper() : q(0) {} + ~SettingsHelper() { delete q; } + Settings *q; +}; +K_GLOBAL_STATIC(SettingsHelper, s_globalSettings) +Settings *Settings::self() +{ + if (!s_globalSettings->q) { + new Settings; + s_globalSettings->q->readConfig(); + } + + return s_globalSettings->q; +} + +Settings::Settings( ) + : KConfigSkeleton( QLatin1String( "mailreaderrc" ) ) +{ + Q_ASSERT(!s_globalSettings->q); + s_globalSettings->q = this; + setCurrentGroup( QLatin1String( "Preferences" ) ); + + KConfigSkeleton::ItemColor *itemCol_background; + itemCol_background = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "col_background" ), mCol_background, QColor( "black" ) ); + addItem( itemCol_background, QLatin1String( "col_background" ) ); + KConfigSkeleton::ItemColor *itemCol_foreground; + itemCol_foreground = new KConfigSkeleton::ItemColor( currentGroup(), QLatin1String( "col_foreground" ), mCol_foreground, QColor( "yellow" ) ); + addItem( itemCol_foreground, QLatin1String( "col_foreground" ) ); + KConfigSkeleton::ItemInt *itemVal_time; + itemVal_time = new KConfigSkeleton::ItemInt( currentGroup(), QLatin1String( "val_time" ), mVal_time, 2 ); + addItem( itemVal_time, QLatin1String( "val_time" ) ); +} + +Settings::~Settings() +{ + if (!s_globalSettings.isDestroyed()) { + s_globalSettings->q = 0; + } +} + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.h --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,78 @@ +// This file is generated by kconfig_compiler from mailreader.kcfg. +// All changes you do to this file will be lost. +#ifndef SETTINGS_H +#define SETTINGS_H + +#include +#include + +class Settings : public KConfigSkeleton +{ + public: + + static Settings *self(); + ~Settings(); + + /** + Set color of the background + */ + static + void setCol_background( const QColor & v ) + { + if (!self()->isImmutable( QString::fromLatin1 ( "col_background" ) )) + self()->mCol_background = v; + } + + /** + Get color of the background + */ + static + QColor col_background() + { + return self()->mCol_background; + } + + /** + Set color of the foreground + */ + static + void setCol_foreground( const QColor & v ) + { + if (!self()->isImmutable( QString::fromLatin1 ( "col_foreground" ) )) + self()->mCol_foreground = v; + } + + /** + Get color of the foreground + */ + static + QColor col_foreground() + { + return self()->mCol_foreground; + } + + + /** + Get size of a ball + */ + static + int val_time() + { + return self()->mVal_time; + } + + protected: + Settings(); + friend class SettingsHelper; + + + // Preferences + QColor mCol_background; + QColor mCol_foreground; + int mVal_time; + + private: +}; + +#endif + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.kcfgc /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.kcfgc --- kde-nightly-kdepim-20091006+svn1032120/examples/mailreader/settings.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/examples/mailreader/settings.kcfgc 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,6 @@ +# Code generation options for kconfig_compiler +File=mailreader.kcfg +ClassName=Settings +Singleton=true +Mutators=col_background,col_foreground +# will create the necessary code for setting those variables diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmcalendar.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmcalendar.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmcalendar.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmcalendar.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -1546,3 +1546,22 @@ // Now update the earliest alarm to trigger for its resource findEarliestAlarm(AlarmResources::instance()->resourceForIncidence(id)); } + +/****************************************************************************** +* Called when the user changes the start-of-day time. +* Adjust the start times of all date-only alarms' recurrences. +*/ +void AlarmCalendar::adjustStartOfDay() +{ + if (!mCalendar) + return; + for (ResourceMap::ConstIterator rit = mResourceMap.constBegin(); rit != mResourceMap.constEnd(); ++rit) + { + const KAEvent::List events = rit.value(); + for (int i = 0, end = events.count(); i < end; ++i) + { + if (events[i]->startDateTime().isDateOnly() && events[i]->recurs()) + events[i]->adjustRecurrenceStartOfDay(); + } + } +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmcalendar.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmcalendar.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmcalendar.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmcalendar.h 2009-10-09 23:31:00.000000000 +0100 @@ -83,6 +83,7 @@ bool isEmpty() const; QString path() const { return (mCalType == RESOURCES) ? QString() : mUrl.prettyUrl(); } QString urlString() const { return (mCalType == RESOURCES) ? QString() : mUrl.url(); } + void adjustStartOfDay(); static bool initialiseCalendars(); static void terminateCalendars(); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmevent.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmevent.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/alarmevent.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/alarmevent.h 2009-10-09 23:31:00.000000000 +0100 @@ -240,6 +240,7 @@ { return mEventData->setRecurAnnualByDate(freq, months, day, f, count, end); } bool setRecurAnnualByPos(int freq, const QList& pos, const QList& months, int count, const QDate& end) { return mEventData->setRecurAnnualByPos(freq, pos, months, count, end); } + void adjustRecurrenceStartOfDay() { mEventData->adjustRecurrenceStartOfDay(); } #ifdef NDEBUG void dumpDebug() const { } #else diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/kaeventdata.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/kaeventdata.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/kaeventdata.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/kaeventdata.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -35,8 +35,8 @@ // KAlarm version which first used the current calendar/event format. // If this changes, KAEventData::convertKCalEvents() must be changed correspondingly. // The string version is the KAlarm version string used in the calendar file. -QByteArray KAEventData::currentCalendarVersionString() { return QByteArray("1.9.10"); } -int KAEventData::currentCalendarVersion() { return KAlarm::Version(1,9,10); } +QByteArray KAEventData::currentCalendarVersionString() { return QByteArray("2.2.9"); } +int KAEventData::currentCalendarVersion() { return KAlarm::Version(2,2,9); } QByteArray KAEventData::icalProductId() { @@ -1250,14 +1250,17 @@ /* Always set DTSTART as date/time, and use the category "DATE" to indicate * a date-only event, instead of calling setAllDay(). This is necessary to - * allow the alarm to float within the 24-hour period defined by the - * start-of-day time rather than midnight to midnight. + * allow a time zone to be specified for a date-only event. Also, KAlarm + * allows the alarm to float within the 24-hour period defined by the + * start-of-day time (which is user-dependent and therefore can't be + * written into the calendar) rather than midnight to midnight, and there + * is no RFC2445 conformant way to specify this. * RFC2445 states that alarm trigger times specified in absolute terms * (rather than relative to DTSTART or DTEND) can only be specified as a * UTC DATE-TIME value. So always use a time relative to DTSTART instead of * an absolute time. */ - ev->setDtStart(mStartDateTime.effectiveKDateTime()); + ev->setDtStart(mStartDateTime.calendarKDateTime()); ev->setAllDay(false); ev->setHasEndDate(false); @@ -1296,7 +1299,7 @@ { DateTime dtl; if (mArchiveRepeatAtLogin) - dtl = mStartDateTime.effectiveKDateTime().addDays(-1); + dtl = mStartDateTime.calendarKDateTime().addDays(-1); else if (mAtLoginDateTime.isValid()) dtl = mAtLoginDateTime; else if (mStartDateTime.isDateOnly()) @@ -1343,12 +1346,12 @@ QStringList list; if (mDeferralTime.isDateOnly()) { - startOffset = nextDateTime.secsTo(mDeferralTime.effectiveKDateTime()); + startOffset = nextDateTime.secsTo(mDeferralTime.calendarKDateTime()); list += DATE_DEFERRAL_TYPE; } else { - startOffset = nextDateTime.effectiveKDateTime().secsTo(mDeferralTime.effectiveKDateTime()); + startOffset = nextDateTime.calendarKDateTime().secsTo(mDeferralTime.calendarKDateTime()); list += TIME_DEFERRAL_TYPE; } if (mDeferral == REMINDER_DEFERRAL) @@ -1427,7 +1430,7 @@ Alarm* KAEventData::initKCalAlarm(Event* event, const DateTime& dt, const QStringList& types, KAAlarm::Type type) const { int startOffset = dt.isDateOnly() ? mStartDateTime.secsTo(dt) - : mStartDateTime.effectiveKDateTime().secsTo(dt.effectiveKDateTime()); + : mStartDateTime.calendarKDateTime().secsTo(dt.calendarKDateTime()); return initKCalAlarm(event, startOffset, types, type); } @@ -2025,7 +2028,7 @@ if (mStartDateTime.isDateOnly()) { QDate pre = preDateTime.date(); - if (preDateTime.time() < startOfDay) + if (preDateTime.toTimeSpec(mStartDateTime.timeSpec()).time() < startOfDay) pre = pre.addDays(-1); // today's recurrence (if today recurs) is still to come if (pre < dt.date()) return true; @@ -2141,7 +2144,7 @@ else { KDateTime recurStart = mRecurrence->startDateTime(); - KDateTime after = afterDateTime; + KDateTime after = afterDateTime.toTimeSpec(mStartDateTime.timeSpec()); if (mStartDateTime.isDateOnly() && afterDateTime.time() > startOfDay) after = after.addDays(1); // today's recurrence (if today recurs) has passed KDateTime dt = mRecurrence->getPreviousDateTime(after); @@ -2266,7 +2269,7 @@ KAEventData::OccurType KAEventData::nextRecurrence(const KDateTime& preDateTime, DateTime& result, const QTime& startOfDay) const { KDateTime recurStart = mRecurrence->startDateTime(); - KDateTime pre = preDateTime; + KDateTime pre = preDateTime.toTimeSpec(mStartDateTime.timeSpec()); if (mStartDateTime.isDateOnly() && !pre.isDateOnly() && pre.time() < startOfDay) { pre = pre.addDays(-1); // today's recurrence (if today recurs) is still to come @@ -2384,10 +2387,10 @@ DateTime next; nextRecurrence(mNextMainDateTime.effectiveKDateTime(), next, startOfDay); if (!next.isValid()) - mRecurrence->setStartDateTime(recurStart); // reinstate the old value + mRecurrence->setStartDateTime(recurStart, mStartDateTime.isDateOnly()); // reinstate the old value else { - mRecurrence->setStartDateTime(next.effectiveKDateTime()); + mRecurrence->setStartDateTime(next.effectiveKDateTime(), next.isDateOnly()); mStartDateTime = mNextMainDateTime = next; mUpdated = changed = true; } @@ -2408,8 +2411,7 @@ if (recurrence.recurs()) { mRecurrence = new KARecurrence(recurrence); - mRecurrence->setStartDateTime(mStartDateTime.effectiveKDateTime()); - mRecurrence->setAllDay(mStartDateTime.isDateOnly()); + mRecurrence->setStartDateTime(mStartDateTime.effectiveKDateTime(), mStartDateTime.isDateOnly()); mChanged = true; } else @@ -2429,6 +2431,16 @@ } /****************************************************************************** +* Called when the user changes the start-of-day time. +* Adjust the start time of a date-only alarm's recurrence. +*/ +void KAEventData::adjustRecurrenceStartOfDay() +{ + if (mRecurrence) + mRecurrence->setStartDateTime(mStartDateTime.effectiveKDateTime(), mStartDateTime.isDateOnly()); +} + +/****************************************************************************** * Initialise the event's sub-repetition. * The repetition length is adjusted if necessary to fit the recurrence interval. * Reply = false if a non-daily interval was specified for a date-only recurrence. @@ -2774,95 +2786,13 @@ #endif /****************************************************************************** - * Adjust the time at which date-only events will occur for each of the events - * in a list. Events for which both date and time are specified are left - * unchanged. - * Reply = true if any events have been updated. - */ -bool KAEventData::adjustStartOfDay(const Event::List& events, const QTime& startOfDay, const KTimeZone& timeZone) -{ - bool changed = false; - for (int ei = 0, eend = events.count(); ei < eend; ++ei) - { - Event* event = events[ei]; - QStringList flags = event->customProperty(KCalendar::APPNAME, FLAGS_PROPERTY).split(SC, QString::SkipEmptyParts); - if (flags.indexOf(DATE_ONLY_FLAG) >= 0) - { - // It's an untimed event, so fix it - QTime oldTime = event->dtStart().time(); - int adjustment = oldTime.secsTo(startOfDay); - if (adjustment) - { - event->setDtStart(KDateTime(event->dtStart().date(), startOfDay, timeZone)); - Alarm::List alarms = event->alarms(); - int deferralOffset = 0; - for (int ai = 0, aend = alarms.count(); ai < aend; ++ai) - { - // Parse the next alarm's text - Alarm* alarm = alarms[ai]; - AlarmData data; - readAlarm(alarm, data); - if (data.type & KAAlarm::TIMED_DEFERRAL_FLAG) - { - // Timed deferral alarm, so adjust the offset - deferralOffset = alarm->startOffset().asSeconds(); - alarm->setStartOffset(deferralOffset - adjustment); - } - else if (data.type == KAAlarm::AUDIO__ALARM - && alarm->startOffset().asSeconds() == deferralOffset) - { - // Audio alarm is set for the same time as the deferral alarm - alarm->setStartOffset(deferralOffset - adjustment); - } - } - changed = true; - } - } - else - { - // It's a timed event. Fix any untimed alarms. - int deferralOffset = 0; - int newDeferralOffset = 0; - DateTime start; - KDateTime nextMainDateTime = readDateTime(event, false, start).kDateTime(); - AlarmMap alarmMap; - readAlarms(event, &alarmMap); - for (AlarmMap::Iterator it = alarmMap.begin(); it != alarmMap.end(); ++it) - { - const AlarmData& data = it.value(); - if (!data.alarm->hasStartOffset()) - continue; - if ((data.type & KAAlarm::DEFERRED_ALARM) - && !(data.type & KAAlarm::TIMED_DEFERRAL_FLAG)) - { - // Date-only deferral alarm, so adjust its time - KDateTime altime = data.alarm->startOffset().end(nextMainDateTime); - altime.setTime(startOfDay); - deferralOffset = data.alarm->startOffset().asSeconds(); - newDeferralOffset = event->dtStart().secsTo(altime); - const_cast(data.alarm)->setStartOffset(newDeferralOffset); - changed = true; - } - else if (data.type == KAAlarm::AUDIO__ALARM - && data.alarm->startOffset().asSeconds() == deferralOffset) - { - // Audio alarm is set for the same time as the deferral alarm - const_cast(data.alarm)->setStartOffset(newDeferralOffset); - changed = true; - } - } - } - } - return changed; -} - -/****************************************************************************** * If the calendar was written by a previous version of KAlarm, do any * necessary format conversions on the events to ensure that when the calendar * is saved, no information is lost or corrupted. * Reply = true if any conversions were done. */ -bool KAEventData::convertKCalEvents(KCal::CalendarLocal& calendar, int version, bool adjustSummerTime, const QTime& startOfDay) +bool KAEventData::convertKCalEvents(KCal::CalendarLocal& calendar, int calendarVersion, + bool adjustSummerTime, const QTime& startOfDay, const KTimeZone& timeZone) { // KAlarm pre-0.9 codes held in the alarm's DESCRIPTION property static const QChar SEPARATOR = QLatin1Char(';'); @@ -2902,25 +2832,28 @@ // KAlarm pre-1.5.0/1.9.9 properties static const QByteArray KMAIL_ID_PROPERTY("KMAILID"); // X-KDE-KALARM-KMAILID property - if (version >= currentCalendarVersion()) + if (calendarVersion >= currentCalendarVersion()) return false; - kDebug() << "Adjusting version" << version; - bool pre_0_7 = (version < KAlarm::Version(0,7,0)); - bool pre_0_9 = (version < KAlarm::Version(0,9,0)); - bool pre_0_9_2 = (version < KAlarm::Version(0,9,2)); - bool pre_1_1_1 = (version < KAlarm::Version(1,1,1)); - bool pre_1_2_1 = (version < KAlarm::Version(1,2,1)); - bool pre_1_3_0 = (version < KAlarm::Version(1,3,0)); - bool pre_1_3_1 = (version < KAlarm::Version(1,3,1)); - bool pre_1_4_14 = (version < KAlarm::Version(1,4,14)); - bool pre_1_5_0 = (version < KAlarm::Version(1,5,0)); - bool pre_1_9_0 = (version < KAlarm::Version(1,9,0)); - bool pre_1_9_2 = (version < KAlarm::Version(1,9,2)); - bool pre_1_9_7 = (version < KAlarm::Version(1,9,7)); - bool pre_1_9_9 = (version < KAlarm::Version(1,9,9)); - bool pre_1_9_10 = (version < KAlarm::Version(1,9,10)); - Q_ASSERT(currentCalendarVersion() == KAlarm::Version(1,9,10)); + kDebug() << "Adjusting version" << calendarVersion; + bool pre_0_7 = (calendarVersion < KAlarm::Version(0,7,0)); + bool pre_0_9 = (calendarVersion < KAlarm::Version(0,9,0)); + bool pre_0_9_2 = (calendarVersion < KAlarm::Version(0,9,2)); + bool pre_1_1_1 = (calendarVersion < KAlarm::Version(1,1,1)); + bool pre_1_2_1 = (calendarVersion < KAlarm::Version(1,2,1)); + bool pre_1_3_0 = (calendarVersion < KAlarm::Version(1,3,0)); + bool pre_1_3_1 = (calendarVersion < KAlarm::Version(1,3,1)); + bool pre_1_4_14 = (calendarVersion < KAlarm::Version(1,4,14)); + bool pre_1_5_0 = (calendarVersion < KAlarm::Version(1,5,0)); + bool pre_1_9_0 = (calendarVersion < KAlarm::Version(1,9,0)); + bool pre_1_9_2 = (calendarVersion < KAlarm::Version(1,9,2)); + bool pre_1_9_7 = (calendarVersion < KAlarm::Version(1,9,7)); + bool pre_1_9_9 = (calendarVersion < KAlarm::Version(1,9,9)); + bool pre_1_9_10 = (calendarVersion < KAlarm::Version(1,9,10)); + bool pre_2_2_9 = (calendarVersion < KAlarm::Version(2,2,9)); + bool pre_2_3_0 = (calendarVersion < KAlarm::Version(2,3,0)); + bool pre_2_3_2 = (calendarVersion < KAlarm::Version(2,3,2)); + Q_ASSERT(currentCalendarVersion() == KAlarm::Version(2,2,9)); KTimeZone localZone; if (pre_1_9_2) @@ -3391,6 +3324,16 @@ } #endif + if (pre_2_2_9 || (pre_2_3_2 && !pre_2_3_0)) + { + /* + * It's a KAlarm pre-2.2.9 or KAlarm 2.3 series pre-2.3.2 calendar file. + * Set the time in the calendar for all date-only alarms to 00:00. + */ + if (convertStartOfDay(event, timeZone)) + converted = true; + } + if (readOnly) event->setReadOnly(true); event->endUpdates(); // finally issue an update notification @@ -3398,6 +3341,84 @@ return converted; } +/****************************************************************************** +* Set the time for a date-only event to 00:00. +* Reply = true if the event was updated. +*/ +bool KAEventData::convertStartOfDay(Event* event, const KTimeZone& timeZone) +{ + bool changed = false; + QTime midnight(0, 0); + QStringList flags = event->customProperty(KCalendar::APPNAME, FLAGS_PROPERTY).split(SC, QString::SkipEmptyParts); + if (flags.indexOf(DATE_ONLY_FLAG) >= 0) + { + // It's an untimed event, so fix it + QTime oldTime = event->dtStart().time(); + int adjustment = oldTime.secsTo(midnight); + if (adjustment) + { + event->setDtStart(KDateTime(event->dtStart().date(), midnight, timeZone)); + Alarm::List alarms = event->alarms(); + int deferralOffset = 0; + for (int ai = 0, aend = alarms.count(); ai < aend; ++ai) + { + // Parse the next alarm's text + Alarm* alarm = alarms[ai]; + AlarmData data; + readAlarm(alarm, data); + if (data.type & KAAlarm::TIMED_DEFERRAL_FLAG) + { + // Timed deferral alarm, so adjust the offset + deferralOffset = alarm->startOffset().asSeconds(); + alarm->setStartOffset(deferralOffset - adjustment); + } + else if (data.type == KAAlarm::AUDIO__ALARM + && alarm->startOffset().asSeconds() == deferralOffset) + { + // Audio alarm is set for the same time as the deferral alarm + alarm->setStartOffset(deferralOffset - adjustment); + } + } + changed = true; + } + } + else + { + // It's a timed event. Fix any untimed alarms. + int deferralOffset = 0; + int newDeferralOffset = 0; + DateTime start; + KDateTime nextMainDateTime = readDateTime(event, false, start).kDateTime(); + AlarmMap alarmMap; + readAlarms(event, &alarmMap); + for (AlarmMap::Iterator it = alarmMap.begin(); it != alarmMap.end(); ++it) + { + const AlarmData& data = it.value(); + if (!data.alarm->hasStartOffset()) + continue; + if ((data.type & KAAlarm::DEFERRED_ALARM) + && !(data.type & KAAlarm::TIMED_DEFERRAL_FLAG)) + { + // Date-only deferral alarm, so adjust its time + KDateTime altime = data.alarm->startOffset().end(nextMainDateTime); + altime.setTime(midnight); + deferralOffset = data.alarm->startOffset().asSeconds(); + newDeferralOffset = event->dtStart().secsTo(altime); + const_cast(data.alarm)->setStartOffset(newDeferralOffset); + changed = true; + } + else if (data.type == KAAlarm::AUDIO__ALARM + && data.alarm->startOffset().asSeconds() == deferralOffset) + { + // Audio alarm is set for the same time as the deferral alarm + const_cast(data.alarm)->setStartOffset(newDeferralOffset); + changed = true; + } + } + } + return changed; +} + #if 0 /****************************************************************************** * If the calendar was written by a pre-1.9.10 version of KAlarm, or another diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/kaeventdata.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/kaeventdata.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/kaeventdata.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/kaeventdata.h 2009-10-09 23:31:00.000000000 +0100 @@ -428,6 +428,7 @@ bool setRecurAnnualByDate(int freq, const QList& months, int day, KARecurrence::Feb29Type, int count, const QDate& end); bool setRecurAnnualByPos(int freq, const QList& pos, const QList& months, int count, const QDate& end); // static QValueList convRecurPos(const QValueList&); + void adjustRecurrenceStartOfDay(); #ifdef NDEBUG void dumpDebug() const { } #else @@ -436,8 +437,7 @@ static QByteArray icalProductId(); static int currentCalendarVersion(); static QByteArray currentCalendarVersionString(); - static bool adjustStartOfDay(const KCal::Event::List&, const QTime& startOfDay, const KTimeZone& timeZone); - static bool convertKCalEvents(KCal::CalendarLocal&, int version, bool adjustSummerTime, const QTime& startOfDay); + static bool convertKCalEvents(KCal::CalendarLocal&, int calendarVersion, bool adjustSummerTime, const QTime& startOfDay, const KTimeZone&); // static bool convertRepetitions(KCal::CalendarLocal&); KARecurrence::Type checkRecur() const; void checkRepetition() const; @@ -455,6 +455,7 @@ void clearRecur(); OccurType nextRecurrence(const KDateTime& preDateTime, DateTime& result, const QTime& startOfDay) const; void notifyChanges() const; + static bool convertStartOfDay(KCal::Event*, const KTimeZone&); static bool convertRepetition(KCal::Event*); KCal::Alarm* initKCalAlarm(KCal::Event*, const DateTime&, const QStringList& types, KAAlarm::Type = KAAlarm::INVALID_ALARM) const; KCal::Alarm* initKCalAlarm(KCal::Event*, int startOffsetSecs, const QStringList& types, KAAlarm::Type = KAAlarm::INVALID_ALARM) const; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/karecurrence.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/karecurrence.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/karecurrence.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/karecurrence.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -154,7 +154,7 @@ } mFeb29Type = feb29Type; } - setStartDateTime(startdt); // sets recurrence all-day if date-only + Recurrence::setStartDateTime(startdt); // sets recurrence all-day if date-only return true; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/karecurrence.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/karecurrence.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/cal/karecurrence.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/cal/karecurrence.h 2009-10-09 23:31:00.000000000 +0100 @@ -66,6 +66,8 @@ { return init(t, freq, count, f29, start, end); } void fix(); void writeRecurrence(KCal::Recurrence&) const; + void setStartDateTime(const KDateTime& dt, bool dateOnly) + { KCal::Recurrence::setStartDateTime(dt); if (dateOnly) KCal::Recurrence::setAllDay(true); } KDateTime endDateTime() const; QDate endDate() const; bool recursOn(const QDate&, const KDateTime::Spec&) const; @@ -81,6 +83,9 @@ static void setDefaultFeb29Type(Feb29Type t) { mDefaultFeb29 = t; } private: + /** Prevent public use: KARecurrence::setStartDateTime() handles all-day setting. */ + void setAllDay(bool); + bool set(Type, int freq, int count, int feb29Type, const KDateTime& start, const KDateTime& end); bool init(KCal::RecurrenceRule::PeriodType, int freq, int count, int feb29Type, const KDateTime& start, const KDateTime& end); int combineDurations(const KCal::RecurrenceRule*, const KCal::RecurrenceRule*, QDate& end) const; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/calendarcompat.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/calendarcompat.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/calendarcompat.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/calendarcompat.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -82,7 +82,7 @@ kDebug() << "KAlarm version" << version; // Convert events to current KAlarm format for if the calendar is saved - KAEventData::convertKCalEvents(calendar, version, version057_UTC, Preferences::startOfDay()); + KAEventData::convertKCalEvents(calendar, version, version057_UTC, Preferences::startOfDay(), Preferences::timeZone()); if (!resource) return KCalendar::Current; // update non-shared calendars regardless if (resource->ResourceCached::readOnly() || conv == AlarmResource::NO_CONVERT) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmapp.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmapp.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmapp.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmapp.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -128,7 +128,7 @@ Preferences::self()->readConfig(); Preferences::setAutoStart(true); Preferences::self()->writeConfig(); - Preferences::connect(SIGNAL(startOfDayChanged(const QTime&, const QTime&)), this, SLOT(changeStartOfDay())); + Preferences::connect(SIGNAL(startOfDayChanged(const QTime&)), this, SLOT(changeStartOfDay())); Preferences::connect(SIGNAL(feb29TypeChanged(Feb29Type)), this, SLOT(slotFeb29TypeChanged(Feb29Type))); Preferences::connect(SIGNAL(showInSystemTrayChanged(bool)), this, SLOT(slotShowInSystemTrayChanged())); Preferences::connect(SIGNAL(archivedKeepDaysChanged(int)), this, SLOT(setArchivePurgeDays())); @@ -143,10 +143,7 @@ KConfigGroup config(KGlobal::config(), "General"); mNoSystemTray = config.readEntry("NoSystemTray", false); mOldShowInSystemTray = wantShowInSystemTray(); - mStartOfDay = Preferences::startOfDay(); - if (Preferences::hasStartOfDayChanged()) - mStartOfDay.setHMS(100,0,0); // start of day time has changed: flag it as invalid - DateTime::setStartOfDay(mStartOfDay); + DateTime::setStartOfDay(Preferences::startOfDay()); mPrefsArchivedColour = Preferences::archivedColour(); } @@ -830,13 +827,8 @@ */ void KAlarmApp::changeStartOfDay() { - QTime sod = Preferences::startOfDay(); - DateTime::setStartOfDay(sod); - AlarmCalendar* cal = AlarmCalendar::resources(); - if (KAEventData::adjustStartOfDay(cal->kcalEvents(KCalEvent::ACTIVE), Preferences::startOfDay(), Preferences::timeZone())) - cal->save(); - Preferences::updateStartOfDayCheck(sod); // now that calendar is updated, set OK flag in config file - mStartOfDay = sod; + DateTime::setStartOfDay(Preferences::startOfDay()); + AlarmCalendar::resources()->adjustStartOfDay(); } /****************************************************************************** @@ -1851,8 +1843,6 @@ if (firstTime) { kDebug() << "first time"; - if (!mStartOfDay.isValid()) - changeStartOfDay(); // start of day time has changed, so adjust date-only alarms /* Need to open the display calendar now, since otherwise if display * alarms are immediately due, they will often be processed while diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmapp.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmapp.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmapp.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmapp.h 2009-10-09 23:31:00.000000000 +0100 @@ -173,7 +173,6 @@ DBusHandler* mDBusHandler; // the parent of the main DCOP receiver object TrayWindow* mTrayWindow; // active system tray icon QTimer* mAlarmTimer; // activates KAlarm when next alarm is due - QTime mStartOfDay; // start-of-day time currently in use QColor mPrefsArchivedColour; // archived alarms text colour int mArchivedPurgeDays; // how long to keep archived alarms, 0 = don't keep, -1 = keep indefinitely int mPurgeDaysQueued; // >= 0 to purge the archive calendar from KAlarmApp::processLoop() diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmconfig.kcfg /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmconfig.kcfg --- kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarmconfig.kcfg 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarmconfig.kcfg 2009-10-09 23:31:00.000000000 +0100 @@ -175,11 +175,6 @@ QDateTime(QDate(1900,1,1),QTime(0,0)) - Start time of working day The start time of the working day. diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarm.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarm.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarm.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarm.h 2009-10-09 23:31:00.000000000 +0100 @@ -23,7 +23,7 @@ #undef QT3_SUPPORT -#define KALARM_VERSION "2.2.90" +#define KALARM_VERSION "2.3.2" #define KALARM_NAME "KAlarm" #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarm.upd /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarm.upd --- kde-nightly-kdepim-20091006+svn1032120/kalarm/kalarm.upd 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/kalarm.upd 2009-10-09 23:31:00.000000000 +0100 @@ -63,9 +63,17 @@ Options=overwrite Script=kalarm-2.0.2-general.pl +# KAlarm version 2.1.5 # Convert KDE3 konsole -T command parameter Id=2.1.5 File=kalarmrc Group=General Options=overwrite Script=kalarm-2.1.5-general.pl + +# KAlarm version 2.3.2 +# Remove obsolete key +Id=2.3.2 +File=kalarmrc +Group=General +RemoveKey=Sod diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/lib/datetime.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/lib/datetime.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/lib/datetime.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/lib/datetime.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -1,7 +1,7 @@ /* * datetime.cpp - date/time with start-of-day time for date-only values * Program: kalarm - * Copyright © 2003,2005-2007 by David Jarvie + * Copyright © 2003,2005-2007,2009 by David Jarvie * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,6 +53,17 @@ return mDateTime; } +KDateTime DateTime::calendarKDateTime() const +{ + if (mDateTime.isDateOnly()) + { + KDateTime dt = mDateTime; + dt.setTime(QTime(0, 0)); + return dt; + } + return mDateTime; +} + QString DateTime::formatLocale(bool shortFormat) const { return KGlobal::locale()->formatDateTime(mDateTime, (shortFormat ? KLocale::ShortDate : KLocale::LongDate)); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/lib/datetime.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/lib/datetime.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/lib/datetime.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/lib/datetime.h 2009-10-09 23:31:00.000000000 +0100 @@ -1,7 +1,7 @@ /* * datetime.h - date/time with start-of-day time for date-only values * Program: kalarm - * Copyright © 2003,2005-2007 by David Jarvie + * Copyright © 2003,2005-2007,2009 by David Jarvie * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ * DateTime is very similar to the KDateTime class. The time assumed for date-only values * is the start-of-day time set by setStartOfDay(). * - * @author David Jarvie + * @author David Jarvie */ class DateTime { @@ -83,6 +83,10 @@ * by setStartOfDay(). */ KDateTime effectiveKDateTime() const; + /** Returns the date and time of the value as written in the calendar. + * If the value is date-only, the time part returned is 00:00. + */ + KDateTime calendarKDateTime() const; /** Returns the time zone of the value. */ KTimeZone timeZone() const { return mDateTime.timeZone(); } /** Returns the time specification of the value. */ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/preferences.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/preferences.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/preferences.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/preferences.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -68,8 +68,6 @@ bool Preferences::mUsingDefaults = false; KTimeZone Preferences::mSystemTimeZone; HolidayRegion* Preferences::mHolidays = 0; // always non-null after Preferences initialisation -QTime Preferences::mOldStartOfDay(0, 0, 0); -bool Preferences::mStartOfDayChanged = false; Preferences* Preferences::self() @@ -151,47 +149,19 @@ emit mInstance->holidaysChanged(holidays()); } -static const int SODxor = 0x82451630; -inline int Preferences::startOfDayCheck(const QTime& t) -{ - // Combine with a 'random' constant to prevent 'clever' people fiddling the - // value, and thereby screwing things up. - return QTime().msecsTo(t) ^ SODxor; -} - void Preferences::setStartOfDay(const QTime& t) { - self()->setBase_StartOfDay(QDateTime(QDate(1900,1,1), t)); - // Combine with a 'random' constant to prevent 'clever' people fiddling the - // value, and thereby screwing things up. - updateStartOfDayCheck(t); - if (t != mOldStartOfDay) + if (t != self()->mBase_StartOfDay.time()) { - emit mInstance->startOfDayChanged(t, mOldStartOfDay); - mOldStartOfDay = t; + self()->setBase_StartOfDay(QDateTime(QDate(1900,1,1), t)); + emit mInstance->startOfDayChanged(t); } } // Called when the start of day value has changed in the config file void Preferences::startDayChange(const QDateTime& dt) { - int SOD = sod(); - if (SOD) - mOldStartOfDay = QTime(0,0).addMSecs(SOD ^ SODxor); - QTime t = dt.time(); - mStartOfDayChanged = (t != mOldStartOfDay); - if (mStartOfDayChanged) - { - emit mInstance->startOfDayChanged(t, mOldStartOfDay); - mOldStartOfDay = t; - } -} - -void Preferences::updateStartOfDayCheck(const QTime& t) -{ - self()->setSod(startOfDayCheck(t)); - self()->writeConfig(); - mStartOfDayChanged = false; + emit mInstance->startOfDayChanged(dt.time()); } QBitArray Preferences::workDays() diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/preferences.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/preferences.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/preferences.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/preferences.h 2009-10-09 23:31:00.000000000 +0100 @@ -48,8 +48,6 @@ static void setHolidayRegion(const QString& regionCode); static QTime startOfDay() { return self()->mBase_StartOfDay.time(); } static void setStartOfDay(const QTime&); - static void updateStartOfDayCheck(const QTime&); - static bool hasStartOfDayChanged() { return mStartOfDayChanged; } static QTime workDayStart() { return self()->mBase_WorkDayStart.time(); } static QTime workDayEnd() { return self()->mBase_WorkDayEnd.time(); } static QBitArray workDays(); @@ -86,7 +84,7 @@ signals: void timeZoneChanged(const KTimeZone& newTz); void holidaysChanged(const KHolidays::HolidayRegion& newHolidays); - void startOfDayChanged(const QTime& newStartOfDay, const QTime& oldStartOfDay); + void startOfDayChanged(const QTime& newStartOfDay); void workTimeChanged(const QTime& startTime, const QTime& endTime, const QBitArray& workDays); private slots: @@ -108,8 +106,6 @@ // All the following members are accessed by the Preferences dialog classes static int mMessageButtonDelay; // 0 = scatter; -1 = no delay, no scatter; >0 = delay, no scatter - static QTime mOldStartOfDay; // previous start-of-day time - static bool mStartOfDayChanged; // start-of-day check value doesn't tally with new StartOfDay }; #endif // PREFERENCES_H diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/startdaytimer.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/startdaytimer.cpp --- kde-nightly-kdepim-20091006+svn1032120/kalarm/startdaytimer.cpp 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/startdaytimer.cpp 2009-10-09 23:31:00.000000000 +0100 @@ -1,7 +1,7 @@ /* * startdaytimer.cpp - timer triggered at the user-defined start-of-day time * Program: kalarm - * Copyright (C) 2004, 2005 by David Jarvie + * Copyright © 2004,2005,2009 by David Jarvie * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ StartOfDayTimer::StartOfDayTimer() : DailyTimer(Preferences::startOfDay(), false) { - Preferences::connect(SIGNAL(startOfDayChanged(const QTime&, const QTime&)), this, SLOT(startOfDayChanged(const QTime&, const QTime&))); + Preferences::connect(SIGNAL(startOfDayChanged(const QTime&)), this, SLOT(startOfDayChanged())); } StartOfDayTimer* StartOfDayTimer::instance() @@ -43,7 +43,7 @@ * Called when the start-of-day time has changed. * The timer is adjusted and if appropriate timer events are triggered now. */ -void StartOfDayTimer::startOfDayChanged(const QTime&, const QTime&) +void StartOfDayTimer::startOfDayChanged() { changeTime(Preferences::startOfDay(), true); } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kalarm/startdaytimer.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kalarm/startdaytimer.h --- kde-nightly-kdepim-20091006+svn1032120/kalarm/startdaytimer.h 2009-10-06 23:28:06.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kalarm/startdaytimer.h 2009-10-09 23:31:00.000000000 +0100 @@ -1,7 +1,7 @@ /* * startdaytimer.h - timer triggered at the user-defined start-of-day time * Program: kalarm - * Copyright © 2004,2005 by David Jarvie + * Copyright © 2004,2005,2009 by David Jarvie * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ * start-of-day time (set in KAlarm's Preferences dialog). * It automatically adjusts to any changes in the start-of-day time. * - * @author David Jarvie + * @author David Jarvie */ class StartOfDayTimer : public DailyTimer { @@ -56,7 +56,7 @@ static StartOfDayTimer* instance(); private slots: - void startOfDayChanged(const QTime& newStartOfDay, const QTime& oldStartOfDay); + void startOfDayChanged(); private: static StartOfDayTimer* mInstance; // exists solely to receive signals diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/aboutdata.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/aboutdata.cpp --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/aboutdata.cpp 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/aboutdata.cpp 2009-10-09 23:31:06.000000000 +0100 @@ -35,14 +35,20 @@ #include "aboutdata.h" +#include + #include #include #include #include +#include +#include #include +using namespace Kleo; + static const char kleopatra_version[] = KLEOPATRA_VERSION_STRING; static const char description[] = I18N_NOOP("Certificate Manager and Unified Crypto GUI"); @@ -101,7 +107,25 @@ "Both relevant cryptography standards are supported, OpenPGP " "and S/MIME. Gpg4win and the software included with Gpg4win " "are Free Software."); -static const char gpg4win_version[] = "2.0.0"; // ### make this better come from somewhere... + +static const char gpg4win_version_guessed[] = "2.0.1"; + +static QString gpg4win_version() { + + QProcess p; + p.setReadChannelMode( QProcess::MergedChannels ); + p.start( gpgConfPath(), QStringList( QLatin1String( "--version" ) ) ); + if ( !p.waitForFinished() ) + return QString::fromLatin1( "%1 (%2)" ).arg( QLatin1String( gpg4win_version_guessed ), + i18nc("Version string is a guess","guessed") ); + const QString output = QTextStream( &p ).readAll() ; + QRegExp rx( QLatin1String( "\$Gpg4win\\s+([^\\s)])+\$" ) ); + if ( rx.indexIn( output ) != -1 ) + return rx.cap(1); + else + return QString::fromLatin1( "%1 (%2)" ).arg( QLatin1String( gpg4win_version_guessed ), + i18nc("Version string is a guess","guessed") ); +} static QPixmap UserIcon_nocached2( const char * name ) { @@ -117,7 +141,7 @@ AboutGpg4WinData::AboutGpg4WinData() : KAboutData( "gpg4win", 0, ki18n("Gpg4win"), - gpg4win_version, ki18n(gpg4win_description), + gpg4win_version().toLatin1(), ki18n(gpg4win_description), License_GPL, KLocalizedString(), KLocalizedString(), "http://www.gpg4win.de" ) { addAuthor( ki18n("Intevation GmbH (Project Management)"), KLocalizedString(), 0, "http://www.intevation.de" ); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/CMakeLists.txt 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/CMakeLists.txt 2009-10-09 23:31:06.000000000 +0100 @@ -2,7 +2,7 @@ include(MacroOptionalAddSubdirectory) -set( kleopatra_version 2.0.11 ) +set( kleopatra_version 2.0.12 ) set( kleopatra_release FALSE ) if (NOT kleopatra_release) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/commands/adduseridcommand.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/commands/adduseridcommand.h --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/commands/adduseridcommand.h 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/commands/adduseridcommand.h 2009-10-09 23:31:06.000000000 +0100 @@ -46,7 +46,7 @@ explicit AddUserIDCommand( const GpgME::Key & key ); ~AddUserIDCommand(); - /* reimp */ static Restrictions restrictions() { return OnlyOneKey|MustBeOpenPGP; } + /* reimp */ static Restrictions restrictions() { return OnlyOneKey|MustBeOpenPGP|NeedSecretKey; } void setName( const QString & name ); const QString & name() const; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/commands/learncardkeyscommand.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/commands/learncardkeyscommand.cpp --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/commands/learncardkeyscommand.cpp 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/commands/learncardkeyscommand.cpp 2009-10-09 23:31:06.000000000 +0100 @@ -63,7 +63,7 @@ QStringList LearnCardKeysCommand::arguments() const { if ( protocol() == OpenPGP ) - return QStringList() << gpgPath() << "--learn-card" << "-v"; + return QStringList() << gpgPath() << "--batch" << "--card-status" << "-v"; else return QStringList() << gpgSmPath() << "--learn-card" << "-v"; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/mainwindow.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/mainwindow.cpp --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/mainwindow.cpp 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/mainwindow.cpp 2009-10-09 23:31:06.000000000 +0100 @@ -292,7 +292,7 @@ } void aboutGpg4Win() { - ( new KAboutApplicationDialog( aboutGpg4WinData(), q ) )->show(); + ( new KAboutApplicationDialog( aboutGpg4WinData(), KAboutApplicationDialog::HideKdeVersion|KAboutApplicationDialog::HideTranslators, q ) )->show(); } private: @@ -458,8 +458,10 @@ // Window menu // (come from ui.tabWidget) // Help menu +#ifdef Q_WS_WIN { "help_about_gpg4win", i18n("About Gpg4win"), QString(), "gpg4win-compact", q, SLOT(aboutGpg4Win()), QString(), false, true }, +#endif }; make_actions_from_data( action_data, /*sizeof action_data / sizeof *action_data,*/ coll ); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/newcertificatewizard/advancedsettingsdialog.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/newcertificatewizard/advancedsettingsdialog.ui --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/newcertificatewizard/advancedsettingsdialog.ui 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/newcertificatewizard/advancedsettingsdialog.ui 2009-10-09 23:31:06.000000000 +0100 @@ -133,7 +133,7 @@ true - + ElGamal + + Elgamal diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kleopatra/systrayicon.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kleopatra/systrayicon.cpp --- kde-nightly-kdepim-20091006+svn1032120/kleopatra/systrayicon.cpp 2009-10-06 23:28:11.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kleopatra/systrayicon.cpp 2009-10-09 23:31:06.000000000 +0100 @@ -102,6 +102,7 @@ decryptVerifyClipboardAction.setEnabled( DecryptVerifyClipboardCommand::canDecryptVerifyCurrentClipboard() ); setInitialPinAction.setEnabled( anyCardHasNullPin ); learnCertificatesAction.setEnabled( anyCardCanLearnKeys ); + cardMenu.setEnabled( anyCardHasNullPin || anyCardCanLearnKeys ); q->setAttentionWanted( ( anyCardHasNullPin || anyCardCanLearnKeys ) && !q->attentionWindow() ); } @@ -202,8 +203,8 @@ openPGPSignClipboardAction( i18n("OpenPGP-Sign..."), q ), decryptVerifyClipboardAction( i18n("Decrypt/Verify..."), q ), cardMenu( i18n("SmartCard") ), - setInitialPinAction( i18n("Set Initial PIN..."), q ), - learnCertificatesAction( i18n("Learn Card Certificates"), q ), + setInitialPinAction( i18n("Set NetKey v3 Initial PIN..."), q ), + learnCertificatesAction( i18n("Learn NetKey v3 Card Certificates"), q ), aboutDialog(), mainWindowPreviousGeometry() { diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/kmail/CMakeLists.txt 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/CMakeLists.txt 2009-10-09 23:30:58.000000000 +0100 @@ -342,6 +342,7 @@ ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KMIME_LIBRARY} + messagecore messagelist ${KDEPIMLIBS_KPIMIDENTITIES_LIBRARY} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/folderselectiontreewidget.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/folderselectiontreewidget.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/folderselectiontreewidget.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/folderselectiontreewidget.h 2009-10-09 23:30:58.000000000 +0100 @@ -68,7 +68,7 @@ * Reload the tree and select which folders to show and which not * * @param mustBeReadWrite If true, the read-only folders become non selectable - * @param showOutbox If trye, the otbox folder is shown + * @param showOutbox If true, the outbox folder is shown * @param showImapFolders Whether to show the IMAP folder hierarchy * @param preSelection The initial folder to select */ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/headerstyle.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/headerstyle.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/headerstyle.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/headerstyle.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -379,12 +379,22 @@ } QString titleText; - QString confidenceString; - if ( spamError == noError ) { - confidenceString = ( confidence >= 0 ? QString::number( confidence ) + "% " : QString() ) + " "; - titleText = i18n("%1% probability of being spam with confidence %3%.\n\n" - "Full report:\nProbability=%2\nConfidence=%4", - percent, filterHeader, confidence, confidenceHeader ); + QString confidenceString = QString(); + if ( spamError == noError ) + { + if ( confidence >= 0 ) + { + confidenceString = QString::number( confidence ) + "% "; + titleText = i18n("%1% probability of being spam with confidence %3%.\n\n" + "Full report:\nProbability=%2\nConfidence=%4", + percent, filterHeader, confidence, confidenceHeader ); + } + else // do not show negative confidence + { + titleText = i18n("%1% probability of being spam.\n\n" + "Full report:\nProbability=%2", + percent, filterHeader); + } } else { diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/isubject.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/isubject.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/isubject.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/isubject.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -25,14 +25,14 @@ void ISubject::notify() { - for ( QVector::iterator it = mObserverList.begin() ; it != mObserverList.end() ; ++it ) - { - if ( (*it) ) - { + // iterate over a copy (to prevent crashes when + // {attach(),detach()} is called from an Observer::update() + const QVector copy = mObserverList; + for ( QVector::const_iterator it = copy.begin() ; it != copy.end() ; ++it ) { + if ( (*it) ) { (*it)->update( this ); } } } - } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/KMail.desktop /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/KMail.desktop --- kde-nightly-kdepim-20091006+svn1032120/kmail/KMail.desktop 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/KMail.desktop 2009-10-09 23:30:58.000000000 +0100 @@ -135,5 +135,5 @@ X-KDE-StartupNotify=true X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.kmail -X-KDE-ServiceTypes=DBUS/ResourceBackend/IMAP,DBUS/Mailer +X-KDE-ServiceTypes=DBUS/Mailer Categories=Qt;KDE;Network;Email; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/kmcommands.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/kmcommands.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/kmcommands.h 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/kmcommands.h 2009-10-09 23:30:58.000000000 +0100 @@ -7,7 +7,7 @@ #include "kmmsgbase.h" #include -#include +#include using KPIM::MessageStatus; #include #include diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/kmmsgbase.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/kmmsgbase.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/kmmsgbase.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/kmmsgbase.h 2009-10-09 23:30:58.000000000 +0100 @@ -20,7 +20,7 @@ #ifndef kmmsgbase_h #define kmmsgbase_h -#include "messagestatus.h" +#include using KPIM::MessageStatus; // for large file support flags diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/kmreaderwin.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/kmreaderwin.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/kmreaderwin.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/kmreaderwin.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -176,81 +176,33 @@ kDebug() << "-------------------------------------------------"; kDebug() << "START" << "(" << recCount << ")"; if( node ) { + + kDebug(5006) << node->typeString() << '/' << node->subTypeString(); + partNode* curNode = node; partNode* dataNode = curNode; partNode * child = node->firstChild(); - bool bIsMultipart = false; + const bool bIsMultipart = node->type() == DwMime::kTypeMultipart; + bool bKeepPartAsIs = false; - switch( curNode->type() ){ - case DwMime::kTypeText: { - kDebug() << "* text *"; - switch( curNode->subType() ){ - case DwMime::kSubtypeHtml: - kDebug() << "html"; - break; - case DwMime::kSubtypeXVCard: - kDebug() << "v-card"; - break; - case DwMime::kSubtypeRichtext: - kDebug() << "rich text"; - break; - case DwMime::kSubtypeEnriched: - kDebug() << "enriched"; - break; - case DwMime::kSubtypePlain: - kDebug() << "plain"; - break; - default: - kDebug() << "default"; - break; - } - } - break; + switch( curNode->type() ) { case DwMime::kTypeMultipart: { - kDebug() << "* multipart *"; - bIsMultipart = true; - switch( curNode->subType() ){ - case DwMime::kSubtypeMixed: - kDebug() << "mixed"; - break; - case DwMime::kSubtypeAlternative: - kDebug() << "alternative"; - break; - case DwMime::kSubtypeDigest: - kDebug() << "digest"; - break; - case DwMime::kSubtypeParallel: - kDebug() << "parallel"; - break; - case DwMime::kSubtypeSigned: - kDebug() << "signed"; + switch( curNode->subType() ) { + case DwMime::kSubtypeSigned: { + bKeepPartAsIs = true; + } break; case DwMime::kSubtypeEncrypted: { - kDebug() << "encrypted"; - if ( child ) { - /* - ATTENTION: This code is to be replaced by the new 'auto-detect' feature. -------------------------------------- - */ - partNode* data = - child->findType( DwMime::kTypeApplication, DwMime::kSubtypeOctetStream, false, true ); - if ( !data ) - data = child->findType( DwMime::kTypeApplication, DwMime::kSubtypePkcs7Mime, false, true ); - if ( data && data->firstChild() ) - dataNode = data; - } + if ( child ) + dataNode = child; } break; - default : - kDebug() << "( unknown subtype )"; - break; } } break; case DwMime::kTypeMessage: { - kDebug() << "* message *"; - switch( curNode->subType() ){ + switch( curNode->subType() ) { case DwMime::kSubtypeRfc822: { - kDebug() << "RfC 822"; if ( child ) dataNode = child; } @@ -259,25 +211,19 @@ } break; case DwMime::kTypeApplication: { - kDebug() << "* application *"; - switch( curNode->subType() ){ - case DwMime::kSubtypePostscript: - kDebug() << "postscript"; - break; + switch( curNode->subType() ) { case DwMime::kSubtypeOctetStream: { - kDebug() << "octet stream"; if ( child ) dataNode = child; } break; - case DwMime::kSubtypePgpEncrypted: - kDebug() << "pgp encrypted"; - break; - case DwMime::kSubtypePgpSignature: - kDebug() << "pgp signed"; + case DwMime::kSubtypePkcs7Signature: { + // note: subtype Pkcs7Signature specifies a signature part + // which we do NOT want to remove! + bKeepPartAsIs = true; + } break; case DwMime::kSubtypePkcs7Mime: { - kDebug() << "pkcs7 mime"; // note: subtype Pkcs7Mime can also be signed // and we do NOT want to remove the signature! if ( child && curNode->encryptionState() != KMMsgNotEncrypted ) @@ -287,39 +233,6 @@ } } break; - case DwMime::kTypeImage: { - kDebug() << "* image *"; - switch( curNode->subType() ){ - case DwMime::kSubtypeJpeg: - kDebug() << "JPEG"; - break; - case DwMime::kSubtypeGif: - kDebug() << "GIF"; - break; - } - } - break; - case DwMime::kTypeAudio: { - kDebug() << "* audio *"; - switch( curNode->subType() ){ - case DwMime::kSubtypeBasic: - kDebug() << "basic"; - break; - } - } - break; - case DwMime::kTypeVideo: { - kDebug() << "* video *"; - switch( curNode->subType() ){ - case DwMime::kSubtypeMpeg: - kDebug() << "mpeg"; - break; - } - } - break; - case DwMime::kTypeModel: - kDebug() << "* model *"; - break; } @@ -357,40 +270,45 @@ } } - // B) Store the body of this part. - if( headers && bIsMultipart && dataNode->firstChild() ) { - kDebug() << "is valid Multipart, processing children:"; - QByteArray boundary = headers->ContentType().Boundary().c_str(); - curNode = dataNode->firstChild(); - // store children of multipart - while( curNode ) { - kDebug() << "--boundary"; - if( resultingData.size() && - ( '\n' != resultingData.at( resultingData.size()-1 ) ) ) + if ( bKeepPartAsIs ) { + resultingData += dataNode->encodedBody(); + } else { + + // B) Store the body of this part. + if( headers && bIsMultipart && dataNode->firstChild() ) { + kDebug() << "is valid Multipart, processing children:"; + QByteArray boundary = headers->ContentType().Boundary().c_str(); + curNode = dataNode->firstChild(); + // store children of multipart + while( curNode ) { + kDebug() << "--boundary"; + if( resultingData.size() && + ( '\n' != resultingData.at( resultingData.size()-1 ) ) ) + resultingData += '\n'; + resultingData += '\n'; + resultingData += "--"; + resultingData += boundary; resultingData += '\n'; - resultingData += '\n'; - resultingData += "--"; + // note: We are processing a harmless multipart that is *not* + // to be replaced by one of it's children, therefor + // we set their doStoreHeaders to true. + objectTreeToDecryptedMsg( curNode, + resultingData, + theMessage, + false, + recCount + 1 ); + curNode = curNode->nextSibling(); + } + kDebug() << "--boundary--"; + resultingData += "\n--"; resultingData += boundary; - resultingData += '\n'; - // note: We are processing a harmless multipart that is *not* - // to be replaced by one of it's children, therefor - // we set their doStoreHeaders to true. - objectTreeToDecryptedMsg( curNode, - resultingData, - theMessage, - false, - recCount + 1 ); - curNode = curNode->nextSibling(); + resultingData += "--\n\n"; + kDebug() << "Multipart processing children - DONE"; + } else if( part ){ + // store simple part + kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE"; + resultingData += part->Body().AsString().c_str(); } - kDebug() << "--boundary--"; - resultingData += "\n--"; - resultingData += boundary; - resultingData += "--\n\n"; - kDebug() << "Multipart processing children - DONE"; - } else if( part ){ - // store simple part - kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE"; - resultingData += part->Body().AsString().c_str(); } } else { kDebug() << "dataNode != curNode: Replace curNode by dataNode."; @@ -530,7 +448,6 @@ mLastSerNum = 0; mWaitingForSerNum = 0; mMessage = 0; - mLastStatus.clear(); mMsgDisplay = true; mPrinting = false; mAtmUpdate = false; @@ -1333,14 +1250,11 @@ if (aMsg) { aMsg->setOverrideCodec( overrideCodec() ); aMsg->setDecodeHTML( htmlMail() ); - mLastStatus = aMsg->status(); // FIXME: workaround to disable DND for IMAP load-on-demand if ( !aMsg->isComplete() ) mViewer->setDNDEnabled( false ); else mViewer->setDNDEnabled( true ); - } else { - mLastStatus.clear(); } // only display the msg if it is complete @@ -1621,6 +1535,13 @@ QTimer::singleShot( 1, this, SLOT(injectAttachments()) ); } +static bool message_was_saved_decrypted_before( const KMMessage * msg ) +{ + if ( !msg ) + return false; + kDebug() << "msgId =" << msg->msgId(); + return msg->msgId().trimmed().startsWith( " All received encrypted messages *must* be stored in unencrypted form - // after they have been decrypted once the user has read them. - // ( "Aufhebung der Verschluesselung nach dem Lesen" ) - // - // note: Since there is no configuration option for this, we do that for - // all kinds of encryption now - *not* just for S/MIME. - // This could be changed in the objectTreeToDecryptedMsg() function - // by deciding when (or when not, resp.) to set the 'dataNode' to - // something different than 'curNode'. + // Hack to make sure the S/MIME CryptPlugs follows the strict requirement + // of german government: + // --> All received encrypted messages *must* be stored in unencrypted form + // after they have been decrypted once the user has read them. + // ( "Aufhebung der Verschluesselung nach dem Lesen" ) + // + // note: Since there is no configuration option for this, we do that for + // all kinds of encryption now - *not* just for S/MIME. + // This could be changed in the objectTreeToDecryptedMsg() function + // by deciding when (or when not, resp.) to set the 'dataNode' to + // something different than 'curNode'. -kDebug() << "\n\n\nSpecial post-encryption handling:\n1."; -kDebug() << "(aMsg == msg) =" << (aMsg == message()); -kDebug() << " mLastStatus.isOfUnknownStatus() =" << mLastStatus.isOfUnknownStatus(); -kDebug() << "|| mLastStatus.isNew() =" << mLastStatus.isNew(); -kDebug() << "|| mLastStatus.isUnread) =" << mLastStatus.isUnread(); -kDebug() << "(mIdOfLastViewedMessage != aMsg->msgId()) =" << (mIdOfLastViewedMessage != aMsg->msgId()); -kDebug() << " (KMMsgFullyEncrypted == encryptionState) =" << (KMMsgFullyEncrypted == encryptionState); -kDebug() << "|| (KMMsgPartiallyEncrypted == encryptionState) =" << (KMMsgPartiallyEncrypted == encryptionState); + kDebug() << "\n\n\nSpecial post-encryption handling:\n1."; + kDebug() << "(aMsg == msg) =" << (aMsg == message()); + kDebug() << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()); + kDebug() << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ); + kDebug() << "this->decryptMessage() = " << decryptMessage(); + kDebug() << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs(); + kDebug() << " (KMMsgFullyEncrypted == encryptionState) = " << (KMMsgFullyEncrypted == encryptionState); + kDebug() <<"|| (KMMsgPartiallyEncrypted == encryptionState) =" << (KMMsgPartiallyEncrypted == encryptionState); // only proceed if we were called the normal way - not by // double click on the message (==not running in a separate window) - if( (aMsg == message()) - // only proceed if this message was not saved encryptedly before - // to make sure only *new* messages are saved in decrypted form - && ( mLastStatus.isOfUnknownStatus() - || mLastStatus.isNew() - || mLastStatus.isUnread() ) - // avoid endless recursions - && (mIdOfLastViewedMessage != aMsg->msgId()) - // only proceed if this message is (at least partially) encrypted - && ( (KMMsgFullyEncrypted == encryptionState) - || (KMMsgPartiallyEncrypted == encryptionState) ) ) { - - kDebug() << "Calling objectTreeToDecryptedMsg()"; - - QByteArray decryptedData; - // note: The following call may change the message's headers. - objectTreeToDecryptedMsg( mRootNode, decryptedData, *aMsg ); - kDebug() << "Resulting data:" << decryptedData; - - if( !decryptedData.isEmpty() ) { - kDebug() << "Composing unencrypted message"; - // try this: - aMsg->setBody( decryptedData ); - KMMessage* unencryptedMessage = new KMMessage( *aMsg ); - unencryptedMessage->setParent( 0 ); - // because this did not work: - /* - DwMessage dwMsg( DwString( aMsg->asString() ) ); - dwMsg.Body() = DwBody( DwString( resultString.data() ) ); - dwMsg.Body().Parse(); - KMMessage* unencryptedMessage = new KMMessage( &dwMsg ); - */ - kDebug() << "Resulting message:" << unencryptedMessage->asString(); - kDebug() << "Attach unencrypted message to aMsg"; - aMsg->setUnencryptedMsg( unencryptedMessage ); - emitReplaceMsgByUnencryptedVersion = true; + if( (aMsg == message()) + // don't remove encryption in the outbox folder :) + && ( aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() ) + // only proceed if this message was not saved encryptedly before + && !message_was_saved_decrypted_before( aMsg ) + // only proceed if the message has actually been decrypted + && decryptMessage() + // only proceed if no pending async jobs are running: + && !otp.hasPendingAsyncJobs() + // only proceed if this message is (at least partially) encrypted + && ( (KMMsgFullyEncrypted == encryptionState) + || (KMMsgPartiallyEncrypted == encryptionState) ) ) { + + kDebug() << "Calling objectTreeToDecryptedMsg()"; + + QByteArray decryptedData; + // note: The following call may change the message's headers. + objectTreeToDecryptedMsg( mRootNode, decryptedData, *aMsg ); + kDebug() << "Resulting data:" << decryptedData; + + if( !decryptedData.isEmpty() ) { + kDebug() << "Composing unencrypted message"; + // try this: + aMsg->setBody( decryptedData ); + KMMessage* unencryptedMessage = new KMMessage( *aMsg ); + unencryptedMessage->setParent( 0 ); + // because this did not work: + /* + DwMessage dwMsg( DwString( aMsg->asString() ) ); + dwMsg.Body() = DwBody( DwString( resultString.data() ) ); + dwMsg.Body().Parse(); + KMMessage* unencryptedMessage = new KMMessage( &dwMsg ); + */ + kDebug() << "Resulting message:" << unencryptedMessage->asString(); + kDebug() << "Attach unencrypted message to aMsg"; + aMsg->setUnencryptedMsg( unencryptedMessage ); + emitReplaceMsgByUnencryptedVersion = true; + } } } - } // store message id to avoid endless recursions setIdOfLastViewedMessage( aMsg->msgId() ); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/kmreaderwin.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/kmreaderwin.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/kmreaderwin.h 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/kmreaderwin.h 2009-10-09 23:30:58.000000000 +0100 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include using KPIM::MessageStatus; #include "kmmimeparttree.h" // Needed for friend declaration. @@ -606,7 +606,6 @@ bool mMsgDisplay; bool mNoMDNsWhenEncrypted; unsigned long mLastSerNum; - MessageStatus mLastStatus; KMail::CSSHelper * mCSSHelper; bool mUseFixedFont; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/kmsearchpattern.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/kmsearchpattern.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/kmsearchpattern.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/kmsearchpattern.h 2009-10-09 23:30:58.000000000 +0100 @@ -21,7 +21,7 @@ #define _kmsearchpattern_h_ #include -#include +#include using KPIM::MessageStatus; #include diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/messagelistview/pane.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/messagelistview/pane.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/messagelistview/pane.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/messagelistview/pane.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -36,7 +36,8 @@ #include #include -#include +#include +#include #include "globalsettings.h" #include "kmfolder.h" @@ -451,6 +452,10 @@ connect( KMKernel::self()->msgTagMgr(), SIGNAL( msgTagListChanged() ), w, SLOT( populateStatusFilterCombo() ) ); + connect( w, SIGNAL(statusMessage(QString)), + KPIM::BroadcastStatus::instance(), SLOT(setStatusMsg(QString)) ); + + updateTabControls(); return w; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/messagelistview/storagemodel.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/messagelistview/storagemodel.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/messagelistview/storagemodel.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/messagelistview/storagemodel.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -24,7 +24,7 @@ #include -#include +#include #include #include diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -213,6 +213,11 @@ partNode* parentNode = &startNode; partNode* newNode = new partNode(false, myBody); + + // Build the object tree of the new node before setting the parent, as otherwise + // buildObjectTree() would erronously modify the parents as well + newNode->buildObjectTree( false ); + if ( append && parentNode->firstChild() ) { parentNode = parentNode->firstChild(); while( parentNode->nextSibling() ) @@ -221,8 +226,6 @@ } else parentNode->setFirstChild( newNode ); - newNode->buildObjectTree( false ); - if ( startNode.mimePartTreeItem() ) { newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0, QString(), QString(), QString(), 0, diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser.h 2009-10-09 23:30:58.000000000 +0100 @@ -114,7 +114,9 @@ virtual ~ObjectTreeParser(); void setAllowAsync( bool allow ) { assert( !mHasPendingAsyncJobs ); mAllowAsync = allow; } - bool allowAsync() const { return mAllowAsync; } + + // ### disabled async mode because of crashes, see bug 208353 + bool allowAsync() const { return /*mAllowAsync*/false; } bool hasPendingAsyncJobs() const { return mHasPendingAsyncJobs; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser_p.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser_p.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser_p.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser_p.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -48,14 +48,31 @@ using namespace Kleo; using namespace GpgME; -DecryptVerifyBodyPartMemento::DecryptVerifyBodyPartMemento( DecryptVerifyJob * job, const QByteArray & cipherText ) +CryptoBodyPartMemento::CryptoBodyPartMemento() : QObject( 0 ), Interface::BodyPartMemento(), ISubject(), - m_cipherText( cipherText ), - m_job( job ), m_running( false ) { + +} + +CryptoBodyPartMemento::~CryptoBodyPartMemento() {} + +void CryptoBodyPartMemento::setAuditLog( const Error & err, const QString & log ) { + m_auditLogError = err; + m_auditLog = log; +} + +void CryptoBodyPartMemento::setRunning( bool running ) { + m_running = running; +} + +DecryptVerifyBodyPartMemento::DecryptVerifyBodyPartMemento( DecryptVerifyJob * job, const QByteArray & cipherText ) + : CryptoBodyPartMemento(), + m_cipherText( cipherText ), + m_job( job ) +{ assert( m_job ); } @@ -72,14 +89,14 @@ } connect( m_job, SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const QByteArray&)), this, SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const QByteArray&)) ); - m_running = true; + setRunning( true ); return true; } void DecryptVerifyBodyPartMemento::exec() { assert( m_job ); QByteArray plainText; - m_running = true; + setRunning( true ); const std::pair p = m_job->exec( m_cipherText, plainText ); saveResult( p.first, p.second, plainText ); m_job->deleteLater(); // exec'ed jobs don't delete themselves @@ -91,12 +108,11 @@ const QByteArray & plainText ) { assert( m_job ); - m_running = false; + setRunning( false ); m_dr = dr; m_vr = vr; m_plainText = plainText; - m_auditLog = m_job->auditLogAsHtml(); - m_auditLogError = m_job->auditLogError(); + setAuditLog( m_job->auditLogError(), m_job->auditLogAsHtml() ); } void DecryptVerifyBodyPartMemento::slotResult( const DecryptionResult & dr, @@ -105,7 +121,7 @@ { saveResult( dr, vr, plainText ); m_job = 0; - QTimer::singleShot( 100, this, SLOT(notify()) ); + notify(); } @@ -115,14 +131,11 @@ KeyListJob * klj, const QByteArray & signature, const QByteArray & plainText ) - : QObject( 0 ), - Interface::BodyPartMemento(), - ISubject(), + : CryptoBodyPartMemento(), m_signature( signature ), m_plainText( plainText ), m_job( job ), - m_keylistjob( klj ), - m_running( false ) + m_keylistjob( klj ) { assert( m_job ); } @@ -142,13 +155,13 @@ } connect( m_job, SIGNAL(result(const GpgME::VerificationResult&)), this, SLOT(slotResult(const GpgME::VerificationResult&)) ); - m_running = true; + setRunning( true ); return true; } void VerifyDetachedBodyPartMemento::exec() { assert( m_job ); - m_running = true; + setRunning( true ); saveResult( m_job->exec( m_signature, m_plainText ) ); m_job->deleteLater(); // exec'ed jobs don't delete themselves m_job = 0; @@ -161,7 +174,7 @@ if ( m_keylistjob ) m_keylistjob->deleteLater(); // exec'ed jobs don't delete themselves m_keylistjob = 0; - m_running = false; + setRunning( false ); } bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const @@ -182,8 +195,7 @@ { assert( m_job ); m_vr = vr; - m_auditLog = m_job->auditLogAsHtml(); - m_auditLogError = m_job->auditLogError(); + setAuditLog( m_job->auditLogError(), m_job->auditLogAsHtml() ); } void VerifyDetachedBodyPartMemento::slotResult( const VerificationResult & vr ) @@ -195,8 +207,8 @@ if ( m_keylistjob ) m_keylistjob->deleteLater(); m_keylistjob = 0; - m_running = false; - QTimer::singleShot( 100, this, SLOT(notify()) ); + setRunning( false ); + notify(); } bool VerifyDetachedBodyPartMemento::startKeyListJob() @@ -218,21 +230,18 @@ void VerifyDetachedBodyPartMemento::slotKeyListJobDone() { m_keylistjob = 0; - m_running = false; - QTimer::singleShot( 100, this, SLOT(notify()) ); + setRunning( false ); + notify(); } VerifyOpaqueBodyPartMemento::VerifyOpaqueBodyPartMemento( VerifyOpaqueJob * job, KeyListJob * klj, const QByteArray & signature ) - : QObject( 0 ), - Interface::BodyPartMemento(), - ISubject(), + : CryptoBodyPartMemento(), m_signature( signature ), m_job( job ), - m_keylistjob( klj ), - m_running( false ) + m_keylistjob( klj ) { assert( m_job ); } @@ -252,13 +261,13 @@ } connect( m_job, SIGNAL(result(const GpgME::VerificationResult&,const QByteArray&)), this, SLOT(slotResult(const GpgME::VerificationResult&,const QByteArray&)) ); - m_running = true; + setRunning( true ); return true; } void VerifyOpaqueBodyPartMemento::exec() { assert( m_job ); - m_running = true; + setRunning( true ); QByteArray plainText; saveResult( m_job->exec( m_signature, plainText ), plainText ); m_job->deleteLater(); // exec'ed jobs don't delete themselves @@ -272,7 +281,7 @@ if ( m_keylistjob ) m_keylistjob->deleteLater(); // exec'ed jobs don't delete themselves m_keylistjob = 0; - m_running = false; + setRunning( false ); } bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const @@ -295,8 +304,7 @@ assert( m_job ); m_vr = vr; m_plainText = plainText; - m_auditLog = m_job->auditLogAsHtml(); - m_auditLogError = m_job->auditLogError(); + setAuditLog( m_job->auditLogError(), m_job->auditLogAsHtml() ); } void VerifyOpaqueBodyPartMemento::slotResult( const VerificationResult & vr, @@ -309,8 +317,8 @@ if ( m_keylistjob ) m_keylistjob->deleteLater(); m_keylistjob = 0; - m_running = false; - QTimer::singleShot( 100, this, SLOT(notify()) ); + setRunning( false ); + notify(); } bool VerifyOpaqueBodyPartMemento::startKeyListJob() @@ -332,8 +340,8 @@ void VerifyOpaqueBodyPartMemento::slotKeyListJobDone() { m_keylistjob = 0; - m_running = false; - QTimer::singleShot( 100, this, SLOT(notify()) ); + setRunning( false ); + notify(); } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser_p.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser_p.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/objecttreeparser_p.h 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/objecttreeparser_p.h 2009-10-09 23:30:58.000000000 +0100 @@ -54,37 +54,53 @@ namespace KMail { - class DecryptVerifyBodyPartMemento + class CryptoBodyPartMemento : public QObject, public KMail::Interface::BodyPartMemento, public KMail::ISubject { Q_OBJECT public: - DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const QByteArray & cipherText ); - ~DecryptVerifyBodyPartMemento(); + CryptoBodyPartMemento(); + ~CryptoBodyPartMemento(); /* reimp */ Interface::Observer * asObserver() { return 0; } /* reimp */ Interface::Observable * asObservable() { return this; } + bool isRunning() const { return m_running; } + + const QString & auditLogAsHtml() const { return m_auditLog; } + GpgME::Error auditLogError() const { return m_auditLogError; } + + protected: + void setAuditLog( const GpgME::Error & err, const QString & log ); + void setRunning( bool running ); + + private: + bool m_running; + QString m_auditLog; + GpgME::Error m_auditLogError; + }; + + class DecryptVerifyBodyPartMemento + : public CryptoBodyPartMemento + { + Q_OBJECT + public: + DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const QByteArray & cipherText ); + ~DecryptVerifyBodyPartMemento(); + bool start(); void exec(); - bool isRunning() const { return m_running; } - const QByteArray & plainText() const { return m_plainText; } const GpgME::DecryptionResult & decryptResult() const { return m_dr; } const GpgME::VerificationResult & verifyResult() const { return m_vr; } - const QString & auditLogAsHtml() const { return m_auditLog; } - GpgME::Error auditLogError() const { return m_auditLogError; } private slots: void slotResult( const GpgME::DecryptionResult & dr, const GpgME::VerificationResult & vr, const QByteArray & plainText ); - void notify() { - ISubject::notify(); - } private: void saveResult( const GpgME::DecryptionResult &, @@ -94,20 +110,15 @@ // input: const QByteArray m_cipherText; QPointer m_job; - bool m_running; // output: GpgME::DecryptionResult m_dr; GpgME::VerificationResult m_vr; QByteArray m_plainText; - QString m_auditLog; - GpgME::Error m_auditLogError; }; class VerifyDetachedBodyPartMemento - : public QObject, - public KMail::Interface::BodyPartMemento, - public KMail::ISubject + : public CryptoBodyPartMemento { Q_OBJECT public: @@ -117,26 +128,16 @@ const QByteArray & plainText ); ~VerifyDetachedBodyPartMemento(); - /* reimp */ Interface::Observer * asObserver() { return 0; } - /* reimp */ Interface::Observable * asObservable() { return this; } - bool start(); void exec(); - bool isRunning() const { return m_running; } - const GpgME::VerificationResult & verifyResult() const { return m_vr; } - const QString & auditLogAsHtml() const { return m_auditLog; } - GpgME::Error auditLogError() const { return m_auditLogError; } const GpgME::Key & signingKey() const { return m_key; } private slots: void slotResult( const GpgME::VerificationResult & vr ); void slotKeyListJobDone(); void slotNextKey( const GpgME::Key & ); - void notify() { - ISubject::notify(); - } private: void saveResult( const GpgME::VerificationResult & ); @@ -149,19 +150,14 @@ const QByteArray m_plainText; QPointer m_job; QPointer m_keylistjob; - bool m_running; // output: GpgME::VerificationResult m_vr; - QString m_auditLog; - GpgME::Error m_auditLogError; GpgME::Key m_key; }; class VerifyOpaqueBodyPartMemento - : public QObject, - public KMail::Interface::BodyPartMemento, - public KMail::ISubject + : public CryptoBodyPartMemento { Q_OBJECT public: @@ -170,18 +166,11 @@ const QByteArray & signature ); ~VerifyOpaqueBodyPartMemento(); - /* reimp */ Interface::Observer * asObserver() { return 0; } - /* reimp */ Interface::Observable * asObservable() { return this; } - bool start(); void exec(); - bool isRunning() const { return m_running; } - const QByteArray & plainText() const { return m_plainText; } const GpgME::VerificationResult & verifyResult() const { return m_vr; } - const QString & auditLogAsHtml() const { return m_auditLog; } - GpgME::Error auditLogError() const { return m_auditLogError; } const GpgME::Key & signingKey() const { return m_key; } private slots: @@ -189,9 +178,6 @@ const QByteArray & plainText ); void slotKeyListJobDone(); void slotNextKey( const GpgME::Key & ); - void notify() { - ISubject::notify(); - } private: void saveResult( const GpgME::VerificationResult &, @@ -204,12 +190,9 @@ const QByteArray m_signature; QPointer m_job; QPointer m_keylistjob; - bool m_running; // output: GpgME::VerificationResult m_vr; QByteArray m_plainText; - QString m_auditLog; - GpgME::Error m_auditLogError; GpgME::Key m_key; }; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/partNode.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/partNode.cpp --- kde-nightly-kdepim-20091006+svn1032120/kmail/partNode.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/partNode.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -181,7 +181,8 @@ #ifndef NDEBUG void partNode::dump( int chars ) const { kDebug() << QString().fill( ' ', chars ) <<"+" - << typeString() << '/' << subTypeString() << " embedded:" << mDisplayedEmbedded; + << typeString() << '/' << subTypeString() << " embedded:" << mDisplayedEmbedded + << " address:" << this; if ( mChild ) mChild->dump( chars + 1 ); if ( mNext ) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kmail/partNode.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kmail/partNode.h --- kde-nightly-kdepim-20091006+svn1032120/kmail/partNode.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kmail/partNode.h 2009-10-09 23:30:58.000000000 +0100 @@ -212,7 +212,7 @@ mMimePartTreeItem = item; } - KMMimePartTreeItem* mimePartTreeItem() { + KMMimePartTreeItem* mimePartTreeItem() const { return mMimePartTreeItem; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kontact/plugins/summary/summaryview_part.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kontact/plugins/summary/summaryview_part.cpp --- kde-nightly-kdepim-20091006+svn1032120/kontact/plugins/summary/summaryview_part.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kontact/plugins/summary/summaryview_part.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -19,8 +19,9 @@ You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Boston, MA 02110-1301, USA. */ + #include "summaryview_part.h" #include @@ -156,27 +157,28 @@ QList::ConstIterator it = plugins.constBegin(); for ( ; it != end; ++it ) { KontactInterface::Plugin *plugin = *it; - if ( activeSummaries.contains( plugin->identifier() ) ) { - KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame ); + if ( !activeSummaries.contains( plugin->identifier() ) ) { + continue; + } - if ( summary ) { - if ( summary->summaryHeight() > 0 ) { - mSummaries.insert( plugin->identifier(), summary ); - - connect( summary, SIGNAL(message(const QString&)), - BroadcastStatus::instance(), SLOT(setStatusMsg(const QString&)) ); - connect( summary, SIGNAL(summaryWidgetDropped(QWidget*,QWidget*,int)), - this, SLOT(summaryWidgetMoved(QWidget*,QWidget*,int)) ); - - if ( !mLeftColumnSummaries.contains( plugin->identifier() ) && - !mRightColumnSummaries.contains( plugin->identifier() ) ) { - mLeftColumnSummaries.append( plugin->identifier() ); - } - - loadedSummaries.append( plugin->identifier() ); - } else { - summary->hide(); + KontactInterface::Summary *summary = plugin->createSummaryWidget( mFrame ); + if ( summary ) { + if ( summary->summaryHeight() > 0 ) { + mSummaries.insert( plugin->identifier(), summary ); + + connect( summary, SIGNAL(message(const QString&)), + BroadcastStatus::instance(), SLOT(setStatusMsg(const QString&)) ); + connect( summary, SIGNAL(summaryWidgetDropped(QWidget*,QWidget*,int)), + this, SLOT(summaryWidgetMoved(QWidget*,QWidget*,int)) ); + + if ( !mLeftColumnSummaries.contains( plugin->identifier() ) && + !mRightColumnSummaries.contains( plugin->identifier() ) ) { + mLeftColumnSummaries.append( plugin->identifier() ); } + + loadedSummaries.append( plugin->identifier() ); + } else { + summary->hide(); } } } @@ -229,8 +231,13 @@ mRightColumn->addWidget( mSummaries[ *strIt ] ); } } - QSpacerItem *lspacer = new QSpacerItem( 1, 1000 ); - QSpacerItem *rspacer = new QSpacerItem( 1, 1000 ); + + QSpacerItem *lspacer = new QSpacerItem( 1, 10, + QSizePolicy::MinimumExpanding, + QSizePolicy::MinimumExpanding ); + QSpacerItem *rspacer = new QSpacerItem( 1, 10, + QSizePolicy::MinimumExpanding, + QSizePolicy::MinimumExpanding ); mLeftColumn->addSpacerItem( lspacer ); mRightColumn->addSpacerItem( rspacer ); diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/kontact/src/Kontact.desktop /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/kontact/src/Kontact.desktop --- kde-nightly-kdepim-20091006+svn1032120/kontact/src/Kontact.desktop 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/kontact/src/Kontact.desktop 2009-10-09 23:30:58.000000000 +0100 @@ -122,5 +122,6 @@ X-KDE-StartupNotify=true X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.kontact +X-KDE-ServiceTypes=DBUS/ResourceBackend/IMAP Categories=Qt;KDE;Office;ProjectManagement; X-DocPath=kontact/index.html diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/korganizer/interfaces/calendar/calendardecoration.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/korganizer/interfaces/calendar/calendardecoration.h --- kde-nightly-kdepim-20091006+svn1032120/korganizer/interfaces/calendar/calendardecoration.h 2009-10-06 23:28:12.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/korganizer/interfaces/calendar/calendardecoration.h 2009-10-09 23:31:07.000000000 +0100 @@ -98,11 +98,11 @@ virtual KUrl url(); Q_SIGNALS: - virtual void gotNewPixmap( const QPixmap & ) const; - virtual void gotNewShortText( const QString & ) const; - virtual void gotNewLongText( const QString & ) const; - virtual void gotNewExtensiveText( const QString & ) const; - virtual void gotNewUrl( const KUrl & ) const; + void gotNewPixmap( const QPixmap & ) const; + void gotNewShortText( const QString & ) const; + void gotNewLongText( const QString & ) const; + void gotNewExtensiveText( const QString & ) const; + void gotNewUrl( const KUrl & ) const; protected: QString mId; diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/korganizer/kcmconfigs/korganizer_configfreebusy.desktop /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/korganizer/kcmconfigs/korganizer_configfreebusy.desktop --- kde-nightly-kdepim-20091006+svn1032120/korganizer/kcmconfigs/korganizer_configfreebusy.desktop 2009-10-06 23:28:12.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/korganizer/kcmconfigs/korganizer_configfreebusy.desktop 2009-10-09 23:31:08.000000000 +0100 @@ -18,7 +18,7 @@ Name[ca]=Lliure/ocupat Name[cs]=Aktivita Name[cy]=Rhydd/Prysur -Name[da]=Fri/Optaget +Name[da]=Ledig/optaget Name[de]=Frei/Belegt Name[el]=Free/Busy Name[en_GB]=Free/Busy @@ -75,7 +75,7 @@ Comment[ca]=Configuració de Lliure/ocupat per a KOrganizer Comment[cs]=Nastavení aktivity pro KOrganizer Comment[cy]=Ffurfweddiad Rhydd/Prysur KTrefnydd -Comment[da]=KOrganizer Fri/Optaget-indstilling +Comment[da]=KOrganizer indstilling af ledig/optaget Comment[de]=Frei/Belegt-Festlegung für KOrganizer Comment[el]=Ρυθμίσεις KOrganizer Free/Busy Comment[en_GB]=KOrganizer Free/Busy Configuration diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/korganizer/views/agendaview/koagendaview.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/korganizer/views/agendaview/koagendaview.cpp --- kde-nightly-kdepim-20091006+svn1032120/korganizer/views/agendaview/koagendaview.cpp 2009-10-06 23:28:12.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/korganizer/views/agendaview/koagendaview.cpp 2009-10-09 23:31:08.000000000 +0100 @@ -1525,7 +1525,7 @@ void KOAgendaView::setHolidayMasks() { - if ( mSelectedDates.isEmpty() ) { + if ( mSelectedDates.isEmpty() || !mSelectedDates[0].isValid() ) { return; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/ktimetracker/csvexportdialog_base.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/ktimetracker/csvexportdialog_base.ui --- kde-nightly-kdepim-20091006+svn1032120/ktimetracker/csvexportdialog_base.ui 2009-10-06 23:28:12.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/ktimetracker/csvexportdialog_base.ui 2009-10-09 23:31:09.000000000 +0100 @@ -43,7 +43,7 @@ - The file where Karm will write the data. + The file where KTimeTracker will write the data. diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/libkdepim/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/libkdepim/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/libkdepim/CMakeLists.txt 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/libkdepim/CMakeLists.txt 2009-10-09 23:30:57.000000000 +0100 @@ -1,3 +1,4 @@ +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) @@ -69,7 +70,6 @@ distributionlist.cpp sendsmsdialog.cpp categoryhierarchyreader.cpp - messagestatus.cpp kmailcompletion.cpp kmeditor.cpp autochecktreewidget.cpp @@ -81,7 +81,11 @@ QT4_ADD_DBUS_INTERFACE(kdepim_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/korgac/org.kde.korganizer.KOrgac.xml korganizer_korgac_interface ) -kde4_add_ui_files(kdepim_LIB_SRCS categoryselectdialog_base.ui categoryeditdialog_base.ui addresspicker.ui) +kde4_add_ui_files(kdepim_LIB_SRCS + categoryselectdialog_base.ui + categoryeditdialog_base.ui + addresspicker.ui +) kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS}) @@ -100,6 +104,7 @@ ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} + ${KDEPIMLIBS_KMIME_LIBS} ) target_link_libraries(kdepim LINK_INTERFACE_LIBRARIES diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/libkdepim/ldapclient.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/libkdepim/ldapclient.cpp --- kde-nightly-kdepim-20091006+svn1032120/libkdepim/ldapclient.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/libkdepim/ldapclient.cpp 2009-10-09 23:30:57.000000000 +0100 @@ -62,6 +62,7 @@ void LdapClient::setAttrs( const QStringList& attrs ) { mAttrs = attrs; + mAttrs << "objectClass"; // via objectClass we detect distribution lists } void LdapClient::startQuery( const QString& filter ) @@ -368,8 +369,7 @@ readWeighForClient( ldapClient, config, j ); QStringList attrs; - // note: we need "objectClass" to detect distribution lists - attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass"; + attrs << "cn" << "mail" << "givenname" << "sn"; ldapClient->setAttrs( attrs ); connect( ldapClient, SIGNAL( result( const KPIM::LdapClient&, const KLDAP::LdapObject& ) ), diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/libkdepim/ldapsearchdialog.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/libkdepim/ldapsearchdialog.cpp --- kde-nightly-kdepim-20091006+svn1032120/libkdepim/ldapsearchdialog.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/libkdepim/ldapsearchdialog.cpp 2009-10-09 23:30:57.000000000 +0100 @@ -462,13 +462,19 @@ for ( int i = 0; i < mResultListView->topLevelItemCount(); i++ ) { ContactListItem *cli = static_cast( mResultListView->topLevelItem( i ) ); if ( cli->isSelected() ) { - QString email = asUtf8( cli->mAttrs[ "mail" ].first() ).trimmed(); - if ( !email.isEmpty() ) { - QString name = asUtf8( cli->mAttrs[ "cn" ].first() ).trimmed(); - if ( name.isEmpty() ) { - result << email; - } else { - result << name + " <" + email + '>'; + const KLDAP::LdapAttrValue &mailAttrs = cli->mAttrs[ "mail" ]; + if ( mailAttrs.size() >= 1 ) { + QString email = asUtf8( mailAttrs.first() ).trimmed(); + if ( !email.isEmpty() ) { + const KLDAP::LdapAttrValue &nameAttrs = cli->mAttrs[ "cn" ]; + if ( nameAttrs.size() > 1 ) { + QString name = asUtf8( nameAttrs.first() ).trimmed(); + if ( name.isEmpty() ) { + result << email; + } else { + result << name + " <" + email + '>'; + } + } } } } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/libkdepim/messagestatus.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/libkdepim/messagestatus.cpp --- kde-nightly-kdepim-20091006+svn1032120/libkdepim/messagestatus.cpp 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/libkdepim/messagestatus.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,799 +0,0 @@ -/* - This file is part of KDEPIM. - Copyright (c) 2003 Andreas Gungl - - KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - KMail is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - In addition, as a special exception, the copyright holders give - permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked - combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to - your version of the file, but you are not obligated to do so. If - you do not wish to do so, delete this exception statement from - your version. -*/ - -#include "messagestatus.h" - -#include -#include - -using namespace KPIM; - -/** The message status format. These can be or'd together. - Note, that the KMMsgStatusIgnored implies the - status to be Read even if the flags are set - to Unread or New. This is done in isRead() - and related getters. So we can preserve the state - when switching a thread to Ignored and back. */ -enum MsgStatus { - KMMsgStatusUnknown = 0x00000000, - KMMsgStatusNew = 0x00000001, - KMMsgStatusUnread = 0x00000002, - KMMsgStatusRead = 0x00000004, - KMMsgStatusOld = 0x00000008, - KMMsgStatusDeleted = 0x00000010, - KMMsgStatusReplied = 0x00000020, - KMMsgStatusForwarded = 0x00000040, - KMMsgStatusQueued = 0x00000080, - KMMsgStatusSent = 0x00000100, - KMMsgStatusFlag = 0x00000200, // flag means important - KMMsgStatusWatched = 0x00000400, - KMMsgStatusIgnored = 0x00000800, // forces isRead() - KMMsgStatusToAct = 0x00001000, - KMMsgStatusSpam = 0x00002000, - KMMsgStatusHam = 0x00004000, - KMMsgStatusHasAttach = 0x00008000 -}; - -MessageStatus::MessageStatus() -{ - mStatus = KMMsgStatusUnknown; -} - -MessageStatus &MessageStatus::operator = ( const MessageStatus &other ) -{ - mStatus = other.mStatus; - return *this; -} - -bool MessageStatus::operator == ( const MessageStatus &other ) const -{ - return ( mStatus == other.mStatus ); -} - -bool MessageStatus::operator != ( const MessageStatus &other ) const -{ - return ( mStatus != other.mStatus ); -} - -bool MessageStatus::operator & ( const MessageStatus &other ) const -{ - return ( mStatus & other.mStatus ); -} - -void MessageStatus::clear() -{ - mStatus = KMMsgStatusUnknown; -} - -void MessageStatus::set( const MessageStatus &other ) -{ - // Those stati are exclusive, but we have to lock at the - // internal representation because Ignored can manipulate - // the result of the getter methods. - if ( other.mStatus & KMMsgStatusNew ) { - setNew(); - } - if ( other.mStatus & KMMsgStatusUnread ) { - setUnread(); - } - if ( other.mStatus & KMMsgStatusRead ) { - setRead(); - } - if ( other.mStatus & KMMsgStatusOld ) { - setOld(); - } - - if ( other.isDeleted() ) { - setDeleted(); - } - if ( other.isReplied() ) { - setReplied(); - } - if ( other.isForwarded() ) { - setForwarded(); - } - if ( other.isQueued() ) { - setQueued(); - } - if ( other.isSent() ) { - setSent(); - } - if ( other.isImportant() ) { - setImportant(); - } - - if ( other.isWatched() ) { - setWatched(); - } - if ( other.isIgnored() ) { - setIgnored(); - } - if ( other.isToAct() ) { - setToAct(); - } - if ( other.isSpam() ) { - setSpam(); - } - if ( other.isHam() ) { - setHam(); - } - if ( other.hasAttachment() ) { - setHasAttachment(); - } -} - -void MessageStatus::toggle( const MessageStatus &other ) -{ - if ( other.isDeleted() ) { - setDeleted( !( mStatus & KMMsgStatusDeleted ) ); - } - if ( other.isReplied() ) { - setReplied( !( mStatus & KMMsgStatusReplied ) ); - } - if ( other.isForwarded() ) { - setForwarded( !( mStatus & KMMsgStatusForwarded ) ); - } - if ( other.isQueued() ) { - setQueued( !( mStatus & KMMsgStatusQueued ) ); - } - if ( other.isSent() ) { - setSent( !( mStatus & KMMsgStatusSent ) ); - } - if ( other.isImportant() ) { - setImportant( !( mStatus & KMMsgStatusFlag ) ); - } - - if ( other.isWatched() ) { - setWatched( !( mStatus & KMMsgStatusWatched ) ); - } - if ( other.isIgnored() ) { - setIgnored( !( mStatus & KMMsgStatusIgnored ) ); - } - if ( other.isToAct() ) { - setToAct( !( mStatus & KMMsgStatusToAct ) ); - } - if ( other.isSpam() ) { - setSpam( !( mStatus & KMMsgStatusSpam ) ); - } - if ( other.isHam() ) { - setHam( !( mStatus & KMMsgStatusHam ) ); - } - if ( other.hasAttachment() ) { - setHasAttachment( !( mStatus & KMMsgStatusHasAttach ) ); - } -} - -bool MessageStatus::isOfUnknownStatus() const -{ - return ( mStatus == KMMsgStatusUnknown ); -} - -bool MessageStatus::isNew() const -{ - return ( mStatus & KMMsgStatusNew && !( mStatus & KMMsgStatusIgnored ) ); -} - -bool MessageStatus::isUnread() const -{ - return ( mStatus & KMMsgStatusUnread && !( mStatus & KMMsgStatusIgnored ) ); -} - -bool MessageStatus::isRead() const -{ - return ( mStatus & KMMsgStatusRead || mStatus & KMMsgStatusIgnored ); -} - -bool MessageStatus::isOld() const -{ - return ( mStatus & KMMsgStatusOld ); -} - -bool MessageStatus::isDeleted() const -{ - return ( mStatus & KMMsgStatusDeleted ); -} - -bool MessageStatus::isReplied() const -{ - return ( mStatus & KMMsgStatusReplied ); -} - -bool MessageStatus::isForwarded() const -{ - return ( mStatus & KMMsgStatusForwarded ); -} - -bool MessageStatus::isQueued() const -{ - return ( mStatus & KMMsgStatusQueued ); -} - -bool MessageStatus::isSent() const -{ - return ( mStatus & KMMsgStatusSent ); -} - -bool MessageStatus::isImportant() const -{ - return ( mStatus & KMMsgStatusFlag ); -} - -bool MessageStatus::isWatched() const -{ - return ( mStatus & KMMsgStatusWatched ); -} - -bool MessageStatus::isIgnored() const -{ - return ( mStatus & KMMsgStatusIgnored ); -} - -bool MessageStatus::isToAct() const -{ - return ( mStatus & KMMsgStatusToAct ); -} - -bool MessageStatus::isSpam() const -{ - return ( mStatus & KMMsgStatusSpam ); -} - -bool MessageStatus::isHam() const -{ - return ( mStatus & KMMsgStatusHam ); -} - -bool MessageStatus::hasAttachment() const -{ - return ( mStatus & KMMsgStatusHasAttach ); -} - -void MessageStatus::setNew() -{ - // new overrides old and read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusNew; -} - -void MessageStatus::setUnread() -{ - // unread overrides read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusUnread; -} - -void MessageStatus::setRead() -{ - // Unset unread and new, set read - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusRead; -} - -void MessageStatus::setOld() -{ - // old can't be new or unread - mStatus &= ~KMMsgStatusNew; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusOld; -} - -void MessageStatus::setDeleted( bool deleted ) -{ - if ( deleted ) { - mStatus |= KMMsgStatusDeleted; - } else { - mStatus &= ~KMMsgStatusDeleted; - } -} - -void MessageStatus::setReplied( bool replied ) -{ - if ( replied ) { - mStatus |= KMMsgStatusReplied; - } else { - mStatus &= ~KMMsgStatusReplied; - } -} - -void MessageStatus::setForwarded( bool forwarded ) -{ - if ( forwarded ) { - mStatus |= KMMsgStatusForwarded; - } else { - mStatus &= ~KMMsgStatusForwarded; - } -} - -void MessageStatus::setQueued( bool queued ) -{ - if ( queued ) { - mStatus |= KMMsgStatusQueued; - } else { - mStatus &= ~KMMsgStatusQueued; - } -} - -void MessageStatus::setSent( bool sent ) -{ - if ( sent ) { - mStatus &= ~KMMsgStatusQueued; - // FIXME to be discussed if sent messages are Read - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusSent; - } else { - mStatus &= ~KMMsgStatusSent; - } -} - -void MessageStatus::setImportant( bool important ) -{ - if ( important ) { - mStatus |= KMMsgStatusFlag; - } else { - mStatus &= ~KMMsgStatusFlag; - } -} - -// Watched and ignored are mutually exclusive -void MessageStatus::setWatched( bool watched ) -{ - if ( watched ) { - mStatus &= ~KMMsgStatusIgnored; - mStatus |= KMMsgStatusWatched; - } else { - mStatus &= ~KMMsgStatusWatched; - } -} - -void MessageStatus::setIgnored( bool ignored ) -{ - if ( ignored ) { - mStatus &= ~KMMsgStatusWatched; - mStatus |= KMMsgStatusIgnored; - } else { - mStatus &= ~KMMsgStatusIgnored; - } -} - -void MessageStatus::setToAct( bool toAct ) -{ - if ( toAct ) { - mStatus |= KMMsgStatusToAct; - } else { - mStatus &= ~KMMsgStatusToAct; - } -} - -// Ham and Spam are mutually exclusive -void MessageStatus::setSpam( bool spam ) -{ - if ( spam ) { - mStatus &= ~KMMsgStatusHam; - mStatus |= KMMsgStatusSpam; - } else { - mStatus &= ~KMMsgStatusSpam; - } -} - -void MessageStatus::setHam( bool ham ) -{ - if ( ham ) { - mStatus &= ~KMMsgStatusSpam; - mStatus |= KMMsgStatusHam; - } else { - mStatus &= ~KMMsgStatusHam; - } -} - -void MessageStatus::setHasAttachment( bool withAttachment ) -{ - if ( withAttachment ) { - mStatus |= KMMsgStatusHasAttach; - } else { - mStatus &= ~KMMsgStatusHasAttach; - } -} - -qint32 MessageStatus::toQInt32() const -{ - return mStatus; -} - -void MessageStatus::fromQInt32( qint32 status ) -{ - mStatus = status; -} - -QString MessageStatus::getStatusStr() const -{ - QString sstr; - if ( mStatus & KMMsgStatusNew ) { - sstr += 'N'; - } - if ( mStatus & KMMsgStatusUnread ) { - sstr += 'U'; - } - if ( mStatus & KMMsgStatusOld ) { - sstr += 'O'; - } - if ( mStatus & KMMsgStatusRead ) { - sstr += 'R'; - } - if ( mStatus & KMMsgStatusDeleted ) { - sstr += 'D'; - } - if ( mStatus & KMMsgStatusReplied ) { - sstr += 'A'; - } - if ( mStatus & KMMsgStatusForwarded ) { - sstr += 'F'; - } - if ( mStatus & KMMsgStatusQueued ) { - sstr += 'Q'; - } - if ( mStatus & KMMsgStatusToAct ) { - sstr += 'K'; - } - if ( mStatus & KMMsgStatusSent ) { - sstr += 'S'; - } - if ( mStatus & KMMsgStatusFlag ) { - sstr += 'G'; - } - if ( mStatus & KMMsgStatusWatched ) { - sstr += 'W'; - } - if ( mStatus & KMMsgStatusIgnored ) { - sstr += 'I'; - } - if ( mStatus & KMMsgStatusSpam ) { - sstr += 'P'; - } - if ( mStatus & KMMsgStatusHam ) { - sstr += 'H'; - } - if ( mStatus & KMMsgStatusHasAttach ) { - sstr += 'T'; - } - - return sstr; -} - -void MessageStatus::setStatusFromStr( QString aStr ) -{ - mStatus = KMMsgStatusUnknown; - - if ( aStr.contains( 'N' ) ) { - setNew(); - } - if ( aStr.contains( 'U' ) ) { - setUnread(); - } - if ( aStr.contains( 'O' ) ) { - setOld(); - } - if ( aStr.contains( 'R' ) ) { - setRead(); - } - if ( aStr.contains( 'D' ) ) { - setDeleted(); - } - if ( aStr.contains( 'A' ) ) { - setReplied(); - } - if ( aStr.contains( 'F' ) ) { - setForwarded(); - } - if ( aStr.contains( 'Q' ) ) { - setQueued(); - } - if ( aStr.contains( 'K' ) ) { - setToAct(); - } - if ( aStr.contains( 'S' ) ) { - setSent(); - } - if ( aStr.contains( 'G' ) ) { - setImportant(); - } - if ( aStr.contains( 'W' ) ) { - setWatched(); - } - if ( aStr.contains( 'I' ) ) { - setIgnored(); - } - if ( aStr.contains( 'P' ) ) { - setSpam(); - } - if ( aStr.contains( 'H' ) ) { - setHam(); - } - if ( aStr.contains( 'T' ) ) { - setHasAttachment(); - } - if ( aStr.contains( 'C' ) ) { - setHasAttachment( false ); - } -} - -QString MessageStatus::getSortRank() const -{ - QString sstr = "bcbbbbbbbb"; - - // put watched ones first, then normal ones, ignored ones last - if ( mStatus & KMMsgStatusWatched ) { - sstr[0] = 'a'; - } - if ( mStatus & KMMsgStatusIgnored ) { - sstr[0] = 'c'; - } - - // Second level. One of new, old, read, unread - if ( mStatus & KMMsgStatusNew ) { - sstr[1] = 'a'; - } - if ( mStatus & KMMsgStatusUnread ) { - sstr[1] = 'b'; - } - //if ( mStatus & KMMsgStatusOld ) { - // sstr[1] = 'c'; - //} - //if ( mStatus & KMMsgStatusRead ) { - // sstr[1] = 'c'; - //} - - // Third level. In somewhat arbitrary order. - if ( mStatus & KMMsgStatusDeleted ) { - sstr[2] = 'a'; - } - if ( mStatus & KMMsgStatusFlag ) { - sstr[3] = 'a'; - } - if ( mStatus & KMMsgStatusReplied ) { - sstr[4] = 'a'; - } - if ( mStatus & KMMsgStatusForwarded ) { - sstr[5] = 'a'; - } - if ( mStatus & KMMsgStatusQueued ) { - sstr[6] = 'a'; - } - if ( mStatus & KMMsgStatusSent ) { - sstr[7] = 'a'; - } - if ( mStatus & KMMsgStatusHam ) { - sstr[8] = 'a'; - } - if ( mStatus & KMMsgStatusSpam ) { - sstr[8] = 'c'; - } - if ( mStatus & KMMsgStatusToAct ) { - sstr[9] = 'a'; - } - - return sstr; -} - -QSet MessageStatus::getStatusFlags() const -{ - QSet flags; - - // Non handled status: - // * KMMsgStatusQueued - // * KMMsgStatusSent - // * KMMsgStatusSpam - // * KMMsgStatusHam - // * KMMsgStatusHasAttach - - if ( mStatus & KMMsgStatusDeleted ) { - flags+= "\\DELETED"; - } else { - if ( mStatus & ( KMMsgStatusOld | KMMsgStatusRead ) ) - flags+= "\\SEEN "; - if ( mStatus & KMMsgStatusReplied ) - flags+= "\\ANSWERED "; - if ( mStatus & KMMsgStatusFlag ) - flags+= "\\FLAGGED "; - // non standard flags - if ( mStatus & KMMsgStatusForwarded ) - flags+= "$FORWARDED "; - if ( mStatus & KMMsgStatusToAct ) - flags+= "$TODO "; - if ( mStatus & KMMsgStatusWatched ) - flags+= "$WATCHED "; - if ( mStatus & KMMsgStatusIgnored ) - flags+= "$IGNORED "; - } - - return flags; -} - -void MessageStatus::setStatusFromFlags( const QSet &flags ) -{ - mStatus = KMMsgStatusUnknown; - setNew(); - - // Non handled status: - // * KMMsgStatusQueued - // * KMMsgStatusSent - // * KMMsgStatusSpam - // * KMMsgStatusHam - // * KMMsgStatusHasAttach - - foreach ( const QByteArray &flag, flags ) { - if ( flag.toUpper() == QByteArray( "\\DELETED" ) ) { - setDeleted(); - } else if ( flag.toUpper() == QByteArray( "\\SEEN" ) ) { - setRead(); - } else if ( flag.toUpper() == QByteArray( "\\ANSWERED" ) ) { - setReplied(); - } else if ( flag.toUpper() == QByteArray( "\\FLAGGED" ) ) { - setImportant(); - - // non standard flags - } else if ( flag.toUpper() == QByteArray( "$FORWARDED" ) ) { - setForwarded(); - } else if ( flag.toUpper() == QByteArray( "$TODO" ) ) { - setToAct(); - } else if ( flag.toUpper() == QByteArray( "$WATCHED" ) ) { - setWatched(); - } else if ( flag.toUpper() == QByteArray( "$IGNORED" ) ) { - setIgnored(); - } else { - kWarning() << "Unknown flag:" << flag; - } - } -} - -MessageStatus MessageStatus::statusNew() -{ - MessageStatus st; - st.setNew(); - return st; -} - -MessageStatus MessageStatus::statusRead() -{ - MessageStatus st; - st.setRead(); - return st; -} - -MessageStatus MessageStatus::statusUnread() -{ - MessageStatus st; - st.setUnread(); - return st; -} - -MessageStatus MessageStatus::statusNewAndUnread() -{ - MessageStatus st; - // set the "new and unread" pseudo status; we have to set the internal - // representation directly because new and unread are mutually exclusive - st.fromQInt32( statusNew().toQInt32() | statusUnread().toQInt32() ); - return st; -} - -MessageStatus MessageStatus::statusOld() -{ - MessageStatus st; - st.setOld(); - return st; -} - -MessageStatus MessageStatus::statusDeleted() -{ - MessageStatus st; - st.setDeleted(); - return st; -} - -MessageStatus MessageStatus::statusReplied() -{ - MessageStatus st; - st.setReplied(); - return st; -} - -MessageStatus MessageStatus::statusForwarded() -{ - MessageStatus st; - st.setForwarded(); - return st; -} - -MessageStatus MessageStatus::statusQueued() -{ - MessageStatus st; - st.setQueued(); - return st; -} - -MessageStatus MessageStatus::statusSent() -{ - MessageStatus st; - st.setSent(); - return st; -} - -MessageStatus MessageStatus::statusImportant() -{ - MessageStatus st; - st.setImportant(); - return st; -} - -MessageStatus MessageStatus::statusWatched() -{ - MessageStatus st; - st.setWatched(); - return st; -} - -MessageStatus MessageStatus::statusIgnored() -{ - MessageStatus st; - st.setIgnored(); - return st; -} - -MessageStatus MessageStatus::statusToAct() -{ - MessageStatus st; - st.setToAct(); - return st; -} - -MessageStatus MessageStatus::statusSpam() -{ - MessageStatus st; - st.setSpam(); - return st; -} - -MessageStatus MessageStatus::statusHam() -{ - MessageStatus st; - st.setHam(); - return st; -} - -MessageStatus MessageStatus::statusHasAttachment() -{ - MessageStatus st; - st.setHasAttachment(); - return st; -} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/libkdepim/messagestatus.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/libkdepim/messagestatus.h --- kde-nightly-kdepim-20091006+svn1032120/libkdepim/messagestatus.h 2009-10-06 23:28:04.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/libkdepim/messagestatus.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,419 +0,0 @@ -/* -*- mode: C++ -*- - This file is part of KDEPIM. - Copyright (c) 2005 Andreas Gungl - - KMail is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License, version 2, as - published by the Free Software Foundation. - - KMail is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - In addition, as a special exception, the copyright holders give - permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked - combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to - your version of the file, but you are not obligated to do so. If - you do not wish to do so, delete this exception statement from - your version. -*/ -#ifndef KDEPIM_MESSAGESTATUS_H -#define KDEPIM_MESSAGESTATUS_H - -#include - -#include "kdepim_export.h" - -class QString; - -namespace KPIM { - -//--------------------------------------------------------------------------- -/** - @short KDEPIM Message Status. - @author Andreas Gungl - - The class encapsulates the handling of the different flags - which describe the status of a message. - The flags itself are not intended to be used outside this class. - - In the status pairs Watched/Ignored and Spam/Ham, there both - values can't be set at the same time, however they can - be unset at the same time. - - The stati New/Unread/Read/Old are mutually exclusive. -*/ -class KDEPIM_EXPORT MessageStatus -{ - public: - /** Constructor - sets status initially to unknown. */ - MessageStatus(); - - /** Assign the status from another instance. The internal - representation is identical afterwards, i.e. a comparison - by operator == will return true. - */ - MessageStatus &operator = ( const MessageStatus &other ); - - /** Compare the status with that from another instance. - @return true if the stati are equal, false if different. - */ - bool operator == ( const MessageStatus &other ) const; - - /** Compare the status with that from another instance. - @return true if the stati are equal, false if different. - */ - bool operator != ( const MessageStatus &other ) const; - - /** Check, if some of the flags in the status match - with those flags from another instance. - @return true if at least one flag is set in both stati. - */ - bool operator & ( const MessageStatus &other ) const; - - /** Clear all status flags, this resets to unknown. */ - void clear(); - - /** Set / add stati described by another MessageStatus object. - This can be used to merge in multiple stati at once without - using the single setter methods. - However, internally the setters are used anyway to ensure the - integrity of the resulting status. - */ - void set( const MessageStatus &other ); - - /** Toggle one or more stati described by another MessageStatus object. - Internally the setters are used to ensure the integrity of the - resulting status. - Toggling of the stati New, Unread, Read and Old is not supported. - These stati are completely ignored. - */ - void toggle( const MessageStatus &other ); - - /* ----- getters ----------------------------------------------------- */ - - /** Check for Unknown status. - @return true if status is unknown. - */ - bool isOfUnknownStatus() const; - - /** Check for New status. Ignored messages are not new. - @return true if status is new. - */ - bool isNew() const; - - /** Check for Unread status. Note that new messages are not unread. - Ignored messages are not unread as well. - @return true if status is unread. - */ - bool isUnread() const; - - /** Check for Read status. Note that ignored messages are read. - @return true if status is read. - */ - bool isRead() const; - - /** Check for Old status. - @return true if status is old. - */ - bool isOld() const; - - /** Check for Deleted status. - @return true if status is deleted. - */ - bool isDeleted() const; - - /** Check for Replied status. - @return true if status is replied. - */ - bool isReplied() const; - - /** Check for Forwarded status. - @return true if status is forwarded. - */ - bool isForwarded() const; - - /** Check for Queued status. - @return true if status is queued. - */ - bool isQueued() const; - - /** Check for Sent status. - @return true if status is sent. - */ - bool isSent() const; - - /** Check for Important status. - @return true if status is important. - */ - bool isImportant() const; - - /** Check for Watched status. - @return true if status is watched. - */ - bool isWatched() const; - - /** Check for Ignored status. - @return true if status is ignored. - */ - bool isIgnored() const; - - /** Check for ToAct status. - @return true if status is action item. - */ - bool isToAct() const; - - /** Check for Spam status. - @return true if status is spam. - */ - bool isSpam() const; - - /** Check for Ham status. - @return true if status is not spam. - */ - bool isHam() const; - - /** Check for Attachment status. - @return true if status indicates an attachment. - */ - bool hasAttachment() const; - - /* ----- setters ----------------------------------------------------- */ - - /** Set the status to new. */ - void setNew(); - - /** Set the status to unread. */ - void setUnread(); - - /** Set the status to read. */ - void setRead(); - - /** Set the status to old. */ - void setOld(); - - /** Set the status for deleted. - @param deleted Set (true) or unset (false) this status flag. - */ - void setDeleted( bool deleted = true ); - - /** Set the status for replied. - @param replied Set (true) or unset (false) this status flag. - */ - void setReplied( bool replied = true ); - - /** Set the status for forwarded. - @param forwarded Set (true) or unset (false) this status flag. - */ - void setForwarded( bool forwarded = true ); - - /** Set the status for queued. - @param queued Set (true) or unset (false) this status flag. - */ - void setQueued( bool queued = true ); - - /** Set the status for sent. - @param sent Set (true) or unset (false) this status flag. - */ - void setSent( bool sent = true ); - - /** Set the status for important. - @param important Set (true) or unset (false) this status flag. - */ - void setImportant( bool important = true ); - - /** Set the status to watched. - @param watched Set (true) or unset (false) this status flag. - */ - void setWatched( bool watched = true ); - - /** Set the status to ignored. - @param ignored Set (true) or unset (false) this status flag. - */ - void setIgnored( bool ignored = true ); - - /** Set the status to action item. - @param toAct Set (true) or unset (false) this status flag. - */ - void setToAct( bool toAct = true ); - - /** Set the status to spam. - @param spam Set (true) or unset (false) this status flag. - */ - void setSpam( bool spam = true ); - - /** Set the status to not spam. - @param ham Set (true) or unset (false) this status flag. - */ - void setHam( bool ham = true ); - - /** Set the status for an attachment. - @param withAttechment Set (true) or unset (false) this status flag. - */ - void setHasAttachment( bool withAttachment = true ); - - /* ----- state representation --------------------------------------- */ - - /** Get the status as a whole e.g. for storage in an index. - Don't manipulte the index via this value, this bypasses - all integrity checks in the setter methods. - @return The status encoded in bits. - */ - qint32 toQInt32() const; - - /** Set the status as a whole e.g. for reading from an index. - Don't manipulte the index via this value, this bypasses - all integrity checks in the setter methods. - @param status The status encoded in bits to be set in this instance. - */ - void fromQInt32( qint32 status ); - - /** Convert the status to a string representation. - @return A string containing coded uppercase letters - which describe the status. - */ - QString getStatusStr() const; - - /** Set the status based on a string representation. - @param aStr The status string to be analyzed. - Normally it is a string obtained using - getStatusStr(). - */ - void setStatusFromStr( QString aStr ); - - /** Convert the status to a string for sorting. - @return A string containing coded lowercase letters - which allows a predefined sorting by status. - */ - QString getSortRank() const; - - /** Get the status as a whole e.g. for storage as IMAP flags. - @return The status encoded in flags. - */ - QSet getStatusFlags() const; - - /** Set the status as a whole e.g. for reading from IMAP flags. - @param status The status encoded in bits to be set in this instance. - */ - void setStatusFromFlags( const QSet &flags ); - - /* ----- static accessors to simple states --------------------------- */ - - /** Return a predefined status initialized as New as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as New. - */ - static MessageStatus statusNew(); - - /** Return a predefined status initialized as Read as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Read. - */ - static MessageStatus statusRead(); - - /** Return a predefined status initialized as Unread as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Unread. - */ - static MessageStatus statusUnread(); - - /** Return a predefined status initialized as New and Unread as is - useful e.g. when searching for unread messages. - @return A reference to a status instance initialized as New | Unread. - */ - static MessageStatus statusNewAndUnread(); - - /** Return a predefined status initialized as Old as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Old. - */ - static MessageStatus statusOld(); - - /** Return a predefined status initialized as Deleted as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Deleted. - */ - static MessageStatus statusDeleted(); - - /** Return a predefined status initialized as Replied as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Replied. - */ - static MessageStatus statusReplied(); - - /** Return a predefined status initialized as Forwarded as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Forwarded. - */ - static MessageStatus statusForwarded(); - - /** Return a predefined status initialized as Queued as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Queued. - */ - static MessageStatus statusQueued(); - - /** Return a predefined status initialized as Sent as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Sent. - */ - static MessageStatus statusSent(); - - /** Return a predefined status initialized as Important as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Important. - */ - static MessageStatus statusImportant(); - - /** Return a predefined status initialized as Watched as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Watched. - */ - static MessageStatus statusWatched(); - - /** Return a predefined status initialized as Ignored as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Ignored. - */ - static MessageStatus statusIgnored(); - - /** Return a predefined status initialized as Action Item as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as ToAct. - */ - static MessageStatus statusToAct(); - - /** Return a predefined status initialized as Spam as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Spam. - */ - static MessageStatus statusSpam(); - - /** Return a predefined status initialized as Ham as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Ham. - */ - static MessageStatus statusHam(); - - /** Return a predefined status initialized as Attachment as is useful - e.g. when providing a state for comparison. - @return A reference to a status instance initialized as Attachment. - */ - static MessageStatus statusHasAttachment(); - - private: - qint32 mStatus; -}; - -} // namespace KPIM - -#endif /*KMAIL_MESSAGESTATUS_H*/ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentcompressjob.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentcompressjob.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentcompressjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentcompressjob.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,138 @@ +/* + Copyright (c) 2009 Constantin Berzan + + Based on KMail code by various authors. + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentcompressjob.h" + +#include + +#include +#include + +#include +#include +#include +#include + +using namespace KPIM; + +class KPIM::AttachmentCompressJob::Private +{ + public: + Private( AttachmentCompressJob *qq ); + + void doStart(); // slot + + AttachmentCompressJob *const q; + AttachmentPart::Ptr originalPart; + AttachmentPart::Ptr compressedPart; + bool compressedPartLarger; +}; + +AttachmentCompressJob::Private::Private( AttachmentCompressJob *qq ) + : q( qq ) + , compressedPartLarger( false ) +{ +} + +void AttachmentCompressJob::Private::doStart() +{ + Q_ASSERT( originalPart ); + QByteArray decoded = originalPart->data(); + + QByteArray array; + QBuffer dev( &array ); + KZip zip( &dev ); + if( !zip.open( QIODevice::WriteOnly ) ) { + q->setError( KJob::UserDefinedError ); + q->setErrorText( i18n( "Could not initiate attachment compression." ) ); + q->emitResult(); + return; + } + + // Compress. + zip.setCompression( KZip::DeflateCompression ); + if( !zip.writeFile( originalPart->name(), QString( /*user*/ ), QString( /*group*/ ), + decoded.data(), decoded.size() ) ) { + q->setError( KJob::UserDefinedError ); + q->setErrorText( i18n( "Could not compress the attachment." ) ); + q->emitResult(); + return; + } + zip.close(); + compressedPartLarger = ( array.size() >= decoded.size() ); + + // Create new part. + Q_ASSERT( compressedPart == 0 ); + compressedPart = AttachmentPart::Ptr( new AttachmentPart ); + compressedPart->setName( originalPart->name() + QString::fromLatin1( ".zip" ) ); // TODO not sure name should be .zipped too + compressedPart->setFileName( originalPart->fileName() + QString::fromLatin1( ".zip" ) ); + compressedPart->setDescription( originalPart->description() ); + compressedPart->setInline( originalPart->isInline() ); + compressedPart->setMimeType( "application/zip" ); + compressedPart->setCompressed( true ); + compressedPart->setEncrypted( originalPart->isEncrypted() ); + compressedPart->setSigned( originalPart->isSigned() ); + compressedPart->setData( array ); + q->emitResult(); // Success. + + // TODO consider adding a copy constructor to AttachmentPart. +} + + + +AttachmentCompressJob::AttachmentCompressJob( const AttachmentPart::Ptr &part, QObject *parent ) + : KJob( parent ) + , d( new Private( this ) ) +{ + d->originalPart = part; +} + +AttachmentCompressJob::~AttachmentCompressJob() +{ + delete d; +} + +void AttachmentCompressJob::start() +{ + QTimer::singleShot( 0, this, SLOT(doStart()) ); +} + +const AttachmentPart::Ptr AttachmentCompressJob::originalPart() const +{ + return d->originalPart; +} + +void AttachmentCompressJob::setOriginalPart( const AttachmentPart::Ptr part ) +{ + d->originalPart = part; +} + +AttachmentPart::Ptr AttachmentCompressJob::compressedPart() const +{ + return d->compressedPart; +} + +bool AttachmentCompressJob::isCompressedPartLarger() const +{ + return d->compressedPartLarger; +} + +#include "attachmentcompressjob.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentcompressjob.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentcompressjob.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentcompressjob.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentcompressjob.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,57 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTCOMPRESSJOB_H +#define KDEPIM_ATTACHMENTCOMPRESSJOB_H + +#include "attachmentpart.h" +#include "messagecore_export.h" + +#include + +namespace KPIM { + +/** +*/ +class MESSAGECORE_EXPORT AttachmentCompressJob : public KJob +{ + Q_OBJECT + + public: + explicit AttachmentCompressJob( const AttachmentPart::Ptr &part, QObject *parent = 0 ); + virtual ~AttachmentCompressJob(); + + virtual void start(); + + const AttachmentPart::Ptr originalPart() const; + void setOriginalPart( const AttachmentPart::Ptr part ); + /// does not delete it unless it failed... + AttachmentPart::Ptr compressedPart() const; + bool isCompressedPartLarger() const; + + private: + class Private; + friend class Private; + Private *const d; + Q_PRIVATE_SLOT( d, void doStart() ) +}; + +} // namespace KPIM + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfrommimecontentjob.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfrommimecontentjob.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfrommimecontentjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfrommimecontentjob.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,93 @@ +/* + Copyright (c) 2009 Constantin Berzan + + Based on KMail code by: + Copyright (c) 1997 Markus Wuebben + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentfrommimecontentjob.h" + +#include + +#include + +#include "kmime/kmime_content.h" + +using namespace KPIM; +using KMime::Content; + +class KPIM::AttachmentFromMimeContentJob::Private +{ + public: + const Content *mimeContent; + QByteArray data; +}; + + + +AttachmentFromMimeContentJob::AttachmentFromMimeContentJob( const Content *content, QObject *parent ) + : AttachmentLoadJob( parent ) + , d( new Private ) +{ + d->mimeContent = content; +} + +AttachmentFromMimeContentJob::~AttachmentFromMimeContentJob() +{ + delete d; +} + +const Content *AttachmentFromMimeContentJob::mimeContent() const +{ + return d->mimeContent; +} + +void AttachmentFromMimeContentJob::setMimeContent( const Content *content ) +{ + d->mimeContent = content; +} + +void AttachmentFromMimeContentJob::doStart() +{ + // Create the AttachmentPart. + Q_ASSERT( attachmentPart() == 0 ); + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + Content *content = const_cast( d->mimeContent ); + part->setData( content->decodedContent() ); + + // Get the details from the MIME headers. + if( content->contentType( false ) ) { + part->setMimeType( content->contentType()->mimeType() ); + part->setName( content->contentType()->name() ); + } + if( content->contentTransferEncoding( false ) ) { + part->setEncoding( content->contentTransferEncoding()->encoding() ); + } + if( content->contentDisposition( false ) ) { + part->setFileName( content->contentDisposition()->filename() ); + part->setInline( content->contentDisposition()->disposition() == KMime::Headers::CDinline ); + } + if( content->contentDescription( false ) ) { + part->setDescription( content->contentDescription()->asUnicodeString() ); + } + + setAttachmentPart( part ); + emitResult(); // Success. +} + +#include "attachmentfrommimecontentjob.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfrommimecontentjob.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfrommimecontentjob.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfrommimecontentjob.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfrommimecontentjob.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,56 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTFROMMIMECONTENTJOB_H +#define KDEPIM_ATTACHMENTFROMMIMECONTENTJOB_H + +#include "attachmentloadjob.h" +#include "messagecore_export.h" + +namespace KMime { + class Content; +} + +namespace KPIM { + +/** +*/ +class MESSAGECORE_EXPORT AttachmentFromMimeContentJob : public AttachmentLoadJob +{ + Q_OBJECT + + public: + explicit AttachmentFromMimeContentJob( const KMime::Content *content, QObject *parent = 0 ); + virtual ~AttachmentFromMimeContentJob(); + + const KMime::Content *mimeContent() const; + void setMimeContent( const KMime::Content *content ); + + protected slots: + virtual void doStart(); + + private: + class Private; + friend class Private; + Private *const d; +}; + +} // namespace KPIM + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfromurljob.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfromurljob.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfromurljob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfromurljob.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,161 @@ +/* + Copyright (c) 2009 Constantin Berzan + + Parts based on KMail code by various authors. + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentfromurljob.h" + +#include + +#include + +#include +#include +#include +#include +#include + +using namespace KPIM; + +class KPIM::AttachmentFromUrlJob::Private +{ + public: + Private( AttachmentFromUrlJob *qq ); + + void transferJobData( KIO::Job *job, const QByteArray &jobData ); + void transferJobResult( KJob *job ); + + AttachmentFromUrlJob *const q; + KUrl url; + qint64 maxSize; + QByteArray data; +}; + +AttachmentFromUrlJob::Private::Private( AttachmentFromUrlJob *qq ) + : q( qq ) + , maxSize( -1 ) +{ +} + +void AttachmentFromUrlJob::Private::transferJobData( KIO::Job *job, const QByteArray &jobData ) +{ + Q_UNUSED( job ); + data += jobData; + // TODO original code used a QBuffer; why? +} + +void AttachmentFromUrlJob::Private::transferJobResult( KJob *job ) +{ + if( job->error() ) { + // TODO this loses useful stuff from KIO, like detailed error descriptions, causes+solutions, + // ... use UiDelegate somehow? + q->setError( job->error() ); + q->setErrorText( job->errorString() ); + q->emitResult(); + return; + } + + Q_ASSERT( dynamic_cast( job ) ); + KIO::TransferJob *tjob = static_cast( job ); + + // Determine the MIME type and filename of the attachment. + QString mimeType = tjob->mimetype(); + kDebug() << "Mimetype is" << tjob->mimetype(); + QString filename = url.fileName(); + if( filename.isEmpty() ) { + filename = i18nc( "a file called 'unknown.ext'", "unknown%1", + KMimeType::mimeType( mimeType )->mainExtension() ); + } + + // Create the AttachmentPart. + Q_ASSERT( q->attachmentPart() == 0 ); // Not created before. + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + part->setCharset( url.fileEncoding().toLatin1() ); + part->setMimeType( mimeType.toLatin1() ); + part->setName( filename ); + part->setFileName( filename ); + part->setData( data ); + q->setAttachmentPart( part ); + q->emitResult(); // Success. +} + + + +AttachmentFromUrlJob::AttachmentFromUrlJob( const KUrl &url, QObject *parent ) + : AttachmentLoadJob( parent ) + , d( new Private( this ) ) +{ + d->url = url; +} + +AttachmentFromUrlJob::~AttachmentFromUrlJob() +{ + delete d; +} + +KUrl AttachmentFromUrlJob::url() const +{ + return d->url; +} + +void AttachmentFromUrlJob::setUrl( const KUrl &url ) +{ + d->url = url; +} + +qint64 AttachmentFromUrlJob::maximumAllowedSize() const +{ + return d->maxSize; +} + +void AttachmentFromUrlJob::setMaximumAllowedSize( qint64 size ) +{ + d->maxSize = size; +} + +void AttachmentFromUrlJob::doStart() +{ + if( !d->url.isValid() ) { + setError( KJob::UserDefinedError ); + setErrorText( i18n( "\"%1\" not found. Please specify the full path.", d->url.prettyUrl() ) ); + emitResult(); + return; + } + + if( d->maxSize != -1 && d->url.isLocalFile() ) { + const qint64 size = QFileInfo( d->url.toLocalFile() ).size(); + if( size > d->maxSize ) { + setError( KJob::UserDefinedError ); + setErrorText( i18n( "You may not attach files bigger than %1.", + KGlobal::locale()->formatByteSize( d->maxSize ) ) ); + emitResult(); + return; + } + } + + Q_ASSERT( d->data.isEmpty() ); // Not started twice. + KIO::TransferJob *tjob = KIO::get( d->url, KIO::NoReload, + ( uiDelegate() ? KIO::DefaultFlags : KIO::HideProgressInfo ) ); + KIO::Scheduler::scheduleJob( tjob ); + QObject::connect( tjob, SIGNAL(result(KJob*)), this, SLOT(transferJobResult(KJob*)) ); + QObject::connect( tjob, SIGNAL(data(KIO::Job*,QByteArray)), + this, SLOT(transferJobData(KIO::Job*,QByteArray)) ); +} + +#include "attachmentfromurljob.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfromurljob.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfromurljob.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentfromurljob.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentfromurljob.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,59 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTFROMURLJOB_H +#define KDEPIM_ATTACHMENTFROMURLJOB_H + +#include "attachmentloadjob.h" +#include "messagecore_export.h" + +#include + +namespace KPIM { + +/** +*/ +class MESSAGECORE_EXPORT AttachmentFromUrlJob : public AttachmentLoadJob +{ + Q_OBJECT + + public: + explicit AttachmentFromUrlJob( const KUrl &url = KUrl(), QObject *parent = 0 ); + virtual ~AttachmentFromUrlJob(); + + KUrl url() const; + void setUrl( const KUrl &url ); + qint64 maximumAllowedSize() const; + void setMaximumAllowedSize( qint64 size ); + + protected slots: + virtual void doStart(); + + private: + class Private; + friend class Private; + Private *const d; + + Q_PRIVATE_SLOT( d, void transferJobData( KIO::Job*, QByteArray ) ) + Q_PRIVATE_SLOT( d, void transferJobResult( KJob* ) ) +}; + +} // namespace KPIM + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentloadjob.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentloadjob.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentloadjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentloadjob.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,62 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentloadjob.h" + +#include + +#include + +using namespace KPIM; + +class KPIM::AttachmentLoadJob::Private +{ + public: + AttachmentPart::Ptr part; +}; + + + +AttachmentLoadJob::AttachmentLoadJob( QObject *parent ) + : KJob( parent ) + , d( new Private ) +{ +} + +AttachmentLoadJob::~AttachmentLoadJob() +{ + delete d; +} + +void AttachmentLoadJob::start() +{ + QTimer::singleShot( 0, this, SLOT(doStart()) ); +} + +AttachmentPart::Ptr AttachmentLoadJob::attachmentPart() const +{ + return d->part; +} + +void AttachmentLoadJob::setAttachmentPart( AttachmentPart::Ptr part ) +{ + d->part = part; +} + +#include "attachmentloadjob.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentloadjob.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentloadjob.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentloadjob.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentloadjob.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,58 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTLOADJOB_H +#define KDEPIM_ATTACHMENTLOADJOB_H + +#include "attachmentpart.h" +#include "messagecore_export.h" + +#include + +namespace KPIM { + +/** +*/ +class MESSAGECORE_EXPORT AttachmentLoadJob : public KJob +{ + Q_OBJECT + + public: + explicit AttachmentLoadJob( QObject *parent = 0 ); + virtual ~AttachmentLoadJob(); + + virtual void start(); + + AttachmentPart::Ptr attachmentPart() const; + + protected: + /// for subclasses to set the resulting loaded part. + void setAttachmentPart( AttachmentPart::Ptr part ); + + protected slots: + virtual void doStart() = 0; + + private: + class Private; + Private *const d; +}; + +} // namespace KPIM + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpart.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpart.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpart.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpart.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,215 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentpart.h" + +#include +#include + +#include +#include + +using namespace KPIM; + +uint KPIM::qHash( const KPIM::AttachmentPart::Ptr &ptr ) +{ + return ::qHash( ptr.get() ); +} + +// TODO move to kmime_util? +static qint64 sizeWithEncoding( const QByteArray &data, + KMime::Headers::contentEncoding encoding ) // local +{ + KMime::Content *c = new KMime::Content; + c->setBody( data ); + c->contentTransferEncoding()->setEncoding( encoding ); + int size = c->size(); + delete c; + return size; +} + +class KPIM::AttachmentPart::Private +{ + public: + QString name; + QString fileName; + QString description; + bool isInline; + bool autoEncoding; + KMime::Headers::contentEncoding encoding; + QByteArray charset; + QByteArray mimeType; + bool compressed; + bool toEncrypt; + bool toSign; + QByteArray data; + qint64 size; +}; + +AttachmentPart::AttachmentPart() + : d( new Private ) +{ + d->isInline = false; + d->autoEncoding = true; + d->encoding = KMime::Headers::CE7Bit; + d->compressed = false; + d->toEncrypt = false; + d->toSign = false; + d->size = -1; +} + +AttachmentPart::~AttachmentPart() +{ + delete d; +} + +QString AttachmentPart::name() const +{ + return d->name; +} + +void AttachmentPart::setName( const QString &name ) +{ + d->name = name; +} + +QString AttachmentPart::fileName() const +{ + return d->fileName; +} + +void AttachmentPart::setFileName( const QString &name ) +{ + d->fileName = name; +} + +QString AttachmentPart::description() const +{ + return d->description; +} + +void AttachmentPart::setDescription( const QString &description ) +{ + d->description = description; +} + +bool AttachmentPart::isInline() const +{ + return d->isInline; +} + +void AttachmentPart::setInline( bool inl ) +{ + d->isInline = inl; +} + +bool AttachmentPart::isAutoEncoding() const +{ + return d->autoEncoding; +} + +void AttachmentPart::setAutoEncoding( bool enabled ) +{ + d->autoEncoding = enabled; + if( enabled ) { + d->encoding = KMime::encodingsForData( d->data ).first(); + } + d->size = sizeWithEncoding( d->data, d->encoding ); +} + +KMime::Headers::contentEncoding AttachmentPart::encoding() const +{ + return d->encoding; +} + +void AttachmentPart::setEncoding( KMime::Headers::contentEncoding encoding ) +{ + d->autoEncoding = false; + d->encoding = encoding; + d->size = sizeWithEncoding( d->data, d->encoding ); +} + +QByteArray AttachmentPart::charset() const +{ + return d->charset; +} + +void AttachmentPart::setCharset( const QByteArray &charset ) +{ + d->charset = charset; +} + +QByteArray AttachmentPart::mimeType() const +{ + return d->mimeType; +} + +void AttachmentPart::setMimeType( const QByteArray &mimeType ) +{ + d->mimeType = mimeType; +} + +bool AttachmentPart::isCompressed() const +{ + return d->compressed; +} + +void AttachmentPart::setCompressed( bool compressed ) +{ + d->compressed = compressed; +} + +bool AttachmentPart::isEncrypted() const +{ + return d->toEncrypt; +} + +void AttachmentPart::setEncrypted( bool encrypted ) +{ + d->toEncrypt = encrypted; +} + +bool AttachmentPart::isSigned() const +{ + return d->toSign; +} + +void AttachmentPart::setSigned( bool sign ) +{ + d->toSign = sign; +} + +QByteArray AttachmentPart::data() const +{ + return d->data; +} + +void AttachmentPart::setData( const QByteArray &data ) +{ + d->data = data; + if( d->autoEncoding ) { + d->encoding = KMime::encodingsForData( data ).first(); + }; + d->size = sizeWithEncoding( d->data, d->encoding ); +} + +qint64 AttachmentPart::size() const +{ + return d->size; +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpart.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpart.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpart.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpart.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,90 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTPART_H +#define KDEPIM_ATTACHMENTPART_H + +#include "messagecore_export.h" + +#include + +#include +#include + +#include + +namespace KPIM { + +class MESSAGECORE_EXPORT AttachmentPart +{ + public: + //typedef QList List; + typedef boost::shared_ptr Ptr; + typedef QList List; + + AttachmentPart(); + virtual ~AttachmentPart(); + + /// the name= in Content-Type + QString name() const; + void setName( const QString &name ); + /// the filename= in Content-Disposition + QString fileName() const; + void setFileName( const QString &name ); + QString description() const; + void setDescription( const QString &description ); + // otherwise "attachment" + bool isInline() const; // Perhaps rename to autoDisplay, since the users of + // this class aren't supposed to know MIME? + void setInline( bool inl ); + // default true + bool isAutoEncoding() const; + void setAutoEncoding( bool enabled ); + // only if isAutoEncoding false + KMime::Headers::contentEncoding encoding() const; + void setEncoding( KMime::Headers::contentEncoding encoding ); + QByteArray charset() const; + void setCharset( const QByteArray &charset ); + QByteArray mimeType() const; + void setMimeType( const QByteArray &mimeType ); + bool isCompressed() const; + void setCompressed( bool compressed ); + bool isEncrypted() const; + void setEncrypted( bool encrypted ); + bool isSigned() const; + void setSigned( bool sign ); + QByteArray data() const; + void setData( const QByteArray &data ); + qint64 size() const; + + // TODO outlook-compatible names... + + private: + class Private; + Private *const d; +}; + +// FIXME I don't understand why this doesn't work if I put it outside namespace KPIM. +MESSAGECORE_EXPORT uint qHash( const boost::shared_ptr &ptr ); + +} // namespace KPIM + +Q_DECLARE_METATYPE( KPIM::AttachmentPart::Ptr ) + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,319 @@ +/* + Copyright (c) 2009 Constantin Berzan + + Based on KMail code by various authors (kmmsgpartdlg). + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentpropertiesdialog.h" + +#include "attachmentfrommimecontentjob.h" +#include "ui_attachmentpropertiesdialog.h" + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +using namespace KPIM; + +class KPIM::AttachmentPropertiesDialog::Private +{ + public: + Private( AttachmentPropertiesDialog *qq ) + : q( qq ) + , readOnly( false ) + { + } + + void init( AttachmentPart::Ptr part, bool readOnly ); + void polishUi(); + void mimeTypeChanged( const QString &type ); // slot + void populateEncodings(); + void populateMimeTypes(); + void populateWhatsThis(); + void loadFromPart(); + void saveToPart(); + + AttachmentPropertiesDialog *const q; + bool readOnly; + AttachmentPart::Ptr part; + Ui::AttachmentPropertiesDialog ui; +}; + +void AttachmentPropertiesDialog::Private::init( AttachmentPart::Ptr part, bool readOnly ) +{ + this->readOnly = readOnly; + this->part = part; + + QWidget *widget = new QWidget( q ); + q->setMainWidget( widget ); + ui.setupUi( widget ); + polishUi(); + q->setModal( true ); + q->showButtonSeparator( true ); + q->setHelp( QString::fromLatin1( "attachments" ) ); + + loadFromPart(); +} + +void AttachmentPropertiesDialog::Private::polishUi() +{ + // Update the icon when the selected mime type changes. + connect( ui.mimeType, SIGNAL(editTextChanged(QString)), + q, SLOT(mimeTypeChanged(QString)) ); + + // Tweak the dialog, depending on whether it is read-only or not. + if( readOnly ) { + ui.mimeType->setEditable( false ); + ui.name->setReadOnly( true ); + ui.description->setReadOnly( true ); + ui.encoding->setEnabled( false ); + ui.autoDisplay->setEnabled( false ); + ui.encrypt->setEnabled( false ); + ui.sign->setEnabled( false ); + + q->setButtons( Ok|Help ); + } else { + populateEncodings(); + populateMimeTypes(); + + q->setButtons( Ok|Cancel|Help ); + } + + q->setDefaultButton( Ok ); + populateWhatsThis(); +} + +void AttachmentPropertiesDialog::Private::mimeTypeChanged( const QString &type ) +{ + KMimeType::Ptr mimeType = KMimeType::mimeType( type, KMimeType::ResolveAliases ); + if( !mimeType.isNull() ) { + ui.mimeIcon->setPixmap( KIconLoader::global()->loadMimeTypeIcon( mimeType->iconName(), + KIconLoader::Desktop ) ); + } else { + ui.mimeIcon->setPixmap( DesktopIcon( "unknown" ) ); + } +} + +void AttachmentPropertiesDialog::Private::populateWhatsThis() +{ + QString msg; + + // FIXME These are such a mess... Make them straightforward and pretty. + + msg = i18n( "

The MIME type of the file:

" + "

Normally, you do not need to touch this setting, since the " + "type of the file is automatically checked; but, sometimes, %1 " + "may not detect the type correctly -- here is where you can fix " + "that.

", KGlobal::mainComponent().aboutData()->programName() ); + ui.mimeType->setWhatsThis( msg ); + + msg = i18n( "

The estimated size of the attachment:

" + "

Note that, in an email message, a binary file encoded with " + "base64 will take up four thirds the actual size of the file.

" ); + ui.size->setWhatsThis( msg ); + + msg = i18n( "

The file name of the part:

" + "

Although this defaults to the name of the attached file, " + "it does not specify the file to be attached; rather, it " + "suggests a file name to be used by the recipient's mail agent " + "when saving the part to disk.

" ); + ui.name->setWhatsThis( msg ); + + msg = i18n( "

A description of the part:

" + "

This is just an informational description of the part, " + "much like the Subject is for the whole message; most " + "mail agents will show this information in their message " + "previews alongside the attachment's icon.

" ); + ui.description->setWhatsThis( msg ); + + msg = i18n( "

The transport encoding of this part:

" + "

Normally, you do not need to change this, since %1 will use " + "a decent default encoding, depending on the MIME type; yet, " + "sometimes, you can significantly reduce the size of the " + "resulting message, e.g. if a PostScript file does not contain " + "binary data, but consists of pure text -- in this case, choosing " + "\"quoted-printable\" over the default \"base64\" will save up " + "to 25% in resulting message size.

", + KGlobal::mainComponent().aboutData()->programName() ); + ui.encoding->setWhatsThis( msg ); + + msg = i18n( "

Check this option if you want to suggest to the " + "recipient the automatic (inline) display of this part in the " + "message preview, instead of the default icon view;

" + "

Technically, this is carried out by setting this part's " + "Content-Disposition header field to \"inline\" " + "instead of the default \"attachment\".

" ); + ui.autoDisplay->setWhatsThis( msg ); + + msg = i18n( "

Check this option if you want this message part to be " + "signed.

" + "

The signature will be made with the key that you associated " + "with the currently-selected identity.

" ); + ui.sign->setWhatsThis( msg ); + + msg = i18n( "

Check this option if you want this message part to be " + "encrypted.

" + "

The part will be encrypted for the recipients of this " + "message.

" ); + ui.encrypt->setWhatsThis( msg ); +} + +void AttachmentPropertiesDialog::Private::populateEncodings() +{ + using namespace KMime; + using namespace KMime::Headers; + + ui.encoding->clear(); + ui.encoding->addItem( nameForEncoding( CE7Bit ), int( CE7Bit ) ); + ui.encoding->addItem( nameForEncoding( CE8Bit ), int( CE8Bit ) ); + ui.encoding->addItem( nameForEncoding( CEquPr ), int( CEquPr ) ); + ui.encoding->addItem( nameForEncoding( CEbase64 ), int( CEbase64 ) ); + + // TODO 8bit should be disabled if it is disabled in Settings. + // Also, if it's a message/* part, base64 and qp should be disabled. + // But since this is a dialog for power users anyway, let them shoot + // themselves in the foot. (The AttachmentJob will fail when they + // try to compose the message.) +} + +void AttachmentPropertiesDialog::Private::populateMimeTypes() +{ + // TODO these are what the old KMMsgPartDialog used. + // Should we use KMimeType::allMimeTypes()? + + QStringList list; + list << QString::fromLatin1( "text/html" ) + << QString::fromLatin1( "text/plain" ) + << QString::fromLatin1( "image/gif" ) + << QString::fromLatin1( "image/jpeg" ) + << QString::fromLatin1( "image/png" ) + << QString::fromLatin1( "application/octet-stream" ) + << QString::fromLatin1( "application/x-gunzip" ) + << QString::fromLatin1( "application/zip" ); + ui.mimeType->addItems( list ); +} + +void AttachmentPropertiesDialog::Private::loadFromPart() +{ + Q_ASSERT( part ); + + ui.mimeType->setCurrentItem( part->mimeType(), true ); + ui.size->setText( KGlobal::locale()->formatByteSize( part->size() ) ); + ui.name->setText( part->name() ); + ui.description->setText( part->description() ); + ui.encoding->setCurrentIndex( int( part->encoding() ) ); + ui.autoDisplay->setChecked( part->isInline() ); + ui.encrypt->setChecked( part->isEncrypted() ); + ui.sign->setChecked( part->isSigned() ); +} + +void AttachmentPropertiesDialog::Private::saveToPart() +{ + Q_ASSERT( part ); + Q_ASSERT( !readOnly ); + + part->setMimeType( ui.mimeType->currentText().toLatin1() ); + part->setName( ui.name->text() ); + // TODO what about fileName? Extra field?? + part->setDescription( ui.description->text() ); + part->setInline( ui.autoDisplay->isChecked() ); + part->setSigned( ui.sign->isChecked() ); + part->setEncrypted( ui.encrypt->isChecked() ); + + if( ui.mimeType->currentText().startsWith( QLatin1String( "message" ) ) && + ui.encoding->itemData( ui.encoding->currentIndex() ) != KMime::Headers::CE7Bit && + ui.encoding->itemData( ui.encoding->currentIndex() ) != KMime::Headers::CE8Bit ) { + kWarning() << "Encoding on message/rfc822 must be \"7bit\" or \"8bit\"."; + } + part->setEncoding( KMime::Headers::contentEncoding( + ui.encoding->itemData( ui.encoding->currentIndex() ).toInt() ) ); +} + +AttachmentPropertiesDialog::AttachmentPropertiesDialog( AttachmentPart::Ptr part, + QWidget *parent, bool readOnly ) + : KDialog( parent ) + , d( new Private( this ) ) +{ + d->init( part, readOnly ); +} + +AttachmentPropertiesDialog::AttachmentPropertiesDialog( const KMime::Content *content, + QWidget *parent, bool readOnly ) + : KDialog( parent ) + , d( new Private( this ) ) +{ + if( !readOnly ) { + kFatal() << "Dialog must be read-only if loading from a KMime::Content."; + } + + AttachmentFromMimeContentJob *ajob = new AttachmentFromMimeContentJob( content, this ); + ajob->exec(); + if( ajob->error() ) { + kError() << "AttachmentFromMimeContentJob failed."; + } + AttachmentPart::Ptr part = ajob->attachmentPart(); + d->init( part, readOnly ); +} + +AttachmentPropertiesDialog::~AttachmentPropertiesDialog() +{ + delete d; +} + +KPIM::AttachmentPart::Ptr AttachmentPropertiesDialog::attachmentPart() const +{ + return d->part; +} + +bool AttachmentPropertiesDialog::isEncryptEnabled() const +{ + return d->ui.encrypt->isEnabled(); +} + +void AttachmentPropertiesDialog::setEncryptEnabled( bool enabled ) +{ + return d->ui.encrypt->setEnabled( enabled ); +} + +bool AttachmentPropertiesDialog::isSignEnabled() const +{ + return d->ui.sign->isEnabled(); +} + +void AttachmentPropertiesDialog::setSignEnabled( bool enabled ) +{ + return d->ui.sign->setEnabled( enabled ); +} + +void AttachmentPropertiesDialog::accept() +{ + if( !d->readOnly ) { + d->saveToPart(); + } + KDialog::accept(); +} + +#include "attachmentpropertiesdialog.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,71 @@ +/* + Copyright (c) 2009 Constantin Berzan + + Based on KMail code by various authors (kmmsgpartdlg). + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIM_ATTACHMENTPROPERTIESDIALOG_H +#define KDEPIM_ATTACHMENTPROPERTIESDIALOG_H + +#include "attachmentpart.h" +#include "messagecore_export.h" + +#include + +namespace KPIM { + +class MESSAGECORE_EXPORT AttachmentPropertiesDialog: public KDialog +{ + Q_OBJECT + + public: + explicit AttachmentPropertiesDialog( KPIM::AttachmentPart::Ptr part, + QWidget *parent = 0, bool readOnly = false ); + + /** + This converts the KMime::Content to an AttachmentPart. Therefore, saving + the changes to the KMime::Content is not supported, and readOnly must + be true. + */ + explicit AttachmentPropertiesDialog( const KMime::Content *content, + QWidget *parent = 0, bool readOnly = true ); + virtual ~AttachmentPropertiesDialog(); + + KPIM::AttachmentPart::Ptr attachmentPart() const; + + bool isEncryptEnabled() const; + /** Sets whether or not this attachment can be encrypted */ + void setEncryptEnabled( bool enabled ); + bool isSignEnabled() const; + /** Sets whether or not this attachment can be signed */ + void setSignEnabled( bool enabled ); + + public slots: + /* reimpl */ + virtual void accept(); + + private: + class Private; + Private *const d; + + Q_PRIVATE_SLOT( d, void mimeTypeChanged( const QString& ) ) +}; + +} // namespace KMail + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.ui /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.ui --- kde-nightly-kdepim-20091006+svn1032120/messagecore/attachmentpropertiesdialog.ui 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/attachmentpropertiesdialog.ui 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,227 @@ + + + AttachmentPropertiesDialog + + + + 0 + 0 + 371 + 252 + + + + Attachment Properties + + + + + + + + + + + 0 + 0 + + + + Type: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mimeType + + + + + + + + + + 0 + 0 + + + + true + + + + + + + pretty icon + + + + + + + + + + 0 + 0 + + + + Size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + size goes here + + + + + + + + + + 0 + 0 + + + + Name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + name + + + + + + + + + false + + + + + + + + + + 0 + 0 + + + + Description: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + description + + + + + + + + + true + + + + + + + + + + 0 + 0 + + + + Encoding: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + encoding + + + + + + + + + + + + Suggest automatic display + + + + + + + Encrypt this attachment + + + + + + + Sign this attachment + + + + + + + + + Qt::Vertical + + + + 20 + 31 + + + + + + + + + KLineEdit + QLineEdit +

klineedit.h

+ + + KComboBox + QComboBox +

kcombobox.h

+ + + + + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/messagecore/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/CMakeLists.txt 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,40 @@ +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) + +add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5300) + +add_subdirectory(tests) + +include_directories( ${Boost_INCLUDE_DIR} ) + +########### next target ############### + +set(messagecore_LIB_SRCS + attachmentpart.cpp + attachmentcompressjob.cpp + attachmentloadjob.cpp + attachmentfromurljob.cpp + attachmentfrommimecontentjob.cpp + attachmentpropertiesdialog.cpp + messagestatus.cpp +) + +kde4_add_ui_files(messagecore_LIB_SRCS + attachmentpropertiesdialog.ui +) + +kde4_add_library(messagecore SHARED ${messagecore_LIB_SRCS}) + +target_link_libraries(messagecore + ${KDEPIMLIBS_KMIME_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} +) + +target_link_libraries(messagecore LINK_INTERFACE_LIBRARIES + ${KDEPIMLIBS_KMIME_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KIO_LIBS} +) + +set_target_properties(messagecore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) +install(TARGETS messagecore ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/messagecore_export.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/messagecore_export.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/messagecore_export.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/messagecore_export.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,35 @@ +/* + Copyright (c) 2009 Kevin Ottens + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef MESSAGECORE_CORELIST_EXPORT_H +#define MESSAGECORE_CORELIST_EXPORT_H + +#include + +#ifndef MESSAGECORE_EXPORT +# if defined(MAKE_MESSAGECORE_LIB) + /* We are building this library */ +# define MESSAGECORE_EXPORT KDE_EXPORT +# else + /* We are using this library */ +# define MESSAGECORE_EXPORT KDE_IMPORT +# endif +#endif + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/Messages.sh /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/Messages.sh --- kde-nightly-kdepim-20091006+svn1032120/messagecore/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/Messages.sh 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,2 @@ +#! /bin/sh +$XGETTEXT *.cpp -o $podir/libmessagecore.pot diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/messagestatus.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/messagestatus.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/messagestatus.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/messagestatus.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,799 @@ +/* + This file is part of KDEPIM. + Copyright (c) 2003 Andreas Gungl + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#include "messagestatus.h" + +#include +#include + +using namespace KPIM; + +/** The message status format. These can be or'd together. + Note, that the KMMsgStatusIgnored implies the + status to be Read even if the flags are set + to Unread or New. This is done in isRead() + and related getters. So we can preserve the state + when switching a thread to Ignored and back. */ +enum MsgStatus { + KMMsgStatusUnknown = 0x00000000, + KMMsgStatusNew = 0x00000001, + KMMsgStatusUnread = 0x00000002, + KMMsgStatusRead = 0x00000004, + KMMsgStatusOld = 0x00000008, + KMMsgStatusDeleted = 0x00000010, + KMMsgStatusReplied = 0x00000020, + KMMsgStatusForwarded = 0x00000040, + KMMsgStatusQueued = 0x00000080, + KMMsgStatusSent = 0x00000100, + KMMsgStatusFlag = 0x00000200, // flag means important + KMMsgStatusWatched = 0x00000400, + KMMsgStatusIgnored = 0x00000800, // forces isRead() + KMMsgStatusToAct = 0x00001000, + KMMsgStatusSpam = 0x00002000, + KMMsgStatusHam = 0x00004000, + KMMsgStatusHasAttach = 0x00008000 +}; + +MessageStatus::MessageStatus() +{ + mStatus = KMMsgStatusUnknown; +} + +MessageStatus &MessageStatus::operator = ( const MessageStatus &other ) +{ + mStatus = other.mStatus; + return *this; +} + +bool MessageStatus::operator == ( const MessageStatus &other ) const +{ + return ( mStatus == other.mStatus ); +} + +bool MessageStatus::operator != ( const MessageStatus &other ) const +{ + return ( mStatus != other.mStatus ); +} + +bool MessageStatus::operator & ( const MessageStatus &other ) const +{ + return ( mStatus & other.mStatus ); +} + +void MessageStatus::clear() +{ + mStatus = KMMsgStatusUnknown; +} + +void MessageStatus::set( const MessageStatus &other ) +{ + // Those stati are exclusive, but we have to lock at the + // internal representation because Ignored can manipulate + // the result of the getter methods. + if ( other.mStatus & KMMsgStatusNew ) { + setNew(); + } + if ( other.mStatus & KMMsgStatusUnread ) { + setUnread(); + } + if ( other.mStatus & KMMsgStatusRead ) { + setRead(); + } + if ( other.mStatus & KMMsgStatusOld ) { + setOld(); + } + + if ( other.isDeleted() ) { + setDeleted(); + } + if ( other.isReplied() ) { + setReplied(); + } + if ( other.isForwarded() ) { + setForwarded(); + } + if ( other.isQueued() ) { + setQueued(); + } + if ( other.isSent() ) { + setSent(); + } + if ( other.isImportant() ) { + setImportant(); + } + + if ( other.isWatched() ) { + setWatched(); + } + if ( other.isIgnored() ) { + setIgnored(); + } + if ( other.isToAct() ) { + setToAct(); + } + if ( other.isSpam() ) { + setSpam(); + } + if ( other.isHam() ) { + setHam(); + } + if ( other.hasAttachment() ) { + setHasAttachment(); + } +} + +void MessageStatus::toggle( const MessageStatus &other ) +{ + if ( other.isDeleted() ) { + setDeleted( !( mStatus & KMMsgStatusDeleted ) ); + } + if ( other.isReplied() ) { + setReplied( !( mStatus & KMMsgStatusReplied ) ); + } + if ( other.isForwarded() ) { + setForwarded( !( mStatus & KMMsgStatusForwarded ) ); + } + if ( other.isQueued() ) { + setQueued( !( mStatus & KMMsgStatusQueued ) ); + } + if ( other.isSent() ) { + setSent( !( mStatus & KMMsgStatusSent ) ); + } + if ( other.isImportant() ) { + setImportant( !( mStatus & KMMsgStatusFlag ) ); + } + + if ( other.isWatched() ) { + setWatched( !( mStatus & KMMsgStatusWatched ) ); + } + if ( other.isIgnored() ) { + setIgnored( !( mStatus & KMMsgStatusIgnored ) ); + } + if ( other.isToAct() ) { + setToAct( !( mStatus & KMMsgStatusToAct ) ); + } + if ( other.isSpam() ) { + setSpam( !( mStatus & KMMsgStatusSpam ) ); + } + if ( other.isHam() ) { + setHam( !( mStatus & KMMsgStatusHam ) ); + } + if ( other.hasAttachment() ) { + setHasAttachment( !( mStatus & KMMsgStatusHasAttach ) ); + } +} + +bool MessageStatus::isOfUnknownStatus() const +{ + return ( mStatus == KMMsgStatusUnknown ); +} + +bool MessageStatus::isNew() const +{ + return ( mStatus & KMMsgStatusNew && !( mStatus & KMMsgStatusIgnored ) ); +} + +bool MessageStatus::isUnread() const +{ + return ( mStatus & KMMsgStatusUnread && !( mStatus & KMMsgStatusIgnored ) ); +} + +bool MessageStatus::isRead() const +{ + return ( mStatus & KMMsgStatusRead || mStatus & KMMsgStatusIgnored ); +} + +bool MessageStatus::isOld() const +{ + return ( mStatus & KMMsgStatusOld ); +} + +bool MessageStatus::isDeleted() const +{ + return ( mStatus & KMMsgStatusDeleted ); +} + +bool MessageStatus::isReplied() const +{ + return ( mStatus & KMMsgStatusReplied ); +} + +bool MessageStatus::isForwarded() const +{ + return ( mStatus & KMMsgStatusForwarded ); +} + +bool MessageStatus::isQueued() const +{ + return ( mStatus & KMMsgStatusQueued ); +} + +bool MessageStatus::isSent() const +{ + return ( mStatus & KMMsgStatusSent ); +} + +bool MessageStatus::isImportant() const +{ + return ( mStatus & KMMsgStatusFlag ); +} + +bool MessageStatus::isWatched() const +{ + return ( mStatus & KMMsgStatusWatched ); +} + +bool MessageStatus::isIgnored() const +{ + return ( mStatus & KMMsgStatusIgnored ); +} + +bool MessageStatus::isToAct() const +{ + return ( mStatus & KMMsgStatusToAct ); +} + +bool MessageStatus::isSpam() const +{ + return ( mStatus & KMMsgStatusSpam ); +} + +bool MessageStatus::isHam() const +{ + return ( mStatus & KMMsgStatusHam ); +} + +bool MessageStatus::hasAttachment() const +{ + return ( mStatus & KMMsgStatusHasAttach ); +} + +void MessageStatus::setNew() +{ + // new overrides old and read + mStatus &= ~KMMsgStatusOld; + mStatus &= ~KMMsgStatusRead; + mStatus &= ~KMMsgStatusUnread; + mStatus |= KMMsgStatusNew; +} + +void MessageStatus::setUnread() +{ + // unread overrides read + mStatus &= ~KMMsgStatusOld; + mStatus &= ~KMMsgStatusRead; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusUnread; +} + +void MessageStatus::setRead() +{ + // Unset unread and new, set read + mStatus &= ~KMMsgStatusUnread; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusRead; +} + +void MessageStatus::setOld() +{ + // old can't be new or unread + mStatus &= ~KMMsgStatusNew; + mStatus &= ~KMMsgStatusUnread; + mStatus |= KMMsgStatusOld; +} + +void MessageStatus::setDeleted( bool deleted ) +{ + if ( deleted ) { + mStatus |= KMMsgStatusDeleted; + } else { + mStatus &= ~KMMsgStatusDeleted; + } +} + +void MessageStatus::setReplied( bool replied ) +{ + if ( replied ) { + mStatus |= KMMsgStatusReplied; + } else { + mStatus &= ~KMMsgStatusReplied; + } +} + +void MessageStatus::setForwarded( bool forwarded ) +{ + if ( forwarded ) { + mStatus |= KMMsgStatusForwarded; + } else { + mStatus &= ~KMMsgStatusForwarded; + } +} + +void MessageStatus::setQueued( bool queued ) +{ + if ( queued ) { + mStatus |= KMMsgStatusQueued; + } else { + mStatus &= ~KMMsgStatusQueued; + } +} + +void MessageStatus::setSent( bool sent ) +{ + if ( sent ) { + mStatus &= ~KMMsgStatusQueued; + // FIXME to be discussed if sent messages are Read + mStatus &= ~KMMsgStatusUnread; + mStatus &= ~KMMsgStatusNew; + mStatus |= KMMsgStatusSent; + } else { + mStatus &= ~KMMsgStatusSent; + } +} + +void MessageStatus::setImportant( bool important ) +{ + if ( important ) { + mStatus |= KMMsgStatusFlag; + } else { + mStatus &= ~KMMsgStatusFlag; + } +} + +// Watched and ignored are mutually exclusive +void MessageStatus::setWatched( bool watched ) +{ + if ( watched ) { + mStatus &= ~KMMsgStatusIgnored; + mStatus |= KMMsgStatusWatched; + } else { + mStatus &= ~KMMsgStatusWatched; + } +} + +void MessageStatus::setIgnored( bool ignored ) +{ + if ( ignored ) { + mStatus &= ~KMMsgStatusWatched; + mStatus |= KMMsgStatusIgnored; + } else { + mStatus &= ~KMMsgStatusIgnored; + } +} + +void MessageStatus::setToAct( bool toAct ) +{ + if ( toAct ) { + mStatus |= KMMsgStatusToAct; + } else { + mStatus &= ~KMMsgStatusToAct; + } +} + +// Ham and Spam are mutually exclusive +void MessageStatus::setSpam( bool spam ) +{ + if ( spam ) { + mStatus &= ~KMMsgStatusHam; + mStatus |= KMMsgStatusSpam; + } else { + mStatus &= ~KMMsgStatusSpam; + } +} + +void MessageStatus::setHam( bool ham ) +{ + if ( ham ) { + mStatus &= ~KMMsgStatusSpam; + mStatus |= KMMsgStatusHam; + } else { + mStatus &= ~KMMsgStatusHam; + } +} + +void MessageStatus::setHasAttachment( bool withAttachment ) +{ + if ( withAttachment ) { + mStatus |= KMMsgStatusHasAttach; + } else { + mStatus &= ~KMMsgStatusHasAttach; + } +} + +qint32 MessageStatus::toQInt32() const +{ + return mStatus; +} + +void MessageStatus::fromQInt32( qint32 status ) +{ + mStatus = status; +} + +QString MessageStatus::getStatusStr() const +{ + QString sstr; + if ( mStatus & KMMsgStatusNew ) { + sstr += 'N'; + } + if ( mStatus & KMMsgStatusUnread ) { + sstr += 'U'; + } + if ( mStatus & KMMsgStatusOld ) { + sstr += 'O'; + } + if ( mStatus & KMMsgStatusRead ) { + sstr += 'R'; + } + if ( mStatus & KMMsgStatusDeleted ) { + sstr += 'D'; + } + if ( mStatus & KMMsgStatusReplied ) { + sstr += 'A'; + } + if ( mStatus & KMMsgStatusForwarded ) { + sstr += 'F'; + } + if ( mStatus & KMMsgStatusQueued ) { + sstr += 'Q'; + } + if ( mStatus & KMMsgStatusToAct ) { + sstr += 'K'; + } + if ( mStatus & KMMsgStatusSent ) { + sstr += 'S'; + } + if ( mStatus & KMMsgStatusFlag ) { + sstr += 'G'; + } + if ( mStatus & KMMsgStatusWatched ) { + sstr += 'W'; + } + if ( mStatus & KMMsgStatusIgnored ) { + sstr += 'I'; + } + if ( mStatus & KMMsgStatusSpam ) { + sstr += 'P'; + } + if ( mStatus & KMMsgStatusHam ) { + sstr += 'H'; + } + if ( mStatus & KMMsgStatusHasAttach ) { + sstr += 'T'; + } + + return sstr; +} + +void MessageStatus::setStatusFromStr( const QString& aStr ) +{ + mStatus = KMMsgStatusUnknown; + + if ( aStr.contains( 'N' ) ) { + setNew(); + } + if ( aStr.contains( 'U' ) ) { + setUnread(); + } + if ( aStr.contains( 'O' ) ) { + setOld(); + } + if ( aStr.contains( 'R' ) ) { + setRead(); + } + if ( aStr.contains( 'D' ) ) { + setDeleted(); + } + if ( aStr.contains( 'A' ) ) { + setReplied(); + } + if ( aStr.contains( 'F' ) ) { + setForwarded(); + } + if ( aStr.contains( 'Q' ) ) { + setQueued(); + } + if ( aStr.contains( 'K' ) ) { + setToAct(); + } + if ( aStr.contains( 'S' ) ) { + setSent(); + } + if ( aStr.contains( 'G' ) ) { + setImportant(); + } + if ( aStr.contains( 'W' ) ) { + setWatched(); + } + if ( aStr.contains( 'I' ) ) { + setIgnored(); + } + if ( aStr.contains( 'P' ) ) { + setSpam(); + } + if ( aStr.contains( 'H' ) ) { + setHam(); + } + if ( aStr.contains( 'T' ) ) { + setHasAttachment(); + } + if ( aStr.contains( 'C' ) ) { + setHasAttachment( false ); + } +} + +QString MessageStatus::getSortRank() const +{ + QString sstr = "bcbbbbbbbb"; + + // put watched ones first, then normal ones, ignored ones last + if ( mStatus & KMMsgStatusWatched ) { + sstr[0] = 'a'; + } + if ( mStatus & KMMsgStatusIgnored ) { + sstr[0] = 'c'; + } + + // Second level. One of new, old, read, unread + if ( mStatus & KMMsgStatusNew ) { + sstr[1] = 'a'; + } + if ( mStatus & KMMsgStatusUnread ) { + sstr[1] = 'b'; + } + //if ( mStatus & KMMsgStatusOld ) { + // sstr[1] = 'c'; + //} + //if ( mStatus & KMMsgStatusRead ) { + // sstr[1] = 'c'; + //} + + // Third level. In somewhat arbitrary order. + if ( mStatus & KMMsgStatusDeleted ) { + sstr[2] = 'a'; + } + if ( mStatus & KMMsgStatusFlag ) { + sstr[3] = 'a'; + } + if ( mStatus & KMMsgStatusReplied ) { + sstr[4] = 'a'; + } + if ( mStatus & KMMsgStatusForwarded ) { + sstr[5] = 'a'; + } + if ( mStatus & KMMsgStatusQueued ) { + sstr[6] = 'a'; + } + if ( mStatus & KMMsgStatusSent ) { + sstr[7] = 'a'; + } + if ( mStatus & KMMsgStatusHam ) { + sstr[8] = 'a'; + } + if ( mStatus & KMMsgStatusSpam ) { + sstr[8] = 'c'; + } + if ( mStatus & KMMsgStatusToAct ) { + sstr[9] = 'a'; + } + + return sstr; +} + +QSet MessageStatus::getStatusFlags() const +{ + QSet flags; + + // Non handled status: + // * KMMsgStatusQueued + // * KMMsgStatusSent + // * KMMsgStatusSpam + // * KMMsgStatusHam + // * KMMsgStatusHasAttach + + if ( mStatus & KMMsgStatusDeleted ) { + flags+= "\\DELETED"; + } else { + if ( mStatus & ( KMMsgStatusOld | KMMsgStatusRead ) ) + flags+= "\\SEEN "; + if ( mStatus & KMMsgStatusReplied ) + flags+= "\\ANSWERED "; + if ( mStatus & KMMsgStatusFlag ) + flags+= "\\FLAGGED "; + // non standard flags + if ( mStatus & KMMsgStatusForwarded ) + flags+= "$FORWARDED "; + if ( mStatus & KMMsgStatusToAct ) + flags+= "$TODO "; + if ( mStatus & KMMsgStatusWatched ) + flags+= "$WATCHED "; + if ( mStatus & KMMsgStatusIgnored ) + flags+= "$IGNORED "; + } + + return flags; +} + +void MessageStatus::setStatusFromFlags( const QSet &flags ) +{ + mStatus = KMMsgStatusUnknown; + setNew(); + + // Non handled status: + // * KMMsgStatusQueued + // * KMMsgStatusSent + // * KMMsgStatusSpam + // * KMMsgStatusHam + // * KMMsgStatusHasAttach + + foreach ( const QByteArray &flag, flags ) { + if ( flag.toUpper() == QByteArray( "\\DELETED" ) ) { + setDeleted(); + } else if ( flag.toUpper() == QByteArray( "\\SEEN" ) ) { + setRead(); + } else if ( flag.toUpper() == QByteArray( "\\ANSWERED" ) ) { + setReplied(); + } else if ( flag.toUpper() == QByteArray( "\\FLAGGED" ) ) { + setImportant(); + + // non standard flags + } else if ( flag.toUpper() == QByteArray( "$FORWARDED" ) ) { + setForwarded(); + } else if ( flag.toUpper() == QByteArray( "$TODO" ) ) { + setToAct(); + } else if ( flag.toUpper() == QByteArray( "$WATCHED" ) ) { + setWatched(); + } else if ( flag.toUpper() == QByteArray( "$IGNORED" ) ) { + setIgnored(); + } else { + kWarning() << "Unknown flag:" << flag; + } + } +} + +MessageStatus MessageStatus::statusNew() +{ + MessageStatus st; + st.setNew(); + return st; +} + +MessageStatus MessageStatus::statusRead() +{ + MessageStatus st; + st.setRead(); + return st; +} + +MessageStatus MessageStatus::statusUnread() +{ + MessageStatus st; + st.setUnread(); + return st; +} + +MessageStatus MessageStatus::statusNewAndUnread() +{ + MessageStatus st; + // set the "new and unread" pseudo status; we have to set the internal + // representation directly because new and unread are mutually exclusive + st.fromQInt32( statusNew().toQInt32() | statusUnread().toQInt32() ); + return st; +} + +MessageStatus MessageStatus::statusOld() +{ + MessageStatus st; + st.setOld(); + return st; +} + +MessageStatus MessageStatus::statusDeleted() +{ + MessageStatus st; + st.setDeleted(); + return st; +} + +MessageStatus MessageStatus::statusReplied() +{ + MessageStatus st; + st.setReplied(); + return st; +} + +MessageStatus MessageStatus::statusForwarded() +{ + MessageStatus st; + st.setForwarded(); + return st; +} + +MessageStatus MessageStatus::statusQueued() +{ + MessageStatus st; + st.setQueued(); + return st; +} + +MessageStatus MessageStatus::statusSent() +{ + MessageStatus st; + st.setSent(); + return st; +} + +MessageStatus MessageStatus::statusImportant() +{ + MessageStatus st; + st.setImportant(); + return st; +} + +MessageStatus MessageStatus::statusWatched() +{ + MessageStatus st; + st.setWatched(); + return st; +} + +MessageStatus MessageStatus::statusIgnored() +{ + MessageStatus st; + st.setIgnored(); + return st; +} + +MessageStatus MessageStatus::statusToAct() +{ + MessageStatus st; + st.setToAct(); + return st; +} + +MessageStatus MessageStatus::statusSpam() +{ + MessageStatus st; + st.setSpam(); + return st; +} + +MessageStatus MessageStatus::statusHam() +{ + MessageStatus st; + st.setHam(); + return st; +} + +MessageStatus MessageStatus::statusHasAttachment() +{ + MessageStatus st; + st.setHasAttachment(); + return st; +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/messagestatus.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/messagestatus.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/messagestatus.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/messagestatus.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,419 @@ +/* -*- mode: C++ -*- + This file is part of KDEPIM. + Copyright (c) 2005 Andreas Gungl + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ +#ifndef KDEPIM_MESSAGESTATUS_H +#define KDEPIM_MESSAGESTATUS_H + +#include + +#include "messagecore_export.h" + +class QString; + +namespace KPIM { + +//--------------------------------------------------------------------------- +/** + @short KDEPIM Message Status. + @author Andreas Gungl + + The class encapsulates the handling of the different flags + which describe the status of a message. + The flags itself are not intended to be used outside this class. + + In the status pairs Watched/Ignored and Spam/Ham, there both + values can't be set at the same time, however they can + be unset at the same time. + + The stati New/Unread/Read/Old are mutually exclusive. +*/ +class MESSAGECORE_EXPORT MessageStatus +{ + public: + /** Constructor - sets status initially to unknown. */ + MessageStatus(); + + /** Assign the status from another instance. The internal + representation is identical afterwards, i.e. a comparison + by operator == will return true. + */ + MessageStatus &operator = ( const MessageStatus &other ); + + /** Compare the status with that from another instance. + @return true if the stati are equal, false if different. + */ + bool operator == ( const MessageStatus &other ) const; + + /** Compare the status with that from another instance. + @return true if the stati are equal, false if different. + */ + bool operator != ( const MessageStatus &other ) const; + + /** Check, if some of the flags in the status match + with those flags from another instance. + @return true if at least one flag is set in both stati. + */ + bool operator & ( const MessageStatus &other ) const; + + /** Clear all status flags, this resets to unknown. */ + void clear(); + + /** Set / add stati described by another MessageStatus object. + This can be used to merge in multiple stati at once without + using the single setter methods. + However, internally the setters are used anyway to ensure the + integrity of the resulting status. + */ + void set( const MessageStatus &other ); + + /** Toggle one or more stati described by another MessageStatus object. + Internally the setters are used to ensure the integrity of the + resulting status. + Toggling of the stati New, Unread, Read and Old is not supported. + These stati are completely ignored. + */ + void toggle( const MessageStatus &other ); + + /* ----- getters ----------------------------------------------------- */ + + /** Check for Unknown status. + @return true if status is unknown. + */ + bool isOfUnknownStatus() const; + + /** Check for New status. Ignored messages are not new. + @return true if status is new. + */ + bool isNew() const; + + /** Check for Unread status. Note that new messages are not unread. + Ignored messages are not unread as well. + @return true if status is unread. + */ + bool isUnread() const; + + /** Check for Read status. Note that ignored messages are read. + @return true if status is read. + */ + bool isRead() const; + + /** Check for Old status. + @return true if status is old. + */ + bool isOld() const; + + /** Check for Deleted status. + @return true if status is deleted. + */ + bool isDeleted() const; + + /** Check for Replied status. + @return true if status is replied. + */ + bool isReplied() const; + + /** Check for Forwarded status. + @return true if status is forwarded. + */ + bool isForwarded() const; + + /** Check for Queued status. + @return true if status is queued. + */ + bool isQueued() const; + + /** Check for Sent status. + @return true if status is sent. + */ + bool isSent() const; + + /** Check for Important status. + @return true if status is important. + */ + bool isImportant() const; + + /** Check for Watched status. + @return true if status is watched. + */ + bool isWatched() const; + + /** Check for Ignored status. + @return true if status is ignored. + */ + bool isIgnored() const; + + /** Check for ToAct status. + @return true if status is action item. + */ + bool isToAct() const; + + /** Check for Spam status. + @return true if status is spam. + */ + bool isSpam() const; + + /** Check for Ham status. + @return true if status is not spam. + */ + bool isHam() const; + + /** Check for Attachment status. + @return true if status indicates an attachment. + */ + bool hasAttachment() const; + + /* ----- setters ----------------------------------------------------- */ + + /** Set the status to new. */ + void setNew(); + + /** Set the status to unread. */ + void setUnread(); + + /** Set the status to read. */ + void setRead(); + + /** Set the status to old. */ + void setOld(); + + /** Set the status for deleted. + @param deleted Set (true) or unset (false) this status flag. + */ + void setDeleted( bool deleted = true ); + + /** Set the status for replied. + @param replied Set (true) or unset (false) this status flag. + */ + void setReplied( bool replied = true ); + + /** Set the status for forwarded. + @param forwarded Set (true) or unset (false) this status flag. + */ + void setForwarded( bool forwarded = true ); + + /** Set the status for queued. + @param queued Set (true) or unset (false) this status flag. + */ + void setQueued( bool queued = true ); + + /** Set the status for sent. + @param sent Set (true) or unset (false) this status flag. + */ + void setSent( bool sent = true ); + + /** Set the status for important. + @param important Set (true) or unset (false) this status flag. + */ + void setImportant( bool important = true ); + + /** Set the status to watched. + @param watched Set (true) or unset (false) this status flag. + */ + void setWatched( bool watched = true ); + + /** Set the status to ignored. + @param ignored Set (true) or unset (false) this status flag. + */ + void setIgnored( bool ignored = true ); + + /** Set the status to action item. + @param toAct Set (true) or unset (false) this status flag. + */ + void setToAct( bool toAct = true ); + + /** Set the status to spam. + @param spam Set (true) or unset (false) this status flag. + */ + void setSpam( bool spam = true ); + + /** Set the status to not spam. + @param ham Set (true) or unset (false) this status flag. + */ + void setHam( bool ham = true ); + + /** Set the status for an attachment. + @param withAttechment Set (true) or unset (false) this status flag. + */ + void setHasAttachment( bool withAttachment = true ); + + /* ----- state representation --------------------------------------- */ + + /** Get the status as a whole e.g. for storage in an index. + Don't manipulte the index via this value, this bypasses + all integrity checks in the setter methods. + @return The status encoded in bits. + */ + qint32 toQInt32() const; + + /** Set the status as a whole e.g. for reading from an index. + Don't manipulte the index via this value, this bypasses + all integrity checks in the setter methods. + @param status The status encoded in bits to be set in this instance. + */ + void fromQInt32( qint32 status ); + + /** Convert the status to a string representation. + @return A string containing coded uppercase letters + which describe the status. + */ + QString getStatusStr() const; + + /** Set the status based on a string representation. + @param aStr The status string to be analyzed. + Normally it is a string obtained using + getStatusStr(). + */ + void setStatusFromStr( const QString &aStr ); + + /** Convert the status to a string for sorting. + @return A string containing coded lowercase letters + which allows a predefined sorting by status. + */ + QString getSortRank() const; + + /** Get the status as a whole e.g. for storage as IMAP flags. + @return The status encoded in flags. + */ + QSet getStatusFlags() const; + + /** Set the status as a whole e.g. for reading from IMAP flags. + @param status The status encoded in bits to be set in this instance. + */ + void setStatusFromFlags( const QSet &flags ); + + /* ----- static accessors to simple states --------------------------- */ + + /** Return a predefined status initialized as New as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as New. + */ + static MessageStatus statusNew(); + + /** Return a predefined status initialized as Read as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Read. + */ + static MessageStatus statusRead(); + + /** Return a predefined status initialized as Unread as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Unread. + */ + static MessageStatus statusUnread(); + + /** Return a predefined status initialized as New and Unread as is + useful e.g. when searching for unread messages. + @return A reference to a status instance initialized as New | Unread. + */ + static MessageStatus statusNewAndUnread(); + + /** Return a predefined status initialized as Old as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Old. + */ + static MessageStatus statusOld(); + + /** Return a predefined status initialized as Deleted as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Deleted. + */ + static MessageStatus statusDeleted(); + + /** Return a predefined status initialized as Replied as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Replied. + */ + static MessageStatus statusReplied(); + + /** Return a predefined status initialized as Forwarded as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Forwarded. + */ + static MessageStatus statusForwarded(); + + /** Return a predefined status initialized as Queued as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Queued. + */ + static MessageStatus statusQueued(); + + /** Return a predefined status initialized as Sent as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Sent. + */ + static MessageStatus statusSent(); + + /** Return a predefined status initialized as Important as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Important. + */ + static MessageStatus statusImportant(); + + /** Return a predefined status initialized as Watched as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Watched. + */ + static MessageStatus statusWatched(); + + /** Return a predefined status initialized as Ignored as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Ignored. + */ + static MessageStatus statusIgnored(); + + /** Return a predefined status initialized as Action Item as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as ToAct. + */ + static MessageStatus statusToAct(); + + /** Return a predefined status initialized as Spam as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Spam. + */ + static MessageStatus statusSpam(); + + /** Return a predefined status initialized as Ham as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Ham. + */ + static MessageStatus statusHam(); + + /** Return a predefined status initialized as Attachment as is useful + e.g. when providing a state for comparison. + @return A reference to a status instance initialized as Attachment. + */ + static MessageStatus statusHasAttachment(); + + private: + qint32 mStatus; +}; + +} // namespace KPIM + +#endif /*KMAIL_MESSAGESTATUS_H*/ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/README /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/README --- kde-nightly-kdepim-20091006+svn1032120/messagecore/README 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/README 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,12 @@ +What should be put here? +======================== + +Stuff here needs to comply with at least these rules (additionally to all the other ones that apply to all code): +- no dependencies on legacy libs (Qt3/KDE3 support, kresources, libkdepim) +- no dependencies on: + - libmessagelist + - libmessageviewer + - libmessagecomposer +- used by at least one of the above listed libs +- used by at least one other component (most commonly a second one of the above listed libs) + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentcompressjobtest.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentcompressjobtest.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentcompressjobtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentcompressjobtest.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,107 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentcompressjobtest.h" +#include "qtest_messagecore.h" + +#include + +#include +#include +#include + +#include +using namespace KPIM; + +QTEST_KDEMAIN( AttachmentCompressJobTest, NoGUI ) + +void AttachmentCompressJobTest::testCompress() +{ + // Some data. + QByteArray data; + for( int i = 0; i < 100; i++ ) { + data += "This is some highly compressible text...\n"; + } + const QString name = QString::fromLatin1( "name" ); + const QString fileName = QString::fromLatin1( "name.txt" ); + const QString description = QString::fromLatin1( "description" ); + + // Create the original part. + AttachmentPart::Ptr origPart = AttachmentPart::Ptr( new AttachmentPart ); + origPart->setName( name ); + origPart->setFileName( fileName ); + origPart->setDescription( description ); + origPart->setMimeType( "text/plain" ); + origPart->setEncoding( KMime::Headers::CE7Bit ); + QVERIFY( !origPart->isAutoEncoding() ); + origPart->setData( data ); + QVERIFY( !origPart->isCompressed() ); + + // Compress the part and verify it. + AttachmentCompressJob *cjob = new AttachmentCompressJob( origPart, this ); + VERIFYEXEC( cjob ); + QCOMPARE( cjob->originalPart(), origPart ); + AttachmentPart::Ptr zipPart = cjob->compressedPart(); + //kDebug() << data; + //kDebug() << zipPart->data(); + QVERIFY( zipPart->isAutoEncoding() ); + QVERIFY( zipPart->isCompressed() ); + QCOMPARE( zipPart->name(), name + QString::fromLatin1( ".zip" ) ); + QCOMPARE( zipPart->fileName(), fileName + QString::fromLatin1( ".zip" ) ); + QCOMPARE( zipPart->description(), description ); + QCOMPARE( zipPart->mimeType(), QByteArray( "application/zip" ) ); + + // Uncompress the data and verify it. + // (Stuff below is stolen from KMail code.) + QByteArray zipData = zipPart->data(); + QBuffer buffer( &zipData ); + KZip zip( &buffer ); + QVERIFY( zip.open( QIODevice::ReadOnly ) ); + const KArchiveDirectory *dir = zip.directory(); + QCOMPARE( dir->entries().count(), 1 ); + const KZipFileEntry *entry = (KZipFileEntry*)dir->entry( dir->entries()[0] ); + QCOMPARE( entry->data(), data ); + QCOMPARE( entry->name(), name ); + zip.close(); +} + +void AttachmentCompressJobTest::testCompressedSizeLarger() +{ + // Some data. + QByteArray data( "This is short enough that compressing it is not efficient." ); + const QString name = QString::fromLatin1( "name.txt" ); + const QString description = QString::fromLatin1( "description" ); + + // Create the original part. + AttachmentPart::Ptr origPart = AttachmentPart::Ptr( new AttachmentPart ); + origPart->setName( name ); + origPart->setDescription( description ); + origPart->setMimeType( "text/plain" ); + origPart->setEncoding( KMime::Headers::CE7Bit ); + QVERIFY( !origPart->isAutoEncoding() ); + origPart->setData( data ); + QVERIFY( !origPart->isCompressed() ); + + // Compress the part and verify that it is aware of its folly. + AttachmentCompressJob *cjob = new AttachmentCompressJob( origPart, this ); + VERIFYEXEC( cjob ); + QVERIFY( cjob->isCompressedPartLarger() ); +} + +#include "attachmentcompressjobtest.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentcompressjobtest.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentcompressjobtest.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentcompressjobtest.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentcompressjobtest.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,33 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef ATTACHMENTCOMPRESSJOBTEST_H +#define ATTACHMENTCOMPRESSJOBTEST_H + +#include + +class AttachmentCompressJobTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testCompress(); + void testCompressedSizeLarger(); +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfrommimecontentjobtest.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfrommimecontentjobtest.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfrommimecontentjobtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfrommimecontentjobtest.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,80 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentfrommimecontentjobtest.h" +#include "qtest_messagecore.h" + +#include + +#include +#include + +#include +#include +using namespace KMime; + +#include +using namespace KPIM; + +QTEST_KDEMAIN( AttachmentFromMimeContentJobTest, NoGUI ) + +void AttachmentFromMimeContentJobTest::testAttachment() +{ + const QByteArray mimeType( "x-some/x-type" ); + const QString name = QString::fromLatin1( "name abcd" ); + const QString description = QString::fromLatin1( "description" ); + const QByteArray charset( "utf-8" ); + const QString fileName = QString::fromLatin1( "filename abcd" ); + const Headers::contentEncoding encoding = Headers::CEquPr; + const Headers::contentDisposition disposition = Headers::CDinline; + const QByteArray data( "ocean soul" ); + + Content *content = new Content; + content->contentType()->setMimeType( mimeType ); + content->contentType()->setName( name, charset ); + content->contentType()->setCharset( charset ); + content->contentTransferEncoding()->setEncoding( encoding ); + content->contentDisposition()->setDisposition( disposition ); + content->contentDisposition()->setFilename( fileName ); + content->contentDescription()->fromUnicodeString( description, charset ); + content->setBody( data ); + content->assemble(); + //kDebug() << "Encoded content:" << content->encodedContent(); + //kDebug() << "Decoded content:" << content->decodedContent(); + + AttachmentFromMimeContentJob *job = new AttachmentFromMimeContentJob( content, this ); + QVERIFY( job->uiDelegate() == 0 ); // No GUI thankyouverymuch. + VERIFYEXEC( job ); + delete content; + content = 0; + AttachmentPart::Ptr part = job->attachmentPart(); + delete job; + job = 0; + + QCOMPARE( part->mimeType(), mimeType ); + QCOMPARE( part->name(), name ); + QCOMPARE( part->description(), description ); + //QCOMPARE( part->charset(), charset ); // TODO will probably need charsets in AttachmentPart :( + QCOMPARE( part->fileName(), fileName ); + QVERIFY( part->encoding() == encoding ); + QVERIFY( part->isInline() ); + QCOMPARE( part->data(), data ); +} + +#include "attachmentfrommimecontentjobtest.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfrommimecontentjobtest.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfrommimecontentjobtest.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfrommimecontentjobtest.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfrommimecontentjobtest.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,33 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef ATTACHMENTFROMMIMECONTENTJOBTEST_H +#define ATTACHMENTFROMMIMECONTENTJOBTEST_H + +#include + +// 33-byte class names say I suck? +class AttachmentFromMimeContentJobTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testAttachment(); +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfromurljobtest.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfromurljobtest.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfromurljobtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfromurljobtest.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,103 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentfromurljobtest.h" +#include "qtest_messagecore.h" + +#include + +#include + +#include +using namespace KPIM; + +QTEST_KDEMAIN( AttachmentFromUrlJobTest, NoGUI ) + +void AttachmentFromUrlJobTest::testAttachments_data() +{ + QTest::addColumn( "url" ); + QTest::addColumn( "filename" ); + QTest::addColumn( "mimetype" ); + + // PATH_ATTACHMENTS is defined by CMake. + QTest::newRow( "png image" ) << KUrl::fromPath( PATH_ATTACHMENTS + QString::fromLatin1( "image.png" ) ) + << QString::fromLatin1( "image.png" ) + << QByteArray( "image/png" ); + QTest::newRow( "pdf doc" ) << KUrl::fromPath( PATH_ATTACHMENTS + QString::fromLatin1( "doc.pdf" ) ) + << QString::fromLatin1( "doc.pdf" ) + << QByteArray( "application/pdf" ); + QTest::newRow( "text file" ) << KUrl::fromPath( PATH_ATTACHMENTS + QString::fromLatin1( "file.txt" ) ) + << QString::fromLatin1( "file.txt" ) + << QByteArray( "text/plain" ); +} + +void AttachmentFromUrlJobTest::testAttachments() +{ + QFETCH( KUrl, url ); + QFETCH( QString, filename ); + QFETCH( QByteArray, mimetype ); + + QFile file( url.path() ); + QVERIFY( file.open(QIODevice::ReadOnly) ); + QByteArray data = file.readAll(); + file.close(); + + AttachmentFromUrlJob *ljob = new AttachmentFromUrlJob( url, this ); + VERIFYEXEC( ljob ); + AttachmentPart::Ptr part = ljob->attachmentPart(); + delete ljob; + ljob = 0; + + QCOMPARE( part->name(), filename ); + QCOMPARE( part->fileName(), filename ); + QVERIFY( !part->isInline() ); + QCOMPARE( part->mimeType(), mimetype ); + QCOMPARE( part->data(), data ); +} + +void AttachmentFromUrlJobTest::testAttachmentTooBig() +{ + const KUrl url = KUrl::fromPath( PATH_ATTACHMENTS + QString::fromLatin1( "doc.pdf" ) ); + const QString name = QString::fromLatin1( "doc.pdf" ); + const QByteArray mimetype( "application/pdf" ); + + AttachmentFromUrlJob *ljob = new AttachmentFromUrlJob( url, this ); + ljob->setMaximumAllowedSize( 1024 ); // 1KiB, whereas the file is >9KiB. + QVERIFY( !ljob->exec() ); +} + +void AttachmentFromUrlJobTest::testAttachmentCharset() +{ + const QByteArray charset( "iso-8859-2" ); + const QString filename = QString::fromLatin1( "file.txt" ); + KUrl url = KUrl::fromPath( PATH_ATTACHMENTS + filename ); + url.setFileEncoding( charset ); + + AttachmentFromUrlJob *ljob = new AttachmentFromUrlJob( url, this ); + VERIFYEXEC( ljob ); + AttachmentPart::Ptr part = ljob->attachmentPart(); + delete ljob; + ljob = 0; + + QCOMPARE( part->name(), filename ); + QCOMPARE( part->fileName(), filename ); + QCOMPARE( part->charset(), charset ); +} + +#include "attachmentfromurljobtest.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfromurljobtest.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfromurljobtest.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentfromurljobtest.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentfromurljobtest.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,35 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef ATTACHMENTFROMURLJOBTEST_H +#define ATTACHMENTFROMURLJOBTEST_H + +#include + +class AttachmentFromUrlJobTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testAttachments_data(); + void testAttachments(); + void testAttachmentTooBig(); + void testAttachmentCharset(); +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentparttest.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentparttest.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentparttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentparttest.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,51 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentparttest.h" +#include "qtest_messagecore.h" + +#include + +#include +#include + +#include +#include +using namespace KPIM; + +QTEST_KDEMAIN( AttachmentPartTest, NoGUI ) + +void AttachmentPartTest::testApi() +{ + const QString str = QString::fromLatin1( "test" ); + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + + // Test that an AttachmentPart::Ptr can be put in a QHash. + QHash hash; + hash[ part ] = str; + QVERIFY( hash.contains( part ) ); + + // Test that an AttachmentPart::Ptr can be put in a QVariant. + QVariant variant = QVariant::fromValue( part ); + QVERIFY( variant.isValid() ); + QVERIFY( variant.canConvert() ); + QVERIFY( variant.value() == part ); +} + +#include "attachmentparttest.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentparttest.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentparttest.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentparttest.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentparttest.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,32 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef ATTACHMENTPARTTEST_H +#define ATTACHMENTPARTTEST_H + +#include + +class AttachmentPartTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testApi(); +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentpropertiesdialogtest.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentpropertiesdialogtest.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentpropertiesdialogtest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentpropertiesdialogtest.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,189 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "attachmentpropertiesdialogtest.h" +#include "qtest_messagecore.h" + +#include + +#include + +#include +#include +#include +#include + +#include +using namespace KMime; + +#include +#include +using namespace KPIM; + +QTEST_KDEMAIN( AttachmentPropertiesDialogTest, GUI ) + +void AttachmentPropertiesDialogTest::testAttachmentPartReadWrite() +{ + // Sample data. + const QString name = QString::fromLatin1( "old name" ); + const QString newName = QString::fromLatin1( "new name" ); + const QString description = QString::fromLatin1( "old description" ); + const QString newDescription = QString::fromLatin1( "new description" ); + const QByteArray data( "12345" ); + const QByteArray mimeType( "text/plain" ); + const QByteArray newMimeType( "x-weird/x-type" ); + const Headers::contentEncoding encoding = Headers::CEquPr; + const Headers::contentEncoding newEncoding = Headers::CE7Bit; + const bool autoDisplay = true; + const bool encrypt = true; + const bool sign = true; + + // Create the part. + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + part->setName( name ); + part->setDescription( description ); + part->setData( data ); + part->setMimeType( mimeType ); + part->setEncoding( encoding ); + part->setInline( autoDisplay ); + part->setEncrypted( encrypt ); + part->setSigned( sign ); + + // Show the dialog and verify that it is accurate. + AttachmentPropertiesDialog *dialog = new AttachmentPropertiesDialog( part ); + dialog->show(); + KLineEdit *nameEdit = dialog->findChild( QLatin1String( "name" ) ); + Q_ASSERT( nameEdit ); + QCOMPARE( nameEdit->text(), name ); + KLineEdit *descriptionEdit = dialog->findChild( QLatin1String( "description" ) ); + Q_ASSERT( descriptionEdit ); + QCOMPARE( descriptionEdit->text(), description ); + KComboBox *mimeTypeCombo = dialog->findChild( QLatin1String( "mimeType" ) ); + Q_ASSERT( mimeTypeCombo ); + QCOMPARE( mimeTypeCombo->currentText().toLatin1(), mimeType ); + KComboBox *encodingCombo = dialog->findChild( QLatin1String( "encoding" ) ); + Q_ASSERT( encodingCombo ); + QCOMPARE( encodingCombo->currentIndex(), int( encoding ) ); + QCheckBox *autoDisplayCheck = dialog->findChild( QLatin1String( "autoDisplay" ) ); + Q_ASSERT( autoDisplayCheck ); + QCOMPARE( autoDisplayCheck->isChecked(), autoDisplay ); + QCheckBox *encryptCheck = dialog->findChild( QLatin1String( "encrypt" ) ); + Q_ASSERT( encryptCheck ); + QCOMPARE( encryptCheck->isChecked(), encrypt ); + QCheckBox *signCheck = dialog->findChild( QLatin1String( "sign" ) ); + Q_ASSERT( signCheck ); + QCOMPARE( signCheck->isChecked(), sign ); + //QTest::qWait( 5000 ); + + // Make some changes in the dialog. + nameEdit->setText( newName ); + descriptionEdit->setText( newDescription ); + mimeTypeCombo->setCurrentItem( newMimeType, true ); + encodingCombo->setCurrentIndex( int( newEncoding ) ); + autoDisplayCheck->setChecked( !autoDisplay ); + encryptCheck->setChecked( !encrypt ); + signCheck->setChecked( !sign ); + + // Click on 'OK' and verify changes. + dialog->accept(); + delete dialog; + QCOMPARE( part->name(), newName ); + QCOMPARE( part->description(), newDescription ); + QCOMPARE( part->data(), data ); // Unchanged. + QCOMPARE( part->mimeType(), newMimeType ); + QCOMPARE( int( part->encoding() ), int( newEncoding ) ); + QCOMPARE( part->isInline(), !autoDisplay ); + QCOMPARE( part->isEncrypted(), !encrypt ); + QCOMPARE( part->isSigned(), !sign ); +} + +void AttachmentPropertiesDialogTest::testAttachmentPartReadOnly() +{ + // Sample data. + const QString name = QString::fromLatin1( "old name" ); + const QString newName = QString::fromLatin1( "new name" ); + + // Create the part. + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + part->setName( name ); + + // Show the (read-only) dialog and do some changes. + AttachmentPropertiesDialog *dialog = new AttachmentPropertiesDialog( part, 0, true ); + dialog->show(); + KLineEdit *nameEdit = dialog->findChild( QLatin1String( "name" ) ); + Q_ASSERT( nameEdit ); + nameEdit->setText( newName ); + + // Click on 'OK'. No changes should have been made. + dialog->accept(); + delete dialog; + QCOMPARE( part->name(), name ); // No change. +} + +void AttachmentPropertiesDialogTest::testAttachmentPartCancel() +{ + // Sample data. + const QString name = QString::fromLatin1( "old name" ); + const QString newName = QString::fromLatin1( "new name" ); + + // Create the part. + AttachmentPart::Ptr part = AttachmentPart::Ptr( new AttachmentPart ); + part->setName( name ); + + // Show the (read-write) dialog and do some changes. + AttachmentPropertiesDialog *dialog = new AttachmentPropertiesDialog( part ); + dialog->show(); + KLineEdit *nameEdit = dialog->findChild( QLatin1String( "name" ) ); + Q_ASSERT( nameEdit ); + nameEdit->setText( newName ); + + // Click on 'Cancel'. No changes should have been made. + dialog->reject(); + delete dialog; + QCOMPARE( part->name(), name ); // No change. +} + +void AttachmentPropertiesDialogTest::testMimeContentReadOnly() +{ + // Sample data. + const QString name = QString::fromLatin1( "old name" ); + const QString newName = QString::fromLatin1( "new name" ); + const QByteArray charset( "us-ascii" ); + + // Create the MIME Content. + Content *content = new Content; + content->contentType()->setName( name, charset ); + const Content *constContent = content; + + // Show the (read-only) dialog and do some changes. + AttachmentPropertiesDialog *dialog = new AttachmentPropertiesDialog( constContent ); + dialog->show(); + KLineEdit *nameEdit = dialog->findChild( QLatin1String( "name" ) ); + QVERIFY( nameEdit->isReadOnly() ); + QCOMPARE( nameEdit->text(), name ); + Q_ASSERT( nameEdit ); + nameEdit->setText( newName ); + + // Click on 'OK'. The MIME Content should be untouched. + dialog->accept(); + delete dialog; + QCOMPARE( content->contentType()->name(), name ); // No change. +} + +#include "attachmentpropertiesdialogtest.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentpropertiesdialogtest.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentpropertiesdialogtest.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachmentpropertiesdialogtest.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachmentpropertiesdialogtest.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,35 @@ +/* + Copyright (c) 2009 Constantin Berzan + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef ATTACHMENTPROPERTIESDIALOGTEST_H +#define ATTACHMENTPROPERTIESDIALOGTEST_H + +#include + +class AttachmentPropertiesDialogTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testAttachmentPartReadWrite(); + void testAttachmentPartReadOnly(); + void testAttachmentPartCancel(); + void testMimeContentReadOnly(); +}; + +#endif Binary files /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachments/doc.pdf and /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachments/doc.pdf differ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachments/file.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachments/file.txt --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachments/file.txt 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachments/file.txt 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,2 @@ +some plain ascii text... + Binary files /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/attachments/image.png and /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/attachments/image.png differ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/CMakeLists.txt 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,22 @@ +set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) + +include_directories( ${Boost_INCLUDE_DIR} ) + +# Location of the attachments to test. +set( attachments_root "QLatin1String( \"${CMAKE_CURRENT_SOURCE_DIR}/attachments/\" )" ) +add_definitions( -DPATH_ATTACHMENTS='${attachments_root}' ) + +# Convenience macro to add unit tests. +macro( add_messagecore_test _source ) + set( _test ${_source} ) + get_filename_component( _name ${_source} NAME_WE ) + kde4_add_unit_test( ${_name} TESTNAME messagecore-${_name} ${_test} ) + target_link_libraries( ${_name} messagecore ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ) +endmacro( add_messagecore_test ) + +# Attachment tests. +add_messagecore_test( attachmentcompressjobtest.cpp ) +add_messagecore_test( attachmentfrommimecontentjobtest.cpp ) +add_messagecore_test( attachmentfromurljobtest.cpp ) +add_messagecore_test( attachmentparttest.cpp ) +add_messagecore_test( attachmentpropertiesdialogtest.cpp ) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/qtest_messagecore.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/qtest_messagecore.h --- kde-nightly-kdepim-20091006+svn1032120/messagecore/tests/qtest_messagecore.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagecore/tests/qtest_messagecore.h 2009-10-09 23:30:58.000000000 +0100 @@ -0,0 +1,34 @@ +/* + Copyright (C) 2009 Constantin Berzan + + Based on Akonadi code by: + Copyright (C) 2009 Volker Krause + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef QTEST_LIBKDEPIM_H +#define QTEST_LIBKDEPIM_H + +/** + * Runs a KJob synchronously and aborts if the job failed. + * Similar to QVERIFY( job->exec() ) but includes the job error message + * in the output in case of a failure. + */ +// TODO move to qtest_kde... +#define VERIFYEXEC( job ) \ + QVERIFY2( job->exec(), job->errorString().toUtf8().constData() ) + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/messagelist/CMakeLists.txt 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/CMakeLists.txt 2009-10-09 23:30:58.000000000 +0100 @@ -84,7 +84,7 @@ ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_KMIME_LIBS} - kdepim + messagecore ) set_target_properties(messagelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/item.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/item.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/item.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/item.h 2009-10-09 23:30:58.000000000 +0100 @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/model.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/model.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/model.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/model.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -53,8 +53,7 @@ #include "core/manager.h" #include "core/messageitemsetmanager.h" -#include // KPIM::BroadcastStatus -#include +#include #include #include @@ -3844,19 +3843,34 @@ case ViewItemJob::Pass1Fill: case ViewItemJob::Pass1Cleanup: case ViewItemJob::Pass1Update: - KPIM::BroadcastStatus::instance()->setStatusMsg( i18np("Processed 1 Message of %2", "Processed %1 Messages of %2", job->currentIndex() - job->startIndex(), ( job->endIndex() - job->startIndex() ) + 1 ) ); + emit q->statusMessage( i18np( "Processed 1 Message of %2", + "Processed %1 Messages of %2", + job->currentIndex() - job->startIndex(), + job->endIndex() - job->startIndex() + 1 ) ); break; case ViewItemJob::Pass2: - KPIM::BroadcastStatus::instance()->setStatusMsg( i18np("Threaded 1 Message of %2", "Threaded %1 Messages of %2", job->currentIndex() - job->startIndex(), ( job->endIndex() - job->startIndex() ) + 1 ) ); + emit q->statusMessage( i18np( "Threaded 1 Message of %2", + "Threaded %1 Messages of %2", + job->currentIndex() - job->startIndex(), + job->endIndex() - job->startIndex() + 1 ) ); break; case ViewItemJob::Pass3: - KPIM::BroadcastStatus::instance()->setStatusMsg( i18np("Threaded 1 Message of %2", "Threaded %1 Messages of %2", job->currentIndex() - job->startIndex(), ( job->endIndex() - job->startIndex() ) + 1 ) ); + emit q->statusMessage( i18np( "Threaded 1 Message of %2", + "Threaded %1 Messages of %2", + job->currentIndex() - job->startIndex(), + job->endIndex() - job->startIndex() + 1 ) ); break; case ViewItemJob::Pass4: - KPIM::BroadcastStatus::instance()->setStatusMsg( i18np("Grouped 1 Thread of %2", "Grouped %1 Threads of %2", job->currentIndex() - job->startIndex(), ( job->endIndex() - job->startIndex() ) + 1 ) ); + emit q->statusMessage( i18np( "Grouped 1 Thread of %2", + "Grouped %1 Threads of %2", + job->currentIndex() - job->startIndex(), + job->endIndex() - job->startIndex() + 1 ) ); break; case ViewItemJob::Pass5: - KPIM::BroadcastStatus::instance()->setStatusMsg( i18np("Updated 1 Group of %2", "Updated %1 Groups of %2", job->currentIndex() - job->startIndex(), ( job->endIndex() - job->startIndex() ) + 1 ) ); + emit q->statusMessage( i18np( "Updated 1 Group of %2", + "Updated %1 Groups of %2", + job->currentIndex() - job->startIndex(), + job->endIndex() - job->startIndex() + 1 ) ); break; default: break; } @@ -3949,7 +3963,7 @@ // no more jobs - KPIM::BroadcastStatus::instance()->setStatusMsg( i18nc( "@info:status Finished view fill", "Ready" ) ); + emit q->statusMessage( i18nc( "@info:status Finished view fill", "Ready" ) ); return ViewItemJobCompleted; } diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/model.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/model.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/model.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/model.h 2009-10-09 23:30:58.000000000 +0100 @@ -238,6 +238,13 @@ virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const; virtual Qt::ItemFlags flags( const QModelIndex &index ) const; +Q_SIGNALS: + /** + * Notify the outside when updating the status bar with a message + * could be useful + */ + void statusMessage( const QString &message ); + private: Q_PRIVATE_SLOT(d, void checkIfDateChanged()) Q_PRIVATE_SLOT(d, void viewItemJobStep()) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/subjectutils.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/subjectutils.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/subjectutils.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/subjectutils.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -20,17 +20,30 @@ #include "subjectutils_p.h" +#include #include #include #include +#include "configprovider.h" + QString MessageList::Core::SubjectUtils::stripOffPrefixes( const QString &subject ) { + KConfigGroup composerGroup( ConfigProvider::self()->config(), "Composer" ); + + QStringList replyPrefixes = composerGroup.readEntry( "reply-prefixes", QStringList() ); + if ( replyPrefixes.isEmpty() ) { + replyPrefixes << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:"; + } + + QStringList forwardPrefixes = composerGroup.readEntry( "forward-prefixes", QStringList() ); + if ( forwardPrefixes.isEmpty() ) { + forwardPrefixes << "Fwd:" << "FW:"; + } + QString str = subject; - QStringList prefixRegExps; - prefixRegExps << "Re\\s*:" << "Re\\[\\d+\\]:" << "Re\\d+:" - << "Fwd:" << "FW:"; + const QStringList prefixRegExps = replyPrefixes + forwardPrefixes; // construct a big regexp that // 1. is anchored to the beginning of str (sans whitespace) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/view.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/view.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/view.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/view.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -33,7 +33,6 @@ #include "core/widgetbase.h" #include // kdepimlibs -#include #include #include @@ -114,6 +113,9 @@ d->mModel = new Model( this ); setModel( d->mModel ); + connect( d->mModel, SIGNAL( statusMessage( const QString & ) ), + pParent, SIGNAL( statusMessage( const QString & ) ) ); + //connect( selectionModel(), SIGNAL( currentChanged( const QModelIndex &, const QModelIndex & ) ), // this, SLOT( slotCurrentIndexChanged( const QModelIndex &, const QModelIndex & ) ) ); connect( selectionModel(), SIGNAL( selectionChanged( const QItemSelection &, const QItemSelection & ) ), @@ -2594,4 +2596,9 @@ setAllGroupsExpanded( true ); } +void View::focusQuickSearch() +{ + d->mWidget->focusQuickSearch(); +} + #include "view.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/view.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/view.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/view.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/view.h 2009-10-09 23:30:58.000000000 +0100 @@ -342,6 +342,10 @@ */ void fillViewMenu( KMenu * menu ); + /** + * Sets the focus on the quick search line of the currently active tab. + */ + void focusQuickSearch(); protected: /** * Reimplemented in order to catch QHelpEvent diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/widgetbase.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/widgetbase.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/widgetbase.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/widgetbase.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -50,7 +50,7 @@ #include #include -#include +#include using namespace MessageList::Core; @@ -1108,3 +1108,11 @@ Q_UNUSED( clear ); } +void Widget::focusQuickSearch() +{ + if ( d->mSearchEdit ) + { + d->mSearchEdit->setFocus(); + } +} + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/core/widgetbase.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/core/widgetbase.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/core/widgetbase.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/core/widgetbase.h 2009-10-09 23:30:58.000000000 +0100 @@ -109,6 +109,12 @@ */ QString currentFilterTagId() const; + /** + * Sets the focus on the quick search line of the currently active tab. + */ + void focusQuickSearch(); + + public slots: /** @@ -190,12 +196,18 @@ void tagIdSelected( QVariant data ); -signals: +Q_SIGNALS: /** * Emitted when a full search is requested. */ void fullSearchRequest(); + /** + * Notify the outside when updating the status bar with a message + * could be useful + */ + void statusMessage( const QString &message ); + protected slots: /** * This is called by Manager when the option sets stored within have changed. diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/pane.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/pane.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/pane.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/pane.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -39,7 +39,7 @@ { public: Private( Pane *owner ) - : q( owner ) { } + : q( owner ), mXmlGuiClient( 0 ) { } void onSelectionChanged( const QItemSelection &selected, const QItemSelection &deselected ); void onNewTabClicked(); @@ -53,6 +53,8 @@ Pane * const q; + KXMLGUIClient *mXmlGuiClient; + QAbstractItemModel *mModel; QItemSelectionModel *mSelectionModel; @@ -66,6 +68,7 @@ } // namespace MessageList +using namespace Akonadi; using namespace MessageList; @@ -131,6 +134,16 @@ delete d; } +void Pane::setXmlGuiClient( KXMLGUIClient *xmlGuiClient ) +{ + d->mXmlGuiClient = xmlGuiClient; + + for ( int i=0; i( widget( i ) ); + w->setXmlGuiClient( d->mXmlGuiClient ); + } +} + bool Pane::selectNextMessageItem( MessageList::Core::MessageTypeFilter messageTypeFilter, MessageList::Core::ExistingSelectionBehaviour existingSelectionBehaviour, bool centerItem, @@ -210,6 +223,43 @@ } } + +void Pane::setCurrentThreadExpanded( bool expand ) +{ + Widget *w = static_cast( currentWidget() ); + + if ( w ) { + w->setCurrentThreadExpanded(expand ); + } +} + +void Pane::setAllThreadsExpanded( bool expand ) +{ + Widget *w = static_cast( currentWidget() ); + + if ( w ) { + w->setAllThreadsExpanded( expand ); + } +} + +void Pane::setAllGroupsExpanded( bool expand ) +{ + Widget *w = static_cast( currentWidget() ); + + if ( w ) { + w->setAllGroupsExpanded(expand); + } +} + +void Pane::focusQuickSearch() +{ + Widget *w = static_cast( currentWidget() ); + + if ( w ) { + w->focusQuickSearch(); + } +} + void Pane::Private::onSelectionChanged( const QItemSelection &selected, const QItemSelection &deselected ) { Widget *w = static_cast( q->currentWidget() ); @@ -315,6 +365,7 @@ void Pane::createNewTab() { Widget * w = new Widget( this ); + w->setXmlGuiClient( d->mXmlGuiClient ); addTab( w, i18nc( "@title:tab Empty messagelist", "Empty" ) ); QItemSelectionModel *s = new QItemSelectionModel( d->mModel, w ); @@ -332,6 +383,10 @@ connect( w, SIGNAL(messageStatusChangeRequest(Akonadi::Item, KPIM::MessageStatus, KPIM::MessageStatus)), this, SIGNAL(messageStatusChangeRequest(Akonadi::Item, KPIM::MessageStatus, KPIM::MessageStatus)) ); + connect( w, SIGNAL(statusMessage(QString)), + this, SIGNAL(statusMessage(QString)) ); + + connect( w, SIGNAL( fullSearchRequest() ), this, SIGNAL( fullSearchRequest() ) ); d->updateTabControls(); setCurrentWidget( w ); } @@ -372,4 +427,26 @@ } } +Item Pane::currentItem() const +{ + Widget *w = static_cast( currentWidget() ); + + if ( w == 0 ) { + return Item(); + } + + return w->currentItem(); +} + +MessagePtr Pane::currentMessage() const +{ + Widget *w = static_cast( currentWidget() ); + + if ( w == 0 ) { + return MessagePtr(); + } + + return w->currentMessage(); +} + #include "pane.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/pane.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/pane.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/pane.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/pane.h 2009-10-09 23:30:58.000000000 +0100 @@ -24,13 +24,19 @@ #include #include +#include +#include + +#include + +class KXMLGUIClient; class QAbstractItemModel; class QAbstractProxyModel; class QItemSelectionModel; class QItemSelection; class QToolButton; -#include +typedef boost::shared_ptr MessagePtr; namespace KPIM { @@ -51,6 +57,11 @@ * This is the main MessageList panel for Akonadi applications. * It contains multiple MessageList::Widget tabs * so it can actually display multiple folder sets at once. + * + * When a KXmlGuiWindow is passed to setXmlGuiClient, the XMLGUI + * defined context menu @c akonadi_messagelist_contextmenu is + * used if available. + * */ class MESSAGELIST_EXPORT Pane : public QTabWidget { @@ -64,6 +75,29 @@ ~Pane(); /** + * Sets the XML GUI client which the pane is used in. + * + * This is needed if you want to use the built-in context menu. + * Passing 0 is ok and will disable the builtin context menu. + * + * @param xmlGuiClient The KXMLGUIClient the view is used in. + */ + void setXmlGuiClient( KXMLGUIClient *xmlGuiClient ); + + /** + * Returns the current message for the list as Akonadi::Item. + * May return an invalid Item if there is no current message or no current folder. + */ + Akonadi::Item currentItem() const; + + /** + * Returns the current message for the list as MessagePtr. + * May return 0 if there is no current message or no current folder. + */ + MessagePtr currentMessage() const; + + + /** * Selects the next message item in the view. * * messageTypeFilter can be used to restrict the selection to only certain message types. @@ -148,6 +182,32 @@ */ bool selectFirstMessageItem( MessageList::Core::MessageTypeFilter messageTypeFilter, bool centerItem ); + + /** + * If expand is true then it expands the current thread, otherwise + * collapses it. + */ + void setCurrentThreadExpanded( bool expand ); + + /** + * If expand is true then it expands all the threads, otherwise + * collapses them. + */ + void setAllThreadsExpanded( bool expand ); + + /** + * If expand is true then it expands all the groups (only the toplevel + * group item: inner threads are NOT expanded). If expand is false + * then it collapses all the groups. If no grouping is in effect + * then this function does nothing. + */ + void setAllGroupsExpanded( bool expand ); + + /** + * Sets the focus on the quick search line of the currently active tab. + */ + void focusQuickSearch(); + public slots: /** * Selects all the items in the current folder. @@ -187,6 +247,17 @@ */ void messageStatusChangeRequest( const Akonadi::Item &item, const KPIM::MessageStatus &set, const KPIM::MessageStatus &clear ); + /** + * Emitted when a full search is requested. + */ + void fullSearchRequest(); + + /** + * Notify the outside when updating the status bar with a message + * could be useful + */ + void statusMessage( const QString &message ); + private: Q_PRIVATE_SLOT(d, void onSelectionChanged( const QItemSelection&, const QItemSelection& )) Q_PRIVATE_SLOT(d, void onNewTabClicked()) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/utils/themeeditor.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/utils/themeeditor.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/utils/themeeditor.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/utils/themeeditor.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -26,7 +26,7 @@ #include "core/manager.h" #include "utils/comboboxutils.h" -#include +#include #include #include diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/widget.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/widget.cpp --- kde-nightly-kdepim-20091006+svn1032120/messagelist/widget.cpp 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/widget.cpp 2009-10-09 23:30:58.000000000 +0100 @@ -40,6 +40,8 @@ #include #include #include +#include +#include namespace MessageList { @@ -48,14 +50,16 @@ { public: Private( Widget *owner ) - : q( owner ) { } + : q( owner ), mXmlGuiClient( 0 ) { } Akonadi::Item::List selectionAsItems() const; Akonadi::Item itemForRow( int row ) const; + MessagePtr messageForRow( int row ) const; Widget * const q; int mLastSelectedMessage; + KXMLGUIClient *mXmlGuiClient; }; } // namespace MessageList @@ -63,70 +67,44 @@ using namespace MessageList; using namespace Akonadi; -struct DragPayload -{ - QList sourceCollections; - QList items; - bool readOnly; - - DragPayload() : readOnly( false ) { } - - static QString mimeType() - { - return "x-akonadi-drag/message-list"; - } -}; - -QDataStream &operator<<(QDataStream &stream, const DragPayload &payload) -{ - stream << payload.sourceCollections; - stream << payload.items; - stream << payload.readOnly; - - return stream; -} - -QDataStream &operator>>(QDataStream &stream, DragPayload &payload) -{ - stream >> payload.sourceCollections; - stream >> payload.items; - stream >> payload.readOnly; - - return stream; -} - Widget::Widget( QWidget *parent ) : Core::Widget( parent ), d( new Private( this ) ) { - QTimer::singleShot( 0, this, SLOT( populateStatusFilterCombo() ) ); + populateStatusFilterCombo(); } Widget::~Widget() { + delete d; } -bool Widget::canAcceptDrag( const QDragMoveEvent * e ) +void Widget::setXmlGuiClient( KXMLGUIClient *xmlGuiClient ) +{ + d->mXmlGuiClient = xmlGuiClient; +} + +bool Widget::canAcceptDrag( const QDropEvent * e ) { Collection::List collections = static_cast( storageModel() )->displayedCollections(); if ( collections.size()!=1 ) return false; // no folder here or too many (in case we can't decide where the drop will end) - Collection c = collections.first(); + const Collection target = collections.first(); - if ( ( c.rights() & Collection::CanCreateItem ) == 0 ) + if ( ( target.rights() & Collection::CanCreateItem ) == 0 ) return false; // no way to drag into - if ( !e->mimeData()->hasFormat( DragPayload::mimeType() ) ) - return false; // no way to decode it - - DragPayload payload; - QDataStream stream( e->mimeData()->data( DragPayload::mimeType() ) ); - stream >> payload; - - foreach ( Collection::Id id, payload.sourceCollections ) { - if ( id == c.id() ) { + const KUrl::List urls = KUrl::List::fromMimeData( e->mimeData() ); + foreach ( const KUrl &url, urls ) { + const Collection collection = Collection::fromUrl( url ); + if ( collection.isValid() ) { // You're not supposed to drop collections here return false; + } else { // Yay, this is an item! + const QString type = url.queryItems()["type"]; // But does it have the right type? + if ( !target.contentMimeTypes().contains( type ) ) { + return false; + } } } @@ -175,6 +153,26 @@ view()->selectAll(); } +void Widget::setCurrentThreadExpanded( bool expand ) +{ + view()->setCurrentThreadExpanded(expand ); +} + +void Widget::setAllThreadsExpanded( bool expand ) +{ + view()->setAllThreadsExpanded( expand ); +} + +void Widget::setAllGroupsExpanded( bool expand ) +{ + view()->setAllGroupsExpanded(expand); +} + +void Widget::focusQuickSearch() +{ + view()->focusQuickSearch(); +} + void Widget::viewMessageSelected( MessageList::Core::MessageItem *msg ) { int row = -1; @@ -232,10 +230,18 @@ } } -void Widget::viewMessageListContextPopupRequest( const QList< MessageList::Core::MessageItem * > &selectedItems, const QPoint &globalPos ) +void Widget::viewMessageListContextPopupRequest( const QList< MessageList::Core::MessageItem * > &selectedItems, + const QPoint &globalPos ) { - //FIXME: To implement once the other infrastructure is ready for a KMail independent implementation - kWarning() << "Needs to be reimplemented"; + if ( !d->mXmlGuiClient ) + return; + + QMenu *popup = static_cast( d->mXmlGuiClient->factory()->container( + QLatin1String( "akonadi_messagelist_contextmenu" ), + d->mXmlGuiClient ) ); + if ( popup ) { + popup->exec( globalPos ); + } } void Widget::viewMessageStatusChangeRequest( MessageList::Core::MessageItem *msg, const KPIM::MessageStatus &set, const KPIM::MessageStatus &clear ) @@ -306,19 +312,13 @@ void Widget::viewDropEvent( QDropEvent *e ) { - Collection::List collections = static_cast( storageModel() )->displayedCollections(); - - if ( collections.size()!=1 || !e->mimeData()->hasFormat( DragPayload::mimeType() ) ) { - // no folder here or too many (in case we can't decide where the drop will end), or we can't decode + if ( !canAcceptDrag( e ) ) { e->ignore(); return; } - DragPayload payload; - QDataStream stream( e->mimeData()->data( DragPayload::mimeType() ) ); - stream >> payload; - - if ( payload.items.isEmpty() ) { + KUrl::List urls = KUrl::List::fromMimeData( e->mimeData() ); + if ( urls.isEmpty() ) { kWarning() << "Could not decode drag data!"; e->ignore(); return; @@ -327,7 +327,7 @@ e->accept(); int action; - if ( payload.readOnly ) { + if ( ( e->possibleActions() & Qt::MoveAction ) == 0 ) { // We can't move anyway action = DragCopy; } else { action = DragCancel; @@ -357,10 +357,11 @@ } } + Collection::List collections = static_cast( storageModel() )->displayedCollections(); Collection target = collections.first(); Item::List items; - foreach ( Item::Id id, payload.items ) { - items << Item( id ); + foreach ( const KUrl &url, urls ) { + items << Item::fromUrl( url ); } if ( action == DragCopy ) { @@ -382,29 +383,23 @@ if ( items.isEmpty() ) return; - DragPayload payload; + bool readOnly = false; foreach ( const Collection c, collections ) { - payload.sourceCollections << c.id(); // We won't be able to remove items from this collection if ( ( c.rights() & Collection::CanDeleteItem ) == 0 ) { // So the drag will be read-only - payload.readOnly = true; + readOnly = true; } } + KUrl::List urls; foreach ( const Item i, items ) { - payload.items << i.id(); - } - - QByteArray data; - { - QDataStream stream( &data, QIODevice::WriteOnly ); - stream << payload; + urls << i.url( Item::UrlWithMimeType ); } QMimeData *mimeData = new QMimeData; - mimeData->setData( DragPayload::mimeType(), data ); + urls.populateMimeData( mimeData ); QDrag *drag = new QDrag( view()->viewport() ); drag->setMimeData( mimeData ); @@ -423,7 +418,7 @@ drag->setPixmap( pixmap ); } - if ( payload.readOnly ) + if ( readOnly ) drag->exec( Qt::CopyAction ); else drag->exec( Qt::CopyAction | Qt::MoveAction ); @@ -447,3 +442,30 @@ { return static_cast( q->storageModel() )->itemForRow( row ); } + +MessagePtr Widget::Private::messageForRow( int row ) const +{ + return static_cast( q->storageModel() )->messageForRow( row ); +} + +Item Widget::currentItem() const +{ + Core::MessageItem *mi = view()->currentMessageItem(); + + if ( mi == 0 ) { + return Item(); + } + + return d->itemForRow( mi->currentModelIndexRow() ); +} + +MessagePtr Widget::currentMessage() const +{ + Core::MessageItem *mi = view()->currentMessageItem(); + + if ( mi == 0 ) { + return MessagePtr(); + } + + return d->messageForRow( mi->currentModelIndexRow() ); +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messagelist/widget.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messagelist/widget.h --- kde-nightly-kdepim-20091006+svn1032120/messagelist/widget.h 2009-10-06 23:28:05.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messagelist/widget.h 2009-10-09 23:30:58.000000000 +0100 @@ -23,15 +23,26 @@ #include +#include +#include + #include +class KXMLGUIClient; class QWidget; +typedef boost::shared_ptr MessagePtr; + namespace MessageList { /** * The Akonadi specific implementation of the Core::Widget. + * + * When a KXmlGuiWindow is passed to setXmlGuiClient, the XMLGUI + * defined context menu @c akonadi_messagelist_contextmenu is + * used if available. + * */ class MESSAGELIST_EXPORT Widget : public MessageList::Core::Widget { @@ -39,15 +50,38 @@ public: /** - * Create a Widget wrapping the specified folder. + * Create a new message list widget. */ explicit Widget( QWidget *parent ); ~Widget(); /** + * Sets the XML GUI client which the view is used in. + * + * This is needed if you want to use the built-in context menu. + * Passing 0 is ok and will disable the builtin context menu. + * + * @param xmlGuiClient The KXMLGUIClient the view is used in. + */ + void setXmlGuiClient( KXMLGUIClient *xmlGuiClient ); + + /** + * Returns the current message for the list as Akonadi::Item. + * May return an invalid Item if there is no current message or no current folder. + */ + Akonadi::Item currentItem() const; + + /** + * Returns the current message for the list as MessagePtr. + * May return 0 if there is no current message or no current folder. + */ + MessagePtr currentMessage() const; + + + /** * Returns true if this drag can be accepted by the underlying view */ - bool canAcceptDrag( const QDragMoveEvent *e ); + bool canAcceptDrag( const QDropEvent *e ); /** * Selects the next message item in the view. @@ -138,6 +172,30 @@ * Selects all the items in the current folder. */ void selectAll(); + /** + * If expand is true then it expands the current thread, otherwise + * collapses it. + */ + void setCurrentThreadExpanded( bool expand ); + + /** + * If expand is true then it expands all the threads, otherwise + * collapses them. + */ + void setAllThreadsExpanded( bool expand ); + + /** + * If expand is true then it expands all the groups (only the toplevel + * group item: inner threads are NOT expanded). If expand is false + * then it collapses all the groups. If no grouping is in effect + * then this function does nothing. + */ + void setAllGroupsExpanded( bool expand ); + + /** + * Sets the focus on the quick search line of the currently active tab. + */ + void focusQuickSearch(); protected: /** diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/antispamconfig.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/antispamconfig.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/antispamconfig.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/antispamconfig.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,113 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + antispamconfig.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2004 Patrick Audley + Copyright (c) 2004 Ingo Kloecker + + KMail is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#include "antispamconfig.h" + +#include +#include +#include +#include + +#include +namespace MessageViewer { +class AntiSpamConfigSingletonProvider +{ + public: + AntiSpamConfig instance; +}; + +K_GLOBAL_STATIC( AntiSpamConfigSingletonProvider, theAntiSpamConfigSingletonProvider ) + +AntiSpamConfig * AntiSpamConfig::instance() +{ + // better safe than sorry; check whether the global static has already been destroyed + if ( theAntiSpamConfigSingletonProvider.isDestroyed() ) + { + return 0; + } + return &theAntiSpamConfigSingletonProvider->instance; +} + +AntiSpamConfig::AntiSpamConfig() +{ + readConfig(); +} + +void AntiSpamConfig::readConfig() +{ + mAgents.clear(); + KConfig config( "kmail.antispamrc" ); + config.setReadDefaults( true ); + KConfigGroup general( &config, "General" ); + unsigned int totalTools = general.readEntry( "tools", 0 ); + for ( unsigned int i = 1; i <= totalTools; ++i ) { + KConfigGroup tool( &config, QString("Spamtool #%1").arg( i ) ); + if ( tool.hasKey( "ScoreHeader" ) ) { + QString name = tool.readEntry( "ScoreName" ); + QByteArray header = tool.readEntry( "ScoreHeader" ).toLatin1(); + QByteArray cheader = tool.readEntry( "ConfidenceHeader" ).toLatin1(); + QByteArray type = tool.readEntry( "ScoreType" ).toLatin1(); + QString score = tool.readEntryUntranslated( "ScoreValueRegexp" ); + QString threshold = tool.readEntryUntranslated( "ScoreThresholdRegexp" ); + QString confidence = tool.readEntryUntranslated( "ScoreConfidenceRegexp" ); + SpamAgentTypes typeE = SpamAgentNone; + if ( kasciistricmp( type.data(), "bool" ) == 0 ) + typeE = SpamAgentBool; + else if ( kasciistricmp( type.data(), "decimal" ) == 0 ) + typeE = SpamAgentFloat; + else if ( kasciistricmp( type.data(), "percentage" ) == 0 ) + typeE = SpamAgentFloatLarge; + else if ( kasciistricmp( type.data(), "adjusted" ) == 0 ) + typeE = SpamAgentAdjustedFloat; + mAgents.append( SpamAgent( name, typeE, header, cheader, QRegExp( score ), + QRegExp( threshold ), QRegExp( confidence ) ) ); + } + } +} + +const SpamAgents AntiSpamConfig::uniqueAgents() const +{ + QStringList seenAgents; + SpamAgents agents; + SpamAgents::ConstIterator it( mAgents.begin() ); + SpamAgents::ConstIterator end( mAgents.end() ); + for ( ; it != end ; ++it ) { + const QString agent( ( *it ).name() ); + if ( !seenAgents.contains( agent ) ) { + agents.append( *it ); + seenAgents.append( agent ); + } + } + return agents; +} +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/antispamconfig.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/antispamconfig.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/antispamconfig.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/antispamconfig.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,122 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + antispamconfig.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2004 Patrick Audley + Copyright (c) 2004 Ingo Kloecker + + KMail is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_ANTISPAMCONFIG_H__ +#define __MESSAGEVIEWER_ANTISPAMCONFIG_H__ + +#include +#include +#include "messageviewer_export.h" +class QString; +namespace MessageViewer { + +/// Valid types of SpamAgent +typedef enum { + SpamAgentNone, //!< Invalid SpamAgent, skip this agent + SpamAgentBool, //!< Simple Yes or No (Razor) + SpamAgentFloat, //!< For straight percentages between 0.0 and 1.0 (BogoFilter) + SpamAgentFloatLarge, //!< For straight percentages between 0.0 and 100.0 + SpamAgentAdjustedFloat //!< Use this when we need to compare against a threshold (SpamAssasssin) +} SpamAgentTypes; + +class SpamAgent { +public: + SpamAgent() : mType( SpamAgentNone ) {} + SpamAgent( const QString & name, SpamAgentTypes type, const QByteArray & field, const QByteArray & cfield, + const QRegExp & score, const QRegExp & threshold, const QRegExp & confidence ) + : mName( name ), mType( type ), mField( field ), mConfidenceField( cfield ), + mScore( score ), mThreshold( threshold ), mConfidence( confidence ) {} + + QString name() const { return mName; } + SpamAgentTypes scoreType() const { return mType; } + QByteArray header() const { return mField; } + QByteArray confidenceHeader() const { return mConfidenceField; } + QRegExp scorePattern() const { return mScore; } + QRegExp thresholdPattern() const { return mThreshold; } + QRegExp confidencePattern() const { return mConfidence; } + +private: + QString mName; + SpamAgentTypes mType; + QByteArray mField; + QByteArray mConfidenceField; + QRegExp mScore; + QRegExp mThreshold; + QRegExp mConfidence; +}; +typedef QList SpamAgents; +typedef QList::Iterator SpamAgentsIterator; + +class AntiSpamConfigSingletonProvider; + +/** + @short Singleton to manage loading the kmail.antispamrc file. + @author Patrick Audley + + Use of this config-manager class is straight forward. Since it + is a singleton object, all you have to do is obtain an instance + by calling @p SpamConfig::instance() and use any of the + public member functions. + */ +class MESSAGEVIEWER_EXPORT AntiSpamConfig { +friend class AntiSpamConfigSingletonProvider; +private: + AntiSpamConfig(); + +public: + ~AntiSpamConfig() {} + + static AntiSpamConfig * instance(); + + /** + * Returns a list of all agents found on the system. This + * might list SA twice, if both the C and the Perl version are present. + */ + const SpamAgents agents() const { return mAgents; } + SpamAgents agents() { return mAgents; } + + /** + * Returns a list of unique agents, found on the system. SpamAssassin will + * only be listed once, even if both the C and the Perl version are + * installed. + */ + const SpamAgents uniqueAgents() const; + +private: + SpamAgents mAgents; + + void readConfig(); +}; +} + +#endif // __MESSAGEVIEWER_ANTISPAMCONFIG_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentdialog.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentdialog.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentdialog.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentdialog.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,108 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + This file is part of KMail, the KDE mail client. + Copyright (c) 2009 Martin Koller + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include + +#include +#include +#include + + +//--------------------------------------------------------------------- + +AttachmentDialog::AttachmentDialog( QWidget *parent, const QString &filenameText, + const QString &application, const QString &dontAskAgainName ) + : dontAskName( dontAskAgainName ) +{ + text = i18n( "Open attachment '%1'?\n" + "Note that opening an attachment may compromise " + "your system's security.", + filenameText ); + + dialog = new KDialog( parent ); + dialog->setCaption( i18n("Open Attachment?") ); + dialog->setObjectName( "attachmentSaveOpen" ); + + if ( application.isEmpty() ) + dialog->setButtons( KDialog::User3 | KDialog::User1 | KDialog::Cancel ); + else { + dialog->setButtons( KDialog::User3 | KDialog::User2 | KDialog::User1 | KDialog::Cancel ); + dialog->setButtonText( KDialog::User2, i18n("&Open with '%1'", application ) ); + } + + dialog->setButtonGuiItem( KDialog::User3, KStandardGuiItem::saveAs() ); + dialog->setButtonText( KDialog::User1, i18n("&Open With...") ); + dialog->setDefaultButton( KDialog::User3 ); + + connect( dialog, SIGNAL( user3Clicked() ), this, SLOT( saveClicked() ) ); + connect( dialog, SIGNAL( user2Clicked() ), this, SLOT( openClicked() ) ); + connect( dialog, SIGNAL( user1Clicked() ), this, SLOT( openWithClicked() ) ); +} + +//--------------------------------------------------------------------- + +int AttachmentDialog::exec() +{ + KConfigGroup cg( KGlobal::config().data(), "Notification Messages" ); + if ( cg.hasKey( dontAskName ) ) + return cg.readEntry( dontAskName, int(0) ); + + bool again = false; + const int ret = + KMessageBox::createKMessageBox( dialog, QMessageBox::Question, text, QStringList(), + i18n( "Do not ask again" ), &again, 0 ); + + if ( ret == QDialog::Rejected ) + return Cancel; + else { + if ( again ) { + KConfigGroup::WriteConfigFlags flags = KConfig::Persistent; + KConfigGroup cg( KGlobal::config().data(), "Notification Messages" ); + cg.writeEntry( dontAskName, ret, flags ); + cg.sync(); + } + + return ret; + } +} + +//--------------------------------------------------------------------- + +void AttachmentDialog::saveClicked() +{ + dialog->done( Save ); +} + +//--------------------------------------------------------------------- + +void AttachmentDialog::openClicked() +{ + dialog->done( Open ); +} + +//--------------------------------------------------------------------- + +void AttachmentDialog::openWithClicked() +{ + dialog->done( OpenWith ); +} + +//--------------------------------------------------------------------- + +#include "attachmentdialog.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentdialog.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentdialog.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentdialog.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentdialog.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,64 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + This file is part of KMail, the KDE mail client. + Copyright (c) 2009 Martin Koller + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef MESSAGEVIEWERT_ATTACHMENTDIALOG_H +#define MESSAGEVIEWERT_ATTACHMENTDIALOG_H + +#include "messageviewer_export.h" +#include + +class KDialog; + +/** A class which handles the dialog used to present the user a choice what to do + with an attachment. +*/ + +class MESSAGEVIEWER_EXPORT AttachmentDialog : public QObject +{ + Q_OBJECT + + public: + /// returncodes for exec() + enum + { + Save = 2, + Open, + OpenWith, + Cancel + }; + + // if @application is non-empty, the "open with " button will also be shown, + // otherwise only save, open with, cancel + AttachmentDialog( QWidget *parent, const QString &filenameText, const QString &application, + const QString &dontAskAgainName ); + + // executes the modal dialog + int exec(); + + private slots: + void saveClicked(); + void openClicked(); + void openWithClicked(); + + private: + QString text, dontAskName; + KDialog *dialog; +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentstrategy.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentstrategy.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentstrategy.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentstrategy.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,222 @@ +/* -*- c++ -*- + attachmentstrategy.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#include "attachmentstrategy.h" + +#include + +#include +#include + +namespace MessageViewer { + +// +// IconicAttachmentStrategy: +// show everything but the first text/plain body as icons +// + +class IconicAttachmentStrategy : public AttachmentStrategy { + friend class AttachmentStrategy; +protected: + IconicAttachmentStrategy() : AttachmentStrategy() {} + virtual ~IconicAttachmentStrategy() {} + +public: + const char * name() const { return "iconic"; } + const AttachmentStrategy * next() const { return smart(); } + const AttachmentStrategy * prev() const { return hidden(); } + + bool inlineNestedMessages() const { return false; } + Display defaultDisplay( KMime::Content * node ) const { + if ( node->contentType()->isText() && + node->contentDisposition()->filename().trimmed().isEmpty() && + node->contentType()->name().trimmed().isEmpty() ) + // text/* w/o filename parameter: + return Inline; + return AsIcon; + } +}; + +// +// SmartAttachmentStrategy: +// in addition to Iconic, show all body parts +// with content-disposition == "inline" and +// all text parts without a filename or name parameter inline +// + +class SmartAttachmentStrategy : public AttachmentStrategy { + friend class AttachmentStrategy; +protected: + SmartAttachmentStrategy() : AttachmentStrategy() {} + virtual ~SmartAttachmentStrategy() {} + +public: + const char * name() const { return "smart"; } + const AttachmentStrategy * next() const { return inlined(); } + const AttachmentStrategy * prev() const { return iconic(); } + + bool inlineNestedMessages() const { return true; } + Display defaultDisplay( KMime::Content * node ) const { + if ( node->contentDisposition()->disposition() == KMime::Headers::CDinline ) + // explict "inline" disposition: + return Inline; + if ( node->contentDisposition()->disposition() == KMime::Headers::CDattachment) + // explicit "attachment" disposition: + return AsIcon; + if ( node->contentType()->isText() && + node->contentDisposition()->filename().trimmed().isEmpty() && + node->contentType()->name().trimmed().isEmpty() ) + // text/* w/o filename parameter: + return Inline; + return AsIcon; + } +}; + +// +// InlinedAttachmentStrategy: +// show everything possible inline +// + +class InlinedAttachmentStrategy : public AttachmentStrategy { + friend class AttachmentStrategy; +protected: + InlinedAttachmentStrategy() : AttachmentStrategy() {} + virtual ~InlinedAttachmentStrategy() {} + +public: + const char * name() const { return "inlined"; } + const AttachmentStrategy * next() const { return hidden(); } + const AttachmentStrategy * prev() const { return smart(); } + + bool inlineNestedMessages() const { return true; } + Display defaultDisplay( KMime::Content * ) const { return Inline; } +}; + +// +// HiddenAttachmentStrategy +// show nothing except the first text/plain body part _at all_ +// + +class HiddenAttachmentStrategy : public AttachmentStrategy { + friend class AttachmentStrategy; +protected: + HiddenAttachmentStrategy() : AttachmentStrategy() {} + virtual ~HiddenAttachmentStrategy() {} + +public: + const char * name() const { return "hidden"; } + const AttachmentStrategy * next() const { return iconic(); } + const AttachmentStrategy * prev() const { return inlined(); } + + bool inlineNestedMessages() const { return false; } + Display defaultDisplay( KMime::Content * node ) const { + if ( node->contentType()->isText() && + node->contentDisposition()->filename().trimmed().isEmpty() && + node->contentType()->name().trimmed().isEmpty() ) + // text/* w/o filename parameter: + return Inline; + + if ( node->parent() && node->parent()->contentType()->isMultipart() && + node->parent()->contentType()->subType() == "related" ) + return Inline; + + return None; + } +}; + + +// +// AttachmentStrategy abstract base: +// + +AttachmentStrategy::AttachmentStrategy() { + +} + +AttachmentStrategy::~AttachmentStrategy() { + +} + +const AttachmentStrategy * AttachmentStrategy::create( Type type ) { + switch ( type ) { + case Iconic: return iconic(); + case Smart: return smart(); + case Inlined: return inlined(); + case Hidden: return hidden(); + } + kFatal( 5006 ) << "Unknown attachment startegy ( type ==" + << (int)type << ") requested!"; + return 0; // make compiler happy +} + +const AttachmentStrategy * AttachmentStrategy::create( const QString & type ) { + QString lowerType = type.toLower(); + if ( lowerType == "iconic" ) return iconic(); + //if ( lowerType == "smart" ) return smart(); // not needed, see below + if ( lowerType == "inlined" ) return inlined(); + if ( lowerType == "hidden" ) return hidden(); + // don't kFatal here, b/c the strings are user-provided + // (KConfig), so fail gracefully to the default: + return smart(); +} + +static const AttachmentStrategy * iconicStrategy = 0; +static const AttachmentStrategy * smartStrategy = 0; +static const AttachmentStrategy * inlinedStrategy = 0; +static const AttachmentStrategy * hiddenStrategy = 0; + +const AttachmentStrategy * AttachmentStrategy::iconic() { + if ( !iconicStrategy ) + iconicStrategy = new IconicAttachmentStrategy(); + return iconicStrategy; +} + +const AttachmentStrategy * AttachmentStrategy::smart() { + if ( !smartStrategy ) + smartStrategy = new SmartAttachmentStrategy(); + return smartStrategy; +} + +const AttachmentStrategy * AttachmentStrategy::inlined() { + if ( !inlinedStrategy ) + inlinedStrategy = new InlinedAttachmentStrategy(); + return inlinedStrategy; +} + +const AttachmentStrategy * AttachmentStrategy::hidden() { + if ( !hiddenStrategy ) + hiddenStrategy = new HiddenAttachmentStrategy(); + return hiddenStrategy; +} + +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentstrategy.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentstrategy.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/attachmentstrategy.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/attachmentstrategy.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,85 @@ +/* -*- c++ -*- + attachmentstrategy.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__ +#define __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__ + +#include "messageviewer_export.h" + +class QString; +namespace KMime { + class Content; +} + +namespace MessageViewer { + +class MESSAGEVIEWER_EXPORT AttachmentStrategy { +protected: + AttachmentStrategy(); + virtual ~AttachmentStrategy(); + +public: + // + // Factory methods: + // + enum Type { Iconic, Smart, Inlined, Hidden }; + + static const AttachmentStrategy * create( Type type ); + static const AttachmentStrategy * create( const QString & type ); + + static const AttachmentStrategy * iconic(); + static const AttachmentStrategy * smart(); + static const AttachmentStrategy * inlined(); + static const AttachmentStrategy * hidden(); + + // + // Navigation methods: + // + + virtual const char * name() const = 0; + virtual const AttachmentStrategy * next() const = 0; + virtual const AttachmentStrategy * prev() const = 0; + + // + // Bahavioural: + // + + enum Display { None, AsIcon, Inline }; + + virtual bool inlineNestedMessages() const = 0; + virtual Display defaultDisplay( KMime::Content * node ) const = 0; +}; + +} + +#endif // __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/autoqpointer.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/autoqpointer.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/autoqpointer.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/autoqpointer.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * autoqpointer.h - QPointer which on destruction deletes object + * This is a (mostly) verbatim, private copy of kdepim/kalarm/lib/autoqpointer.h + * + * Copyright © 2009 by David Jarvie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef AUTOQPOINTER_H +#define AUTOQPOINTER_H + +#include + + +/** + * A QPointer which when destructed, deletes the object it points to. + * + * @author David Jarvie + */ +template +class AutoQPointer : public QPointer +{ + public: + inline AutoQPointer() : QPointer() {} + inline AutoQPointer(T* p) : QPointer(p) {} + inline AutoQPointer(const QPointer& p) : QPointer(p) {} + inline ~AutoQPointer() { delete this->data(); } + inline AutoQPointer& operator=(const AutoQPointer& p) { QPointer::operator=(p); return *this; } + inline AutoQPointer& operator=(T* p) { QPointer::operator=(p); return *this; } +}; + +#endif // AUTOQPOINTER_H diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatter.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatter.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatter.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,324 @@ +/* -*- c++ -*- + bodypartformatter.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + + +#include "bodypartformatter.h" +#include "bodypartformatterfactory_p.h" +#include "interfaces/bodypartformatter.h" + +#include "objecttreeparser.h" + +#include + +#include +#include + +using namespace MessageViewer; + +namespace { + class AnyTypeBodyPartFormatter + : public BodyPartFormatter, + public MessageViewer::Interface::BodyPartFormatter { + static const AnyTypeBodyPartFormatter * self; + public: + Result format( Interface::BodyPart *, HtmlWriter * ) const { + kDebug() << "Acting as a Interface::BodyPartFormatter!"; + return AsIcon; + } + + bool process( ObjectTreeParser *, KMime::Content *, ProcessResult & result ) const { + result.setNeverDisplayInline( true ); + return false; + } + static const ::BodyPartFormatter * create() { + if ( !self ) + self = new AnyTypeBodyPartFormatter(); + return self; + } + }; + + const AnyTypeBodyPartFormatter * AnyTypeBodyPartFormatter::self = 0; + + + class ImageTypeBodyPartFormatter : public BodyPartFormatter { + static const ImageTypeBodyPartFormatter * self; + public: + bool process( ObjectTreeParser *, KMime::Content *, ProcessResult & result ) const { + result.setIsImage( true ); + return false; + } + static const BodyPartFormatter * create() { + if ( !self ) + self = new ImageTypeBodyPartFormatter(); + return self; + } + }; + + const ImageTypeBodyPartFormatter * ImageTypeBodyPartFormatter::self = 0; + +#define CREATE_BODY_PART_FORMATTER(subtype) \ + class subtype##BodyPartFormatter : public BodyPartFormatter { \ + static const subtype##BodyPartFormatter * self; \ + public: \ + bool process( ObjectTreeParser *, KMime::Content *, ProcessResult & ) const; \ + static const BodyPartFormatter * create() { \ + if ( !self ) \ + self = new subtype##BodyPartFormatter(); \ + return self; \ + } \ + }; \ + \ + const subtype##BodyPartFormatter * subtype##BodyPartFormatter::self; \ + \ + bool subtype##BodyPartFormatter::process( ObjectTreeParser * otp, KMime::Content * node, ProcessResult & result ) const { \ + return otp->process##subtype##Subtype( node, result ); \ + } + + + CREATE_BODY_PART_FORMATTER(TextPlain) + CREATE_BODY_PART_FORMATTER(TextHtml) + //CREATE_BODY_PART_FORMATTER(TextEnriched) + + CREATE_BODY_PART_FORMATTER(ApplicationOctetStream) + CREATE_BODY_PART_FORMATTER(ApplicationPkcs7Mime) + CREATE_BODY_PART_FORMATTER(ApplicationChiasmusText) + //CREATE_BODY_PART_FORMATTER(ApplicationPgp) + CREATE_BODY_PART_FORMATTER(ApplicationMsTnef) + + CREATE_BODY_PART_FORMATTER(MessageRfc822) + + CREATE_BODY_PART_FORMATTER(MultiPartMixed) + CREATE_BODY_PART_FORMATTER(MultiPartAlternative) + CREATE_BODY_PART_FORMATTER(MultiPartSigned) + CREATE_BODY_PART_FORMATTER(MultiPartEncrypted) + + typedef TextPlainBodyPartFormatter ApplicationPgpBodyPartFormatter; + + +#undef CREATE_BODY_PART_FORMATTER +} // anon namespace + +// FIXME: port some more BodyPartFormatters to Interface::BodyPartFormatters +void BodyPartFormatterFactoryPrivate::kmail_create_builtin_bodypart_formatters( BodyPartFormatterFactoryPrivate::TypeRegistry * reg ) { + if ( !reg ) return; + (*reg)["application"]["octet-stream"] = new AnyTypeBodyPartFormatter(); +} + +typedef const BodyPartFormatter * (*BodyPartFormatterCreator)(); + +struct SubtypeBuiltin { + const char * subtype; + BodyPartFormatterCreator create; +}; + +static const SubtypeBuiltin applicationSubtypeBuiltins[] = { + { "octet-stream", &ApplicationOctetStreamBodyPartFormatter::create }, + { "pkcs7-mime", &ApplicationPkcs7MimeBodyPartFormatter::create }, + { "x-pkcs7-mime", &ApplicationPkcs7MimeBodyPartFormatter::create }, + { "vnd.de.bund.bsi.chiasmus-text", &ApplicationChiasmusTextBodyPartFormatter::create }, + { "pgp", &ApplicationPgpBodyPartFormatter::create }, + { "ms-tnef", &ApplicationMsTnefBodyPartFormatter::create } +}; + +static const SubtypeBuiltin textSubtypeBuiltins[] = { + { "html", &TextHtmlBodyPartFormatter::create }, + //{ "enriched", &TextEnrichedBodyPartFormatter::create }, + { "x-vcard", &AnyTypeBodyPartFormatter::create }, + { "vcard", &AnyTypeBodyPartFormatter::create }, + { "rtf", &AnyTypeBodyPartFormatter::create }, + { "*", &TextPlainBodyPartFormatter::create }, +}; + +static const SubtypeBuiltin multipartSubtypeBuiltins[] = { + { "mixed", &MultiPartMixedBodyPartFormatter::create }, + { "alternative", &MultiPartAlternativeBodyPartFormatter::create }, + //{ "digest", &MultiPartDigestFormatter::create }, + //{ "parallel", &MultiPartParallelFormatter::create }, + //{ "related", &MultiPartRelatedFormatter::create }, + { "signed", &MultiPartSignedBodyPartFormatter::create }, + { "encrypted", &MultiPartEncryptedBodyPartFormatter::create }, + //{ "report", &MultiPartReportFormatter::create }, +}; + +static const SubtypeBuiltin messageSubtypeBuiltins[] = { + { "rfc822", &MessageRfc822BodyPartFormatter::create }, +}; + +static const SubtypeBuiltin imageSubtypeBuiltins[] = { + { "*", &ImageTypeBodyPartFormatter::create }, +}; + +static const SubtypeBuiltin anySubtypeBuiltins[] = { + { "*", &AnyTypeBodyPartFormatter::create }, +}; + +#ifdef DIM +#undef DIM +#endif +#define DIM(x) sizeof(x) / sizeof(*x) + +static const struct { + const char * type; + const SubtypeBuiltin * subtypes; + unsigned int num_subtypes; +} builtins[] = { + { "application", applicationSubtypeBuiltins, DIM(applicationSubtypeBuiltins) }, + { "text", textSubtypeBuiltins, DIM(textSubtypeBuiltins) }, + { "multipart", multipartSubtypeBuiltins, DIM(multipartSubtypeBuiltins) }, + { "message", messageSubtypeBuiltins, DIM(messageSubtypeBuiltins) }, + { "image", imageSubtypeBuiltins, DIM(imageSubtypeBuiltins) }, + //{ "audio", audioSubtypeBuiltins, DIM(audioSubtypeBuiltins) }, + //{ "model", modelSubtypeBuiltins, DIM(modelSubtypeBuiltins) }, + //{ "video", videoSubtypeBuiltins, DIM(videoSubtypeBuiltins) }, + { "*", anySubtypeBuiltins, DIM(anySubtypeBuiltins) }, +}; + +#undef DIM + +static const BodyPartFormatter * createForText( const char * subtype ) { + if ( subtype && *subtype ) + switch ( subtype[0] ) { + case 'h': + case 'H': + if ( kasciistricmp( subtype, "html" ) == 0 ) + return TextHtmlBodyPartFormatter::create(); + break; + case 'r': + case 'R': + if ( kasciistricmp( subtype, "rtf" ) == 0 ) + return AnyTypeBodyPartFormatter::create(); + break; + case 'x': + case 'X': + case 'v': + case 'V': + if ( kasciistricmp( subtype, "x-vcard" ) == 0 || + kasciistricmp( subtype, "vcard" ) == 0 ) + return AnyTypeBodyPartFormatter::create(); + break; + } + + return TextPlainBodyPartFormatter::create(); +} + +static const BodyPartFormatter * createForImage( const char * ) { + return ImageTypeBodyPartFormatter::create(); +} + +static const BodyPartFormatter * createForMessage( const char * subtype ) { + if ( kasciistricmp( subtype, "rfc822" ) == 0 ) + return MessageRfc822BodyPartFormatter::create(); + return AnyTypeBodyPartFormatter::create(); +} + +static const BodyPartFormatter * createForMultiPart( const char * subtype ) { + if ( subtype && *subtype ) + switch ( subtype[0] ) { + case 'a': + case 'A': + if ( kasciistricmp( subtype, "alternative" ) == 0 ) + return MultiPartAlternativeBodyPartFormatter::create(); + break; + case 'e': + case 'E': + if ( kasciistricmp( subtype, "encrypted" ) == 0 ) + return MultiPartEncryptedBodyPartFormatter::create(); + break; + case 's': + case 'S': + if ( kasciistricmp( subtype, "signed" ) == 0 ) + return MultiPartSignedBodyPartFormatter::create(); + break; + } + + return MultiPartMixedBodyPartFormatter::create(); +} + +static const BodyPartFormatter * createForApplication( const char * subtype ) { + if ( subtype && *subtype ) + switch ( subtype[0] ) { + case 'p': + case 'P': + if ( kasciistricmp( subtype, "pgp" ) == 0 ) + return ApplicationPgpBodyPartFormatter::create(); + // fall through + case 'x': + case 'X': + if ( kasciistricmp( subtype, "pkcs7-mime" ) == 0 || + kasciistricmp( subtype, "x-pkcs7-mime" ) == 0 ) + return ApplicationPkcs7MimeBodyPartFormatter::create(); + break; + case 'm': + case 'M': + if ( kasciistricmp( subtype, "ms-tnef" ) == 0 ) + return ApplicationMsTnefBodyPartFormatter::create(); + break; + case 'v': + case 'V': + if ( kasciistricmp( subtype, "vnd.de.bund.bsi.chiasmus-text") == 0) + return ApplicationChiasmusTextBodyPartFormatter::create(); + break; + } + + return AnyTypeBodyPartFormatter::create(); +} + +// OK, replace this with a factory with plugin support later on... +const BodyPartFormatter * BodyPartFormatter::createFor( const char * type, const char * subtype ) { + if ( type && *type ) + switch ( type[0] ) { + case 'a': // application + case 'A': + if ( kasciistricmp( type, "application" ) == 0 ) + return createForApplication( subtype ); + break; + case 'i': // image + case 'I': + if ( kasciistricmp( type, "image" ) == 0 ) + return createForImage( subtype ); + break; + case 'm': // multipart / message + case 'M': + if ( kasciistricmp( type, "multipart" ) == 0 ) + return createForMultiPart( subtype ); + else if ( kasciistricmp( type, "message" ) == 0 ) + return createForMessage( subtype ); + break; + case 't': // text + case 'T': + if ( kasciistricmp( type, "text" ) == 0 ) + return createForText( subtype ); + break; + } + + return AnyTypeBodyPartFormatter::create(); +} + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,194 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + bodypartformatterfactory.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2004 Marc Mutz , + Ingo Kloecker + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + + +#include "bodypartformatterfactory.h" +#include "bodypartformatterfactory_p.h" +using namespace BodyPartFormatterFactoryPrivate; + +#include "interfaces/bodypartformatter.h" +#include "urlhandlermanager.h" + +// libkdepim +#include + +// KDE +#include + +// Qt +#include +#include + +#include + +using namespace MessageViewer; + +namespace { + + KPIM_DEFINE_PLUGIN_LOADER( BodyPartFormatterPluginLoader, + Interface::BodyPartFormatterPlugin, + "create_bodypart_formatter_plugin", + "kmail/plugins/bodypartformatter/*.desktop" ) + +} + +BodyPartFormatterFactory * BodyPartFormatterFactory::mSelf = 0; + +const BodyPartFormatterFactory * BodyPartFormatterFactory::instance() { + if ( !mSelf ) + mSelf = new BodyPartFormatterFactory(); + return mSelf; +} + +BodyPartFormatterFactory::BodyPartFormatterFactory() { + mSelf = this; +} + +BodyPartFormatterFactory::~BodyPartFormatterFactory() { + mSelf = 0; +} + +static TypeRegistry * all = 0; + +static void insertBodyPartFormatter( const char * type, const char * subtype, + const Interface::BodyPartFormatter * formatter ) { + if ( !type || !*type || !subtype || !*subtype || !formatter || !all ) + return; + + TypeRegistry::iterator type_it = all->find( type ); + if ( type_it == all->end() ) { + kDebug() <<"BodyPartFormatterFactory: instantiating new Subtype Registry for \"" + << type << "\""; + type_it = all->insert( std::make_pair( type, SubtypeRegistry() ) ).first; + assert( type_it != all->end() ); + } + + SubtypeRegistry & subtype_reg = type_it->second; + SubtypeRegistry::iterator subtype_it = subtype_reg.find( subtype ); + if ( subtype_it != subtype_reg.end() ) { + kDebug() <<"BodyPartFormatterFactory: overwriting previously registered formatter for \"" + << type << "/" << subtype << "\""; + subtype_reg.erase( subtype_it ); subtype_it = subtype_reg.end(); + } + + subtype_reg.insert( std::make_pair( subtype, formatter ) ); +} + +static void loadPlugins() { + const BodyPartFormatterPluginLoader * pl = BodyPartFormatterPluginLoader::instance(); + if ( !pl ) { + kWarning() <<"BodyPartFormatterFactory: cannot instantiate plugin loader!"; + return; + } + const QStringList types = pl->types(); + kDebug() <<"BodyPartFormatterFactory: found" << types.size() <<" plugins."; + for ( QStringList::const_iterator it = types.begin() ; it != types.end() ; ++it ) { + const Interface::BodyPartFormatterPlugin * plugin = pl->createForName( *it ); + if ( !plugin ) { + kWarning() <<"BodyPartFormatterFactory: plugin \"" << *it <<"\" is not valid!"; + continue; + } + const Interface::BodyPartFormatter * bfp; + for ( int i = 0 ; (bfp = plugin->bodyPartFormatter( i )) ; ++i ) { + const char * type = plugin->type( i ); + if ( !type || !*type ) { + kWarning() <<"BodyPartFormatterFactory: plugin \"" << *it + << "\" returned empty type specification for index" + << i; + break; + } + const char * subtype = plugin->subtype( i ); + if ( !subtype || !*subtype ) { + kWarning() <<"BodyPartFormatterFactory: plugin \"" << *it + << "\" returned empty subtype specification for index" + << i; + break; + } + insertBodyPartFormatter( type, subtype, bfp ); + } + const Interface::BodyPartURLHandler * handler; + for ( int i = 0 ; (handler = plugin->urlHandler( i )) ; ++i ) + URLHandlerManager::instance()->registerHandler( handler ); + } +} + +static void setup() { + if ( !all ) { + all = new TypeRegistry(); + kmail_create_builtin_bodypart_formatters( all ); + loadPlugins(); + } +} + +const Interface::BodyPartFormatter * BodyPartFormatterFactory::createFor( const char * type, const char * subtype ) const { + if ( !type || !*type ) + type = "*"; //krazy:exclude=doublequote_chars + if ( !subtype || !*subtype ) + subtype = "*"; //krazy:exclude=doublequote_chars + + setup(); + assert( all ); + + if ( all->empty() ) + return 0; + + TypeRegistry::const_iterator type_it = all->find( type ); + if ( type_it == all->end() ) + type_it = all->find( "*" ); + if ( type_it == all->end() ) + return 0; + + const SubtypeRegistry & subtype_reg = type_it->second; + if ( subtype_reg.empty() ) + return 0; + + SubtypeRegistry::const_iterator subtype_it = subtype_reg.find( subtype ); + if ( subtype_it == subtype_reg.end() ) + subtype_it = subtype_reg.find( "*" ); + if ( subtype_it == subtype_reg.end() ) + return 0; + + kWarning( !(*subtype_it).second, 5006 ) + << "BodyPartFormatterFactory: a null bodypart formatter sneaked in for \"" + << type << "/" << subtype << "\"!"; + + return (*subtype_it).second; +} + +const Interface::BodyPartFormatter * BodyPartFormatterFactory::createFor( const QString & type, const QString & subtype ) const { + return createFor( type.toLatin1(), subtype.toLatin1() ); +} + +const Interface::BodyPartFormatter * BodyPartFormatterFactory::createFor( const QByteArray & type, const QByteArray & subtype ) const { + return createFor( type.data(), subtype.data() ); +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,72 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + bodypartformatterfactory.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2004 Marc Mutz , + Ingo Kloecker + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_H__ +#define __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_H__ + +class QString; +#include + +namespace MessageViewer { + +namespace Interface { + class BodyPartFormatter; +} + +class BodyPartFormatterFactory { + class gcc_shut_up; + friend class BodyPartFormatterFactory::gcc_shut_up; +public: + ~BodyPartFormatterFactory(); + + static const BodyPartFormatterFactory * instance(); + + const Interface::BodyPartFormatter * createFor( const char * type, const char * subtype ) const; + const Interface::BodyPartFormatter * createFor( const QString & type, const QString & subtype ) const; + const Interface::BodyPartFormatter * createFor( const QByteArray & type, const QByteArray & subtype ) const; + + // + // Only boring stuff below: + // +private: + BodyPartFormatterFactory(); + static BodyPartFormatterFactory * mSelf; +private: + // disabled + const BodyPartFormatterFactory & operator=( const BodyPartFormatterFactory & ); + BodyPartFormatterFactory( const BodyPartFormatterFactory & ); +}; + +} + +#endif // __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory_p.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory_p.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatterfactory_p.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatterfactory_p.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,61 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + bodypartformatterfactory.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2004 Marc Mutz , + Ingo Kloecker + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_P_H__ +#define __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_P_H__ + + +#include +#include + +namespace MessageViewer { + namespace Interface { + class BodyPartFormatter; + } +} + +namespace BodyPartFormatterFactoryPrivate { + struct ltstr { + bool operator()( const char * s1, const char * s2 ) const { +return qstricmp( s1, s2 ) < 0; + } + }; + + typedef std::map SubtypeRegistry; + typedef std::map TypeRegistry; + + // defined in bodypartformatters.cpp + extern void kmail_create_builtin_bodypart_formatters( TypeRegistry * ); +} + +#endif // __MESSAGEVIEWER_BODYPARTFORMATTERFACTORY_P_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatter.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatter.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/bodypartformatter.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/bodypartformatter.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,59 @@ +/* -*- c++ -*- + bodypartformatter.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_BODYPARTFORMATTER_H__ +#define __MESSAGEVIEWER_BODYPARTFORMATTER_H__ + +namespace KMime { + class Content; +} + +namespace MessageViewer { + class ObjectTreeParser; + class ProcessResult; +} + + +class BodyPartFormatter { + const BodyPartFormatter & operator=( const BodyPartFormatter & ); + BodyPartFormatter( const BodyPartFormatter & ); +protected: + BodyPartFormatter() {} +public: + virtual ~BodyPartFormatter() {} + + virtual bool process( MessageViewer::ObjectTreeParser *, KMime::Content *, MessageViewer::ProcessResult & ) const = 0; + + static const BodyPartFormatter * createFor( const char * type, const char * subtype ); +}; + + +#endif // __MESSAGEVIEWER_BODYPARTFORMATTER_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/CMakeLists.txt /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/CMakeLists.txt --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/CMakeLists.txt 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,71 @@ +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) + +add_subdirectory(tests) + +set(libmessageviewer_SRCS + +viewer_p.cpp +viewer.cpp +khtmlparthtmlwriter.cpp +htmlstatusbar.cpp +headerstyle.cpp +headerstrategy.cpp +kmaddrbook.cpp +stringutil.cpp +attachmentstrategy.cpp +kmmsgpartdlg.cpp +csshelper.cpp +util.cpp +objecttreeparser_p.cpp +objecttreeparser.cpp +kleojobexecutor.cpp +bodypartformatter.cpp +bodypartformatterfactory.cpp +partnodebodypart.cpp +nodehelper.cpp +urlhandlermanager.cpp +vcardviewer.cpp +iconnamecache.cpp +mailsourceviewer.cpp +mimetreemodel.cpp +global.cpp +spamheaderanalyzer.cpp +antispamconfig.cpp +globalsettings.cpp +configurewidget.cpp +htmlquotecolorer.cpp +editorwatcher.cpp +attachmentdialog.cpp +objecttreeviewersource.cpp +objecttreeemptysource.cpp +filehtmlwriter.cpp +teehtmlwriter.cpp +) + + +kde4_add_kcfg_files(libmessageviewer_SRCS + globalsettings_base.kcfgc +) + +kde4_add_ui_files(libmessageviewer_SRCS + settings.ui +) + +kde4_add_library(messageviewer SHARED ${libmessageviewer_SRCS}) + + +target_link_libraries(messageviewer messagecore kdepim kpgp kleo + ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIIBS} + ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KTNEF_LIBRARY} + ${QGPGME_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS} +) + +include_directories( + ${CMAKE_SOURCE_DIR}/libkleo + ${Boost_INCLUDE_DIRS} + ${GPGME_INCLUDES} +) + +install(TARGETS messageviewer ${INSTALL_TARGETS_DEFAULT_ARGS} ) + +#install( FILES viewer.h attachmentstrategy.h headerstrategy.h messageviewer_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/messageviewer COMPONENT devel) diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/configurewidget.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/configurewidget.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/configurewidget.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/configurewidget.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,120 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include "configurewidget.h" +#include "ui_settings.h" +#include "util.h" +#include "globalsettings.h" + +ConfigureWidget::ConfigureWidget( QWidget *parent ) + : QWidget(parent) +{ + mSettingsUi = new Ui_Settings; + mSettingsUi->setupUi( this ); + QStringList encodings = Util::supportedEncodings( false ); + mSettingsUi->kcfg_FallbackCharacterEncoding->addItems( encodings ); + QString fallbackCharsetWhatsThis = + i18n( GlobalSettings::self()->fallbackCharacterEncodingItem()->whatsThis().toUtf8() ); + mSettingsUi->kcfg_FallbackCharacterEncoding->setWhatsThis( fallbackCharsetWhatsThis ); + + encodings.prepend( i18n( "Auto" ) ); + mSettingsUi->kcfg_OverrideCharacterEncoding->addItems( encodings ); + mSettingsUi->kcfg_OverrideCharacterEncoding->setCurrentIndex(0); + + QString overrideCharsetWhatsThis = + i18n( GlobalSettings::self()->overrideCharacterEncodingItem()->whatsThis().toUtf8() ); + mSettingsUi->kcfg_OverrideCharacterEncoding->setWhatsThis( overrideCharsetWhatsThis ); + + readCurrentFallbackCodec(); + readCurrentOverrideCodec(); +} + + +ConfigureWidget::~ConfigureWidget() +{ + delete mSettingsUi; + mSettingsUi = 0; +} + +void ConfigureWidget::readCurrentFallbackCodec() +{ + QStringList encodings = Util::supportedEncodings( false ); + QStringList::ConstIterator it( encodings.begin() ); + QStringList::ConstIterator end( encodings.end() ); + QString currentEncoding = GlobalSettings::self()->fallbackCharacterEncoding(); + uint i = 0; + int indexOfLatin9 = 0; + bool found = false; + for( ; it != end; ++it) + { + const QString encoding = Util::encodingForName(*it); + if ( encoding == "ISO-8859-15" ) + indexOfLatin9 = i; + if( encoding == currentEncoding ) + { + mSettingsUi->kcfg_FallbackCharacterEncoding->setCurrentIndex( i ); + found = true; + break; + } + i++; + } + if ( !found ) // nothing matched, use latin9 + mSettingsUi->kcfg_FallbackCharacterEncoding->setCurrentIndex( indexOfLatin9 ); +} + +void ConfigureWidget::readCurrentOverrideCodec() +{ + const QString ¤tOverrideEncoding = GlobalSettings::self()->overrideCharacterEncoding(); + if ( currentOverrideEncoding.isEmpty() ) { + mSettingsUi->kcfg_OverrideCharacterEncoding->setCurrentIndex( 0 ); + return; + } + QStringList encodings = Util::supportedEncodings( false ); + encodings.prepend( i18n( "Auto" ) ); + QStringList::ConstIterator it( encodings.constBegin() ); + QStringList::ConstIterator end( encodings.constEnd() ); + int i = 0; + for( ; it != end; ++it) + { + if( Util::encodingForName(*it) == currentOverrideEncoding ) + { + mSettingsUi->kcfg_OverrideCharacterEncoding->setCurrentIndex( i ); + break; + } + i++; + } + if ( i == encodings.size() ) { + // the current value of overrideCharacterEncoding is an unknown encoding => reset to Auto + kWarning() <<"Unknown override character encoding \"" << currentOverrideEncoding + << "\". Resetting to Auto."; + mSettingsUi->kcfg_OverrideCharacterEncoding->setCurrentIndex( 0 ); + GlobalSettings::self()->setOverrideCharacterEncoding( QString() ); + } +} + + +void ConfigureWidget::slotSettingsChanged() +{ + GlobalSettings::self()->setOverrideCharacterEncoding( Util::encodingForName( mSettingsUi->kcfg_OverrideCharacterEncoding->currentText() ) ); + GlobalSettings::self()->setFallbackCharacterEncoding( Util::encodingForName( mSettingsUi->kcfg_FallbackCharacterEncoding->currentText() ) ); + emit settingsChanged(); +} + + +#include "configurewidget.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/configurewidget.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/configurewidget.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/configurewidget.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/configurewidget.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,58 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef MAILVIEWERCONFIGUREWIDGET_H +#define MAILVIEWERCONFIGUREWIDGET_H + +#include "messageviewer_export.h" + +#include +class Ui_Settings; + + +/** +Configure widget that can be used in a KConfigDialog. + + @author Andras Mantia +*/ +class MESSAGEVIEWER_EXPORT ConfigureWidget : public QWidget +{ +Q_OBJECT +public: + ConfigureWidget(QWidget *parent = 0); + + ~ConfigureWidget(); + +private slots: + void slotSettingsChanged(); + +signals: + void settingsChanged(); + +private: + void readCurrentFallbackCodec(); + void readCurrentOverrideCodec(); + + Ui_Settings *mSettingsUi; + +}; + + + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/csshelper.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/csshelper.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/csshelper.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/csshelper.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,106 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + csshelper.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + + +#include "csshelper.h" +#include "global.h" +#include "globalsettings.h" + +#include +#include +#include +#include + +#include +#include +#include + +namespace MessageViewer { + +CSSHelper::CSSHelper( const QPaintDevice *pd ) : + KPIM::CSSHelper( pd ) +{ + KSharedConfigPtr config = Global::instance()->config(); + + KConfigGroup reader( config, "Reader" ); + KConfigGroup fonts( config, "Fonts" ); + KConfigGroup pixmaps( config, "Pixmaps" ); + + mRecycleQuoteColors = reader.readEntry( "RecycleQuoteColors", false ); + + mForegroundColor = KColorScheme( QPalette::Active ).foreground().color(); + mBackgroundColor = KColorScheme( QPalette::Active ).background().color(); + if ( !reader.readEntry( "defaultColors", true ) ) { + mLinkColor = + reader.readEntry( "LinkColor", mLinkColor ); + mVisitedLinkColor = + reader.readEntry( "FollowedColor", mVisitedLinkColor ); + cPgpEncrH = + reader.readEntry( "PGPMessageEncr", cPgpEncrH ); + cPgpOk1H = + reader.readEntry( "PGPMessageOkKeyOk", cPgpOk1H ); + cPgpOk0H = + reader.readEntry( "PGPMessageOkKeyBad", cPgpOk0H ); + cPgpWarnH = + reader.readEntry( "PGPMessageWarn", cPgpWarnH ); + cPgpErrH = + reader.readEntry( "PGPMessageErr", cPgpErrH ); + cHtmlWarning = + reader.readEntry( "HTMLWarningColor", cHtmlWarning ); + for ( int i = 0 ; i < 3 ; ++i ) { + const QString key = "QuotedText" + QString::number( i+1 ); + mQuoteColor[i] = reader.readEntry( key, mQuoteColor[i] ); + } + } + + if ( !fonts.readEntry( "defaultFonts", true ) ) { + mBodyFont = fonts.readEntry( "body-font", mBodyFont ); + mPrintFont = fonts.readEntry( "print-font", mPrintFont ); + mFixedFont = fonts.readEntry( "fixed-font", mFixedFont ); + mFixedPrintFont = mFixedFont; // FIXME when we have a separate fixed print font + QFont defaultFont = mBodyFont; + defaultFont.setItalic( true ); + for ( int i = 0 ; i < 3 ; ++i ) { + const QString key = QString( "quote%1-font" ).arg( i+1 ); + mQuoteFont[i] = fonts.readEntry( key, defaultFont ); + } + } + + mShrinkQuotes = GlobalSettings::self()->shrinkQuotes(); + + mBackingPixmapStr = pixmaps.readPathEntry("Readerwin", QString()); + mBackingPixmapOn = !mBackingPixmapStr.isEmpty(); + + recalculatePGPColors(); +} + +} + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/csshelper.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/csshelper.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/csshelper.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/csshelper.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,47 @@ +/* -*- c++ -*- + csshelper.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_CSSHELPER_H__ +#define __MESSAGEVIEWER_CSSHELPER_H__ + +#include + +#include "messageviewer_export.h" + +namespace MessageViewer { +class MESSAGEVIEWER_EXPORT CSSHelper : public KPIM::CSSHelper { +public: + CSSHelper( const QPaintDevice *pd ); +}; + +} + +#endif // __MESSAGEVIEWER_CSSHELPER_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/editorwatcher.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/editorwatcher.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/editorwatcher.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/editorwatcher.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,166 @@ +/* + Copyright (c) 2007 Volker Krause + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include "editorwatcher.h" +#include "autoqpointer.h" + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +// inotify stuff taken from kdelibs/kio/kio/kdirwatch.cpp +#ifdef HAVE_SYS_INOTIFY_H +#include +#include +#include +#include +#endif + +namespace MessageViewer { +EditorWatcher::EditorWatcher( const KUrl & url, const QString &mimeType, bool openWith, + QObject * parent, QWidget *parentWidget ) : + QObject( parent ), + mUrl( url ), + mMimeType( mimeType ), + mOpenWith( openWith ), + mEditor( 0 ), + mParentWidget( parentWidget ), + mHaveInotify( false ), + mFileOpen( false ), + mEditorRunning( false ), + mFileModified( true ), // assume the worst unless we know better + mDone( false ) +{ + assert( mUrl.isLocalFile() ); + mTimer.setSingleShot( true ); + connect( &mTimer, SIGNAL(timeout()), SLOT(checkEditDone()) ); +} + +bool EditorWatcher::start() +{ + // find an editor + KUrl::List list; + list.append( mUrl ); + KService::Ptr offer = KMimeTypeTrader::self()->preferredService( mMimeType, "Application" ); + if ( mOpenWith || !offer ) { + AutoQPointer dlg( new KOpenWithDialog( list, i18n("Edit with:"), + QString(), 0 ) ); + int dlgrc = dlg->exec(); + if ( dlgrc && dlg ) { + offer = dlg->service(); + } + if ( !dlgrc || !offer ) + return false; + } + +#ifdef HAVE_SYS_INOTIFY_H + // monitor file + mInotifyFd = inotify_init(); + if ( mInotifyFd > 0 ) { + mInotifyWatch = inotify_add_watch( mInotifyFd, mUrl.path().toLatin1(), IN_CLOSE | IN_OPEN | IN_MODIFY ); + if ( mInotifyWatch >= 0 ) { + QSocketNotifier *sn = new QSocketNotifier( mInotifyFd, QSocketNotifier::Read, this ); + connect( sn, SIGNAL(activated(int)), SLOT(inotifyEvent()) ); + mHaveInotify = true; + mFileModified = false; + } + } else { + kWarning() <<"Failed to activate INOTIFY!"; + } +#endif + + // start the editor + QStringList params = KRun::processDesktopExec( *offer, list, false ); + mEditor = new KProcess( this ); + mEditor->setProgram( params ); + connect( mEditor, SIGNAL( finished( int, QProcess::ExitStatus ) ), + SLOT( editorExited() ) ); + mEditor->start(); + if ( !mEditor->waitForStarted() ) + return false; + mEditorRunning = true; + + mEditTime.start(); + return true; +} + +void EditorWatcher::inotifyEvent() +{ + assert( mHaveInotify ); +#ifdef HAVE_SYS_INOTIFY_H + int pending = -1; + char buffer[4096]; + ioctl( mInotifyFd, FIONREAD, &pending ); + while ( pending > 0 ) { + int size = read( mInotifyFd, buffer, qMin( pending, (int)sizeof(buffer) ) ); + pending -= size; + if ( size < 0 ) + break; // error + int offset = 0; + while ( size > 0 ) { + struct inotify_event *event = (struct inotify_event *) &buffer[offset]; + size -= sizeof( struct inotify_event ) + event->len; + offset += sizeof( struct inotify_event ) + event->len; + if ( event->mask & IN_OPEN ) + mFileOpen = true; + if ( event->mask & IN_CLOSE ) + mFileOpen = false; + if ( event->mask & IN_MODIFY ) + mFileModified = true; + } + } +#endif + mTimer.start( 500 ); + +} + +void EditorWatcher::editorExited() +{ + mEditorRunning = false; + mTimer.start( 500 ); +} + +void EditorWatcher::checkEditDone() +{ + if ( mEditorRunning || (mFileOpen && mHaveInotify) || mDone ) + return; + // protect us against double-deletion by calling this method again while + // the subeventloop of the message box is running + mDone = true; + // nobody can edit that fast, we seem to be unable to detect + // when the editor will be closed + if ( mEditTime.elapsed() <= 3000 ) { + KMessageBox::error( mParentWidget, + i18n( "KMail is unable to detect when the chosen editor is closed. " + "To avoid data loss, editing the attachment will be aborted." ), + i18n( "Unable to edit attachment" ) ); + } + + emit editDone( this ); + deleteLater(); +} +} +#include "editorwatcher.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/editorwatcher.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/editorwatcher.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/editorwatcher.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/editorwatcher.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,87 @@ +/* + Copyright (c) 2007 Volker Krause + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef MESSAGEVIEWER_EDITORWATCHER_H +#define MESSAGEVIEWER_EDITORWATCHER_H + +#include "messageviewer_export.h" +#include + +#include +#include +#include + +class KProcess; + +/** + Starts an editor for the given URL and emits an signal when + editing has been finished. Both, the editor process as well + as the edited file are watched to work with as many as possible + editors. +*/ +namespace MessageViewer { +class MESSAGEVIEWER_EXPORT EditorWatcher : public QObject +{ + Q_OBJECT + public: + + /** + * Constructs an EditorWatcher. + * @param parent the parent object of this EditorWatcher, which will take care of deleting + * this EditorWatcher if the parent is deleted. + * @param parentWidget the parent widget of this EditorWatcher, which will be used as the parent + * widget for message dialogs. + */ + EditorWatcher( const KUrl &url, const QString &mimeType, bool openWith, + QObject *parent, QWidget *parentWidget ); + + bool start(); + bool fileChanged() const { return mFileModified; } + KUrl url() { return mUrl;} + signals: + void editDone( EditorWatcher* watcher ); + + private slots: + void editorExited(); + void inotifyEvent(); + void checkEditDone(); + + private: + KUrl mUrl; + QString mMimeType; + bool mOpenWith; + KProcess *mEditor; + QWidget *mParentWidget; + + int mInotifyFd; + int mInotifyWatch; + bool mHaveInotify; + + bool mFileOpen; + bool mEditorRunning; + + bool mFileModified; + + QTimer mTimer; + QTime mEditTime; + + bool mError; + bool mDone; +}; +} +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/filehtmlwriter.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/filehtmlwriter.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/filehtmlwriter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/filehtmlwriter.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,106 @@ +/* -*- c++ -*- + filehtmlwriter.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#include "filehtmlwriter.h" + +#include + +#include + + +namespace MessageViewer { + + FileHtmlWriter::FileHtmlWriter( const QString & filename ) + : HtmlWriter(), + mFile( filename.isEmpty() ? QString( "filehtmlwriter.out" ) : filename ) + { + mStream.setCodec( "UTF-8" ); + } + + FileHtmlWriter::~FileHtmlWriter() { + if ( mFile.isOpen() ) { + kWarning() <<"FileHtmlWriter: file still open!"; + mStream.setDevice(0); + mFile.close(); + } + } + + void FileHtmlWriter::begin( const QString & css ) { + openOrWarn(); + if ( !css.isEmpty() ) + write( "\n" ); + } + + void FileHtmlWriter::end() { + flush(); + mStream.setDevice(0); + mFile.close(); + } + + void FileHtmlWriter::reset() { + if ( mFile.isOpen() ) { + mStream.setDevice( 0 ); + mFile.close(); + } + } + + void FileHtmlWriter::write( const QString & str ) { + mStream << str; + flush(); + } + + void FileHtmlWriter::queue( const QString & str ) { + write( str ); + } + + void FileHtmlWriter::flush() { + mFile.flush(); + } + + void FileHtmlWriter::openOrWarn() { + if ( mFile.isOpen() ) { + kWarning() <<"FileHtmlWriter: file still open!"; + mStream.setDevice( 0 ); + mFile.close(); + } + if ( !mFile.open( QIODevice::WriteOnly ) ) + kWarning() <<"FileHtmlWriter: Cannot open file" << mFile.fileName(); + else + mStream.setDevice( &mFile ); + } + + void FileHtmlWriter::embedPart( const QByteArray & contentId, const QString & url ) { + mStream << "" << endl; + flush(); + } + + +} // namespace KMail diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/filehtmlwriter.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/filehtmlwriter.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/filehtmlwriter.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/filehtmlwriter.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,67 @@ +/* -*- c++ -*- + filehtmlwriter.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __MESSAGEVIEWER_FILEHTMLWRITER_H__ +#define __MESSAGEVIEWER_FILEHTMLWRITER_H__ + +#include "interfaces/htmlwriter.h" + +#include +#include + +class QString; + +namespace MessageViewer { + + class FileHtmlWriter : public MessageViewer::HtmlWriter { + public: + FileHtmlWriter( const QString & filename ); + virtual ~FileHtmlWriter(); + + void begin( const QString & cssDefs ); + void end(); + void reset(); + void write( const QString & str ); + void queue( const QString & str ); + void flush(); + void embedPart( const QByteArray & contentId, const QString & url ); + + private: + void openOrWarn(); + + private: + QFile mFile; + QTextStream mStream; + }; + +} // namespace MessageViewer + +#endif // __MESSAGEVIEWER_FILEHTMLWRITER_H__ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/global.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/global.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/global.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/global.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,48 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#include "global.h" +Global * Global::mSelf = 0; + +Global * Global::instance() +{ + if ( !mSelf ) + mSelf = new Global(); + return mSelf; +} + +Global::Global() +{ + mSelf = this; + mConfig = 0; +} + +Global::~Global() +{ +} + +KSharedConfigPtr Global::config() +{ + if ( !mConfig ) + mConfig = KSharedConfig::openConfig( "mailviewerrc" ); + return mConfig; +} + + + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/global.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/global.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/global.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/global.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,48 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- + Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net + Copyright (c) 2009 Andras Mantia + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef MAILVIEWERGLOBAL_H +#define MAILVIEWERGLOBAL_H + +/** +Globally accesible methods and data structures. + + @author Andras Mantia +*/ + +#include + +class Global{ + +public: + static Global * instance(); + + ~Global(); + + void setConfig( KSharedConfigPtr config ) { mConfig = config; } + KSharedConfigPtr config(); + +private: + Global(); + + static Global * mSelf; + KSharedConfigPtr mConfig; +}; + +#endif diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings_base.kcfgc /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings_base.kcfgc --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings_base.kcfgc 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings_base.kcfgc 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,8 @@ +File=messageviewer.kcfg +ClassName=GlobalSettingsBase +Mutators=true +Singleton=true +ItemAccessors=true +SetUserTexts=true +IncludeFiles=qapplication.h + diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,62 @@ +/* + This file is part of KMail. + + Copyright (c) 2005 David Faure + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. +*/ + + +#include "globalsettings.h" +#include + +GlobalSettings *GlobalSettings::mSelf = 0; + +GlobalSettings *GlobalSettings::self() +{ + if ( !mSelf ) { + mSelf = new GlobalSettings(); + mSelf->readConfig(); + } + + return mSelf; +} + +GlobalSettings::GlobalSettings() +{ + mConfigSyncTimer = new QTimer( this ); + mConfigSyncTimer->setSingleShot( true ); + connect( mConfigSyncTimer, SIGNAL( timeout() ), this, SLOT( slotSyncNow() ) ); +} + +void GlobalSettings::requestSync() +{ + if ( !mConfigSyncTimer->isActive() ) + mConfigSyncTimer->start( 0 ); +} + +void GlobalSettings::slotSyncNow() +{ + config()->sync(); +} + +GlobalSettings::~GlobalSettings() +{ +} + +#include "globalsettings.moc" diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/globalsettings.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/globalsettings.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,56 @@ +/* + This file is part of KMail. + + Copyright (c) 2005 David Faure + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2, + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + As a special exception, permission is given to link this program + with any edition of Qt, and distribute the resulting executable, + without including the source code for Qt in the source distribution. +*/ + +#ifndef MESSAGEVIEWER_GLOBALSETTINGS_H +#define MESSAGEVIEWER_GLOBALSETTINGS_H + +#include "globalsettings_base.h" +#include "messageviewer_export.h" +class QTimer; + +class MESSAGEVIEWER_EXPORT GlobalSettings : public GlobalSettingsBase +{ + Q_OBJECT +public: + static GlobalSettings *self(); + + /** Call this slot instead of directly @ref KConfig::sync() to + minimize the overall config writes. Calling this slot will + schedule a sync of the application config file using a timer, so + that many consecutive calls can be condensed into a single + sync, which is more efficient. */ + void requestSync(); + +private slots: + void slotSyncNow(); + +private: + GlobalSettings(); + virtual ~GlobalSettings(); + static GlobalSettings *mSelf; + + QTimer *mConfigSyncTimer; + +}; + +#endif /* KMAIL_GLOBALSETTINGS_H */ diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/headerstrategy.cpp /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/headerstrategy.cpp --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/headerstrategy.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/headerstrategy.cpp 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,306 @@ +/* -*- c++ -*- + headerstrategy.cpp + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz + + KMail is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + KMail is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + + +#include "headerstrategy.h" +#include "global.h" + +#include +#include +#include + +// +// Header tables: +// +namespace MessageViewer { +static const char * briefHeaders[] = { + "subject", "from", "cc", "bcc", "date" +}; +static const int numBriefHeaders = sizeof briefHeaders / sizeof *briefHeaders; + + +static const char * standardHeaders[] = { + "subject", "from", "cc", "bcc", "to" +}; +static const int numStandardHeaders = sizeof standardHeaders / sizeof *standardHeaders; + + +static const char * richHeaders[] = { + "subject", "date", "from", "cc", "bcc", "to", + "organization", "organisation", "reply-to", + "user-agent", "x-mailer" +}; +static const int numRichHeaders = sizeof richHeaders / sizeof *richHeaders; + +// +// Convenience function +// + +static QStringList stringList( const char * headers[], int numHeaders ) { + QStringList sl; + for ( int i = 0 ; i < numHeaders ; ++i ) + sl.push_back( headers[i] ); + return sl; +} + +// +// AllHeaderStrategy: +// show everything +// + +class AllHeaderStrategy : public HeaderStrategy { + friend class MessageViewer::HeaderStrategy; +protected: + AllHeaderStrategy() : HeaderStrategy() {} + virtual ~AllHeaderStrategy() {} + +public: + const char * name() const { return "all"; } + const HeaderStrategy * next() const { return rich(); } + const HeaderStrategy * prev() const { return custom(); } + + DefaultPolicy defaultPolicy() const { return Display; } + + bool showHeader( const QString & ) const { + return true; // more efficient than default impl + } +}; + +// +// RichHeaderStrategy: +// Date, Subject, From, To, CC, ### what exactly? +// + +class RichHeaderStrategy : public HeaderStrategy { + friend class MessageViewer::HeaderStrategy; +protected: + RichHeaderStrategy() + : HeaderStrategy(), +mHeadersToDisplay( stringList( richHeaders, numRichHeaders ) ) {} + virtual ~RichHeaderStrategy() {} + +public: + const char * name() const { return "rich"; } + const HeaderStrategy * next() const { return standard(); } + const HeaderStrategy * prev() const { return all(); } + + QStringList headersToDisplay() const { return mHeadersToDisplay; } + DefaultPolicy defaultPolicy() const { return Hide; } + +private: + const QStringList mHeadersToDisplay; +}; + +// +// StandardHeaderStrategy: +// BCC, CC, Date, From, Subject, To +// + +class StandardHeaderStrategy : public HeaderStrategy { + friend class MessageViewer::HeaderStrategy; +protected: + StandardHeaderStrategy() + : HeaderStrategy(), +mHeadersToDisplay( stringList( standardHeaders, numStandardHeaders) ) {} + virtual ~StandardHeaderStrategy() {} + +public: + const char * name() const { return "standard"; } + const HeaderStrategy * next() const { return brief(); } + const HeaderStrategy * prev() const { return rich(); } + + QStringList headersToDisplay() const { return mHeadersToDisplay; } + DefaultPolicy defaultPolicy() const { return Hide; } + +private: + const QStringList mHeadersToDisplay; +}; + +// +// BriefHeaderStrategy +// From, Subject, Date +// + +class BriefHeaderStrategy : public HeaderStrategy { + friend class MessageViewer::HeaderStrategy; +protected: + BriefHeaderStrategy() + : HeaderStrategy(), +mHeadersToDisplay( stringList( briefHeaders, numBriefHeaders ) ) {} + virtual ~BriefHeaderStrategy() {} + +public: + const char * name() const { return "brief"; } + const HeaderStrategy * next() const { return custom(); } + const HeaderStrategy * prev() const { return standard(); } + + QStringList headersToDisplay() const { return mHeadersToDisplay; } + DefaultPolicy defaultPolicy() const { return Hide; } + +private: + const QStringList mHeadersToDisplay; +}; + + +// +// CustomHeaderStrategy +// Determined by user +// + +class CustomHeaderStrategy : public HeaderStrategy { + friend class MessageViewer::HeaderStrategy; +protected: + CustomHeaderStrategy(); + virtual ~CustomHeaderStrategy() {} + +public: + const char * name() const { return "custom"; } + const HeaderStrategy * next() const { return all(); } + const HeaderStrategy * prev() const { return brief(); } + + QStringList headersToDisplay() const { return mHeadersToDisplay; } + QStringList headersToHide() const { return mHeadersToHide; } + DefaultPolicy defaultPolicy() const { return mDefaultPolicy; } + +private: + QStringList mHeadersToDisplay; + QStringList mHeadersToHide; + DefaultPolicy mDefaultPolicy; +}; + + +CustomHeaderStrategy::CustomHeaderStrategy() + : HeaderStrategy() +{ + KConfigGroup customHeader( Global::instance()->config(), "Custom Headers" ); + if ( customHeader.hasKey( "headers to display" ) ) { + mHeadersToDisplay = customHeader.readEntry( "headers to display", QStringList() ); + for ( QStringList::iterator it = mHeadersToDisplay.begin() ; it != mHeadersToDisplay.end() ; ++ it ) +*it = (*it).toLower(); + } else + mHeadersToDisplay = stringList( standardHeaders, numStandardHeaders ); + + if ( customHeader.hasKey( "headers to hide" ) ) { + mHeadersToHide = customHeader.readEntry( "headers to hide", QStringList() ); + for ( QStringList::iterator it = mHeadersToHide.begin() ; it != mHeadersToHide.end() ; ++ it ) +*it = (*it).toLower(); + } + + mDefaultPolicy = customHeader.readEntry( "default policy", "hide" ) == "display" ? Display : Hide ; +} + +// +// HeaderStrategy abstract base: +// + +HeaderStrategy::HeaderStrategy() { + +} + +HeaderStrategy::~HeaderStrategy() { + +} + +QStringList HeaderStrategy::headersToDisplay() const { + return QStringList(); +} + +QStringList HeaderStrategy::headersToHide() const { + return QStringList(); +} + +bool HeaderStrategy::showHeader( const QString & header ) const { + if ( headersToDisplay().contains( header.toLower() ) ) return true; + if ( headersToHide().contains( header.toLower() ) ) return false; + return defaultPolicy() == Display; +} + +const HeaderStrategy * HeaderStrategy::create( Type type ) { + switch ( type ) { + case All: return all(); + case Rich: return rich(); + case Standard: return standard(); + case Brief: return brief(); + case Custom: return custom(); + } + kFatal( 5006 ) <<"HeaderStrategy::create(): Unknown header strategy ( type ==" + << (int)type << ") requested!"; + return 0; // make compiler happy +} + +const HeaderStrategy * HeaderStrategy::create( const QString & type ) { + QString lowerType = type.toLower(); + if ( lowerType == "all" ) return all(); + if ( lowerType == "rich" ) return HeaderStrategy::rich(); + //if ( lowerType == "standard" ) return standard(); // not needed, see below + if ( lowerType == "brief" ) return brief(); + if ( lowerType == "custom" ) return custom(); + // don't kFatal here, b/c the strings are user-provided + // (KConfig), so fail gracefully to the default: + return standard(); +} + +static const HeaderStrategy * allStrategy = 0; +static const HeaderStrategy * richStrategy = 0; +static const HeaderStrategy * standardStrategy = 0; +static const HeaderStrategy * briefStrategy = 0; +static const HeaderStrategy * customStrategy = 0; + +const HeaderStrategy * HeaderStrategy::all() { + if ( !allStrategy ) + allStrategy = new AllHeaderStrategy(); + return allStrategy; +} + +const HeaderStrategy * HeaderStrategy::rich() { + if ( !richStrategy ) + richStrategy = new RichHeaderStrategy(); + return richStrategy; +} + +const HeaderStrategy * HeaderStrategy::standard() { + if ( !standardStrategy ) + standardStrategy = new StandardHeaderStrategy(); + return standardStrategy; +} + +const HeaderStrategy * HeaderStrategy::brief() { + if ( !briefStrategy ) + briefStrategy = new BriefHeaderStrategy(); + return briefStrategy; +} + +const HeaderStrategy * HeaderStrategy::custom() { + if ( !customStrategy ) + customStrategy = new CustomHeaderStrategy(); + return customStrategy; +} +} diff -Nru /tmp/ydgLOpdYuA/kde-nightly-kdepim-20091006+svn1032120/messageviewer/headerstrategy.h /tmp/897jxOC6qO/kde-nightly-kdepim-20091009+svn1033340/messageviewer/headerstrategy.h --- kde-nightly-kdepim-20091006+svn1032120/messageviewer/headerstrategy.h 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdepim-20091009+svn1033340/messageviewer/headerstrategy.h 2009-10-09 23:31:07.000000000 +0100 @@ -0,0 +1,79 @@ +/* -*- c++ -*- + headerstrategy.h + + This file is part of KMail, the KDE mail client. + Copyright (c) 2003 Marc Mutz

Welcome to Mailreader %1

"; + txt.append( i18n( "The crypto engine returned no cleartext data." ) ); + txt.append( "