Merge branch 'master' of [email protected]:addons/messagingframework2009W10

8 files changed, 41 insertions, 42 deletions

diff --git a/src/libraries/qmfutil/qmailcomposer.cpp b/src/libraries/qmfutil/qmailcomposer.cpp
index ea4e7079..59b6a923 100644
--- a/src/libraries/qmfutil/qmailcomposer.cpp
+++ b/src/libraries/qmfutil/qmailcomposer.cpp
@@ -359,9 +359,9 @@ void QMailComposerInterface::setMessageType( QMailMessage::MessageType type )
 
     The QMailComposerInterface class describes the interface supported by classes that can be created
     by the QMailComposerFactory class.  To create a new class that can be created via the QMailComposerFactory,
-    implement a plug-in that derives from QMailComposerPlugin.
+    implement a plug-in that derives from QMailComposerInterface.
 
-    \sa QMailComposerInterface, QMailComposerPlugin
+    \sa QMailComposerInterface
 */
 
 /*!
diff --git a/src/libraries/qmfutil/qmailviewer.cpp b/src/libraries/qmfutil/qmailviewer.cpp
index d6bd25f6..43aa4438 100644
--- a/src/libraries/qmfutil/qmailviewer.cpp
+++ b/src/libraries/qmfutil/qmailviewer.cpp
@@ -271,9 +271,9 @@ void QMailViewerInterface::setResource(const QUrl& name, QVariant value)
 
     The QMailViewerInterface class describes the interface supported by classes that can be created
     by the QMailViewerFactory class.  To create a new class that can be created via the QMailViewerFactory,
-    implement a plug-in that derives from QMailViewerPlugin.
+    implement a plug-in that derives from QMailViewerInterface.
 
-    \sa QMailViewerInterface, QMailViewerPlugin
+    \sa QMailViewerInterface
 */
 
 /*!
diff --git a/src/libraries/qtopiamail/qmailmessage.cpp b/src/libraries/qtopiamail/qmailmessage.cpp
index 22631a90..96598f0b 100644
--- a/src/libraries/qtopiamail/qmailmessage.cpp
+++ b/src/libraries/qtopiamail/qmailmessage.cpp
@@ -5507,10 +5507,10 @@ template class QPrivatelyImplemented<QMailMessageMetaDataPrivate>;
 */
 
 /*!
-    \variable QMailMessageMetaData::Attachments
+    \variable QMailMessageMetaData::HasAttachments
 
     The status mask needed for testing the value of the registered status flag named 
-    \c "Attachments" against the result of QMailMessage::status().
+    \c "HasAttachments" against the result of QMailMessage::status().
 
     This flag indicates that the message contains at least one sub-part with 'Attachment' disposition.
 
diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp
index 975f1dab..1063eae5 100644
--- a/src/plugins/messageservices/imap/imapclient.cpp
+++ b/src/plugins/messageservices/imap/imapclient.cpp
@@ -685,8 +685,8 @@ void ImapClient::dataFetched(const QString &uid, const QString &section, const Q
             // Update the relevant part
             QMailMessagePart &part = mail.partAt(partLocation);
             if (partial && section.isEmpty()) {
+                partialLength.insert(partName, partialLength[partName] + size);
                 mail.setBody(QMailMessageBody::fromFile(fileName, mail.contentType(), mail.transferEncoding(), QMailMessageBody::AlreadyEncoded));
-
                 mail.setStatus(QMailMessage::PartialContentAvailable, true);
                 if (partialLength[partName] >= mail.size()) {
                     mail.setStatus(QMailMessage::ContentAvailable, true);
diff --git a/src/plugins/viewers/generic/attachmentoptions.cpp b/src/plugins/viewers/generic/attachmentoptions.cpp
index 3c8de53c..86e7d06d 100644
--- a/src/plugins/viewers/generic/attachmentoptions.cpp
+++ b/src/plugins/viewers/generic/attachmentoptions.cpp
@@ -11,30 +11,26 @@
 
 #include "attachmentoptions.h"
 #include "browser.h"
+#include "qmailmessage.h"
 
 #include <QAction>
 #include <QByteArray>
-#include <QContent>
 #include <QDataStream>
+#include <QDir>
 #include <QFormLayout>
 #include <QImage>
 #include <QImageReader>
 #include <QLabel>
-#include <QMailMessage>
-#include <QMailMessagePart>
 #include <QMenu>
 #include <QMessageBox>
-#include <QMimeType>
 #include <QPushButton>
 #include <QScrollArea>
-#include <QSoftMenuBar>
 #include <QSize>
 #include <QString>
 #include <QStyle>
 #include <QTemporaryFile>
 #include <QTextBrowser>
 #include <QVBoxLayout>
-#include <QtopiaApplication>
 
 
 class TextDisplay : public QDialog
@@ -65,17 +61,15 @@ TextDisplay::TextDisplay(QWidget* parent)
     QVBoxLayout* vb = new QVBoxLayout(this);
     vb->addWidget(_browser);
 
-    QMenu* contextMenu = QSoftMenuBar::menuFor(this);
-
     QAction* toggleLineWrap = new QAction(tr("Wrap text"), this);
     toggleLineWrap->setCheckable(true);
     toggleLineWrap->setChecked(true);
     toggleLineWrap->setVisible(true);
 
     connect(toggleLineWrap, SIGNAL(triggered()), this, SLOT(toggleLineWrapMode()));
-    contextMenu->addAction(toggleLineWrap);
+    addAction(toggleLineWrap);
 
-    showMaximized();
+    setContextMenuPolicy(Qt::ActionsContextMenu);
 }
 
 TextDisplay::~TextDisplay()
@@ -147,25 +141,23 @@ ImageDisplay::ImageDisplay(QWidget* parent)
     vb->setMargin(0);
     vb->setSpacing(0);
 
-    QMenu* contextMenu = QSoftMenuBar::menuFor(this);
-
     connect(_sizeToFit, SIGNAL(triggered()), this, SLOT(sizeToFit()));
     _sizeToFit->setVisible(true);
-    contextMenu->addAction(_sizeToFit);
+    addAction(_sizeToFit);
 
     connect(_sizeDefault, SIGNAL(triggered()), this, SLOT(sizeDefault()));
     _sizeDefault->setVisible(false);
-    contextMenu->addAction(_sizeDefault);
+    addAction(_sizeDefault);
 
     connect(_sizeActual, SIGNAL(triggered()), this, SLOT(sizeActual()));
     _sizeActual->setVisible(true);
-    contextMenu->addAction(_sizeActual);
+    addAction(_sizeActual);
 
     connect(_zoomToFit, SIGNAL(triggered()), this, SLOT(zoomToFit()));
     _zoomToFit->setVisible(false);
-    contextMenu->addAction(_zoomToFit);
+    addAction(_zoomToFit);
 
-    showMaximized();
+    setContextMenuPolicy(Qt::ActionsContextMenu);
 }
 
 ImageDisplay::~ImageDisplay()
@@ -321,14 +313,17 @@ AttachmentOptions::AttachmentOptions(QWidget* parent)
     vb->addWidget(_retrieve);
 
     layout->addRow(vb);
-
-    showMaximized();
 }
 
 AttachmentOptions::~AttachmentOptions()
 {
-    while (!_temporaries.isEmpty())
-        _temporaries.takeFirst().removeFiles();
+    while (!_temporaries.isEmpty()) {
+        QString fileName(_temporaries.takeFirst());
+        if (QFile::exists(fileName)) {
+            QFile::remove(fileName);
+        }
+    }
+
 }
 
 QSize AttachmentOptions::sizeHint() const
@@ -433,15 +428,19 @@ void AttachmentOptions::setAttachment(const QMailMessagePart& msgPart)
             _view->setText(tr("View"));
             _view->setVisible(true);
         } else {
+#if 0
             // See if there is a viewer available for this type
             QMimeType mt(_part->contentType().content());
             if (!mt.id().isEmpty() && !QMimeType::applicationsFor(mt).isEmpty()) {
+#endif
                 _view->setText(tr("View"));
                 _view->setVisible(true);
+#if 0
             } else {
                 _viewer->setText("<i><small><center>" + tr("No viewer available") + "</center></small></i>");
                 _viewer->setVisible(true);
             }
+#endif
         }
     }
 
@@ -462,16 +461,19 @@ void AttachmentOptions::viewAttachment()
 
             TextDisplay display(this);
             display.setText(_decodedText, _part->contentType().subType());
-            QtopiaApplication::execDialog(&display);
+            display.exec();
         } else {
             if (_decodedData.isNull())
                 _decodedData = _part->body().data(QMailMessageBody::Decoded);
 
             ImageDisplay display(this);
             display.setImage(_decodedData);
-            QtopiaApplication::execDialog(&display);
+            display.exec();
         }
     } else {
+#if 1
+        qWarning() << "Cannot display message of type:" << _part->contentType().content();
+#else
         QMimeType mt(_part->contentType().content());
         if (!mt.id().isEmpty()) {
             if (_decodedData.isNull())
@@ -542,13 +544,15 @@ void AttachmentOptions::viewAttachment()
                            QMessageBox::Ok | QMessageBox::Default, QMessageBox::NoButton, QMessageBox::NoButton);
             mb.exec();
         }
+#endif
     }
 }
 
 void AttachmentOptions::saveAttachment()
 {
-    QString fileName(_part->writeBodyTo(Qtopia::documentDir()));
+    QString fileName(_part->writeBodyTo(QDir::currentPath()));
     if (!fileName.isEmpty()) {
+#if 0
         // Create a document object from the saved file
         QContent document(fileName);
 
@@ -562,8 +566,9 @@ void AttachmentOptions::saveAttachment()
         document.setName(_part->displayName());
         document.setRole(QContent::Document);
         document.commit();
+#endif
 
-        _document->setText("<i><small><center>" + tr("Added to Documents") + "</center></small></i>");
+        _document->setText("<i><small><center>" + tr("Saved in:") + QDir::currentPath() + "</center></small></i>");
         _document->setVisible(true);
         _save->setVisible(false);
     } else {
diff --git a/src/plugins/viewers/generic/attachmentoptions.h b/src/plugins/viewers/generic/attachmentoptions.h
index 46284d6e..4aa5de39 100644
--- a/src/plugins/viewers/generic/attachmentoptions.h
+++ b/src/plugins/viewers/generic/attachmentoptions.h
@@ -12,16 +12,12 @@
 #define ATTACHMENTOPTIONS_H
 
 #include <QByteArray>
-#include <QContent>
 #include <QDialog>
 #include <QList>
 #include <QSize>
 #include <QString>
 
-#include <qtopiaglobal.h>
-
 class QByteArray;
-class QContent;
 class QLabel;
 class QMailMessagePart;
 class QPushButton;
@@ -72,7 +68,7 @@ private:
     ContentClass _class;
     QString _decodedText;
     QByteArray _decodedData;
-    QList<QContent> _temporaries;
+    QStringList _temporaries;
 };
 
 #endif
diff --git a/src/plugins/viewers/generic/generic.pro b/src/plugins/viewers/generic/generic.pro
index 0b5f27e4..e1bcaf2b 100644
--- a/src/plugins/viewers/generic/generic.pro
+++ b/src/plugins/viewers/generic/generic.pro
@@ -13,9 +13,9 @@ INCLUDEPATH += . ../../../libraries/qmfutil \
 LIBS += -L../../../libraries/qtopiamail -lqtopiamail \
         -L../../../libraries/qmfutil -lqmfutil
 
-HEADERS += browser.h genericviewer.h
+HEADERS += attachmentoptions.h browser.h genericviewer.h
 
-SOURCES += browser.cpp genericviewer.cpp
+SOURCES += attachmentoptions.cpp browser.cpp genericviewer.cpp
 
 TRANSLATIONS += libgenericviewer-ar.ts \
                 libgenericviewer-de.ts \
diff --git a/src/plugins/viewers/generic/genericviewer.cpp b/src/plugins/viewers/generic/genericviewer.cpp
index 29b24ead..92a4025f 100644
--- a/src/plugins/viewers/generic/genericviewer.cpp
+++ b/src/plugins/viewers/generic/genericviewer.cpp
@@ -10,6 +10,7 @@
 
 #include "genericviewer.h"
 #include "browser.h"
+#include "attachmentoptions.h"
 #include <QAction>
 #include <QGridLayout>
 #include <QKeyEvent>
@@ -45,7 +46,6 @@ GenericViewer::GenericViewer(QWidget* parent)
     browser->addAction(richTextModeAction);
     connect(richTextModeAction, SIGNAL(triggered(bool)),
             this, SLOT(triggered(bool)));
-
 }
 
 GenericViewer::~GenericViewer()
@@ -126,7 +126,6 @@ void GenericViewer::linkClicked(const QUrl& link)
     QString command = link.toString();
 
     if (command.startsWith("attachment")) {
-        /*
         QRegExp splitter("attachment;([^;]+)(?:;(\\d*))?");
         if (splitter.exactMatch(command)) {
             QString cmd = splitter.cap(1);
@@ -143,7 +142,6 @@ void GenericViewer::linkClicked(const QUrl& link)
                 return;
             }
         }
-        */
     } else if (command == "download") {
         emit completeMessage();
     }