Kolab Groupware OBS

_service:set_version:kube.spec Changed

kube.spec Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/Composer.qml Deleted

@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.0
-
-import org.kde.kirigami 1.0 as Kirigami
-
-import org.kube.framework.domain 1.0 as KubeFramework
-
-
-Item {
-    id: root
-
-    function loadMessage(message, loadAsDraft) {
-        composer.loadMessage(message, loadAsDraft)
-    }
-
-    function send() {
-        composer.send()
-    }
-
-    function saveAsDraft() {
-        composer.saveAsDraft()
-    }
-
-    function clear() {
-        composer.clear();
-    }
-
-    KubeFramework.ComposerController {
-        id: composer
-    }
-
-    ColumnLayout {
-
-        anchors.fill: parent
-
-        GridLayout {
-
-            columns: 2
-
-            Kirigami.Label {
-                text: "From"
-            }
-
-            ComboBox {
-                id: identityCombo
-                model: composer.identityModel
-                textRole: "displayName"
-
-                Layout.fillWidth: true
-
-                onCurrentIndexChanged: {
-                    composer.currentIdentityIndex = currentIndex
-                }
-            }
-
-            Kirigami.Label {
-                text: "To"
-            }
-
-            RowLayout {
-                Layout.fillWidth: true
-
-                TextField {
-                    id: to
-
-                    Layout.fillWidth: true
-
-                    text: composer.to
-
-                    onTextChanged: {
-                        composer.to = text;
-                    }
-                }
-
-                Button {
-                    id: ccButton
-
-                    text: "Cc"
-
-                    onClicked: {
-                        cc.visible = true
-                        ccButton.visible = false
-                    }
-                }
-
-                Button {
-                    id: bccButton
-
-                    text: "Bcc"
-
-                    onClicked: {
-                        bcc.visible = true
-                        bccButton.visible = false
-                    }
-                }
-            }
-
-            Kirigami.Label {
-                text: "Cc"
-
-                visible: cc.visible
-            }
-
-            TextField {
-                id: cc
-
-                Layout.fillWidth: true
-
-                visible: false
-
-                text: composer.cc
-
-                onTextChanged: {
-                        composer.cc = text;
-                }
-            }
-
-            Kirigami.Label {
-                text: "Bcc"
-
-                visible: bcc.visible
-            }
-
-            TextField {
-                id: bcc
-
-                Layout.fillWidth: true
-
-                visible : false
-
-                text: composer.bcc
-
-                onTextChanged: {
-                        composer.bcc = text;
-                }
-            }
-        }
-
-        TextField {
-            id: subject
-
-            Layout.fillWidth: true
-
-            placeholderText: "Enter Subject"
-
-            text: composer.subject
-
-            onTextChanged: {
-                composer.subject = text;
-            }
-        }
-
-        Item {
-
-            Layout.fillWidth: true
-
-            height: subject.height * 1.5
-
-            Button {
-
-                anchors {
-                    bottom: parent.bottom
-                }
-
-                text: "Save as Draft"
-
-                onClicked: {
-                    composer.saveAsDraft()
-                }
-            }
-
-            Button {
-
-                anchors {
-                    bottom: parent.bottom
-                    right: parent.right
-                }
-
-                text: "Attach"
-

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/actions/mailactions.cpp Deleted

@@ -1,29 +0,0 @@
-/*
-    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
-
-    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 <actions/context.h>
-#include <actions/actionhandler.h>
-
-#include "../mailtransport.h"
-#include <KMime/Message>
-#include <QByteArray>
-#include <QVariant>
-#include <QDebug>
-
-using namespace Kube;
-

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/csshelper.cpp Deleted

@@ -1,64 +0,0 @@
-/*
-    csshelper.cpp
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    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 <QColor>
-#include <QDebug>
-#include <QFile>
-#include <QFont>
-#include <QFont>
-#include <QPalette>
-
-CSSHelper::CSSHelper(const QPaintDevice *pd) :
-    MimeTreeParser::CSSHelperBase(pd)
-{
-
-}
-
-QString cssDefinitions() 
-{
-    QFile file(QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + "mail.css");
-    if (file.open(QFile::ReadOnly)) {
-        return file.readAll();
-    }
-    return QString();
-}
-
-QString CSSHelper::htmlHead(bool fixed) const
-{
-    return
-        QLatin1String("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
-                      "<html><head><title></title><style>\n")
-        + ::cssDefinitions() +
-        QLatin1String("</style></head>\n"
-                      "<body>\n");
-}
\ No newline at end of file

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/csshelper.h Deleted

@@ -1,44 +0,0 @@
-/*  -*- c++ -*-
-    csshelper.h
-
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
-
-    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.
-*/
-
-#pragma once
-
-#include <MimeTreeParser/CSSHelperBase>
-
-class CSSHelper : public MimeTreeParser::CSSHelperBase
-{
-public:
-    explicit CSSHelper(const QPaintDevice *pd);
-
-    /** @return HTML head including style sheet definitions and the
-    &gt;body&lt; tag */
-    QString htmlHead(bool fixedFont = false) const Q_DECL_OVERRIDE;
-};
\ No newline at end of file

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/data Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/data/mail.css Deleted

@@ -1,298 +0,0 @@
-div.header {
-    margin-bottom: 10pt ! important;
-}
-
-table.textAtm {
-  margin-top: 10pt ! important;
-  margin-bottom: 10pt ! important;
-}
-
-tr.textAtmH,
-tr.textAtmB,
-tr.rfc822B {
-  font-weight: normal ! important;
-}
-
-tr.signInProgressH,
-tr.rfc822H,
-tr.encrH,
-tr.signOkKeyOkH,
-tr.signOkKeyBadH,
-tr.signWarnH,
-tr.sign
-ErrH {
-  font-weight: bold ! important;
-}
-
-tr.textAtmH td,
-tr.textAtmB td {
-  padding: 3px ! important;
-}
-
-table.rfc822 {
-  width: 100% ! important;
-  border: solid 1px black ! important;
-  margin-top: 10pt ! important;
-  margin-bottom: 10pt ! important;
-}
-
-table.textAtm,
-table.encr,
-table.signWarn,
-table.signErr,
-table.signOkKeyBad,
-table.signOkKeyOk,
-table.signInProgress,
-div.fancy.header table {
-  width: 100% ! important;
-  border-width: 0px ! important;
-  line-height: normal;
-}
-
-div.htmlWarn {
-  margin: 0px 5% ! important;
-  padding: 10px ! important;
-  text-align: left ! important;
-  line-height: normal;
-}
-
-div.fancy.header > div {
-  font-weight: bold ! important;
-  padding: 4px ! important;
-  line-height: normal;
-}
-
-div.fancy.header table {
-  padding: 2px ! important;
-  text-align: left ! important;
-  border-collapse: separate ! important;
-}
-
-div.fancy.header table th {
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-  padding: 0px ! important;
-  white-space: nowrap ! important;
-  border-spacing: 0px ! important;
-  text-align: left ! important;
-  vertical-align: top ! important;
-  background-color: #efebe7 ! important;
-  color: #000000 ! important;
-  border: 1px ! important;
-}
-
-div.fancy.header table td {
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-  padding: 0px ! important;
-  border-spacing: 0px ! important;
-  text-align: left ! important;
-  vertical-align: top ! important;
-  width: 100% ! important;
-  background-color: #efebe7 ! important;
-  color: #000000 ! important;
-  border: 1px ! important;
-}
-
-div.fancy.header table a:hover {
-  background-color: transparent ! important;
-}
-
-span.pimsmileytext {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  visibility: hidden;
-}
-
-img.pimsmileyimg {
-}
-
-div.quotelevelmark {
-  position: absolute;
-  margin-left:-10px;
-}
-
-body {
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-  color: #000000 ! important;
-  background-color: #ffffff ! important;
-}
-
-a {
-  color: #0000cc ! important;
-  text-decoration: none ! important;
-}
-
-a.white {
-  color: white ! important;
-}
-
-a.black {
-  color: black ! important;
-}
-
-table.textAtm { background-color: #000000 ! important; }
-
-tr.textAtmH {
-  background-color: #ffffff ! important;
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-}
-
-tr.textAtmB {
-  background-color: #ffffff ! important;
-}
-
-table.signInProgress,
-table.rfc822 {
-  background-color: #ffffff ! important
-;
-}
-
-tr.signInProgressH,
-tr.rfc822H {
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-}
-
-table.encr {
-  background-color: #0010cc ! important;
-}
-
-tr.encrH {
-  background-color: #1010ee ! important;
-  color: #aaaaaa ! important;
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-}
-
-tr.encrB { background-color: #ffe0e0 ! important; }
-
-table.signOkKeyOk {
-  background-color: #00cc00 ! important;
-}
-
-tr.signOkKeyOkH {
-  background-color: #00ff00 ! important;
-  color: #000000 ! important;
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-}
-
-tr.signOkKeyOkB { background-color: #e0ffe0 ! important; }
-
-table.signOkKeyBad {
-  background-color: #00cc00 ! important;
-}
-
-tr.signOkKeyBadH {
-  background-color: #00ff00 ! important;
-  color: #000000 ! important;
-  font-family: "Helvetica" ! important;
-  font-size: 12pt;
-}
-
-tr.signOkKeyBadB { background-color: #e0ffe0 ! important; }
-
-table.signWarn {

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/mailtransport.cpp Deleted

@@ -1,160 +0,0 @@
-/*
-    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
-
-    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 "mailtransport.h"
-
-#include <QByteArray>
-#include <QList>
-#include <QDebug>
-
-extern "C" {
-
-#include <stdio.h>
-#include <string.h>
-#include <curl/curl.h>
-
-struct upload_status {
-    int offset;
-    const char *data;
-};
-
-static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp)
-{
-    struct upload_status *upload_ctx = (struct upload_status *)userp;
-    const char *data;
-
-    if((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
-        return 0;
-    }
-
-    data = &upload_ctx->data[upload_ctx->offset];
-    if(data) {
-        size_t len = strlen(data);
-        if (len > size * nmemb) {
-            len = size * nmemb;
-        }
-        fprintf(stderr, "read n bytes: %d\n",len);
-        memcpy(ptr, data, len);
-        upload_ctx->offset += len;
-        return len;
-    }
-
-    return 0;
-}
-
-
-void sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer)
-{
-    //For ssl use "smtps://mainserver.example.net
-    const char* cacert = 0; // = "/path/to/certificate.pem";
-
-    CURL *curl;
-    CURLcode res = CURLE_OK;
-    struct curl_slist *recipients = NULL;
-    struct upload_status upload_ctx;
-
-    upload_ctx.offset = 0;
-    upload_ctx.data = msg;
-
-    curl = curl_easy_init();
-    if(curl) {
-        curl_easy_setopt(curl, CURLOPT_USERNAME, username);
-        curl_easy_setopt(curl, CURLOPT_PASSWORD, password);
-
-        curl_easy_setopt(curl, CURLOPT_URL, server);
-
-        if (useTls) {
-            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
-        }
-
-        if (!verifyPeer) {
-            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-            curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-        }
-        if (cacert) {
-            curl_easy_setopt(curl, CURLOPT_CAINFO, cacert);
-        }
-
-        if (from) {
-            curl_easy_setopt(curl, CURLOPT_MAIL_FROM, from);
-        }
-
-        for (int i = 0; i < numTos; i++) {
-            recipients = curl_slist_append(recipients, to[i]);
-        }
-        for (int i = 0; i < numCcs; i++) {
-            recipients = curl_slist_append(recipients, cc[i]);
-        }
-        curl_easy_setopt(curl, CURLOPT_MAIL_RCPT, recipients);
-
-        /* We're using a callback function to specify the payload (the headers and
-        * body of the message). You could just use the CURLOPT_READDATA option to
-        * specify a FILE pointer to read from. */
-        curl_easy_setopt(curl, CURLOPT_READFUNCTION, payload_source);
-        curl_easy_setopt(curl, CURLOPT_READDATA, &upload_ctx);
-        curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
-
-        /* Since the traffic will be encrypted, it is very useful to turn on debug
-        * information within libcurl to see what is happening during the transfer.
-        */
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-
-        res = curl_easy_perform(curl);
-        if(res != CURLE_OK) {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",
-                    curl_easy_strerror(res));
-        }
-        curl_slist_free_all(recipients);
-        curl_easy_cleanup(curl);
-    }
-}
-
-};
-
-void MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert)
-{
-    QByteArray msg = message->encodedContent();
-    qWarning() << "Sending message " << msg;
-
-    QByteArray from(message->from(true)->mailboxes().isEmpty() ? QByteArray() : message->from(true)->mailboxes().first().address());
-    QList<QByteArray> toList;
-    for (const auto &mb : message->to(true)->mailboxes()) {
-        toList << mb.address();
-    }
-    QList<QByteArray> ccList;
-    for (const auto &mb : message->cc(true)->mailboxes()) {
-        ccList << mb.address();
-    }
-    bool useTls = true;
-    bool verifyPeer = false;
-
-    const int numTos = toList.size();
-    const char* to[numTos];
-    for (int i = 0; i < numTos; i++) {
-        to[i] = toList.at(i);
-    }
-
-    const int numCcs = ccList.size();
-    const char* cc[numCcs];
-    for (int i = 0; i < numCcs; i++) {
-        cc[i] = ccList.at(i);
-    }
-
-    sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, server, verifyPeer);
-    qWarning() << "Message sent";
-}

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/mailtransport.h Deleted

@@ -1,28 +0,0 @@
-/*
-    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
-
-    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.
-*/
-
-#pragma once
-
-#include <QByteArray>
-#include <KMime/Message>
-
-namespace MailTransport
-{
-    void sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert);
-};

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/maildir_resource.cpp Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/maildir_resource.h Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/resourcelistmodel.cpp Deleted

@@ -1,42 +0,0 @@
-#include "resourcelistmodel.h"
-
-#include <sink/store.h>
-
-ResourceListModel::ResourceListModel(QObject *parent) : QIdentityProxyModel()
-{
-    Sink::Query query;
-    query.syncOnDemand = false;
-    query.processAll = false;
-    query.liveQuery = true;
-    query.requestedProperties << "type";
-    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
-}
-
-ResourceListModel::~ResourceListModel()
-{
-
-}
-
-QHash< int, QByteArray > ResourceListModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-
-    roles[Type] = "type";
-    roles[Id] = "id";
-
-    return roles;
-}
-
-QVariant ResourceListModel::data(const QModelIndex& index, int role) const
-{
-    auto srcIdx = mapToSource(index);
-    switch (role) {
-        case Id:
-            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
-        case Type:
-            return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
-    }
-
-    return QIdentityProxyModel::data(index, role);
-}
-

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/resourcelistmodel.h Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/resourcescontroller.cpp Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/resourcescontroller.h Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/CMakeLists.txt Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/colorpalette.cpp Deleted

@@ -1,45 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
-
-  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 "colorpalette.h"
-
-ColorPalette::ColorPalette(QObject *parent) : QObject(parent), m_background("#fcfcfc"), m_selected("#3daee9"), m_read("#232629"), m_border("#232629")
-{
-
-}
-
-QString ColorPalette::background() const
-{
-    return m_background;
-}
-
-QString ColorPalette::read() const
-{
-    return m_read;
-}
-
-QString ColorPalette::selected() const
-{
-    return m_selected;
-}
-
-QString ColorPalette::border() const
-{
-    return m_border;
-}
-

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/colorpalette.h Deleted

@@ -1,47 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
-
-  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 <QObject>
-#include <QString>
-
-class ColorPalette : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY (QString background READ background NOTIFY themeChanged)
-    Q_PROPERTY (QString selected READ background NOTIFY themeChanged)
-    Q_PROPERTY (QString read READ read NOTIFY themeChanged)
-    Q_PROPERTY (QString border READ border NOTIFY themeChanged)
-
-public:
-    explicit ColorPalette(QObject *parent = Q_NULLPTR);
-
-    QString background() const;
-    QString selected() const;
-    QString read() const;
-    QString border() const;
-
-signals:
-    void themeChanged();
-
-private:
-    QString m_background;
-    QString m_selected;
-    QString m_read;
-    QString m_border;
-};

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/qmldir Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/themeplugin.cpp Deleted

@@ -1,50 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
-
-  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 "themeplugin.h"
-
-#include <QtQml>
-#include <QQmlEngine>
-
-#include "colorpalette.h"
-#include "unit.h"
-
-static QObject *colorpaletteInstace(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-
-    return new ColorPalette;
-}
-
-static QObject *unitInstace(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-
-    return new Unit;
-}
-
-void ThemePlugin::registerTypes (const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("org.kube.framework.theme"));
-
-    qmlRegisterSingletonType<ColorPalette>(uri, 1, 0, "ColorPalette", colorpaletteInstace);
-    qmlRegisterSingletonType<Unit>(uri, 1, 0, "Unit", unitInstace);
-
-}

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/themeplugin.h Deleted

@@ -1,31 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
-
-  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.
-*/
-
-#pragma once
-
-#include <QQmlEngine>
-#include <QQmlExtensionPlugin>
-
-class ThemePlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    virtual void registerTypes(const char *uri);
-};
\ No newline at end of file

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/unit.cpp Deleted

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/theme/unit.h Deleted

@@ -1,38 +0,0 @@
-/*
-  Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
-
-  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 <QObject>
-
-
-class Unit : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY (int size READ size NOTIFY unitChanged)
-
-
-public:
-    explicit Unit(QObject *parent = Q_NULLPTR);
-
-    int size() const;
-
-signals:
-    void unitChanged();
-
-private:
-    int m_size;
-};

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/README.md -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/README.md Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/imap/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/imap/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/imap/imapsettings.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/imap/imapsettings.cpp Changed

@@ -18,233 +18,32 @@
 */
 #include "imapsettings.h"
 
-#include <settings/settings.h>
-
-#include <sink/store.h>
-#include <QDebug>
-#include <QDir>
-#include <QUrl>
-
 ImapSettings::ImapSettings(QObject *parent)
-    : QObject(parent)
-{
-}
-
-
-void ImapSettings::setAccountIdentifier(const QByteArray &id)
-{
-    if (id.isEmpty()) {
-        return;
-    }
-    mAccountIdentifier = id;
-
-    //Clear
-    mIcon = QString();
-    mName = QString();
-    mImapServer = QString();
-    mImapUsername = QString();
-    mImapPassword = QString();
-    mSmtpServer = QString();
-    mSmtpUsername = QString();
-    mSmtpPassword = QString();
-    emit changed();
-    emit imapResourceChanged();
-    emit smtpResourceChanged();
-
-    Q_ASSERT(!id.isEmpty());
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query::IdentityFilter(id))
-        .then<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
-            mIcon = account.getProperty("icon").toString();
-            mName = account.getProperty("name").toString();
-            emit changed();
-        }).exec();
-
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage))
-        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
-            mIdentifier = resource.identifier();
-            mImapServer = resource.getProperty("server").toString();
-            mImapUsername = resource.getProperty("username").toString();
-            mImapPassword = resource.getProperty("password").toString();
-            emit imapResourceChanged();
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the imap resource: " << errorMessage;
-        }).exec();
-
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport))
-        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
-            mMailtransportIdentifier = resource.identifier();
-            mSmtpServer = resource.getProperty("server").toString();
-            mSmtpUsername = resource.getProperty("username").toString();
-            mSmtpPassword = resource.getProperty("password").toString();
-            emit smtpResourceChanged();
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the smtp resource: " << errorMessage;
-        }).exec();
-
-    //FIXME this assumes that we only ever have one identity per account
-    Sink::Store::fetchOne<Sink::ApplicationDomain::Identity>(Sink::Query::AccountFilter(id))
-        .then<void, Sink::ApplicationDomain::Identity>([this](const Sink::ApplicationDomain::Identity &identity) {
-            mIdentityIdentifier = identity.identifier();
-            mUsername = identity.getProperty("username").toString();
-            mEmailAddress = identity.getProperty("address").toString();
-            emit identityChanged();
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the identity resource: " << errorMessage;
-        }).exec();
-}
-
-QByteArray ImapSettings::accountIdentifier() const
-{
-    return mAccountIdentifier;
-}
-
-QValidator *ImapSettings::imapServerValidator() const
+    : AccountSettings(parent)
 {
-    class ImapServerValidator : public QValidator {
-        State validate(QString &input, int &pos) const {
-            Q_UNUSED(pos);
-            // imaps://mainserver.example.net:475
-            const QUrl url(input);
-            static QSet<QString> validProtocols = QSet<QString>() << "imap" << "imaps";
-            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
-                return Acceptable;
-            } else {
-                return Intermediate;
-            }
-        }
-    };
-    static ImapServerValidator *validator = new ImapServerValidator;
-    return validator;
 }
 
-QValidator *ImapSettings::smtpServerValidator() const
+void ImapSettings::load()
 {
-    class SmtpServerValidator : public QValidator {
-        State validate(QString &input, int &pos) const {
-            Q_UNUSED(pos);
-            // smtps://mainserver.example.net:475
-            const QUrl url(input);
-            static QSet<QString> validProtocols = QSet<QString>() << "smtp" << "smtps";
-            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
-                return Acceptable;
-            } else {
-                return Intermediate;
-            }
-        }
-    };
-    static SmtpServerValidator *validator = new SmtpServerValidator;
-    return validator;
+    loadAccount();
+    loadImapResource();
+    loadMailtransportResource();
+    loadIdentity();
 }
 
 void ImapSettings::save()
 {
-    qDebug() << "Saving account " << mAccountIdentifier << mIdentifier << mMailtransportIdentifier;
-    Q_ASSERT(!mAccountIdentifier.isEmpty());
-    Sink::ApplicationDomain::SinkAccount account(mAccountIdentifier);
-    account.setProperty("type", "imap");
-    account.setProperty("name", mName);
-    account.setProperty("icon", mIcon);
-    Q_ASSERT(!account.identifier().isEmpty());
-    Sink::Store::modify(account).then<void>([]() {},
-    [](int errorCode, const QString &errorMessage) {
-        qWarning() << "Error while creating account: " << errorMessage;
-    })
-    .exec();
-
-    if (!mIdentifier.isEmpty()) {
-        Sink::ApplicationDomain::SinkResource resource(mIdentifier);
-        resource.setProperty("server", mImapServer);
-        resource.setProperty("username", mImapUsername);
-        resource.setProperty("password", mImapPassword);
-        Sink::Store::modify(resource).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while modifying resource: " << errorMessage;
-        })
-        .exec();
-    } else {
-        auto resource = Sink::ApplicationDomain::ImapResource::create(mAccountIdentifier);
-        mIdentifier = resource.identifier();
-        resource.setProperty("server", mImapServer);
-        resource.setProperty("username", mImapUsername);
-        resource.setProperty("password", mImapPassword);
-        Sink::Store::create(resource).then<void>([]() {},
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while creating resource: " << errorMessage;
-        })
-        .exec();
-    }
-
-    if (!mMailtransportIdentifier.isEmpty()) {
-        Sink::ApplicationDomain::SinkResource resource(mMailtransportIdentifier);
-        resource.setProperty("server", mSmtpServer);
-        resource.setProperty("username", mSmtpUsername);
-        resource.setProperty("password", mSmtpPassword);
-        Sink::Store::modify(resource).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while modifying resource: " << errorMessage;
-        })
-        .exec();
-    } else {
-        auto resource = Sink::ApplicationDomain::MailtransportResource::create(mAccountIdentifier);
-        mMailtransportIdentifier = resource.identifier();
-        resource.setProperty("server", mSmtpServer);
-        resource.setProperty("username", mSmtpUsername);
-        resource.setProperty("password", mSmtpPassword);
-        Sink::Store::create(resource).then<void>([]() {},
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while creating resource: " << errorMessage;
-        })
-        .exec();
-    }
-
-    if (!mIdentityIdentifier.isEmpty()) {
-        Sink::ApplicationDomain::Identity identity(mMailtransportIdentifier);
-        identity.setProperty("username", mUsername);
-        identity.setProperty("address", mEmailAddress);
-        Sink::Store::modify(identity).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while modifying identity: " << errorMessage;
-        })
-        .exec();
-    } else {
-        auto identity = Sink::ApplicationDomain::ApplicationDomainType::createEntity<Sink::ApplicationDomain::Identity>();

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/imap/imapsettings.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/imap/imapsettings.h Changed

@@ -18,57 +18,16 @@
 */
 #pragma once
 
-#include <QObject>
-#include <QValidator>
+#include <domain/settings/accountsettings.h>
 
-class ImapSettings : public QObject
+class ImapSettings : public AccountSettings
 {
     Q_OBJECT
-    Q_PROPERTY(QByteArray accountIdentifier READ accountIdentifier WRITE setAccountIdentifier)
-    Q_PROPERTY(QString icon MEMBER mIcon NOTIFY changed)
-    Q_PROPERTY(QString accountName MEMBER mName NOTIFY changed)
-    Q_PROPERTY(QString userName MEMBER mUsername NOTIFY identityChanged)
-    Q_PROPERTY(QString emailAddress MEMBER mEmailAddress NOTIFY identityChanged)
-    Q_PROPERTY(QString imapServer MEMBER mImapServer NOTIFY imapResourceChanged)
-    Q_PROPERTY(QValidator* imapServerValidator READ imapServerValidator CONSTANT)
-    Q_PROPERTY(QString imapUsername MEMBER mImapUsername NOTIFY imapResourceChanged)
-    Q_PROPERTY(QString imapPassword MEMBER mImapPassword NOTIFY imapResourceChanged)
-    Q_PROPERTY(QString smtpServer MEMBER mSmtpServer NOTIFY smtpResourceChanged)
-    Q_PROPERTY(QValidator* smtpServerValidator READ smtpServerValidator CONSTANT)
-    Q_PROPERTY(QString smtpUsername MEMBER mSmtpUsername NOTIFY smtpResourceChanged)
-    Q_PROPERTY(QString smtpPassword MEMBER mSmtpPassword NOTIFY smtpResourceChanged)
 
 public:
     ImapSettings(QObject *parent = 0);
 
-    void setAccountIdentifier(const QByteArray &);
-    QByteArray accountIdentifier() const;
-
-    QValidator *imapServerValidator() const;
-    QValidator *smtpServerValidator() const;
-
-    Q_INVOKABLE void save();
-    Q_INVOKABLE void remove();
-
-signals:
-    void imapResourceChanged();
-    void smtpResourceChanged();
-    void identityChanged();
-    void changed();
-
-private:
-    QByteArray mIdentifier;
-    QByteArray mAccountIdentifier;
-    QByteArray mMailtransportIdentifier;
-    QByteArray mIdentityIdentifier;
-    QString mIcon;
-    QString mName;
-    QString mUsername;
-    QString mEmailAddress;
-    QString mImapServer;
-    QString mImapUsername;
-    QString mImapPassword;
-    QString mSmtpServer;
-    QString mSmtpUsername;
-    QString mSmtpPassword;
+    Q_INVOKABLE virtual void load() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void save() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void remove() Q_DECL_OVERRIDE;
 };

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/imap/package/contents/ui/ImapAccountSettings.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/imap/package/contents/ui/ImapAccountSettings.qml Changed

@@ -1,19 +1,20 @@
 /*
- *   Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.4
@@ -30,8 +31,8 @@
     property string accountId
 
     ImapAccount.ImapSettings {
-             id: imapSettings
-             accountIdentifier: accountId
+        id: imapSettings
+        accountIdentifier: accountId
     }
 
     anchors.fill: parent
@@ -59,9 +60,10 @@
 
             width: parent.width
 
-            text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube. For information about which SMTP, IMAP server, which authentification and port to be used, please contact your email provider"
-            //TODO wait for kirgami theme disabled text color
-            opacity: 0.5
+            text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube. For information about which SMTP, IMAP address, which authentification and port to be used, please contact your email provider"
+
+            color: Kirigami.Theme.disabledTextColor
+
             wrapMode: Text.Wrap
         }
 
@@ -87,6 +89,8 @@
             TextField {
                 Layout.fillWidth: true
 
+                placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name"
+
                 text: imapSettings.accountName
                 onTextChanged: {
                     imapSettings.accountName = text
@@ -97,9 +101,12 @@
                 text: "Email address"
                 Layout.alignment: Qt.AlignRight
             }
+
             TextField {
                 Layout.fillWidth: true
 
+                placeholderText: "Your email address"
+
                 text: imapSettings.emailAddress
                 onTextChanged: {
                     imapSettings.emailAddress = text
@@ -113,6 +120,8 @@
             TextField {
                 Layout.fillWidth: true
 
+                placeholderText: "The name used to log into your email account"
+
                 text: imapSettings.imapUsername
                 onTextChanged: {
                     imapSettings.imapUsername = text
@@ -124,14 +133,34 @@
                 text: "Password"
                 Layout.alignment: Qt.AlignRight
             }
-            TextField {
+
+            RowLayout {
                 Layout.fillWidth: true
 
-               text: imapSettings.imapPassword
-               onTextChanged: {
-                   imapSettings.imapPassword = text
-                   imapSettings.smtpPassword = text
+                TextField {
+                    id: pwField
+                    Layout.fillWidth: true
+
+                    text: imapSettings.imapPassword
+                    placeholderText: "Password of your email account"
+                    echoMode: TextInput.Password
+                    onTextChanged: {
+                        imapSettings.imapPassword = text
+                        imapSettings.smtpPassword = text
+                    }
                 }
+
+                CheckBox {
+                    text: "Show Password"
+                    onClicked: {
+                        if(pwField.echoMode == TextInput.Password) {
+                            pwField.echoMode = TextInput.Normal;
+                        } else {
+                            pwField.echoMode = TextInput.Password;
+                        }
+                    }
+                }
+
             }
 
             Kirigami.Label {

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/imap/tests/settingstest.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/imap/tests/settingstest.cpp Changed

@@ -43,7 +43,7 @@
         settings.setProperty("emailAddress", emailAddress);
         settings.save();
 
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then<void, QList<Sink::ApplicationDomain::SinkResource>>([](const QList<Sink::ApplicationDomain::SinkResource> &resources) {
+        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 2);
         })
         .exec().waitForFinished();
@@ -76,7 +76,7 @@
             settings.remove();
         }
 
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then<void, QList<Sink::ApplicationDomain::SinkResource>>([](const QList<Sink::ApplicationDomain::SinkResource> &resources) {
+        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 0);
         })
         .exec().waitForFinished();

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/CMakeLists.txt Added

@@ -0,0 +1,48 @@
+project(kube-accounts-kolabnow)
+
+cmake_minimum_required(VERSION 2.8.12)
+
+include(CPack)
+include(FeatureSummary)
+find_package(PkgConfig)
+
+################# set KDE specific information #################
+
+find_package(ECM 0.0.8 REQUIRED NO_MODULE)
+
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
+
+set (QT_MIN_VERSION "5.4.0")
+find_package(Sink CONFIG REQUIRED)
+find_package(KF5Async CONFIG REQUIRED)
+find_package(KF5 REQUIRED COMPONENTS Package Mime)
+
+include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
+#FIXME
+include_directories(../../framework/)
+
+set(SRCS
+    kolabnowsettings.cpp
+    kolabnowaccountplugin.cpp
+)
+
+add_library(kolabnowaccountplugin SHARED ${SRCS})
+qt5_use_modules(kolabnowaccountplugin Core Quick Qml)
+target_link_libraries(kolabnowaccountplugin sink settingsplugin mailplugin)
+
+add_library(kolabnowaccount_static STATIC ${SRCS})
+qt5_use_modules(kolabnowaccount_static Core Quick Qml)
+target_link_libraries(kolabnowaccount_static sink settingsplugin mailplugin)
+# add_subdirectory(tests)
+
+kpackage_install_package(package org.kube.accounts.kolabnow "genericqml")
+
+install(TARGETS kolabnowaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/kolabnow)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/kolabnow)

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/kolabnowaccountplugin.cpp Added

@@ -0,0 +1,29 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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 "kolabnowaccountplugin.h"
+
+#include "kolabnowsettings.h"
+
+#include <QtQml>
+
+void KolabnowAccountPlugin::registerTypes (const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("org.kube.accounts.kolabnow"));
+    qmlRegisterType<KolabnowSettings>(uri, 1, 0, "KolabnowSettings");
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/kolabnowaccountplugin.h Added

@@ -0,0 +1,31 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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.
+*/
+#pragma once
+
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+
+class KolabnowAccountPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    virtual void registerTypes(const char *uri);
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/kolabnowsettings.cpp Added

@@ -0,0 +1,58 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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 "kolabnowsettings.h"
+
+KolabnowSettings::KolabnowSettings(QObject *parent)
+    : AccountSettings(parent)
+{
+}
+
+void KolabnowSettings::load()
+{
+    loadAccount();
+    loadImapResource();
+    loadMailtransportResource();
+    loadIdentity();
+}
+
+void KolabnowSettings::save()
+{
+    mUsername = mEmailAddress;
+    mImapServer = "imaps://imap.kolabnow.com:993";
+    mImapUsername = mEmailAddress;
+    // mImapPassword = mPassword;
+
+    mSmtpServer = "smtps://smtp.kolabnow.com:587";
+    mSmtpUsername = mEmailAddress;
+    mSmtpPassword = mImapPassword;
+
+    saveAccount();
+    saveImapResource();
+    saveMailtransportResource();
+    saveIdentity();
+}
+
+void KolabnowSettings::remove()
+{
+    removeResource(mMailtransportIdentifier);
+    removeResource(mImapIdentifier);
+    removeIdentity();
+    removeAccount();
+}
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/kolabnowsettings.h Added

@@ -0,0 +1,33 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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.
+*/
+#pragma once
+
+#include <domain/settings/accountsettings.h>
+
+class KolabnowSettings : public AccountSettings
+{
+    Q_OBJECT
+
+public:
+    KolabnowSettings(QObject *parent = 0);
+
+    Q_INVOKABLE virtual void load() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void save() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void remove() Q_DECL_OVERRIDE;
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/package Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/package/contents Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/package/contents/ui Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml Added

@@ -0,0 +1,154 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.1
+
+import org.kde.kirigami 1.0 as Kirigami
+
+import org.kube.framework.settings 1.0 as KubeSettings
+import org.kube.accounts.kolabnow 1.0 as KolabnowAccount
+
+
+Item {
+
+    property string accountId
+
+    KolabnowAccount.KolabnowSettings {
+             id: kolabnowSettings
+             accountIdentifier: accountId
+    }
+
+    anchors.fill: parent
+
+    Item {
+        anchors {
+            fill: parent
+            margins: Kirigami.Units.largeSpacing * 2
+        }
+
+        Kirigami.Heading {
+            id: heading
+            text: "Connect your KOLABNOW account"
+
+            color: Kirigami.Theme.highlightColor
+        }
+
+        Label {
+            id: subHeadline
+
+            anchors {
+                left: heading.left
+                top: heading.bottom
+            }
+
+            width: parent.width
+
+            text: "To let Kube access your KOLABNOW account, fill in email address and password and give the account a title that will be displayed inside Kube."
+            //TODO wait for kirgami theme disabled text color
+            opacity: 0.5
+            wrapMode: Text.Wrap
+        }
+
+
+        GridLayout {
+            anchors {
+                top:subHeadline.bottom
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing
+                bottomMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            columns: 2
+            columnSpacing: Kirigami.Units.largeSpacing
+            rowSpacing: Kirigami.Units.largeSpacing
+
+            Kirigami.Label {
+                text: "Title of Account"
+                Layout.alignment: Qt.AlignRight
+            }
+            TextField {
+                Layout.fillWidth: true
+
+                text: kolabnowSettings.accountName
+                placeholderText: "KOLABNOW"
+                onTextChanged: {
+                    kolabnowSettings.accountName = text
+                }
+            }
+
+            Kirigami.Label {
+                text: "Email address"
+                Layout.alignment: Qt.AlignRight
+            }
+            TextField {
+                Layout.fillWidth: true
+
+                text: kolabnowSettings.emailAddress
+                onTextChanged: {
+                    kolabnowSettings.emailAddress = text
+                }
+            }
+
+            Kirigami.Label {
+                text: "Password"
+                Layout.alignment: Qt.AlignRight
+            }
+            TextField {
+                Layout.fillWidth: true
+
+               text: kolabnowSettings.imapPassword
+               onTextChanged: {
+                   kolabnowSettings.imapPassword = text
+                   kolabnowSettings.smtpPassword = text
+                }
+            }
+
+            Label {
+                text: ""
+            }
+            Item {
+                Layout.fillWidth: true
+
+                Button {
+                    text: "Delete"
+
+                    onClicked: {
+                        kolabnowSettings.remove()
+                        root.closeDialog()
+                    }
+                }
+
+                Button {
+                    anchors.right: parent.right
+
+                    text: "Save"
+
+                    onClicked: {
+                        focus: true
+                        kolabnowSettings.save()
+                        root.closeDialog()
+                    }
+                }
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/package/metadata.desktop Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/kolabnow/qmldir Added

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/maildiraccountplugin.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/maildiraccountplugin.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/maildircontroller.cpp Added

@@ -0,0 +1,107 @@
+/*
+ *    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+ *    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+ *
+ *    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 "maildircontroller.h"
+
+#include <sink/store.h>
+
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
+MaildirController::MaildirController(QObject *parent)
+: QObject(parent)
+{
+}
+
+QByteArray MaildirController::accountIdentifier() const
+{
+    return mAccountIdentifier;
+}
+
+void MaildirController::setAccountIdentifier(const QByteArray &id)
+{
+    if (id.isEmpty()) {
+        return;
+    }
+    mAccountIdentifier = id;
+
+    //clear
+    mIcon = QString();
+    mName = QString();
+    mPath = QUrl();
+
+    //load
+}
+
+QUrl MaildirController::path() const
+{
+    return QUrl(mPath);
+}
+
+void MaildirController::setPath(const QUrl &path)
+{
+    auto normalizedPath = path.path();
+    if (mPath != normalizedPath) {
+        mPath = normalizedPath;
+        emit pathChanged();
+    }
+}
+
+void MaildirController::createAccount()
+{
+    auto account = ApplicationDomainType::createEntity<SinkAccount>();
+    account.setProperty("type", "maildir");
+    account.setProperty("name", mName);
+    account.setProperty("icon", mIcon);
+    Store::create(account).exec().waitForFinished();
+
+    auto resource =  ApplicationDomainType::createEntity<SinkResource>();
+    resource.setResourceType("sink.maildir");
+    resource.setAccount(account);
+    resource.setProperty("path", mPath);
+    //TODO not yet implemented in resource? // resource.setProperty("readonly", readonly);
+    Store::create(resource).exec().waitForFinished();
+}
+
+//TODO
+void MaildirController::loadAccount(const QByteArray &id)
+{
+    Q_ASSERT(!mAccountIdentifier.isEmpty());
+    Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier))
+    .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+        mIcon = account.getIcon();
+        mName = account.getName();
+        emit nameChanged();
+        emit iconChanged();
+    }).exec();
+}
+
+//TODO
+void MaildirController::modifyAccount()
+{
+}
+
+void MaildirController::deleteAccount()
+{
+    if (!mAccountIdentifier.isEmpty()) {
+        SinkAccount account(mAccountIdentifier);
+        Store::remove(account).exec();
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/maildircontroller.h Added

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ * Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <QByteArray>
+#include <QUrl>
+
+class MaildirController : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QByteArray accountIdentifier READ accountIdentifier WRITE setAccountIdentifier NOTIFY accountIdentifierChanged)
+
+    Q_PROPERTY(QString name MEMBER mName NOTIFY nameChanged)
+    Q_PROPERTY(QString icon MEMBER mIcon NOTIFY iconChanged)
+    Q_PROPERTY(QUrl path READ path WRITE setPath NOTIFY pathChanged)
+
+public:
+    explicit MaildirController(QObject *parent = Q_NULLPTR);
+
+    QByteArray accountIdentifier() const;
+    void setAccountIdentifier(const QByteArray &id);
+
+    QUrl path() const;
+    void setPath(const QUrl &path);
+
+signals:
+    void accountIdentifierChanged();
+    void nameChanged();
+    void iconChanged();
+    void pathChanged();
+
+public slots:
+    void createAccount();
+    void loadAccount(const QByteArray &id);
+    void modifyAccount();
+    void deleteAccount();
+
+private:
+    QByteArray mAccountIdentifier;
+    QString mIcon;
+    QString mName;
+    QUrl mPath;
+};
+

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/maildirsettings.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/maildirsettings.cpp Changed

@@ -18,243 +18,32 @@
 */
 #include "maildirsettings.h"
 
-#include <settings/settings.h>
-
-#include <sink/store.h>
-#include <QDebug>
-#include <QDir>
-#include <QUrl>
-
 MaildirSettings::MaildirSettings(QObject *parent)
-    : QObject(parent)
-{
-}
-
-
-void MaildirSettings::setAccountIdentifier(const QByteArray &id)
-{
-    if (id.isEmpty()) {
-        return;
-    }
-    mAccountIdentifier = id;
-
-    //Clear
-    mIcon = QString();
-    mName = QString();
-    mPath = QString();
-    mSmtpServer = QString();
-    mSmtpUsername = QString();
-    mSmtpPassword = QString();
-    emit changed();
-    emit pathChanged();
-    emit smtpResourceChanged();
-
-    Q_ASSERT(!id.isEmpty());
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query::IdentityFilter(id))
-        .then<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
-            mIcon = account.getProperty("icon").toString();
-            mName = account.getProperty("name").toString();
-            emit changed();
-        }).exec();
-
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::storage))
-        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
-            mIdentifier = resource.identifier();
-            auto path = resource.getProperty("path").toString();
-            if (mPath != path) {
-                mPath = path;
-                emit pathChanged();
-            }
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the maildir resource: " << errorMessage;
-        }).exec();
-
-    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(Sink::Query::AccountFilter(id) + Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport))
-        .then<void, Sink::ApplicationDomain::SinkResource>([this](const Sink::ApplicationDomain::SinkResource &resource) {
-            mMailtransportIdentifier = resource.identifier();
-            mSmtpServer = resource.getProperty("server").toString();
-            mSmtpUsername = resource.getProperty("username").toString();
-            mSmtpPassword = resource.getProperty("password").toString();
-            emit smtpResourceChanged();
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the maildir resource: " << errorMessage;
-        }).exec();
-
-    //FIXME this assumes that we only ever have one identity per account
-    Sink::Store::fetchOne<Sink::ApplicationDomain::Identity>(Sink::Query::AccountFilter(id))
-        .then<void, Sink::ApplicationDomain::Identity>([this](const Sink::ApplicationDomain::Identity &identity) {
-            mIdentityIdentifier = identity.identifier();
-            mUsername = identity.getProperty("username").toString();
-            mEmailAddress = identity.getProperty("address").toString();
-            emit identityChanged();
-        },
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Failed to find the identity resource: " << errorMessage;
-        }).exec();
-}
-
-QByteArray MaildirSettings::accountIdentifier() const
+    : AccountSettings(parent)
 {
-    return mAccountIdentifier;
 }
 
-void MaildirSettings::setPath(const QUrl &path)
+void MaildirSettings::load()
 {
-    auto normalizedPath = path.path();
-    if (mPath != normalizedPath) {
-        mPath = normalizedPath;
-        emit pathChanged();
-    }
-}
-
-QUrl MaildirSettings::path() const
-{
-    return QUrl(mPath);
-}
-
-QValidator *MaildirSettings::pathValidator() const
-{
-    class PathValidator : public QValidator {
-        State validate(QString &input, int &pos) const {
-            Q_UNUSED(pos);
-            if (!input.isEmpty() && QDir(input).exists()) {
-                return Acceptable;
-            } else {
-                return Intermediate;
-            }
-        }
-    };
-    static PathValidator *pathValidator = new PathValidator;
-    return pathValidator;
-}
-
-QValidator *MaildirSettings::smtpServerValidator() const
-{
-    class SmtpServerValidator : public QValidator {
-        State validate(QString &input, int &pos) const {
-            Q_UNUSED(pos);
-            // smtps://mainserver.example.net:475
-            const QUrl url(input);
-            static QSet<QString> validProtocols = QSet<QString>() << "smtp" << "smtps";
-            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
-                return Acceptable;
-            } else {
-                return Intermediate;
-            }
-        }
-    };
-    static SmtpServerValidator *validator = new SmtpServerValidator;
-    return validator;
+    loadAccount();
+    loadMaildirResource();
+    loadMailtransportResource();
+    loadIdentity();
 }
 
 void MaildirSettings::save()
 {
-    if (!QDir(mPath).exists()) {
-        qWarning() << "The path doesn't exist: " << mPath;
-        return;
-    }
-    qDebug() << "Saving account " << mAccountIdentifier << mIdentifier << mMailtransportIdentifier;
-    Q_ASSERT(!mAccountIdentifier.isEmpty());
-    Sink::ApplicationDomain::SinkAccount account(mAccountIdentifier);
-    account.setProperty("type", "maildir");
-    account.setProperty("name", mName);
-    account.setProperty("icon", mIcon);
-    Q_ASSERT(!account.identifier().isEmpty());
-    Sink::Store::modify(account).then<void>([]() {},
-    [](int errorCode, const QString &errorMessage) {
-        qWarning() << "Error while creating account: " << errorMessage;
-    })
-    .exec();
-
-    if (!mIdentifier.isEmpty()) {
-        Sink::ApplicationDomain::SinkResource resource(mIdentifier);
-        resource.setProperty("path", mPath);
-        Sink::Store::modify(resource).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while modifying resource: " << errorMessage;
-        })
-        .exec();
-    } else {
-        auto resource = Sink::ApplicationDomain::MaildirResource::create(mAccountIdentifier);
-        resource.setProperty("path", property("path"));
-        mIdentifier = resource.identifier();
-        Sink::Store::create(resource).then<void>([]() {},
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while creating resource: " << errorMessage;
-        })
-        .exec();
-    }
-
-    if (!mMailtransportIdentifier.isEmpty()) {
-        Sink::ApplicationDomain::SinkResource resource(mMailtransportIdentifier);
-        resource.setProperty("server", mSmtpServer);
-        resource.setProperty("username", mSmtpUsername);
-        resource.setProperty("password", mSmtpPassword);
-        Sink::Store::modify(resource).then<void>([](){}, [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while modifying resource: " << errorMessage;
-        })
-        .exec();
-    } else {
-        auto resource = Sink::ApplicationDomain::MailtransportResource::create(mAccountIdentifier);
-        mMailtransportIdentifier = resource.identifier();
-        resource.setProperty("server", mSmtpServer);
-        resource.setProperty("username", mSmtpUsername);
-        resource.setProperty("password", mSmtpPassword);
-        Sink::Store::create(resource).then<void>([]() {},
-        [](int errorCode, const QString &errorMessage) {
-            qWarning() << "Error while creating resource: " << errorMessage;
-        })
-        .exec();
-    }
-

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/maildirsettings.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/maildirsettings.h Changed

@@ -18,56 +18,15 @@
 */
 #pragma once
 
-#include <QObject>
-#include <QValidator>
+#include <domain/settings/accountsettings.h>
 
-class MaildirSettings : public QObject
+class MaildirSettings : public AccountSettings
 {
     Q_OBJECT
-    Q_PROPERTY(QByteArray accountIdentifier READ accountIdentifier WRITE setAccountIdentifier)
-    Q_PROPERTY(QUrl path READ path WRITE setPath NOTIFY pathChanged)
-    Q_PROPERTY(QValidator* pathValidator READ pathValidator CONSTANT)
-    Q_PROPERTY(QString icon MEMBER mIcon NOTIFY changed)
-    Q_PROPERTY(QString accountName MEMBER mName NOTIFY changed)
-    Q_PROPERTY(QString userName MEMBER mUsername NOTIFY identityChanged)
-    Q_PROPERTY(QString emailAddress MEMBER mEmailAddress NOTIFY identityChanged)
-    Q_PROPERTY(QString smtpServer MEMBER mSmtpServer NOTIFY smtpResourceChanged)
-    Q_PROPERTY(QValidator* smtpServerValidator READ smtpServerValidator CONSTANT)
-    Q_PROPERTY(QString smtpUsername MEMBER mSmtpUsername NOTIFY smtpResourceChanged)
-    Q_PROPERTY(QString smtpPassword MEMBER mSmtpPassword NOTIFY smtpResourceChanged)
-
 public:
     MaildirSettings(QObject *parent = 0);
 
-    void setAccountIdentifier(const QByteArray &);
-    QByteArray accountIdentifier() const;
-
-    void setPath(const QUrl &);
-    QUrl path() const;
-    QValidator *pathValidator() const;
-
-    QValidator *smtpServerValidator() const;
-
-    Q_INVOKABLE void save();
-    Q_INVOKABLE void remove();
-
-signals:
-    void pathChanged();
-    void smtpResourceChanged();
-    void identityChanged();
-    void changed();
-
-private:
-    QByteArray mIdentifier;
-    QByteArray mAccountIdentifier;
-    QByteArray mMailtransportIdentifier;
-    QByteArray mIdentityIdentifier;
-    QString mPath;
-    QString mIcon;
-    QString mName;
-    QString mUsername;
-    QString mEmailAddress;
-    QString mSmtpServer;
-    QString mSmtpUsername;
-    QString mSmtpPassword;
+    Q_INVOKABLE virtual void load() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void save() Q_DECL_OVERRIDE;
+    Q_INVOKABLE virtual void remove() Q_DECL_OVERRIDE;
 };

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml Changed

@@ -1,19 +1,20 @@
 /*
- *   Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.4
@@ -23,7 +24,6 @@
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.settings 1.0 as KubeSettings
-import org.kube.framework.theme 1.0
 import org.kube.accounts.maildir 1.0 as MaildirAccount

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/accounts/maildir/tests/settingstest.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/accounts/maildir/tests/settingstest.cpp Changed

@@ -39,7 +39,7 @@
         settings.setProperty("emailAddress", emailAddress);
         settings.save();
 
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then<void, QList<Sink::ApplicationDomain::SinkResource>>([](const QList<Sink::ApplicationDomain::SinkResource> &resources) {
+        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 2);
         })
         .exec().waitForFinished();
@@ -70,7 +70,7 @@
             settings.remove();
         }
 
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).then<void, QList<Sink::ApplicationDomain::SinkResource>>([](const QList<Sink::ApplicationDomain::SinkResource> &resources) {
+        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query()).syncThen<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 0);
         })
         .exec().waitForFinished();

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/applications/mail/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/applications/mail/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/applications/mail/main.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/applications/mail/main.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/AccountWizard.qml Added

@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0 as Controls2
+import org.kde.kirigami 1.0 as Kirigami
+
+Controls2.Popup {
+    id: popup
+
+    modal: true
+    focus: true
+    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+
+    clip: true
+
+    Controls2.StackView {
+        id: stack
+
+        anchors.fill: parent
+
+        initialItem: mainView
+    }
+
+    Component {
+        id: mainView
+
+        Item {
+
+            ColumnLayout {
+
+                anchors.centerIn: parent
+
+                width: parent.width * 0.4
+
+                spacing: Kirigami.Units.largeSpacing
+
+                Controls2.Button {
+
+                    Layout.fillWidth: true
+
+                    text: "kolabnow account"
+
+                    onClicked: {
+                        stack.push(kolabnow)
+                    }
+                }
+
+                Controls2.Button {
+
+                    Layout.fillWidth: true
+
+                    text: "imap account"
+
+                    onClicked: {
+                        stack.push(imap)
+                    }
+                }
+
+                Controls2.Button {
+
+                    Layout.fillWidth: true
+
+                    text: "maildir archive"
+
+                    onClicked: {
+                        stack.push(maildir)
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: kolabnow
+
+        CreateKolabNow {
+        }
+    }
+
+    Component {
+        id: imap
+
+        CreateImap {
+        }
+    }
+
+    Component {
+        id: maildir
+
+        CreateMaildir {
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/CreateImap.qml Added

@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.4 as Controls
+import QtQuick.Controls 2.0 as Controls2
+import org.kde.kirigami 1.0 as Kirigami
+
+Item {
+
+    Controls.ToolButton {
+        iconName: "go-previous"
+
+        tooltip: "go back"
+
+        onClicked: {
+            stack.pop()
+        }
+    }
+
+    //Item to avoid anchors conflict with stack
+    Item {
+
+        anchors {
+            fill: parent
+            margins: Kirigami.Units.largeSpacing * 2
+        }
+
+        Kirigami.Heading {
+            id: heading
+            text: "Connect your IMAP account"
+
+            color: Kirigami.Theme.highlightColor
+        }
+
+        Kirigami.Label {
+            id: subHeadline
+
+            anchors {
+                left: heading.left
+                top: heading.bottom
+            }
+
+            width: parent.width
+
+            text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube."
+
+            color: Kirigami.Theme.disabledTextColor
+
+            wrapMode: Text.Wrap
+        }
+
+        GridLayout {
+            anchors {
+                top:subHeadline.bottom
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            columns: 2
+            columnSpacing: Kirigami.Units.largeSpacing
+            rowSpacing: Kirigami.Units.largeSpacing
+
+            Controls.Label {
+                text: "Title of Account"
+                Layout.alignment: Qt.AlignRight
+            }
+            Controls.TextField {
+                Layout.fillWidth: true
+
+                placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name"
+            }
+
+            Controls.Label {
+                text: "Email address"
+                Layout.alignment: Qt.AlignRight
+            }
+
+            Controls.TextField {
+                Layout.fillWidth: true
+
+                placeholderText: "Your email address"
+            }
+
+            Kirigami.Label {
+                text: "Password"
+                Layout.alignment: Qt.AlignRight
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                Controls.TextField {
+                    id: pwField
+                    Layout.fillWidth: true
+
+                    placeholderText: "Password of your email account"
+                    echoMode: TextInput.Password
+                }
+
+                Controls.CheckBox {
+                    text: "Show Password"
+                    onClicked: {
+                        if(pwField.echoMode == TextInput.Password) {
+                            pwField.echoMode = TextInput.Normal;
+                        } else {
+                            pwField.echoMode = TextInput.Password;
+                        }
+                    }
+                }
+            }
+
+            Item {
+                Layout.fillHeight: true
+            }
+
+            Kirigami.Label {
+                text: ""
+            }
+
+            Kirigami.Label {
+                text: ""
+            }
+
+            Item {
+                Layout.fillWidth: true
+
+                Controls.Button {
+                    text: "Discard"
+
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+
+                Controls.Button {
+                    anchors.right: parent.right
+
+                    text: "Next"
+
+                    onClicked: {
+                    }
+                }
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/CreateKolabNow.qml Added

@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.4 as Controls
+import QtQuick.Controls 2.0 as Controls2
+import org.kde.kirigami 1.0 as Kirigami
+
+Item {
+
+    Controls.ToolButton {
+        iconName: "go-previous"
+
+        tooltip: "go back"
+
+        onClicked: {
+            stack.pop()
+        }
+    }
+
+    //Item to avoid anchors conflict with stack
+    Item {
+
+        anchors {
+            fill: parent
+            margins: Kirigami.Units.largeSpacing * 2
+        }
+
+        Kirigami.Heading {
+            id: heading
+            text: "Connect your Kolab Now account"
+
+            color: Kirigami.Theme.highlightColor
+        }
+
+        Kirigami.Label {
+            id: subHeadline
+
+            anchors {
+                left: heading.left
+                top: heading.bottom
+            }
+
+            width: parent.width
+
+            text: "To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube."
+
+            color: Kirigami.Theme.disabledTextColor
+
+            wrapMode: Text.Wrap
+        }
+
+        GridLayout {
+            anchors {
+                top:subHeadline.bottom
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            columns: 2
+            columnSpacing: Kirigami.Units.largeSpacing
+            rowSpacing: Kirigami.Units.largeSpacing
+
+            Controls.Label {
+                text: "Title of Account"
+                Layout.alignment: Qt.AlignRight
+            }
+            Controls.TextField {
+                Layout.fillWidth: true
+
+                placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name"
+            }
+
+            Controls.Label {
+                text: "Email address"
+                Layout.alignment: Qt.AlignRight
+            }
+
+            Controls.TextField {
+                Layout.fillWidth: true
+
+                placeholderText: "Your email address"
+            }
+
+            Kirigami.Label {
+                text: "Password"
+                Layout.alignment: Qt.AlignRight
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+
+                Controls.TextField {
+                    id: pwField
+                    Layout.fillWidth: true
+
+                    placeholderText: "Password of your email account"
+                    echoMode: TextInput.Password
+                }
+
+                Controls.CheckBox {
+                    text: "Show Password"
+                    onClicked: {
+                        if(pwField.echoMode == TextInput.Password) {
+                            pwField.echoMode = TextInput.Normal;
+                        } else {
+                            pwField.echoMode = TextInput.Password;
+                        }
+                    }
+                }
+            }
+
+            Item {
+                Layout.fillHeight: true
+            }
+
+            Kirigami.Label {
+                text: ""
+            }
+
+            Kirigami.Label {
+                text: ""
+            }
+
+            Item {
+                Layout.fillWidth: true
+
+                Controls.Button {
+                    text: "Discard"
+
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+
+                Controls.Button {
+                    anchors.right: parent.right
+
+                    text: "Save"
+
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/CreateMaildir.qml Added

@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 1.4 as Controls
+import QtQuick.Controls 2.0 as Controls2
+import org.kde.kirigami 1.0 as Kirigami
+import QtQuick.Dialogs 1.0 as Dialogs
+
+import org.kube.accounts.maildir 1.0 as MaildirAccount
+
+Item {
+    id: root
+
+    //Controller
+    MaildirAccount.MaildirController {
+        id: accountsController
+    }
+
+    //Navigation
+    Controls.ToolButton {
+        iconName: "go-previous"
+
+        tooltip: "go back"
+
+        onClicked: {
+            stack.pop()
+        }
+    }
+
+    //Item to avoid anchors conflict with stack
+    Item {
+
+        anchors {
+            fill: parent
+            margins: Kirigami.Units.largeSpacing * 2
+        }
+
+
+        //BEGIN heading
+        Kirigami.Heading {
+            id: heading
+            text: "Add your Maildir archive"
+
+            color: Kirigami.Theme.highlightColor
+        }
+
+        Controls2.Label {
+            id: subHeadline
+
+            anchors {
+                left: heading.left
+                top: heading.bottom
+            }
+
+            width: parent.width
+
+            text: "To let Kube access your maildir archive, add the path to your archive and give the account a title that will be displayed inside Kube"
+
+            color: Kirigami.Theme.disabledTextColor
+            wrapMode: Text.Wrap
+        }
+        //END heading
+
+        GridLayout {
+            anchors {
+                top:subHeadline.bottom
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                topMargin: Kirigami.Units.largeSpacing * 2
+            }
+
+            columns: 2
+            columnSpacing: Kirigami.Units.largeSpacing
+            rowSpacing: Kirigami.Units.largeSpacing
+
+            Controls2.Label {
+                text: "Title of account"
+                Layout.alignment: Qt.AlignRight
+            }
+            Controls.TextField {
+                id: title
+                Layout.fillWidth: true
+
+                text: accountsController.name
+
+                onTextChanged: {
+                    accountsController.name = text
+                }
+            }
+
+            Controls2.Label {
+                text: "Path"
+                Layout.alignment: Qt.AlignRight
+            }
+            RowLayout {
+                Layout.fillWidth: true
+
+                Controls.TextField {
+                    id: path
+                    Layout.fillWidth: true
+
+                    enabled: false
+
+                    text: accountsController.path
+                }
+
+                Controls.Button {
+                    iconName: "folder"
+
+                    onClicked: {
+                        fileDialogComponent.createObject(parent)
+                    }
+
+                    Component {
+                        id: fileDialogComponent
+                        Dialogs.FileDialog {
+                            id: fileDialog
+
+                            visible: true
+                            title: "Choose the maildir folder"
+
+                            selectFolder: true
+
+                            onAccepted: {
+                                accountsController.path = fileDialog.fileUrl
+                            }
+                        }
+                    }
+                }
+            }
+
+            /*
+            Controls2.Label {
+                text: ""
+            }
+            Controls.CheckBox {
+                id: readOnly
+                text: "Read only"
+            }
+            */
+
+            Controls2.Label {
+                text:  ""
+                Layout.fillHeight: true
+            }
+            Controls2.Label {
+                text: ""
+            }
+
+            Controls2.Label {
+                text: ""
+            }
+            Item {
+                Layout.fillWidth: true
+
+                Controls2.Button {
+                    text: "Discard"
+
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+
+                Controls2.Button {
+                    id: saveButton
+
+                    anchors.right: parent.right
+
+                    text: "Save"
+
+                    onClicked: {
+                        accountsController.createAccount()
+                        popup.close()
+                    }
+                }
+            }
+        }
+    }
+}
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/EditImap.qml Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/EditKolabNow.qml Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/EditMaildir.qml Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/main.qml Added

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0 as Controls2
+
+Controls2.ApplicationWindow {
+    id: app
+    height: 900
+    width: 1500
+
+    AccountWizard {
+        visible: true
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/accounts/qmldir Added

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/mail/contents/ui/main.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mail/contents/ui/main.qml Changed

@@ -1,32 +1,36 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
+  Copyright (C) 2015 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+
+import QtQuick 2.7
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
+
+import QtQuick.Controls 2.0 as Controls2
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.actions 1.0 as KubeAction
 import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 import org.kube.components 1.0 as KubeComponents
+import org.kube.accounts 1.0 as KubeAccounts
 
-ApplicationWindow {
+Controls2.ApplicationWindow {
     id: app
 
     //FIXME remove fixed pixel hight
@@ -71,7 +75,7 @@
 
     KubeAction.Action {
         id: deleteAction
-        actionId: "org.kde.kube.actions.delete"
+        actionId: "org.kde.kube.actions.move-to-trash"
         context: maillistcontext
     }
 
@@ -82,6 +86,64 @@
     }
     //END Actions
 
+    //BEGIN ActionHandler
+
+    //TODO
+    /*
+    KubeAction.ActionHandler {
+        actionId: "org.kde.kube.actions.reply"
+        function isReady(context) {
+            return context.mail ? true : false;
+        }
+
+        function handler(context) {
+            var component = composerComponent.createObject(app)
+            component.loadMessage(context.mail, false)
+        }
+    }
+
+    KubeAction.ActionHandler {
+        actionId: "org.kde.kube.actions.edit"
+        function isReady(context) {
+            return context.mail && context.isDraft;
+        }
+        function handler(context) {
+            var component= composerComponent.createObject(app, {"draftMessage": context.mail})
+            component.loadMessage(context.mail, true)
+        }
+    }
+    */
+    //END ActionHandler
+
+    //BEGIN Shortcuts
+    Shortcut {
+        sequence: StandardKey.Refresh
+        onActivated: syncAction.execute()
+        enabled: syncAction.ready
+    }
+    Shortcut {
+        sequence: StandardKey.Delete
+        onActivated: deleteAction.execute()
+        enabled: deleteAction.ready
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToNextLine
+        onActivated: mailListView.currentIndex++
+    }
+    Shortcut {
+        sequence: StandardKey.MoveToPreviousLine
+        onActivated: mailListView.currentIndex--
+    }
+    //END Shortcuts
+
+    //BEGIN background
+    Rectangle {
+        anchors.fill: parent
+
+        color: Kirigami.Theme.backgroundColor
+    }
+    //END background
+
     //BEGIN Main content
     SplitView {
         anchors {
@@ -104,6 +166,7 @@
             id: mailListView
             parentFolder: folderListView.currentFolder
             width: Kirigami.Units.gridUnit * 20
+            height: parent.height
             Layout.maximumWidth: app.width * 0.4
             Layout.minimumWidth: Kirigami.Units.gridUnit * 10
             focus: true
@@ -118,7 +181,7 @@
     //END Main content
 
     //BEGIN Toolbar
-    ToolBar {
+    Controls2.ToolBar {
         id: toolbar
 
         anchors {
@@ -193,46 +256,22 @@
                 height: parent.height
                 width: mailView.width
 
-                Component {
-                    id: composerComponent
-
-                    KubeComponents.FocusComposer {
-                        id: composer
-                        anchors.fill: parent
-                    }
+                Item {
+                    width: Kirigami.Units.smallSpacing
+                    height: width
                 }
 
-                KubeAction.ActionHandler {
-                    actionId: "org.kde.kube.actions.reply"
-                    function isReady(context) {
-                        return context.mail ? true : false;
-                    }
-
-                    function handler(context) {
-                        var component = composerComponent.createObject(app)
-                        component.loadMessage(context.mail, false)
-                    }
-                }
+                Controls2.Button {
+                    id: newMailButton
 
-                KubeAction.ActionHandler {
-                    actionId: "org.kde.kube.actions.edit"
-                    function isReady(context) {
-                        return context.mail && context.isDraft;
-                    }
-                    function handler(context) {
-                        var component= composerComponent.createObject(app, {"draftMessage": context.mail})
-                        component.loadMessage(context.mail, true)
-                    }
-                }
 
-                Button {
-                    id: newMailButton
+                    height: toolbar.height
 
                     //iconName: "mail-message-new"
-                    text: "New Email"
-                    tooltip: "compose new email"
+                    text: "      " + "New Email" + "      "
+                    //Controls2.Tooltip.text: "compose new email"
                     onClicked: {
-                        composerComponent.createObject(app)
+                        composer.open()

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/.directory Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/EmbededPart.qml Added

@@ -0,0 +1,54 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+
+Item {
+
+    height: mailPart.height
+    width: mailPart.width
+
+
+    Rectangle {
+        id: border
+        color: "lightgrey"
+        height: mailPart.height
+        width: 5
+    }
+
+    Text {
+        id: sender
+
+        anchors {
+            left: border.right
+            leftMargin: 15
+        }
+
+        text: "sent by " + model.sender + " on  " + model.date
+        color: "grey"
+    }
+
+    MailPart {
+        id: mailPart
+
+        anchors.top: sender.bottom
+
+    }
+
+}
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/EncryptionPart.qml Added

@@ -0,0 +1,75 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+
+Item {
+    id: encryption
+    property alias rootIndex: visualModel.rootIndex
+    property bool debug: true
+    height: partListView.height
+    width: parent.width
+
+    MailDataModel {
+        id: visualModel
+        debug: encryption.debug
+        model: messageParser.newTree
+    }
+
+    Column {
+        id: partListView
+        anchors {
+            top: parent.top
+            left: parent.left
+        }
+        width: parent.width
+        spacing: 5
+                Text {
+            width: parent.width
+            visible: encryption.debug
+            text: model.type
+        }
+        Text {
+            visible: model.errorType || encryption.debug
+            text: model.errorType + ": " + model.errorString
+        }
+        BorderImage {
+            width: parent.width
+            height: childrenRect.height + 40
+            border { left: 5; top: 5; right: 6; bottom: 6 }
+            horizontalTileMode: BorderImage.Round
+            verticalTileMode: BorderImage.Round
+
+            source: /* "securityborders"+ */ model.securityLevel +".png"
+            ListView {
+                model: visualModel
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    margins: 20
+                }
+                height: contentHeight
+                width: parent.width - 40
+
+                spacing: 20
+
+                interactive: false
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/GREEN.png Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/GREY.png Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/HtmlContent.qml Added

@@ -0,0 +1,70 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+import QtQuick.Controls 1.3
+import QtWebEngine 1.3
+
+Item {
+    id: root
+    property string content: model.content
+    //We have to give it a minimum size so the html content starts to expand
+    property int contentHeight: 10;
+
+    height: contentHeight
+    width: partColumn.width
+
+    WebEngineView {
+        id: htmlView
+        anchors.fill: parent
+        Component.onCompleted: loadHtml(content, "file:///")
+        onContentsSizeChanged: {
+            root.contentHeight = contentsSize.height;
+        }
+        onLoadingChanged: {
+            if (loadRequest.status === WebEngineView.LoadFailedStatus) {
+                console.warn("Failed to load html content.");
+                console.warn("Error is ", loadRequest.errorString);
+            }
+        }
+        settings {
+            webGLEnabled: false
+            touchIconsEnabled: false
+            spatialNavigationEnabled: false
+            screenCaptureEnabled: false
+            pluginsEnabled: false
+            localStorageEnabled: false
+            localContentCanAccessRemoteUrls: false
+            localContentCanAccessFileUrls: false
+            linksIncludedInFocusChain: false
+            javascriptEnabled: false
+            javascriptCanOpenWindows: false
+            javascriptCanAccessClipboard: false
+            hyperlinkAuditingEnabled: false
+            fullScreenSupportEnabled: false
+            errorPageEnabled: false
+            //defaultTextEncoding: ???
+            autoLoadImages: false
+            autoLoadIconsForPage: false
+            accelerated2dCanvasEnabled: false
+        }
+    }
+    onContentChanged: {
+        htmlView.loadHtml(content, "file:///");
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/MailDataModel.qml Added

@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+import QtQml.Models 2.2
+
+DelegateModel {
+    id: mailDataModel
+    property bool debug: true
+    delegate: Item {
+        id: partColumn
+        width: parent.width
+        height: childrenRect.height
+        Loader {
+            id: partLoader
+            anchors {
+                top: parent.top
+                left: parent.left
+            }
+            height: item? item.contentHeight : 0
+            width: parent.width
+        }
+        Component.onCompleted: {
+            switch (model.type) {
+                case "PlainTextContent":
+                case "Content":
+                    partLoader.source = "TextContent.qml"
+                    partLoader.item.debug = mailDataModel.debug
+                    return;
+                case "HtmlContent":
+                    partLoader.source = "HtmlContent.qml"
+                    return;
+                case "Signature":
+                    partLoader.source = "SignaturePart.qml"
+                    partLoader.item.rootIndex = mailDataModel.modelIndex(index)
+                    partLoader.item.debug = mailDataModel.debug
+                    return;
+                case "Encryption":
+                    partLoader.source = "EncryptionPart.qml"
+                    partLoader.item.rootIndex = mailDataModel.modelIndex(index)
+                    partLoader.item.debug = mailDataModel.debug
+                    return;
+            }
+            if (model.hasModelChildren) {
+                partLoader.source = "MailPart.qml"
+                partLoader.item.rootIndex = mailDataModel.modelIndex(index)
+                partLoader.item.debug = mailDataModel.debug
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/MailPart.qml Added

@@ -0,0 +1,47 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+
+Item {
+    id: root
+    property alias rootIndex: visualModel.rootIndex
+    property bool debug: true
+    height: partListView.height + 10
+    width: parent.width
+
+    MailDataModel {
+        id: visualModel
+        debug: root.debug
+        model: messageParser.newTree
+    }
+
+    ListView {
+        id: partListView
+        model: visualModel
+        anchors {
+                top: parent.top
+                left: parent.left
+                margins: 5
+        }
+        spacing: 5
+        height: contentHeight
+        width: parent.width - 10
+        interactive: false
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/MailViewer.qml Added

@@ -0,0 +1,46 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+
+Item {
+    id: root
+    property alias rootIndex: visualModel.rootIndex
+    property bool debug: false
+    height: partListView.height
+
+    MailDataModel {
+        id: visualModel
+        debug: root.debug
+        model: messageParser.newTree
+    }
+
+    ListView {
+        id: partListView
+        model: visualModel
+        anchors {
+                top: parent.top
+                left: parent.left
+                margins: 5
+        }
+        spacing: 5
+        height: contentHeight
+        width: parent.width - 10
+        interactive: false
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/PURPLE.png Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/RED.png Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/SignaturePart.qml Added

@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+
+Item {
+    id: signature
+    property alias rootIndex: visualModel.rootIndex
+    property bool debug: true
+    height: partListView.height
+    width: parent.width
+
+    MailDataModel {
+        id: visualModel
+        debug: signature.debug
+        model: messageParser.newTree
+    }
+    Column {
+        id: partListView
+        anchors {
+            top: parent.top
+            left: parent.left
+        }
+        width: parent.width
+        spacing: 5
+        Text {
+            width: parent.width
+            visible: signature.debug
+            text: model.type
+        }
+        BorderImage {
+            width: parent.width
+            height: childrenRect.height + 40
+            border { left: 5; top: 5; right: 6; bottom: 6 }
+            horizontalTileMode: BorderImage.Round
+            verticalTileMode: BorderImage.Round
+            source: /* "securityborders"+ */ model.securityLevel +".png"
+            ListView {
+                model: visualModel
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    margins: 20
+                }
+                height: contentHeight
+                width: parent.width - 40
+
+                spacing: 20
+                interactive: false
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/TextContent.qml Added

@@ -0,0 +1,50 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.4
+Item {
+    id: textItem
+    property bool debug: true
+    width: partColumn.width
+    height: textColumn.height
+    Column {
+        id: textColumn
+        anchors {
+            top: parent.top
+            left: parent.left
+        }
+        width: parent.width
+        spacing: 5
+        Text {
+            width: parent.width
+            visible: textItem.debug
+            text: model.type
+        }
+        TextEdit  {
+            width: parent.width
+
+            readOnly: true
+            selectByMouse: true
+
+            text: model.content
+            wrapMode: Text.WordWrap
+
+            color: model.embeded ? "grey" : "black"
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/YELLOW.png Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/mailviewer/qml/qmldir Added

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/AccountSwitcher.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/AccountSwitcher.qml Changed

@@ -1,59 +1,55 @@
 /*
- * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
-import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0 as Controls2
 
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
 import org.kube.components 1.0 as KubeComponents
 
-Button {
+Controls2.Button {
     id: accountSwitcher
 
     Layout.fillWidth: true
-    Layout.fillHeight: true
+    height: parent.height
 
     text: "Account Switcher"
-    tooltip: "switch accounts, edit them and add new ones"
 
     onClicked: {
-        dialog.visible = dialog.visible ? false : true
+        popup.open()
+        focus = false
     }
 
-    Rectangle {
-        id: dialog
-
-        anchors {
-            top: parent.bottom
-            left: parent.left
-        }
+    Controls2.Popup {
+        id: popup
 
         height: 300
         width: 600
 
-        color: Kirigami.Theme.backgroundColor
-        border.width: 1
-        border.color: Kirigami.Theme.highlightColor //TODO change to Kirigami inactive text color once it is available
-        radius: 3
-        clip: true
-        visible: false
+        x: parent.x
+        y: parent.y + parent.height
+
+        modal: true
+        focus: true
+        closePolicy: Controls2.Popup.CloseOnEscape | Controls2.Popup.CloseOnPressOutsideParent
 
         Item {
             id: footer
@@ -68,7 +64,7 @@
             height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 1
             width: listView.width
 
-            Button {
+            Controls2.Button {
 
                 anchors {
                     verticalCenter: parent.verticalCenter
@@ -79,7 +75,6 @@
 
                 onClicked: {
                     newAccountComponent.createObject(app)
-                    dialog.visible = false
                 }
 
                 Component {
@@ -91,20 +86,19 @@
                 }
             }
 
-            Button {
+            Controls2.Button {
 
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
                 }
 
-                iconName: "view-refresh"
+                //iconName: "view-refresh"
                 text: "Sync"
                 enabled: syncAction.ready
 
                 onClicked: {
                     syncAction.execute()
-                    dialog.visible = false
                 }
             }
         }
@@ -151,11 +145,16 @@
                             source: accountFactory.icon
                         }
 
-                        Label {
+                        Controls2.Label {
                             text: model.name === "" ? accountFactory.name : model.name
                         }
+                        //FIXME port to qqc2
+//                         Button {
+//                             visible: model.showStatus
+//                             source: model.statusIcon
+//                         }
                     }
-                    Button {
+                    Controls2.Button {
 
                         anchors {
                             right: parent.right
@@ -188,4 +187,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/AttachmentDelegate.qml Added

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Layouts 1.1
+import org.kde.kirigami 1.0 as Kirigami
+
+Item {
+    id: root
+
+    property string name
+    property string icon
+
+    width: content.width + Kirigami.Units.gridUnit / 2
+    height: content.height + Kirigami.Units.gridUnit / 2
+
+    Rectangle {
+        anchors.fill: parent
+
+        id: background
+        color: Kirigami.Theme.disabledTextColor
+    }
+
+    RowLayout {
+        id: content
+
+        anchors.centerIn: parent
+
+        spacing: Kirigami.Units.smallSpacing
+
+        Rectangle {
+            id: mimetype
+
+            height: Kirigami.Units.gridUnit
+            width: Kirigami.Units.gridUnit
+
+            color: Kirigami.Theme.backgroundColor
+
+            Kirigami.Icon {
+                height: parent.height
+                width: height
+
+                source: root.icon
+            }
+        }
+
+        Text {
+            text: root.name
+            color: Kirigami.Theme.backgroundColor
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/AutocompleteLineEdit.qml Added

@@ -0,0 +1,138 @@
+/*
+ *  Copyright (C) 2016 Christian Mollekopf, <mollekopf@kolabsys.com>
+ *
+ *  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.
+ */
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0 as Controls2
+import QtQuick.Layouts 1.1
+
+import org.kde.kirigami 1.0 as Kirigami
+
+Controls2.TextField {
+    id: textField
+
+    property string searchTerm
+    property variant model
+    onTextChanged: {
+        if (text.length >= 2) {
+            searchTerm = text
+            startCompleting()
+        } else {
+            searchTerm = ""
+            abort()
+        }
+    }
+    Keys.onDownPressed: {
+        listView.incrementCurrentIndex()
+    }
+    Keys.onUpPressed: {
+        listView.decrementCurrentIndex()
+    }
+    Keys.onRightPressed: {
+        startCompleting()
+    }
+    Keys.onTabPressed: {
+        if (popup.visible) {
+            listView.incrementCurrentIndex()
+        } else {
+            event.accepted = false
+        }
+    }
+    Keys.onReturnPressed: {
+        accept()
+    }
+    Keys.onEscapePressed: {
+        abort()
+    }
+
+    function startCompleting() {
+        if (!popup.visible) {
+            popup.open()
+            listView.currentIndex = -1
+        }
+    }
+
+    function accept() {
+        textField.text = listView.currentItem.text;
+        popup.close()
+    }
+
+    function abort() {
+        popup.close()
+    }
+
+    Controls2.Popup {
+        id: popup
+        x: 0
+        y: textField.y + textField.height
+        padding: 0
+        contentWidth: rect.width
+        contentHeight: rect.height
+
+        Rectangle {
+            color: Kirigami.Theme.backgroundColor
+            id: rect
+            anchors.top: popup.top
+            anchors.left: popup.left
+            height: listView.contentHeight
+            width: textField.width
+            border.color: "Black"
+            radius: 5
+            ListView {
+                id: listView
+                height: childrenRect.height
+                width: parent.width
+                interactive: true
+                model: textField.model
+                delegate: Kirigami.AbstractListItem {
+                    id: listDelegate
+                    property string text: model.text
+
+                    width: listView.width
+                    height: textField.height
+
+                    enabled: true
+                    supportsMouseEvents: true
+
+                    checked: listView.currentIndex == index
+                    onClicked:  {
+                        listView.currentIndex = model.index
+                        accept()
+                    }
+
+                    //Content
+                    Item {
+                        width: parent.width
+                        height: parent.height
+
+                        Column {
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                left: parent.left
+                            }
+
+                            Text{
+                                text: model.text
+                                color: listDelegate.checked ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/Avatar.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/Avatar.qml Changed

@@ -1,22 +1,22 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.3
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.7
 import QtQuick.Layouts 1.1

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/ContentView.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/ContentView.qml Changed

@@ -1,6 +1,23 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-import QtWebKit 3.0
 
 Item {
     id: root
@@ -8,7 +25,8 @@
     property bool isHtml;
     property string content;
     property string contentType;
-    height: contentRect.height
+    property int contentWidth: contentLoader.item.contentWidth
+    property int contentHeight: contentLoader.item.contentHeight
     Rectangle {
         id: contentRect
 
@@ -17,61 +35,26 @@
         // border.color: "black"
         // radius: 5
         // anchors.leftMargin: nestingLevel * 5
-
-        height: contentLoader.height
-        width: root.width
+        anchors.fill: parent
 
         Loader {
             id: contentLoader
-            anchors.top: contentRect.top
-            anchors.left: contentRect.left
-            width: contentRect.width
+            property string content: root.content
+            anchors.fill: parent
             sourceComponent: isHtml ? htmlComponent : textComponent
-            height: isHtml ? item.flickableItem.contentHeight : text.height
-            onStatusChanged: {
-                if (isHtml) {
-                    item.flickableItem.loadHtml(root.content, "file:///");
-                }
-            }
         }
 
         Component {
             id: textComponent
-            Text {
-                id: text
-                text: content
+            TextView {
+                content: root.content
             }
         }
         Component {
             id: htmlComponent
-            //We need the scrollview so the WebView can fully expand so we have access to the contentHeight
-            //Otherwise it would just scale the content.
-            ScrollView {
-                horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                WebView {
-                    id: htmlView
-                    onNavigationRequested: {
-                        // detect URL scheme prefix, most likely an external link
-                        var schemaRE = /^\w+:/;
-                        if (schemaRE.test(request.url)) {
-                            request.action = WebView.AcceptRequest;
-                        } else {
-                            request.action = WebView.IgnoreRequest;
-                            // delegate request.url here
-                        }
-                    }
-                    onLoadingChanged: {
-                        console.warn("Error is ", loadRequest.errorString);
-                        console.warn("Status is ", loadRequest.status);
-                    }
-                }
+            WebView {
+                content: root.content
             }
         }
     }
-    onContentChanged: {
-        if (isHtml) {
-            contentLoader.item.flickableItem.loadHtml(content, "file:///");
-        }
-    }
 }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/EditAccountDialog.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/EditAccountDialog.qml Changed

@@ -1,22 +1,22 @@
 /*
- *   Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 1.0 as Kirigami

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/FocusComposer.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/FocusComposer.qml Changed

@@ -1,40 +1,63 @@
 /*
- * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+ *  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
  *
- *   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 3 of the License, or
- *   (at your option) any later version.
+ *  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.
+ *  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, see <http://www.gnu.org/licenses/>.
+ *  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.
  */
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0 as Controls2
 
 import org.kde.kirigami 1.0 as Kirigami
 
-import org.kube.components 1.0 as KubeComponents
+import org.kube.framework.domain 1.0 as KubeFramework
 
-KubeComponents.OverlayDialog {
+Controls2.Popup {
     id: root
 
+    //Controler
+    KubeFramework.ComposerController {
+        id: composer
+    }
+
+    //BEGIN functions
     function loadMessage(message, loadAsDraft) {
-        composer.loadMessage(message, loadAsDraft);
+        composer.loadMessage(message, loadAsDraft)
+    }
+
+    function send() {
+        composer.send()
+    }
+
+    function saveAsDraft() {
+        composer.saveAsDraft()
+    }
+
+    function clear() {
+        composer.clear();
     }
+    //END functions
+
+    modal: true
+    focus: true
+    closePolicy: Controls2.Popup.CloseOnEscape | Controls2.Popup.CloseOnPressOutsideParent
 
     Item {
-        anchors.centerIn: parent
 
-        height: root.height * 0.8
-        width: root.width * 0.8
+        height: parent.height
+        width: parent.width
 
         ColumnLayout {
 
@@ -43,22 +66,190 @@
                 margins: Kirigami.Units.largeSpacing
             }
 
-            Composer {
-                id: composer
+            ColumnLayout {
 
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-            }
+                anchors.fill: parent
+
+                GridLayout {
+
+                    columns: 2
+
+                    Controls2.Label {
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                        text: "To"
+                    }
+
+                    AutocompleteLineEdit {
+                        id: to
+
+                        Layout.fillWidth: true
+
+                        text: composer.to
+                        onTextChanged: {
+                            composer.to = text;
+                        }
+
+                        model: composer.recepientAutocompletionModel
+                        onSearchTermChanged: {
+                            composer.recepientSearchString = searchTerm
+                        }
+                    }
+
+
+                    Controls2.Label {
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                        text: "Cc"
+                        visible: cc.visible
+                    }
+
+                    AutocompleteLineEdit {
+                        id: cc
+
+                        Layout.fillWidth: true
+
+                        visible: false
+
+                        text: composer.cc
+
+                        onTextChanged: {
+                            composer.cc = text;
+                        }
+
+                        model: composer.recepientAutocompletionModel
+                        onSearchTermChanged: {
+                            composer.recepientSearchString = searchTerm
+                        }
+                    }
+
+                    Controls2.Label {
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+                        text: "Bcc"
+                        visible: bcc.visible
+                    }
+
+                    AutocompleteLineEdit {
+                        id: bcc
+
+                        Layout.fillWidth: true
+
+                        visible : false
+
+                        text: composer.bcc
+
+                        onTextChanged: {
+                            composer.bcc = text;
+                        }
+
+                        model: composer.recepientAutocompletionModel
+                        onSearchTermChanged: {
+                            composer.recepientSearchString = searchTerm
+                        }
+                    }
 
-            RowLayout {
-                Layout.alignment: Qt.AlignRight
+                    Controls2.Label {
+                        text: "From"
+                    }
+
+                    RowLayout {
+
+                        Controls2.ComboBox {
+                            id: identityCombo
+                            model: composer.identityModel
+                            textRole: "displayName"
+
+                            Layout.fillWidth: true
+
+                            onCurrentIndexChanged: {
+                                composer.currentIdentityIndex = currentIndex
+                            }
+                        }
+
+                        Controls2.Button {
+                            id: ccButton
+
+                            text: "Cc"
+                            onClicked: {
+                                cc.visible = true
+                                ccButton.visible = false
+                            }
+                        }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/FolderListView.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/FolderListView.qml Changed

@@ -1,19 +1,20 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.4
@@ -23,7 +24,6 @@
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/ListItem.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/ListItem.qml Changed

@@ -1,22 +1,22 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
-import org.kube.framework.theme 1.0
 
 Item {
     id: delegateRoot

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/MailListView.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/MailListView.qml Changed

@@ -1,55 +1,72 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtQuick.Controls 1.4 as Controls
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.7
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import QtQml 2.2 as QtQml
 
 import org.kde.kirigami 1.0 as Kirigami
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
-Controls.ScrollView {
+Item {
     id: root
     property variant parentFolder
     property variant currentMail
     property bool isDraft : false
+    property int currentIndex
+
+    onParentFolderChanged: {
+        currentMail = null
+    }
 
     ListView {
         id: listView
 
-        model: KubeFramework.MailListModel {
-            parentFolder: root.parentFolder
+        anchors.fill: parent
+
+        focus: true
+
+        ScrollBar.vertical: ScrollBar{
+            id: scrollbar
         }
 
+        //BEGIN keyboard nav
         Keys.onDownPressed: {
             incrementCurrentIndex()
         }
         Keys.onUpPressed: {
             decrementCurrentIndex()
         }
-        focus: true
+        //END keyboard nav
+
+        currentIndex: root.currentIndex
+
+        model: KubeFramework.MailListModel {
+            parentFolder: root.parentFolder
+        }
 
         delegate: Kirigami.AbstractListItem {
             id: mailListDelegate
 
-            width: listView.width
+            width: scrollbar.visible ? listView.width - scrollbar.width : listView.width
+            height: Kirigami.Units.gridUnit * 4.5
 
             enabled: true
             supportsMouseEvents: true
@@ -62,7 +79,7 @@
             //Content
             Item {
                 width: parent.width
-                height: Kirigami.Units.gridUnit * 4
+                height: parent.height
 
                 QtQml.Binding {
                     target: root
@@ -77,51 +94,74 @@
                     value: model.draft
                 }
 
-                RowLayout {
+                //TODO implement bulk action
+                //    Controls.CheckBox {
+                //        visible: mailListDelegate.containsMouse == true
+                //    }
 
+                Column {
                     anchors {
-                        top: parent.top
-                        bottom: parent.bottom
+                        verticalCenter: parent.verticalCenter
                         left: parent.left
+                        leftMargin: Kirigami.Units.largeSpacing
                     }
 
-                    Avatar {
-                        id: avatar
+                    Text{
+                        text: model.subject
+                        color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : model.unread ? "#1d99f3" : Kirigami.Theme.textColor
 
-                        height: textItem.height
-                        width: height
+                        maximumLineCount: 2
+                        width: mailListDelegate.width - Kirigami.Units.gridUnit * 3
+                        wrapMode: Text.WrapAnywhere
+                        elide: Text.ElideRight
+                    }
 
-                        name: model.senderName
+                    Text {
+                        text: model.senderName
+                        font.italic: true
+                        color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.textColor
+                        width: mailListDelegate.width - Kirigami.Units.gridUnit * 3
+                        elide: Text.ElideRight
                     }
+                }
 
-                    ColumnLayout {
-                        id: textItem
-                        height: Kirigami.Units.gridUnit * 3
+                Text {
+                    anchors {
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+                    text: Qt.formatDateTime(model.date, "dd MMM yyyy")
+                    font.italic: true
+                    color: mailListDelegate.checked ? Kirigami.Theme.highlightedTextColor : Kirigami.Theme.disabledTextColor
+                    font.pointSize: 9
+                }
 
-                        Text{
-                            text: model.subject
 
-                            renderType: Text.NativeRendering
-                            color: mailListDelegate.checked ? Kirigami.Theme.textColor : model.unread ? "#1d99f3" : Kirigami.Theme.textColor
-                            font.weight: model.unread || model.important ? Font.DemiBold : Font.Normal
-                        }
+                Item {
+                    anchors {
+                        right: parent.right
+                    }
 
-                        Text {
-                            text: model.senderName
+                    height: Kirigami.Units.gridUnit * 1.2
+                    width: height
 
-                            renderType: Text.NativeRendering
-                            color:  Kirigami.Theme.textColor
-                        }
+                    visible: !mailListDelegate.checked
 
-                        Text {
-                            text: Qt.formatDateTime(model.date)
+                    Rectangle {
+                        anchors.fill: parent
 
-                            renderType: Text.NativeRendering
-                            font.weight: Font.Light
-                            opacity: 0.5
-                            color: Kirigami.Theme.textColor
-                        }
+                        opacity: model.unread ? 1 :  0.5
+                        radius: 80
+                        color: model.unread ? Kirigami.Theme.highlightColor : Kirigami.Theme.disabledTextColor
                     }
+

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/MailViewer.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/MailViewer.qml Changed

@@ -1,62 +1,95 @@
+/*
+ * Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+ *
+ * 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.
+ */
+
 import QtQuick 2.4
-import QtQuick.Controls 1.3
-import QtQuick.Controls 1.4
+import QtQuick.Controls 1.4 as Controls1
 import QtQuick.Layouts 1.1
 
 import org.kube.framework.domain 1.0 as KubeFramework
+import org.kube.mailviewer 1.0 as MV
 
 Item {
     id: root
     property variant message;
     property string html;
-    property bool enablePartTreeView : false
-    property int desiredHeight: enablePartTreeView ? topPartLoader.height+450 : topPartLoader.height;
-
-    Rectangle {
-        id: rootRectangle
-        anchors.fill: parent
-        anchors.margins: 0
-        ScrollView {
-            id: scrollView
-            anchors.fill: parent
-            anchors.margins: 0
-            horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-            verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-            Column {
-                spacing:2
-                MessagePartTree {
-                    id: topPartLoader
-                    width: rootRectangle.width
-                    height: topPartLoader.desiredHeight
-                }
-                TreeView {
-                    visible: enablePartTreeView
-                    width: 500
-                    height: 400
-                    TableViewColumn {
-                        role: "type"
-                        title: "Type"
-                        width: 300
-                    }
-                    TableViewColumn {
-                        role: "isHidden"
-                        title: "Hidden"
-                        width: 60
-                    }
-                    TableViewColumn {
-                        role: "text"
-                        title: "Text"
-                        width: 600
-                    }
-                    model: messageParser.partTree
-                }
-            }
-       }
+    property int desiredHeight: topPartLoader.height + newMailViewer.height + 20
+    property variant attachments
+
+    clip: true
+
+    MV.MailViewer {
+        id: newMailViewer
+        debug: false
+        width: parent.width
+    }
+
+    //BEGIN old mail viewer
+
+    MessagePartTree {
+        id: topPartLoader
+        anchors.top: newMailViewer.bottom
+
+        Text {
+            text: "old mailviewer"
+            color: "blue"
+        }
+
+        visible: false
+        // width: parent.width
+        height: topPartLoader.contentHeight
+        width: topPartLoader.contentWidth >= parent.width ? topPartLoader.contentWidth : parent.width
+    }
+
+    //END old mail viewer
+
+    Controls1.TreeView {
+        id: mailStructure
+        anchors.top: messageParser.attachments.rowCount() > 0 ? attachments.bottom : newMailViewer.bottom
+        visible: newMailViewer.debug
+        width: parent.width
+        height: 400
+        Controls1.TableViewColumn {
+            role: "type"
+            title: "Type"
+            width: 300
+        }
+        Controls1.TableViewColumn {
+            role: "embeded"
+            title: "Embeded"
+            width: 60
+        }
+        Controls1.TableViewColumn {
+            role: "securityLevel"
+            title: "SecurityLevel"
+            width: 60
+        }
+        Controls1.TableViewColumn {
+            role: "content"
+            title: "Content"
+            width: 200
+        }
+        model: messageParser.newTree
     }
 
     KubeFramework.MessageParser {
         id: messageParser
         message: root.message
     }
+    attachments: messageParser.attachments
     html: messageParser.html
 }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/MessagePartTree.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/MessagePartTree.qml Changed

@@ -1,3 +1,21 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
 import QtQuick 2.4
 import QtQuick.Controls 1.3
 
@@ -5,7 +23,8 @@
     id: root
     property alias rootIndex: visualModel.rootIndex
     property int nestingLevel: 0
-    property int desiredHeight: messagePartRect.height
+    property int contentHeight: messagePartRect.height
+    property int contentWidth: 0
     Rectangle {
         id: messagePartRect
         height: partListView.contentHeight
@@ -24,6 +43,7 @@
                     anchors.top: delegateRect.top
                     anchors.left: delegateRect.left
                     width: messagePartRect.width
+                    height: contentHeight
                     content: model.text
                     isHtml: model.isHtml
                     visible: model.hasContent
@@ -33,16 +53,19 @@
                             height = 0
                         }
                     }
+                    onContentWidthChanged: {
+                        root.contentWidth = contentWidth > root.contentWidth ? contentWidth : root.contentWidth
+                    }
                     contentType: model.type
                 }
                 Loader {
                     id: partLoader
                     anchors.top: contentView.bottom
                     anchors.left: contentView.left
-                    width: messagePartRect.width
                     visible: model.hasModelChildren
                     active: model.hasModelChildren
-                    height: item ? item.desiredHeight : 0
+                    height: item ? item.contentHeight : 0
+                    width: messagePartRect.width
                 }
                 Component.onCompleted: {
                     if (model.hasModelChildren) {

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/NewAccountDialog.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/NewAccountDialog.qml Changed

@@ -1,19 +1,20 @@
 /*
- *   Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.4
@@ -154,40 +155,14 @@
             Component {
                 id: kolabnow
 
-                Item {
-                    id: pageRoot
+                Rectangle {
+                    color: "yellow"
 
                     height: dialog.height
                     width: dialog.width
-
-                    Column {
-                        anchors.centerIn: parent
-
-                        spacing: Kirigami.Units.largeSpacing
-
-                        TextField {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: pageRoot.width * 0.4
-
-                            placeholderText: "Title of Account (e.g. work, private, kolabnow...)"
-                        }
-
-                        TextField {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: pageRoot.width * 0.4
-
-                            placeholderText: "Email (e.g. jens.moep@kolabnow.com)"
-                        }
-
-                        TextField {
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            width: pageRoot.width * 0.4
-
-                            placeholderText: "Password"
-                        }
-                    }
                 }
             }
+
         }
     }
 }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/Outbox.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/Outbox.qml Changed

@@ -1,19 +1,20 @@
 /*
- * Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.3
@@ -38,13 +39,15 @@
     Rectangle {
         id: dialog
 
+        property int modelCount: listView.count
+
         anchors {
             top: parent.bottom
             horizontalCenter: parent.horizontalCenter
         }
 
-        height: Kirigami.Units.gridUnit * 15
-        width: Kirigami.Units.gridUnit * 12
+       height: modelCount * Kirigami.Units.gridUnit * 3 + 10//scrollView.height  height: Kirigami.Units.gridUnit * 15
+       width: Kirigami.Units.gridUnit * 20
 
         color: Kirigami.Theme.backgroundColor
         border.width: 1
@@ -55,19 +58,28 @@
 
         //BEGIN Dialog Content
         ScrollView {
+            id: scrollView
+
             anchors {
                 fill: parent
-                margins: 1
+                margins: 5
             }
+
             ListView {
                 id: listView
 
-                model: 3
+                model: KubeFramework.OutboxModel {
+                }
 
                 delegate: Kirigami.AbstractListItem {
+
+                    height: Kirigami.Units.gridUnit * 3
+
                     Kirigami.Label {
-                        anchors.centerIn: parent
-                        text: "Subjext subxetson"
+
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        text: model.subject
                     }
                 }
             }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/OverlayDialog.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/OverlayDialog.qml Changed

@@ -1,19 +1,20 @@
 /*
- *   Copyright (C) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
- *
- *   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 3 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, see <http://www.gnu.org/licenses/>.
- */
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
 
 import QtQuick 2.4
 import QtQuick.Controls 1.4
@@ -59,4 +60,4 @@
             anchors.fill: parent
         }
     }
-}
\ No newline at end of file
+}

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/components/package/contents/ui/SingleMailView.qml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/SingleMailView.qml Changed

@@ -1,232 +1,353 @@
 /*
- * Copyright (C) 2015 Michael Bohlender <michael.bohlender@kdemail.net>
+ *  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
  *
- *   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 3 of the License, or
- *   (at your option) any later version.
+ *  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.
+ *  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, see <http://www.gnu.org/licenses/>.
+ *  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.
  */
 
-import QtQuick 2.4
-import QtQuick.Controls 1.3
+import QtQuick 2.7
+import QtQuick.Controls 1.3 as Controls1
+import QtQuick.Controls 2
 import QtQuick.Layouts 1.1
 import org.kde.kirigami 1.0 as Kirigami
 
 import QtQml 2.2 as QtQml
 
 import org.kube.framework.domain 1.0 as KubeFramework
-import org.kube.framework.theme 1.0
 
 Item {
     id: root
 
     property variant mail;
 
-    ScrollView {
+    Rectangle {
+        id: subjectBar
 
-        anchors.fill: parent
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
 
-        ListView {
-            anchors.fill: parent
+        height: Kirigami.Units.gridUnit * 2
 
-            model: KubeFramework.MailListModel {
-                mail: root.mail
-            }
+        color: Kirigami.Theme.backgroundColor
+
+        Kirigami.Heading {
+            anchors.centerIn: parent
 
-            header: Item {
-                height: Kirigami.Units.gridUnit
-                width: parent.width
+            width: parent.width - Kirigami.Units.gridUnit * 4.2
+
+            text: "Some subject"
+            color: Kirigami.Theme.textColor
+            level: 4
+            font.italic: true
+
+        }
 
+        Button {
+            anchors {
+                right: parent.right
+                rightMargin: Kirigami.Units.gridUnit * 0.2
+                verticalCenter: parent.verticalCenter
             }
+            text: "show plaintext"
 
-            footer: Item {
-                 height: Kirigami.Units.gridUnit * 2
-                 width: parent.width
+            onClicked: {
+                text = text == "show plaintext" ? "show html" : "show plaintext"
+                focus = false
             }
+        }
+
+        Rectangle {
+            anchors.bottom: parent.bottom
+
+            height: 1
+            width: parent.width
+
+            color: Kirigami.Theme.highlightColor
+        }
+    }
+
+
+    ListView {
+        anchors {
+            top: subjectBar.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        clip: true
+
+        model: KubeFramework.MailListModel {
+            mail: root.mail
+        }
+
+        header: Item {
+            height: Kirigami.Units.gridUnit
+            width: parent.width
+
+        }
+
+        footer: Item {
+            height: Kirigami.Units.gridUnit * 2
+            width: parent.width
+        }
 
-            delegate: Item {
+        delegate: Item {
 
-                height: sheet.height + Kirigami.Units.gridUnit * 2
-                width: parent.width
+            height: sheet.height + Kirigami.Units.gridUnit * 2
+            width: parent.width
 
-                Rectangle {
-                    id: sheet
-                    anchors.centerIn: parent
-                    implicitHeight: header.height + body.height + (Kirigami.Units.gridUnit * 2.5) * 2 + footer.height
-                    width: parent.width - Kirigami.Units.gridUnit * 4
+            Rectangle {
+                id: sheet
+                anchors.centerIn: parent
+                implicitHeight: header.height + body.height + (Kirigami.Units.gridUnit * 2.5) * 2 + footer.height
+                width: parent.width - Kirigami.Units.gridUnit * 4
 
-                    //TODO bookmark
-                    /*
-                    ToolButton {
-                        iconName: "bookmark-new"
+                color: Kirigami.Theme.viewBackgroundColor
 
+                //BEGIN header
+                Item {
+                    id: header
+
+                    anchors {
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                        margins: Kirigami.Units.largeSpacing
                     }
-                    */
-                    Item {
-                        id: header
-
-                        height: Kirigami.Units.gridUnit * 5
-                        width: parent.width
-
-                        Row {
-                            id: headerContent
-                            anchors {
-                                left: seperator.left
-                                bottom: seperator.top
-                                bottomMargin: height * 0.25
-                            }
-
-                            spacing: Kirigami.Units.largeSpacing / 2
-
-                            Avatar {
-                                id: avatar
-
-                                height: Kirigami.Units.gridUnit * 2.5
-                                width: height
-
-                                name: model.sender
-                            }
-
-                            ColumnLayout {
-
-                                RowLayout {

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/TextView.qml Added

@@ -0,0 +1,32 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.7
+
+Item {
+    id: root
+    property string content;
+    property int contentWidth: 0;
+    property int contentHeight: textView.contentHeight;
+    Text {
+        id: textView
+        wrapMode: Text.WordWrap
+        anchors.fill: parent
+        text: content
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/components/package/contents/ui/WebView.qml Added

@@ -0,0 +1,48 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+
+  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.
+*/
+
+import QtQuick 2.7
+import QtWebKit 3.0
+// import QtWebEngine 1.3 //This would give use contentsSize
+import QtWebEngine 1.2
+
+Item {
+    id: root
+    property string content;
+    property int contentWidth: helperView.contentWidth;
+    property int contentHeight: helperView.contentHeight;
+    //FIXME workaround until QtWebEngine 1.3 with contentsSize
+    WebView {
+        id: helperView
+        visible: false
+        Component.onCompleted: loadHtml(content, "file:///")
+    }
+    WebEngineView {
+        id: htmlView
+        anchors.fill: parent
+        onLoadingChanged: {
+            console.warn("Error is ", loadRequest.errorString);
+            console.warn("Status is ", loadRequest.status);
+        }
+        Component.onCompleted: loadHtml(content, "file:///")
+    }
+    onContentChanged: {
+        htmlView.loadHtml(content, "file:///");
+        helperView.loadHtml(content, "file:///");
+    }
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/docs/cryptography.md Added

@@ -0,0 +1,56 @@
+# Cryptograghy
+
+## OpenPGP
+
+To get Open PGP support we use GpgME >= 1.8.0. GpgME has now include Gpgme++ and QGpgME, that were living before in kdepim repositories.
+
+GpgME gives use directly PGP and SMime support and needs gpg-agent, gpg2, gpgsm and a pinentry to be installed to work correctly. The package names differ between the distributions on Fedora the are named gnupg2, gnupg2-smime and pinentry-qt (there are several different flavours for diffrent environments. I think the Qt flavour mathes best).
+
+gnupg using ~/.gnupg as default homedir to store every file it uses. In our test docker environment, we setup all relevat files and added keys without passphrase to test PGP/SMime support. We also incuded one key `With Passphrase "test" <passphrase@example.org>`, that has a phassphrase named `test`.
+
+You can get all keys with secret key available via `gpg2 --list-secret-keys` all known keys with `gpg2 --list-keys`.
+
+```
+$ gpg2 --list-secret-keys
+gpg: WARNING: unsafe permissions on homedir '/home/developer/.gnupg'
+gpg: enabled debug flags: memstat
+/home/developer/.gnupg/pubring.gpg
+----------------------------------
+sec   rsa2048 2009-11-13 [SC]
+      1BA323932B3FAA826132C79E8D9860C58F246DE6
+uid           [ultimate] unittest key (no password) <test@kolab.org>
+ssb   rsa2048 2009-11-13 [E]
+
+sec   rsa1024 2009-11-25 [SC]
+      00949E2AF4A985AFB572FDD214B79E26050467AA
+uid           [ultimate] kdetest <you@you.com>
+ssb   rsa1024 2009-11-25 [E]
+
+sec   rsa1024 2009-11-25 [SC]
+      CA739AC832766152139B5C49FC4FAB94C727D4BB
+uid           [ultimate] kde testing <bcc@bcc.org>
+ssb   rsa1024 2009-11-25 [E]
+
+sec   rsa2048 2016-11-22 [SC]
+      4F7EE48F586A13D1397E91D270057E539B9DE64B
+uid           [ultimate] With Passphrase "test" <passphrase@example.org>
+ssb   rsa2048 2016-11-22 [E]
+```
+
+### Testing OpenPGP support
+
+We have many testmails, that are signed and encrypted with keys without a passphrase.
+
+All testmails can be found in the folder [github:cmollekopf/docker](https://github.com/cmollekopf/docker/tree/master/kube/testmails/cur).
+
+* With `openpgp-` prefix are PGP/Mime messages [RFC 3156](https://tools.ietf.org/html/rfc3156).
+* With `openpgp-inline-` prefix are PGP inline messages [RFC 4880](https://tools.ietf.org/html/rfc4880).
+* With `smime-` prefix are SMIME messages [RFC 2633](https://tools.ietf.org/html/rfc2633).
+
+To be able to also test gpg errors, we created some test mails, that triggers known issues:
+
+* `openpgp-keymissing.mbox` this key is missing in the test environment, so gpg returns a KeyMissing error.
+* `openpgp-wrong_passphrase.mbox`, here a pinentry popups and if you press three time `Cancel` in a row, a Passphrase error is returnd. If you enter the correct passphrase `test` you the the content of the mail. But than you need wither restart the testenvironment, kill `gpg-agent` or simply wait 1h before you see the passphrase error again.
+* you can unistall the `gnupg-smime` package, or delete `/usr/bin/gpgsm` by hand to trigger a UnknownError for smime encrypted messages. If delete all `gnupgp2` related pacakges the application may react with segfaults.
+
+We also have a unittest for gnupg errors in a lower level [kde:kube/framework/domain/mimetreeparser/tests/gpgerrortest.cpp](https://cgit.kde.org/kube.git/tree/framework/domain/mimetreeparser/tests/gpgerrortest.cpp?h=develop).

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/docs/design.md -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/docs/design.md Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/actions/actionhandler.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/actions/actionhandler.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/CMakeLists.txt Changed

@@ -1,35 +1,36 @@
 set(mailplugin_SRCS
+    attachmentmodel.cpp
     mailplugin.cpp
     maillistmodel.cpp
     folderlistmodel.cpp
     actions/sinkactions.cpp
-    actions/mailactions.cpp
     objecttreesource.cpp
     stringhtmlwriter.cpp
-    csshelper.cpp
     composercontroller.cpp
     messageparser.cpp
-    mailtransport.cpp
+    messageparser_new.cpp
+    messageparser_old.cpp
     mailtemplates.cpp
+    modeltest.cpp
     retriever.cpp
     accountfactory.cpp
     accountscontroller.cpp
     accountsmodel.cpp
+    outboxmodel.cpp
     identitiesmodel.cpp
+    recepientautocompletionmodel.cpp
+    settings/accountsettings.cpp
 )
-add_definitions(-DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
-
-find_package(CURL 7.20.0 REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS Package)
 
-include_directories(${CURL_INCLUDE_DIRS})
-
 add_library(mailplugin SHARED ${mailplugin_SRCS})
 
-qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets)
-target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::MimeTreeParser KF5::Codecs KF5::Package KF5::Async KF5::IconThemes ${CURL_LIBRARIES})
+qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets Test)
+target_link_libraries(mailplugin actionplugin settingsplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KF5::Async)
 
 add_subdirectory(actions/tests)
 
 install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
+
+add_subdirectory(mimetreeparser)

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/accountfactory.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/accountfactory.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/accountscontroller.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/accountscontroller.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/accountsmodel.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/accountsmodel.cpp Changed

@@ -22,8 +22,10 @@
 AccountsModel::AccountsModel(QObject *parent) : QIdentityProxyModel()
 {
     Sink::Query query;
-    query.liveQuery = true;
-    query.requestedProperties << "name" << "icon";
+    query.setFlags(Sink::Query::LiveQuery);
+    query.request<Sink::ApplicationDomain::SinkAccount::Name>();
+    query.request<Sink::ApplicationDomain::SinkAccount::Icon>();
+    query.request<Sink::ApplicationDomain::SinkAccount::Status>();
     runQuery(query);
 }
 
@@ -39,6 +41,9 @@
     roles[Name] = "name";
     roles[Icon] = "icon";
     roles[AccountId] = "accountId";
+    roles[Status] = "status";
+    roles[StatusIcon] = "statusIcon";
+    roles[ShowStatus] = "showStatus";
 
     return roles;
 }
@@ -46,13 +51,26 @@
 QVariant AccountsModel::data(const QModelIndex &idx, int role) const
 {
     auto srcIdx = mapToSource(idx);
+    auto account = srcIdx.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>();
     switch (role) {
         case Name:
-            return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
+            return account->getName();
         case Icon:
-            return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
+            return account->getIcon();
         case AccountId:
-            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
+            return account->identifier();
+        case Status:
+            return account->getStatus();
+        case StatusIcon:
+            if (account->getStatus() == Sink::ApplicationDomain::ErrorStatus) {
+                return "emblem-error";
+            } else if (account->getStatus() == Sink::ApplicationDomain::BusyStatus) {
+                return "view-refresh";
+            } else if (account->getStatus() == Sink::ApplicationDomain::ConnectedStatus) {
+                return "checkmark";
+            }
+        case ShowStatus:
+            return (account->getStatus() != Sink::ApplicationDomain::OfflineStatus);
     }
     return QIdentityProxyModel::data(idx, role);
 }

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/accountsmodel.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/accountsmodel.h Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/actions/sinkactions.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/actions/sinkactions.cpp Changed

@@ -23,22 +23,43 @@
 #include <QFile>
 
 #include <sink/store.h>
+#include <sink/log.h>
+
+SINK_DEBUG_AREA("sinkactions")
 
 using namespace Kube;
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
 
 static ActionHandlerHelper markAsReadHandler("org.kde.kube.actions.mark-as-read",
     [](Context *context) -> bool {
         return context->property("mail").isValid();
     },
     [](Context *context) {
-        auto mail = context->property("mail").value<Sink::ApplicationDomain::Mail::Ptr>();
+        auto mail = context->property("mail").value<Mail::Ptr>();
         if (!mail) {
-            qWarning() << "Failed to get the mail mail: " << context->property("mail");
+            SinkWarning() << "Failed to get the mail mail: " << context->property("mail");
             return;
         }
         mail->setProperty("unread", false);
-        qDebug() << "Mark as read " << mail->identifier();
-        Sink::Store::modify(*mail).exec();
+        SinkLog() << "Mark as read " << mail->identifier();
+        Store::modify(*mail).exec();
+    }
+);
+
+static ActionHandlerHelper moveToTrashHandler("org.kde.kube.actions.move-to-trash",
+    [](Context *context) -> bool {
+        return context->property("mail").isValid();
+    },
+    [](Context *context) {
+        auto mail = context->property("mail").value<Mail::Ptr>();
+        if (!mail) {
+            SinkWarning() << "Failed to get the mail mail: " << context->property("mail");
+            return;
+        }
+        mail->setTrash(true);
+        SinkLog() << "Move to trash " << mail->identifier();
+        Store::modify(*mail).exec();
     }
 );
 
@@ -47,14 +68,13 @@
         return context->property("mail").isValid();
     },
     [](Context *context) {
-        auto mail = context->property("mail").value<Sink::ApplicationDomain::Mail::Ptr>();
+        auto mail = context->property("mail").value<Mail::Ptr>();
         if (!mail) {
-            qWarning() << "Failed to get the mail mail: " << context->property("mail");
+            SinkWarning() << "Failed to get the mail mail: " << context->property("mail");
             return;
         }
-        mail->setProperty("unread", false);
-        qDebug() << "Remove " << mail->identifier();
-        Sink::Store::remove(*mail).exec();
+        SinkLog() << "Remove " << mail->identifier();
+        Store::remove(*mail).exec();
     }
 );
 
@@ -63,12 +83,14 @@
         return true;
     },
     [](Context *context) {
-        if (auto folder = context->property("folder").value<Sink::ApplicationDomain::Folder::Ptr>()) {
-            qDebug() << "Synchronizing resource " << folder->resourceInstanceIdentifier();
-            Sink::Store::synchronize(Sink::Query::ResourceFilter(folder->resourceInstanceIdentifier())).exec();
+        if (auto folder = context->property("folder").value<Folder::Ptr>()) {
+            SinkLog() << "Synchronizing folder " << folder->resourceInstanceIdentifier() << folder->identifier();
+            auto scope = SyncScope().resourceFilter(folder->resourceInstanceIdentifier()).filter<Mail::Folder>(QVariant::fromValue(folder->identifier()));
+            scope.setType<ApplicationDomain::Mail>();
+            Store::synchronize(scope).exec();
         } else {
-            qDebug() << "Synchronizing all";
-            Sink::Store::synchronize(Sink::Query()).exec();
+            SinkLog() << "Synchronizing all";
+            Store::synchronize(SyncScope()).exec();
         }
     }
 );
@@ -82,21 +104,21 @@
     [](Context *context) {
         auto accountId = context->property("accountId").value<QByteArray>();
         auto message = context->property("message").value<KMime::Message::Ptr>();
-        qWarning() << "Sending a mail: ";
+        SinkLog() << "Sending a mail: ";
 
-        Sink::Query query;
-        query += Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::transport);
-        query += Sink::Query::AccountFilter(accountId);
-        Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(query)
-            .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([=](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
+        Query query;
+        query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::transport);
+        query.filter<SinkResource::Account>(accountId);
+        Store::fetchAll<ApplicationDomain::SinkResource>(query)
+            .then<void, QList<ApplicationDomain::SinkResource::Ptr>>([=](const QList<ApplicationDomain::SinkResource::Ptr> &resources) -> KAsync::Job<void> {
                 if (!resources.isEmpty()) {
                     auto resourceId = resources[0]->identifier();
-                    qDebug() << "Sending message via resource: " << resourceId;
-                    Sink::ApplicationDomain::Mail mail(resourceId);
+                    SinkTrace() << "Sending message via resource: " << resourceId;
+                    Mail mail(resourceId);
                     mail.setBlobProperty("mimeMessage", message->encodedContent());
-                    return Sink::Store::create(mail);
+                    return Store::create(mail);
                 }
-                qWarning() << "Failed to find a mailtransport resource";
+                SinkWarning() << "Failed to find a mailtransport resource";
                 return KAsync::error<void>(0, "Failed to find a MailTransport resource.");
             }).exec();
     }
@@ -109,30 +131,30 @@
         return !accountId.isEmpty() && message;
     },
     ActionHandlerHelper::JobHandler([](Context *context) -> KAsync::Job<void> {
-        qWarning() << "executing save as draft";
+        SinkLog() << "Executing the save-as-draft action";
         const auto accountId = context->property("accountId").value<QByteArray>();
         const auto message = context->property("message").value<KMime::Message::Ptr>();
-        auto existingMail = context->property("existingMail").value<Sink::ApplicationDomain::Mail>();
+        auto existingMail = context->property("existingMail").value<Mail>();
         if (!message) {
-            qWarning() << "Failed to get the mail: " << context->property("mail");
+            SinkWarning() << "Failed to get the mail: " << context->property("mail");
             return KAsync::error<void>(1, "Failed to get the mail: " + context->property("mail").toString());
         }
 
         if (existingMail.identifier().isEmpty()) {
-            Sink::Query query;
-            query += Sink::Query::CapabilityFilter(Sink::ApplicationDomain::ResourceCapabilities::Mail::drafts);
-            query += Sink::Query::AccountFilter(accountId);
-            return Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(query)
-                .then<void, KAsync::Job<void>, Sink::ApplicationDomain::SinkResource>([=](const Sink::ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> {
-                    Sink::ApplicationDomain::Mail mail(resource.identifier());
-                    mail.setProperty("draft", true);
-                    mail.setBlobProperty("mimeMessage", message->encodedContent());
-                    return Sink::Store::create(mail);
+            Query query;
+            query.containsFilter<SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::drafts);
+            query.filter<SinkResource::Account>(accountId);
+            return Store::fetchOne<SinkResource>(query)
+                .then<void, SinkResource>([=](const SinkResource &resource) -> KAsync::Job<void> {
+                    Mail mail(resource.identifier());
+                    mail.setDraft(true);
+                    mail.setMimeMessage(message->encodedContent());
+                    return Store::create(mail);
                 });
         } else {
-            qWarning() << "Modifying an existing mail" << existingMail.identifier();
-            existingMail.setBlobProperty("mimeMessage", message->encodedContent());
-            return Sink::Store::modify(existingMail);
+            SinkWarning() << "Modifying an existing mail" << existingMail.identifier();
+            existingMail.setMimeMessage(message->encodedContent());
+            return Store::modify(existingMail);
         }
     })
 );

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/attachmentmodel.cpp Added

@@ -0,0 +1,145 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsys.com>
+
+    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 "messageparser.h"
+#include "mimetreeparser/interface.h"
+
+#include <QIcon>
+#include <QDebug>
+
+QString sizeHuman(const Content::Ptr &content)
+{
+    float num = content->content().size();
+    QStringList list;
+    list << "KB" << "MB" << "GB" << "TB";
+
+    QStringListIterator i(list);
+    QString unit("Bytes");
+
+    while(num >= 1024.0 && i.hasNext())
+     {
+        unit = i.next();
+        num /= 1024.0;
+    }
+
+    if (unit == "Bytes") {
+        return QString().setNum(num) + " " + unit;
+    } else {
+        return QString().setNum(num,'f',2)+" "+unit;
+    }
+}
+
+class AttachmentModelPrivate
+{
+public:
+    AttachmentModelPrivate(AttachmentModel *q_ptr, const std::shared_ptr<Parser> &parser);
+
+    AttachmentModel *q;
+    std::shared_ptr<Parser> mParser;
+    QVector<Part::Ptr> mAttachments;
+};
+
+AttachmentModelPrivate::AttachmentModelPrivate(AttachmentModel* q_ptr, const std::shared_ptr<Parser>& parser)
+    : q(q_ptr)
+    , mParser(parser)
+{
+    mAttachments = mParser->collectAttachmentParts();
+}
+
+AttachmentModel::AttachmentModel(std::shared_ptr<Parser> parser)
+    : d(std::unique_ptr<AttachmentModelPrivate>(new AttachmentModelPrivate(this, parser)))
+{
+}
+
+AttachmentModel::~AttachmentModel()
+{
+}
+
+QHash<int, QByteArray> AttachmentModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[TypeRole] = "type";
+    roles[NameRole] = "name";
+    roles[SizeRole] = "size";
+    roles[IconRole] = "icon";
+    roles[IsEncryptedRole] = "encrypted";
+    roles[IsSignedRole] = "signed";
+    return roles;
+}
+
+QModelIndex AttachmentModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (row < 0 || column != 0) {
+        return QModelIndex();
+    }
+
+    if (row < d->mAttachments.size()) {
+        return createIndex(row, column, d->mAttachments.at(row).get());
+    }
+    return QModelIndex();
+}
+
+QVariant AttachmentModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        switch (role) {
+        case Qt::DisplayRole:
+            return QString("root");
+        }
+        return QVariant();
+    }
+
+    if (index.internalPointer()) {
+        const auto entry = static_cast<Part *>(index.internalPointer());
+        const auto content = entry->content().at(0);
+        switch(role) {
+        case TypeRole:
+            return content->mailMime()->mimetype().name();
+        case NameRole:
+            return entry->mailMime()->filename();
+        case IconRole:
+            return QIcon::fromTheme(content->mailMime()->mimetype().iconName());
+        case SizeRole:
+            return sizeHuman(content);
+        case IsEncryptedRole:
+            return content->encryptions().size() > 0;
+        case IsSignedRole:
+            return content->signatures().size() > 0;
+        }
+    }
+    return QVariant();
+}
+
+QModelIndex AttachmentModel::parent(const QModelIndex &index) const
+{
+    return QModelIndex();
+}
+
+int AttachmentModel::rowCount(const QModelIndex &parent) const
+{
+    if (!parent.isValid()) {
+        return d->mAttachments.size();
+    }
+    return 0;
+}
+
+int AttachmentModel::columnCount(const QModelIndex &parent) const
+{
+    return 1;
+}

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/composercontroller.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/composercontroller.cpp Changed

@@ -25,14 +25,20 @@
 #include <KMime/Message>
 #include <KCodecs/KEmailAddress>
 #include <QVariant>
+#include <QSortFilterProxyModel>
+#include <QList>
 #include <QDebug>
 #include <QQmlEngine>
 #include <sink/store.h>
+#include <sink/log.h>
 
 #include "accountsmodel.h"
 #include "identitiesmodel.h"
+#include "recepientautocompletionmodel.h"
 #include "mailtemplates.h"
 
+SINK_DEBUG_AREA("composercontroller");
+
 ComposerController::ComposerController(QObject *parent) : QObject(parent)
 {
 }
@@ -102,6 +108,18 @@
     }
 }
 
+QString ComposerController::recepientSearchString() const
+{
+    return QString();
+}
+
+void ComposerController::setRecepientSearchString(const QString &s)
+{
+    if (auto model = static_cast<RecipientAutocompletionModel*>(recepientAutocompletionModel())) {
+        model->setFilter(s);
+    }
+}
+
 QAbstractItemModel *ComposerController::identityModel() const
 {
     static auto model = new IdentitiesModel();
@@ -109,6 +127,13 @@
     return model;
 }
 
+QAbstractItemModel *ComposerController::recepientAutocompletionModel() const
+{
+    static auto model = new RecipientAutocompletionModel();
+    QQmlEngine::setObjectOwnership(model, QQmlEngine::CppOwnership);
+    return model;
+}
+
 QStringList ComposerController::attachemts() const
 {
     return m_attachments;
@@ -133,7 +158,7 @@
 {
     Sink::Query query(*message.value<Sink::ApplicationDomain::Mail::Ptr>());
     query.request<Sink::ApplicationDomain::Mail::MimeMessage>();
-    Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).then<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) {
+    Sink::Store::fetchOne<Sink::ApplicationDomain::Mail>(query).syncThen<void, Sink::ApplicationDomain::Mail>([this, loadAsDraft](const Sink::ApplicationDomain::Mail &mail) {
         m_existingMail = mail;
         const auto mailData = KMime::CRLFtoLF(mail.getMimeMessage());
         if (!mailData.isEmpty()) {
@@ -153,43 +178,82 @@
     }).exec();
 }
 
-KMime::Message::Ptr ComposerController::assembleMessage()
+void ComposerController::recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName)
 {
-    auto mail = m_msg.value<KMime::Message::Ptr>();
-    if (!mail) {
-        mail = KMime::Message::Ptr::create();
+    if (auto model = static_cast<RecipientAutocompletionModel*>(recepientAutocompletionModel())) {
+        model->addEntry(addrSpec, displayName);
     }
-    for (const auto &to : KEmailAddress::splitAddressList(m_to)) {
+}
+
+void applyAddresses(const QString &list, std::function<void(const QByteArray &, const QByteArray &)> callback)
+{
+    for (const auto &to : KEmailAddress::splitAddressList(list)) {
         QByteArray displayName;
         QByteArray addrSpec;
         QByteArray comment;
         KEmailAddress::splitAddress(to.toUtf8(), displayName, addrSpec, comment);
+        callback(addrSpec, displayName);
+    }
+}
+
+bool ComposerController::identityIsSet() const
+{
+    return (identityModel()->rowCount() > 0) && (m_currentAccountIndex >= 0);
+}
+
+KMime::Message::Ptr ComposerController::assembleMessage()
+{
+    auto mail = m_msg.value<KMime::Message::Ptr>();
+    if (!mail) {
+        mail = KMime::Message::Ptr::create();
+    }
+    applyAddresses(m_to, [&](const QByteArray &addrSpec, const QByteArray &displayName) {
         mail->to(true)->addAddress(addrSpec, displayName);
+        recordForAutocompletion(addrSpec, displayName);
+    });
+    applyAddresses(m_cc, [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+        mail->cc(true)->addAddress(addrSpec, displayName);
+        recordForAutocompletion(addrSpec, displayName);
+    });
+    applyAddresses(m_bcc, [&](const QByteArray &addrSpec, const QByteArray &displayName) {
+        mail->bcc(true)->addAddress(addrSpec, displayName);
+        recordForAutocompletion(addrSpec, displayName);
+    });
+    if (!identityIsSet()) {
+        SinkWarning() << "We don't have an identity to send the mail with.";
+    } else {
+        auto currentIndex = identityModel()->index(m_currentAccountIndex, 0);
+        KMime::Types::Mailbox mb;
+        mb.setName(currentIndex.data(IdentitiesModel::Username).toString());
+        mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8());
+        mail->from(true)->addAddress(mb);
+        mail->subject(true)->fromUnicodeString(m_subject, "utf-8");
+        mail->setBody(m_body.toUtf8());
+        mail->assemble();
+        return mail;
     }
-    auto currentIndex = identityModel()->index(m_currentAccountIndex, 0);
-    KMime::Types::Mailbox mb;
-    mb.setName(currentIndex.data(IdentitiesModel::Username).toString());
-    mb.setAddress(currentIndex.data(IdentitiesModel::Address).toString().toUtf8());
-    mail->from(true)->addAddress(mb);
-    mail->subject(true)->fromUnicodeString(m_subject, "utf-8");
-    mail->setBody(m_body.toUtf8());
-    mail->assemble();
-    return mail;
+    return KMime::Message::Ptr();
 }
 
 void ComposerController::send()
 {
     auto mail = assembleMessage();
-    auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(IdentitiesModel::AccountId).toByteArray();
 
-    Kube::Context context;
-    context.setProperty("message", QVariant::fromValue(mail));
-    context.setProperty("accountId", QVariant::fromValue(currentAccountId));
+    //TODO deactivate action if we don't have the identiy set
+    if (!identityIsSet()) {
+        SinkWarning() << "We don't have an identity to send the mail with.";
+    } else {
+        auto currentAccountId = identityModel()->index(m_currentAccountIndex, 0).data(IdentitiesModel::AccountId).toByteArray();
 
-    qDebug() << "Current account " << currentAccountId;
+        Kube::Context context;
+        context.setProperty("message", QVariant::fromValue(mail));
+        context.setProperty("accountId", QVariant::fromValue(currentAccountId));
 
-    Kube::Action("org.kde.kube.actions.sendmail", context).execute();
-    clear();
+        qDebug() << "Current account " << currentAccountId;
+
+        Kube::Action("org.kde.kube.actions.sendmail", context).execute();
+        clear();
+    }
 }
 
 void ComposerController::saveAsDraft()

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/composercontroller.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/composercontroller.h Changed

@@ -38,6 +38,8 @@
     Q_PROPERTY (QString bcc READ bcc WRITE setBcc NOTIFY bccChanged)
     Q_PROPERTY (QString subject READ subject WRITE setSubject NOTIFY subjectChanged)
     Q_PROPERTY (QString body READ body WRITE setBody NOTIFY bodyChanged)
+    Q_PROPERTY (QString recepientSearchString READ recepientSearchString WRITE setRecepientSearchString)
+    Q_PROPERTY (QAbstractItemModel* recepientAutocompletionModel READ recepientAutocompletionModel CONSTANT)
     Q_PROPERTY (QAbstractItemModel* identityModel READ identityModel CONSTANT)
     Q_PROPERTY (int currentIdentityIndex MEMBER m_currentAccountIndex)
     Q_PROPERTY (QStringList attachments READ attachemts NOTIFY attachmentsChanged)
@@ -60,7 +62,11 @@
     QString body() const;
     void setBody(const QString &body);
 
+    QString recepientSearchString() const;
+    void setRecepientSearchString(const QString &body);
+
     QAbstractItemModel *identityModel() const;
+    QAbstractItemModel *recepientAutocompletionModel() const;
 
     QStringList attachemts() const;
     Q_INVOKABLE void loadMessage(const QVariant &draft, bool loadAsDraft);
@@ -81,6 +87,8 @@
     void addAttachment(const QUrl &fileUrl);
 
 private:
+    bool identityIsSet() const;
+    void recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName);
     void setMessage(const QSharedPointer<KMime::Message> &msg);
     QSharedPointer<KMime::Message> assembleMessage();
     QString m_to;

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/folderlistmodel.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/folderlistmodel.cpp Changed

@@ -22,12 +22,18 @@
 #include <sink/store.h>
 #include <settings/settings.h>
 
-FolderListModel::FolderListModel(QObject *parent) : QIdentityProxyModel()
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
+FolderListModel::FolderListModel(QObject *parent) : QSortFilterProxyModel()
 {
-    Sink::Query query;
-    query.liveQuery = true;
-    query.requestedProperties << "name" << "icon" << "parent";
-    query.parentProperty = "parent";
+    setDynamicSortFilter(true);
+    sort(0, Qt::AscendingOrder);
+
+    Query query;
+    query.setFlags(Sink::Query::LiveQuery);
+    query.request<Folder::Name>().request<Folder::Icon>().request<Folder::Parent>();
+    query.requestTree<Folder::Parent>();
     runQuery(query);
 }
 
@@ -57,34 +63,55 @@
         case Icon:
             return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
         case Id:
-            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
+            return srcIdx.data(Store::DomainObjectBaseRole).value<ApplicationDomainType::Ptr>()->identifier();
         case DomainObject:
-            return srcIdx.data(Sink::Store::DomainObjectRole);
+            return srcIdx.data(Store::DomainObjectRole);
     }
-    return QIdentityProxyModel::data(idx, role);
+    return QSortFilterProxyModel::data(idx, role);
 }
 
-void FolderListModel::runQuery(const Sink::Query &query)
+void FolderListModel::runQuery(const Query &query)
 {
-    mModel = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
+    mModel = Store::loadModel<Folder>(query);
     setSourceModel(mModel.data());
 }
 
 void FolderListModel::setAccountId(const QVariant &accountId)
 {
     const auto account = accountId.toString().toUtf8();
-    Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(Sink::Query::PropertyFilter("account", QVariant::fromValue(account)))
-        .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([this, account](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
-            Sink::Query query;
-            query.liveQuery = true;
-            query.requestedProperties << "name" << "icon" << "parent";
-            query.parentProperty = "parent";
-            for (const auto &r : resources) {
-                qDebug() << "Found resources for account: " << r->identifier() << account;
-                query.resources << r->identifier();
-            }
-            runQuery(query);
-        }).exec();
+
+    //Get all folders of an account
+    auto query = Query();
+    query.resourceFilter<SinkResource::Account>(account);
+    query.setFlags(Sink::Query::LiveQuery);
+    query.requestTree<Folder::Parent>();
+    query.request<Folder::Name>()
+         .request<Folder::Icon>()
+         .request<Folder::Parent>();
+    query.requestTree<Folder::Parent>();
+    runQuery(query);
+}
+
+static int getPriority(const Sink::ApplicationDomain::Folder &folder)
+{
+    auto specialPurpose = folder.getSpecialPurpose();
+    if (specialPurpose.contains(Sink::ApplicationDomain::SpecialPurpose::Mail::inbox)) {
+        return 10;
+    }
+    if (!specialPurpose.isEmpty()) {
+        return 9;
+    }
+    return 0;
+}
+
+bool FolderListModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const auto leftFolder = left.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
+    const auto rightFolder = right.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
+    if (getPriority(*leftFolder) < getPriority(*rightFolder)) {
+        return true;
+    }
+    return leftFolder->getName() < rightFolder->getName();
 }
 
 QVariant FolderListModel::accountId() const

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/folderlistmodel.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/folderlistmodel.h Changed

@@ -21,7 +21,7 @@
 #pragma once
 
 #include <QObject>
-#include <QIdentityProxyModel>
+#include <QSortFilterProxyModel>
 #include <QSharedPointer>
 #include <QStringList>
 
@@ -29,7 +29,7 @@
     class Query;
 }
 
-class FolderListModel : public QIdentityProxyModel
+class FolderListModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
@@ -39,7 +39,7 @@
     FolderListModel(QObject *parent = Q_NULLPTR);
     ~FolderListModel();
 
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
     enum Roles {
         Name  = Qt::UserRole + 1,
@@ -49,10 +49,12 @@
     };
     Q_ENUMS(Roles)
 
-    QHash<int, QByteArray> roleNames() const;
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
 
     void setAccountId(const QVariant &accountId);
     QVariant accountId() const;
+protected:
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
 
 private:
     void runQuery(const Sink::Query &query);

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/identitiesmodel.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/identitiesmodel.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/maillistmodel.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/maillistmodel.cpp Changed

@@ -23,6 +23,7 @@
 #include <QFile>
 #include <QDateTime>
 
+#include <sink/standardqueries.h>
 
 MailListModel::MailListModel(QObject *parent)
     : QSortFilterProxyModel()
@@ -43,6 +44,9 @@
     roles[Subject] = "subject";
     roles[Sender] = "sender";
     roles[SenderName] = "senderName";
+    roles[To] = "to";
+    roles[Cc] = "cc";
+    roles[Bcc] = "bcc";
     roles[Date] = "date";
     roles[Unread] = "unread";
     roles[Important] = "important";
@@ -50,10 +54,24 @@
     roles[Id] = "id";
     roles[MimeMessage] = "mimeMessage";
     roles[DomainObject] = "domainObject";
+    roles[ThreadSize] = "threadSize";
 
     return roles;
 }
 
+static QString join(const QList<Sink::ApplicationDomain::Mail::Contact> &contacts)
+{
+    QStringList list;
+    for (const auto &contact : contacts) {
+        if (!contact.name.isEmpty()) {
+            list << QString("%1 <%2>").arg(contact.name).arg(contact.emailAddress);
+        } else {
+            list << contact.emailAddress;
+        }
+    }
+    return list.join(", ");
+}
+
 QVariant MailListModel::data(const QModelIndex &idx, int role) const
 {
     auto srcIdx = mapToSource(idx);
@@ -62,24 +80,31 @@
         case Subject:
             return mail->getSubject();
         case Sender:
-            return mail->getSender();
+            return mail->getSender().emailAddress;
         case SenderName:
-            return mail->getSenderName();
+            return mail->getSender().name;
+        case To:
+            return join(mail->getTo());
+        case Cc:
+            return join(mail->getCc());
+        case Bcc:
+            return join(mail->getBcc());
         case Date:
             return mail->getDate();
         case Unread:
-            return mail->getUnread();
+            return mail->getProperty("unreadCollected").toList().contains(true);
         case Important:
-            return mail->getImportant();
+            return mail->getProperty("importantCollected").toList().contains(true);
         case Draft:
             return mail->getDraft();
         case Id:
             return mail->identifier();
         case DomainObject:
             return QVariant::fromValue(mail);
-        case MimeMessage: {
+        case MimeMessage:
             return mail->getMimeMessage();
-        }
+        case ThreadSize:
+            return mail->getProperty("count").toInt();
     }
     return QSortFilterProxyModel::data(idx, role);
 }
@@ -105,20 +130,19 @@
         qWarning() << "No folder: " << parentFolder;
         return;
     }
-    Sink::Query query;
-    query.liveQuery = true;
-    query.resources << folder->resourceInstanceIdentifier();
-    query.sort<Mail::Date>();
-    query.limit = 100;
+    Sink::Query query = Sink::StandardQueries::threadLeaders(*folder);
+    query.setFlags(Sink::Query::LiveQuery);
+    query.limit(100);
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
-    query.request<Mail::SenderName>();
+    query.request<Mail::To>();
+    query.request<Mail::Cc>();
+    query.request<Mail::Bcc>();
     query.request<Mail::Date>();
     query.request<Mail::Unread>();
     query.request<Mail::Important>();
     query.request<Mail::Draft>();
     query.request<Mail::Folder>();
-    query.filter<Mail::Folder>(*folder);
     qWarning() << "Running folder query: " << folder->resourceInstanceIdentifier() << folder->identifier();
     runQuery(query);
 }
@@ -136,11 +160,12 @@
         qWarning() << "No mail: " << mail;
         return;
     }
-    Sink::Query query(*mail);
-    query.liveQuery = false;
+    Sink::Query query = Sink::StandardQueries::completeThread(*mail);
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
-    query.request<Mail::SenderName>();
+    query.request<Mail::To>();
+    query.request<Mail::Cc>();
+    query.request<Mail::Bcc>();
     query.request<Mail::Date>();
     query.request<Mail::Unread>();
     query.request<Mail::Important>();

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/maillistmodel.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/maillistmodel.h Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/mailplugin.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mailplugin.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/mailtemplates.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mailtemplates.cpp Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/messageparser.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/messageparser.cpp Changed

@@ -18,9 +18,13 @@
 */
 #include "messageparser.h"
 
+#include "modeltest.h"
 #include "stringhtmlwriter.h"
 #include "objecttreesource.h"
-#include "csshelper.h"
+
+#include "mimetreeparser/interface.h"
+
+#include <QRegExp>
 
 #include <QFile>
 #include <QImage>
@@ -30,127 +34,32 @@
 #include <MimeTreeParser/ObjectTreeParser>
 #include <MimeTreeParser/MessagePart>
 
-PartModel::PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap) : mPartTree(partTree), mEmbeddedPartMap(embeddedPartMap)
-{
-}
-
-QHash<int, QByteArray> PartModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles[Text] = "text";
-    roles[IsHtml] = "isHtml";
-    roles[IsHidden] = "isHidden";
-    roles[IsEncrypted] = "isEncrypted";
-    roles[IsAttachment] = "isAttachment";
-    roles[HasContent] = "hasContent";
-    roles[Type] = "type";
-    roles[IsHidden] = "isHidden";
-    return roles;
-}
-
-QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) const
-{
-    // qDebug() << "index " << parent << row << column << mPartTree->subParts().size();
-    if (!parent.isValid()) {
-        if (row < mPartTree->subParts().size()) {
-            auto part = mPartTree->subParts().at(row);
-            return createIndex(row, column, part.data());
-        }
-    } else {
-        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
-        auto subPart = part->subParts().at(row);
-        return createIndex(row, column, subPart.data());
-    }
-    return QModelIndex();
-}
-
-QVariant PartModel::data(const QModelIndex &index, int role) const
-{
-    // qDebug() << "Getting data for index";
-    if (index.isValid()) {
-        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
-        switch (role) {
-            case Text: {
-                // qDebug() << "Getting text: " << part->property("text").toString();
-                // FIXME: we should have a list per part, and not one for all parts.
-                auto text = part->property("htmlContent").toString();
-                for (const auto &cid : mEmbeddedPartMap.keys()) {
-                    text.replace(QString("src=\"cid:%1\"").arg(QString(cid)), QString("src=\"%1\"").arg(mEmbeddedPartMap.value(cid).toString()));
-                }
-                return text;
-            }
-            case IsAttachment:
-                return part->property("attachment").toBool();
-            case IsEncrypted:
-                return part->property("isEncrypted").toBool();
-            case IsHtml:
-                return part->property("isHtml").toBool();
-            case HasContent:
-                return !part->property("htmlContent").toString().isEmpty();
-            case Type:
-                return part->metaObject()->className();
-            case IsHidden:
-                return part->property("isHidden").toBool();
-
-        }
-    }
-    return QVariant();
-}
 
-QModelIndex PartModel::parent(const QModelIndex &index) const
+class MessagePartPrivate
 {
-    // qDebug() << "parent " << index;
-    if (index.isValid()) {
-        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
-        auto parentPart = static_cast<MimeTreeParser::MessagePart*>(part->parentPart());
-        auto row = 0;//get the parents parent to find the index
-        if (!parentPart) {
-            parentPart = mPartTree.data();
-        }
-        int i = 0;
-        for (const auto &p : parentPart->subParts()) {
-            if (p.data() == part) {
-                row = i;
-                break;
-            }
-            i++;
-        }
-        return createIndex(row, index.column(), parentPart);
-    }
-    return QModelIndex();
-}
+public:
+    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
+    QString mHtml;
+    QMap<QByteArray, QUrl> mEmbeddedPartMap;
+    std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
+    std::shared_ptr<Parser> mParser;
+};
 
-int PartModel::rowCount(const QModelIndex &parent) const
+MessageParser::MessageParser(QObject *parent)
+    : QObject(parent)
+    , d(std::unique_ptr<MessagePartPrivate>(new MessagePartPrivate))
 {
-    // qDebug() << "Row count " << parent;
-    if (!parent.isValid()) {
-        // qDebug() << "Row count " << mPartTree->subParts().size();
-        return mPartTree->subParts().size();
-    } else {
-        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
-        if (part) {
-            return part->subParts().size();
-        }
-    }
-    return 0;
-}
 
-int PartModel::columnCount(const QModelIndex &parent) const
-{
-    // qDebug() << "Column count " << parent;
-    return 1;
 }
 
-
-MessageParser::MessageParser(QObject *parent)
-    : QObject(parent)
+MessageParser::~MessageParser()
 {
 
 }
 
 QString MessageParser::html() const
 {
-    return mHtml;
+    return d->mHtml;
 }
 
 QVariant MessageParser::message() const
@@ -162,6 +71,8 @@
 {
     QTime time;
     time.start();
+    d->mParser = std::shared_ptr<Parser>(new Parser(message.toByteArray()));
+
     const auto mailData = KMime::CRLFtoLF(message.toByteArray());
     KMime::Message::Ptr msg(new KMime::Message);
     msg->setContent(mailData);
@@ -170,25 +81,34 @@
 
     // render the mail
     StringHtmlWriter htmlWriter;
-    QImage paintDevice;
-    CSSHelper cssHelper(&paintDevice);
     //temporary files only have the lifetime of the nodehelper, so we keep it around until the mail changes.
-    mNodeHelper = std::make_shared<MimeTreeParser::NodeHelper>();
-    ObjectTreeSource source(&htmlWriter, &cssHelper);
-    MimeTreeParser::ObjectTreeParser otp(&source, mNodeHelper.get());
+    d->mNodeHelper = std::make_shared<MimeTreeParser::NodeHelper>();
+    ObjectTreeSource source(&htmlWriter);
+    MimeTreeParser::ObjectTreeParser otp(&source, d->mNodeHelper.get());
 
     otp.parseObjectTree(msg.data());
-    mPartTree = otp.parsedPart().dynamicCast<MimeTreeParser::MessagePart>();
+    d->mPartTree = otp.parsedPart().dynamicCast<MimeTreeParser::MessagePart>();
 
-    mEmbeddedPartMap = htmlWriter.embeddedParts();
-    mHtml = htmlWriter.html();
+    d->mEmbeddedPartMap = htmlWriter.embeddedParts();
+    d->mHtml = htmlWriter.html();
     emit htmlChanged();
 }
 
 QAbstractItemModel *MessageParser::partTree() const
 {
-    qDebug() << "Getting partTree";
-    qDebug() << "Row count " << mPartTree->subParts().size();
-    return new PartModel(mPartTree, mEmbeddedPartMap);
+    return new PartModel(d->mPartTree, d->mParser);
 }
 
+QAbstractItemModel *MessageParser::newTree() const
+{

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/messageparser.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/messageparser.h Changed

@@ -29,41 +29,52 @@
 #include <memory>
 #include <MimeTreeParser/MessagePart>
 
-namespace MimeTreeParser {
-    class NodeHelper;
-};
 class QAbstractItemModel;
 
+class Parser;
+class Part;
+class Encryption;
+class Signature;
+typedef std::shared_ptr<Part> PartPtr;
+class Content;
+typedef std::shared_ptr<Content> ContentPtr;
+class MessagePartPrivate;
+
+class NewModelPrivate;
+class AttachmentModelPrivate;
+
 class MessageParser : public QObject
 {
     Q_OBJECT
     Q_PROPERTY (QVariant message READ message WRITE setMessage)
     Q_PROPERTY (QString html READ html NOTIFY htmlChanged)
     Q_PROPERTY (QAbstractItemModel* partTree READ partTree NOTIFY htmlChanged)
+    Q_PROPERTY (QAbstractItemModel* newTree READ newTree NOTIFY htmlChanged)
+    Q_PROPERTY (QAbstractItemModel* attachments READ attachments NOTIFY htmlChanged)
 
 public:
     explicit MessageParser(QObject *parent = Q_NULLPTR);
+    ~MessageParser();
 
     QString html() const;
 
     QVariant message() const;
     void setMessage(const QVariant &to);
     QAbstractItemModel *partTree() const;
+    QAbstractItemModel *newTree() const;
+    QAbstractItemModel *attachments() const;
 
 signals:
     void htmlChanged();
 
 private:
-    QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
-    QString mHtml;
-    QMap<QByteArray, QUrl> mEmbeddedPartMap;
-    std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
+    std::unique_ptr<MessagePartPrivate> d;
 };
 
 class PartModel : public QAbstractItemModel {
     Q_OBJECT
 public:
-    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, QMap<QByteArray, QUrl> embeddedPartMap);
+    PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, std::shared_ptr<Parser> parser);
 
 public:
     enum Roles {
@@ -86,5 +97,61 @@
 private:
     QSharedPointer<MimeTreeParser::MessagePart> mPartTree;
     QMap<QByteArray, QUrl> mEmbeddedPartMap;
+    std::shared_ptr<Parser> mParser;
+};
+
+
+class NewModel : public QAbstractItemModel {
+    Q_OBJECT
+public:
+    NewModel(std::shared_ptr<Parser> parser);
+    ~NewModel();
+
+public:
+    enum Roles {
+        TypeRole  = Qt::UserRole + 1,
+        ContentsRole,
+        ContentRole,
+        IsEmbededRole,
+        SecurityLevelRole,
+        EncryptionErrorType,
+        EncryptionErrorString
+    };
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+
+private:
+    std::unique_ptr<NewModelPrivate> d;
 };
 
+class AttachmentModel : public QAbstractItemModel {
+     Q_OBJECT
+public:
+    AttachmentModel(std::shared_ptr<Parser> parser);
+    ~AttachmentModel();
+
+public:
+    enum Roles {
+        TypeRole  = Qt::UserRole + 1,
+        IconRole,
+        NameRole,
+        SizeRole,
+        IsEncryptedRole,
+        IsSignedRole
+    };
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+    QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+
+private:
+    std::unique_ptr<AttachmentModelPrivate> d;
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/messageparser_new.cpp Added

@@ -0,0 +1,477 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsys.com>
+
+    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 "messageparser.h"
+#include "mimetreeparser/interface.h"
+
+#include <QDebug>
+
+Q_DECLARE_METATYPE(Part *)
+Q_DECLARE_METATYPE(Content *)
+Q_DECLARE_METATYPE(Signature *)
+Q_DECLARE_METATYPE(Encryption *)
+
+class Entry;
+
+class NewModelPrivate
+{
+public:
+    NewModelPrivate(NewModel *q_ptr, const std::shared_ptr<Parser> &parser);
+    ~NewModelPrivate();
+
+    void createTree();
+
+    QSharedPointer<QVariant> getVar(const std::shared_ptr<Signature> &sig);
+    QSharedPointer<QVariant> getVar(const std::shared_ptr<Encryption> &enc);
+    QSharedPointer<QVariant> getVar(const std::shared_ptr<Part> &part);
+    QSharedPointer<QVariant> getVar(Part *part);
+    QSharedPointer<QVariant> getVar(const std::shared_ptr<Content> &content);
+    QSharedPointer<QVariant> getVar(Content *content);
+
+    int getPos(Signature *sig);
+    int getPos(Encryption *enc);
+    int getPos(Part *part);
+    int getPos(Content *content);
+
+    NewModel *q;
+    QVector<Part::Ptr> mParts;
+    std::unique_ptr<Entry> mRoot;
+
+    std::shared_ptr<Parser> mParser;
+private:
+    QMap<std::shared_ptr<Signature>, QSharedPointer<QVariant>> mSignatureMap;
+    QMap<std::shared_ptr<Encryption>, QSharedPointer<QVariant>> mEncryptionMap;
+    QMap<Part *, QSharedPointer<QVariant>> mPartMap;
+    QMap<Content *, QSharedPointer<QVariant>> mCMap;
+};
+
+class Entry
+{
+public:
+    Entry(NewModelPrivate *model)
+        : mParent(nullptr)
+        , mNewModelPrivate(model)
+    {
+    }
+
+    ~Entry()
+    {
+        foreach(auto child, mChildren) {
+            delete child;
+        }
+        mChildren.clear();
+    }
+
+    void addChild(Entry *entry)
+    {
+        mChildren.append(entry);
+        entry->mParent = this;
+    }
+
+    Entry *addSignatures(QVector<Signature::Ptr> signatures)
+    {
+        auto ret = this;
+        foreach(const auto &sig, signatures) {
+            auto entry = new Entry(mNewModelPrivate);
+            entry->mData = mNewModelPrivate->getVar(sig);
+            ret->addChild(entry);
+            ret = entry;
+        }
+        return ret;
+    }
+
+    Entry *addEncryptions(QVector<Encryption::Ptr> encryptions)
+    {
+        auto ret = this;
+        foreach(const auto &enc, encryptions) {
+            auto entry = new Entry(mNewModelPrivate);
+            entry->mData = mNewModelPrivate->getVar(enc);
+            ret->addChild(entry);
+            ret = entry;
+        }
+        return ret;
+    }
+
+     Entry *addPart(Part *part)
+    {
+        auto entry = new Entry(mNewModelPrivate);
+        entry->mData = mNewModelPrivate->getVar(part);
+        addChild(entry);
+        foreach(const auto &content, part->availableContents()) {
+            foreach(const auto &contentPart, part->content(content)) {
+                auto _entry = entry;
+                _entry = _entry->addEncryptions(contentPart->encryptions().mid(part->encryptions().size()));
+                _entry = _entry->addSignatures(contentPart->signatures().mid(part->signatures().size()));
+                auto c = new Entry(mNewModelPrivate);
+                c->mData = mNewModelPrivate->getVar(contentPart);
+                _entry->addChild(c);
+            }
+        }
+        foreach(const auto &sp, part->subParts()) {
+            auto _entry = entry;
+            _entry = _entry->addEncryptions(sp->encryptions().mid(part->encryptions().size()));
+            _entry = _entry->addSignatures(sp->signatures().mid(part->signatures().size()));
+            _entry->addPart(sp.get());
+        }
+        return entry;
+    }
+
+    int pos()
+    {
+        if(!mParent) {
+            return -1;
+        }
+        int i=0;
+        foreach(const auto &child, mParent->mChildren) {
+            if (child == this) {
+                return i;
+            }
+            i++;
+        }
+        return -1;
+    }
+
+    QSharedPointer<QVariant> mData;
+
+    Entry *mParent;
+    QVector<Entry *> mChildren;
+    NewModelPrivate *mNewModelPrivate;
+};
+
+
+NewModelPrivate::NewModelPrivate(NewModel *q_ptr, const std::shared_ptr<Parser> &parser)
+    : q(q_ptr)
+    , mRoot(std::unique_ptr<Entry>(new Entry(this)))
+    , mParser(parser)
+{
+   mParts = mParser->collectContentParts();
+   createTree();
+}
+
+NewModelPrivate::~NewModelPrivate()
+{
+}
+
+void NewModelPrivate::createTree()
+{
+    auto root = mRoot.get();
+    auto parent = root;
+    Part *pPart = nullptr;
+    QVector<Signature::Ptr> signatures;
+    QVector<Encryption::Ptr> encryptions;
+    foreach(const auto part, mParts) {
+        auto _parent = parent;
+        if (pPart != part->parent()) {
+            auto _parent = root;
+            _parent = _parent->addEncryptions(part->parent()->encryptions());
+            _parent = _parent->addSignatures(part->parent()->signatures());
+            signatures = part->parent()->signatures();
+            encryptions = part->parent()->encryptions();
+            parent = _parent;
+            pPart = part->parent();
+        }
+        _parent = _parent->addEncryptions(part->encryptions().mid(encryptions.size()));
+        _parent = _parent->addSignatures(part->signatures().mid(signatures.size()));
+        _parent->addPart(part.get());
+    }
+}
+
+QSharedPointer<QVariant> NewModelPrivate::getVar(const std::shared_ptr<Signature> &sig)
+{
+    if (!mSignatureMap.contains(sig)) {
+        auto var = new QVariant();
+        var->setValue(sig.get());

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/messageparser_old.cpp Added

@@ -0,0 +1,151 @@
+/*
+    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 "messageparser.h"
+#include "mimetreeparser/interface.h"
+
+PartModel::PartModel(QSharedPointer<MimeTreeParser::MessagePart> partTree, std::shared_ptr<Parser> parser)
+    : mPartTree(partTree)
+    , mParser(parser)
+{
+}
+
+QHash<int, QByteArray> PartModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Text] = "text";
+    roles[IsHtml] = "isHtml";
+    roles[IsHidden] = "isHidden";
+    roles[IsEncrypted] = "isEncrypted";
+    roles[IsAttachment] = "isAttachment";
+    roles[HasContent] = "hasContent";
+    roles[Type] = "type";
+    roles[IsHidden] = "isHidden";
+    return roles;
+}
+
+QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) const
+{
+    // qDebug() << "index " << parent << row << column << mPartTree->subParts().size();
+    if (!parent.isValid()) {
+        if (row < mPartTree->subParts().size()) {
+            auto part = mPartTree->subParts().at(row);
+            return createIndex(row, column, part.data());
+        }
+    } else {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
+        auto subPart = part->subParts().at(row);
+        return createIndex(row, column, subPart.data());
+    }
+    return QModelIndex();
+}
+
+QVariant PartModel::data(const QModelIndex &index, int role) const
+{
+    // qDebug() << "Getting data for index";
+    if (index.isValid()) {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
+        switch (role) {
+            case Text: {
+                // qDebug() << "Getting text: " << part->property("text").toString();
+                // FIXME: we should have a list per part, and not one for all parts.
+                auto text = part->property("htmlContent").toString();
+                const auto rx = QRegExp("(src)\\s*=\\s*(\"|')(cid:[^\"']+)\\2");
+                int pos = 0;
+                while ((pos = rx.indexIn(text, pos)) != -1) {
+                    const auto link = QUrl(rx.cap(3).toUtf8());
+                    pos += rx.matchedLength();
+                    const auto repl = mParser->getPart(link);
+                    if (!repl) {
+                        continue;
+                    }
+                    const auto content = repl->content();
+                    if(content.size() < 1) {
+                        continue;
+                    }
+                    const auto mailMime = content.first()->mailMime();
+                    const auto mimetype = mailMime->mimetype().name();
+                    if (mimetype.startsWith("image/")) {
+                        const auto data = content.first()->content();
+                        text.replace(rx.cap(0), QString("src=\"data:%1;base64,%2\"").arg(mimetype, QString::fromLatin1(data.toBase64())));
+                    }
+                }
+                return text;
+            }
+            case IsAttachment:
+                return part->property("attachment").toBool();
+            case IsEncrypted:
+                return part->property("isEncrypted").toBool();
+            case IsHtml:
+                return part->property("isHtml").toBool();
+            case HasContent:
+                return !part->property("htmlContent").toString().isEmpty();
+            case Type:
+                return part->metaObject()->className();
+            case IsHidden:
+                return false;
+                //return part->property("isHidden").toBool();
+
+        }
+    }
+    return QVariant();
+}
+
+QModelIndex PartModel::parent(const QModelIndex &index) const
+{
+    // qDebug() << "parent " << index;
+    if (index.isValid()) {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
+        auto parentPart = static_cast<MimeTreeParser::MessagePart*>(part->parentPart());
+        auto row = 0;//get the parents parent to find the index
+        if (!parentPart) {
+            parentPart = mPartTree.data();
+        }
+        int i = 0;
+        for (const auto &p : parentPart->subParts()) {
+            if (p.data() == part) {
+                row = i;
+                break;
+            }
+            i++;
+        }
+        return createIndex(row, index.column(), parentPart);
+    }
+    return QModelIndex();
+}
+
+int PartModel::rowCount(const QModelIndex &parent) const
+{
+    // qDebug() << "Row count " << parent;
+    if (!parent.isValid()) {
+        // qDebug() << "Row count " << mPartTree->subParts().size();
+        return mPartTree->subParts().size();
+    } else {
+        auto part = static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer());
+        if (part) {
+            return part->subParts().size();
+        }
+    }
+    return 0;
+}
+
+int PartModel::columnCount(const QModelIndex &parent) const
+{
+    // qDebug() << "Column count " << parent;
+    return 1;
+}
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/CMakeLists.txt Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/interface.cpp Added

@@ -0,0 +1,1179 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsystems.com>
+
+    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 "interface.h"
+#include "interface_p.h"
+
+#include "stringhtmlwriter.h"
+#include "objecttreesource.h"
+
+#include <QGpgME/KeyListJob>
+#include <QGpgME/Protocol>
+#include <gpgme++/key.h>
+#include <gpgme++/keylistresult.h>
+
+#include <KMime/Content>
+#include <MimeTreeParser/ObjectTreeParser>
+#include <MimeTreeParser/MessagePart>
+#include <MimeTreeParser/NodeHelper>
+
+#include <QMimeDatabase>
+#include <QMimeType>
+#include <QTextCodec>
+#include <QDebug>
+
+class MailMimePrivate
+{
+public:
+    MailMimePrivate(MailMime *p);
+
+    MailMime *q;
+    KMime::Content *mNode;
+    std::shared_ptr<MailMime> parent;
+};
+
+MailMimePrivate::MailMimePrivate(MailMime* p)
+    : q(p)
+    , mNode(nullptr)
+    , parent(nullptr)
+{
+}
+
+
+MailMime::MailMime()
+    : d(std::unique_ptr<MailMimePrivate>(new MailMimePrivate(this)))
+{
+}
+
+QByteArray MailMime::cid() const
+{
+    if (!d->mNode || !d->mNode->contentID()) {
+        return QByteArray();
+    }
+    return d->mNode->contentID()->identifier();
+}
+
+QByteArray MailMime::charset() const
+{
+    if(!d->mNode || !d->mNode->contentType(false)) {
+        return QByteArray();
+    }
+    if (d->mNode->contentType(false)) {
+        return d->mNode->contentType(false)->charset();
+    }
+    return d->mNode->defaultCharset();
+}
+
+bool MailMime::isFirstTextPart() const
+{
+    if (!d->mNode || !d->mNode->topLevel()) {
+        return false;
+    }
+    return (d->mNode->topLevel()->textContent() == d->mNode);
+}
+
+bool MailMime::isFirstPart() const
+{
+   if (!d->mNode || !d->mNode->parent()) {
+       return false;
+   }
+   return (d->mNode->parent()->contents().first() == d->mNode);
+}
+
+bool MailMime::isTopLevelPart() const
+{
+    if (!d->mNode) {
+        return false;
+    }
+    return (d->mNode->topLevel() == d->mNode);
+}
+
+MailMime::Disposition MailMime::disposition() const
+{
+    if (!d->mNode) {
+        return Invalid;
+    }
+    const auto cd = d->mNode->contentDisposition(false);
+    if (!cd) {
+        return Invalid;
+    }
+    switch (cd->disposition()){
+        case KMime::Headers::CDinline:
+            return Inline;
+        case KMime::Headers::CDattachment:
+            return Attachment;
+        default:
+            return Invalid;
+    }
+}
+
+QString MailMime::filename() const
+{
+    if (!d->mNode) {
+        return QString();
+    }
+    const auto cd = d->mNode->contentDisposition(false);
+    if (!cd) {
+        return QString();
+    }
+    return cd->filename();
+}
+
+QMimeType MailMime::mimetype() const
+{
+    if (!d->mNode) {
+        return QMimeType();
+    }
+
+    const auto ct = d->mNode->contentType(false);
+    if (!ct) {
+        return QMimeType();
+    }
+
+    QMimeDatabase mimeDb;
+    return mimeDb.mimeTypeForName(ct->mimeType());
+}
+
+MailMime::Ptr MailMime::parent() const
+{
+    if (!d->parent) {
+        d->parent = std::shared_ptr<MailMime>(new MailMime());
+        d->parent->d->mNode = d->mNode->parent();
+    }
+    return d->parent;
+}
+
+QByteArray MailMime::decodedContent() const
+{
+    if (!d->mNode) {
+        return QByteArray();
+    }
+    return d->mNode->decodedContent();
+}
+
+class KeyPrivate
+{
+public:
+    Key *q;
+    GpgME::Key mKey;
+    QByteArray mKeyID;
+};
+
+Key::Key()
+    :d(std::unique_ptr<KeyPrivate>(new KeyPrivate))
+{
+    d->q = this;
+}
+
+
+Key::Key(KeyPrivate *d_ptr)
+    :d(std::unique_ptr<KeyPrivate>(d_ptr))
+{
+    d->q = this;
+}
+
+Key::~Key()
+{
+
+}
+
+QString Key::keyid() const
+{
+    if (!d->mKey.isNull()) {
+        return d->mKey.keyID();

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/interface.h Added

@@ -0,0 +1,378 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsystems.com>
+
+    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.
+*/
+
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include <QDateTime>
+#include <QUrl>
+#include <QMimeType>
+
+class Part;
+class PartPrivate;
+
+class MailMime;
+class MailMimePrivate;
+
+class AlternativePart;
+class AlternativePartPrivate;
+
+class SinglePart;
+class SinglePartPrivate;
+
+class EncryptionPart;
+class EncryptionPartPrivate;
+
+class EncapsulatedPart;
+class EncapsulatedPartPrivate;
+
+class Content;
+class ContentPrivate;
+
+class CertContent;
+class CertContentPrivate;
+
+class EncryptionError;
+
+class Key;
+class KeyPrivate;
+class Signature;
+class SignaturePrivate;
+class Encryption;
+class EncryptionPrivate;
+
+typedef std::shared_ptr<Signature> SignaturePtr;
+typedef std::shared_ptr<Encryption> EncryptionPtr;
+
+class Parser;
+class ParserPrivate;
+
+/* 
+ * A MessagePart that is based on a KMime::Content
+ */
+class MailMime
+{
+public:
+    typedef std::shared_ptr<MailMime> Ptr;
+    /**
+     *  Various possible values for the "Content-Disposition" header.
+     */
+    enum Disposition {
+        Invalid,           ///< Default, invalid value
+        Inline,            ///< inline
+        Attachment        ///< attachment
+    };
+
+    MailMime();
+
+    // interessting header parts of a KMime::Content
+    QMimeType mimetype() const;
+    Disposition disposition() const;
+    QUrl label() const;
+    QByteArray cid() const;
+    QByteArray charset() const;
+    QString filename() const;
+
+    // Unique identifier to ecactly this KMime::Content
+    QByteArray link() const;
+
+    QByteArray content() const;
+    //Use default charset
+    QString encodedContent() const;
+
+    // overwrite default charset with given charset
+    QString encodedContent(QByteArray charset) const;
+
+    QByteArray decodedContent() const;
+
+    bool isFirstTextPart() const;
+    bool isFirstPart() const;
+    bool isTopLevelPart() const;
+
+    MailMime::Ptr parent() const;
+
+private:
+    std::unique_ptr<MailMimePrivate> d;
+
+    friend class PartPrivate;
+};
+
+class Content
+{
+public:
+    typedef std::shared_ptr<Content> Ptr;
+    Content(const QByteArray &content, Part *parent);
+    Content(ContentPrivate *d_ptr);
+    virtual ~Content();
+
+    QByteArray content() const;
+
+    QByteArray charset() const;
+
+    //Use default charset
+    QString encodedContent() const;
+
+    // overwrite default charset with given charset
+    QString encodedContent(const QByteArray &charset) const;
+
+    QVector<SignaturePtr> signatures() const;
+    QVector<EncryptionPtr> encryptions() const;
+    MailMime::Ptr mailMime() const;
+    virtual QByteArray type() const;
+    Part* parent() const;
+private:
+    std::unique_ptr<ContentPrivate> d;
+};
+
+class PlainTextContent : public Content
+{
+public:
+    PlainTextContent(const QByteArray &content, Part *parent);
+    PlainTextContent(ContentPrivate *d_ptr);
+    QByteArray type() const Q_DECL_OVERRIDE;
+};
+
+class HtmlContent : public Content
+{
+public:
+    HtmlContent(const QByteArray &content, Part *parent);
+    HtmlContent(ContentPrivate* d_ptr);
+    QByteArray type() const Q_DECL_OVERRIDE;
+};
+
+/*
+ * importing a cert GpgMe::ImportResult
+ * checking a cert (if it is a valid cert)
+ */
+
+class CertContent : public Content
+{
+public:
+    typedef std::shared_ptr<CertContent> Ptr;
+    CertContent(const QByteArray &content, Part *parent);
+
+    QByteArray type() const Q_DECL_OVERRIDE;
+    enum CertType {
+        Pgp,
+        SMime
+    };
+
+    enum CertSubType {
+        Public,
+        Private
+    };
+
+    CertType certType() const;
+    CertSubType certSubType() const;
+    int keyLength() const;
+
+private:
+    std::unique_ptr<CertContentPrivate> d;
+};
+
+class Part
+{
+public:
+    typedef std::shared_ptr<Part> Ptr;
+    Part();
+    virtual QByteArray type() const;
+
+    virtual QVector<QByteArray> availableContents() const;

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/interface_p.h Added

@@ -0,0 +1,56 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsystems.com>
+
+    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.
+*/
+
+#pragma once
+
+#include "interface.h"
+
+#include <QSharedPointer>
+#include <QMap>
+
+namespace KMime
+{
+    class Message;
+    typedef QSharedPointer<Message> MessagePtr;
+}
+
+namespace MimeTreeParser
+{
+    class MessagePart;
+    class NodeHelper;
+    typedef QSharedPointer<MessagePart> MessagePartPtr;
+}
+
+class ParserPrivate
+{
+public:
+    ParserPrivate(Parser *parser);
+
+    void setMessage(const QByteArray &mimeMessage);
+    void createTree(const MimeTreeParser::MessagePartPtr& start, const Part::Ptr& tree);
+
+    Part::Ptr mTree;
+    Parser *q;
+
+    MimeTreeParser::MessagePartPtr mPartTree;
+    KMime::MessagePtr mMsg;
+    std::shared_ptr<MimeTreeParser::NodeHelper> mNodeHelper;
+    QString mHtml;
+    QMap<QByteArray, QUrl> mEmbeddedPartMap;
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/objecttreesource.cpp Added

@@ -0,0 +1,152 @@
+/*
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
+  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
+
+  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 "objecttreesource.h"
+
+#include <MimeTreeParser/AttachmentStrategy>
+#include <MimeTreeParser/BodyPartFormatterBaseFactory>
+#include <MimeTreeParser/MessagePart>
+#include <MimeTreeParser/MessagePartRenderer>
+
+class ObjectSourcePrivate
+{
+public:
+    ObjectSourcePrivate()
+        : mWriter(0)
+        , mAllowDecryption(true)
+        , mHtmlLoadExternal(true)
+        , mPreferredMode(MimeTreeParser::Util::Html)
+    {
+
+    }
+    MimeTreeParser::HtmlWriter *mWriter;
+    MimeTreeParser::BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory;
+    bool mAllowDecryption;
+    bool mHtmlLoadExternal;
+    MimeTreeParser::Util::HtmlMode mPreferredMode;
+};
+
+ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer)
+        : MimeTreeParser::Interface::ObjectTreeSource()
+        , d(new ObjectSourcePrivate)
+    {
+        d->mWriter = writer;
+    }
+
+ObjectTreeSource::~ObjectTreeSource()
+{
+    delete d;
+}
+
+void ObjectTreeSource::setAllowDecryption(bool allowDecryption)
+{
+    d->mAllowDecryption = allowDecryption;
+}
+
+MimeTreeParser::HtmlWriter *ObjectTreeSource::htmlWriter()
+{
+    return d->mWriter;
+}
+
+bool ObjectTreeSource::htmlLoadExternal() const
+{
+    return d->mHtmlLoadExternal;
+}
+
+void ObjectTreeSource::setHtmlLoadExternal(bool loadExternal)
+{
+    d->mHtmlLoadExternal = loadExternal;
+}
+
+bool ObjectTreeSource::decryptMessage() const
+{
+    return d->mAllowDecryption;
+}
+
+bool ObjectTreeSource::showSignatureDetails() const
+{
+    return true;
+}
+
+int ObjectTreeSource::levelQuote() const
+{
+    return 1;
+}
+
+const QTextCodec *ObjectTreeSource::overrideCodec()
+{
+    return Q_NULLPTR;
+}
+
+QString ObjectTreeSource::createMessageHeader(KMime::Message *message)
+{
+    return QString();
+}
+
+const MimeTreeParser::AttachmentStrategy *ObjectTreeSource::attachmentStrategy()
+{
+    return MimeTreeParser::AttachmentStrategy::smart();
+}
+
+QObject *ObjectTreeSource::sourceObject()
+{
+    return Q_NULLPTR;
+}
+
+void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes)
+{
+      Q_UNUSED(mode);
+      Q_UNUSED(availableModes);
+}
+
+MimeTreeParser::Util::HtmlMode ObjectTreeSource::preferredMode() const
+{
+    return d->mPreferredMode;
+}
+
+bool ObjectTreeSource::autoImportKeys() const
+{
+    return false;
+}
+
+bool ObjectTreeSource::showEmoticons() const
+{
+    return false;
+}
+
+bool ObjectTreeSource::showExpandQuotesMark() const
+{
+    return false;
+}
+
+bool ObjectTreeSource::isPrinting() const
+{
+    return false;
+}
+
+const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFormatterFactory()
+{
+    return &(d->mBodyPartFormatterBaseFactory);
+}
+
+MimeTreeParser::Interface::MessagePartRenderer::Ptr ObjectTreeSource::messagePartTheme(MimeTreeParser::Interface::MessagePart::Ptr msgPart)
+{
+    Q_UNUSED(msgPart);
+    return MimeTreeParser::Interface::MessagePartRenderer::Ptr();
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/objecttreesource.h Added

@@ -0,0 +1,57 @@
+/*
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
+  Copyright (c) 2009 Andras Mantia <andras@kdab.net>
+
+  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 MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
+#define MAILVIEWER_OBJECTTREEEMPTYSOURCE_H
+
+#include <MimeTreeParser/ObjectTreeSource>
+
+class QString;
+
+class ObjectSourcePrivate;
+class ObjectTreeSource : public MimeTreeParser::Interface::ObjectTreeSource
+{
+public:
+    ObjectTreeSource(MimeTreeParser::HtmlWriter *writer);
+    virtual ~ObjectTreeSource();
+    void setHtmlLoadExternal(bool loadExternal);
+    bool decryptMessage() const Q_DECL_OVERRIDE;
+    bool htmlLoadExternal() const Q_DECL_OVERRIDE;
+    bool showSignatureDetails() const Q_DECL_OVERRIDE;
+    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) Q_DECL_OVERRIDE;
+    MimeTreeParser::Util::HtmlMode preferredMode() const Q_DECL_OVERRIDE;
+    void setAllowDecryption(bool allowDecryption);
+    int levelQuote() const Q_DECL_OVERRIDE;
+    const QTextCodec *overrideCodec() Q_DECL_OVERRIDE;
+    QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE;
+    const MimeTreeParser::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE;
+    MimeTreeParser::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE;
+    QObject *sourceObject() Q_DECL_OVERRIDE;
+    bool autoImportKeys() const Q_DECL_OVERRIDE;
+    bool showEmoticons() const Q_DECL_OVERRIDE;
+    bool showExpandQuotesMark() const Q_DECL_OVERRIDE;
+    bool isPrinting() const Q_DECL_OVERRIDE;
+    const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE;
+    MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE;
+private:
+    ObjectSourcePrivate *const d;
+};
+
+#endif
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/stringhtmlwriter.cpp Added

@@ -0,0 +1,150 @@
+/*  -*- c++ -*-
+    filehtmlwriter.cpp
+
+    This file is part of KMail, the KDE mail client.
+    Copyright (c) 2003 Marc Mutz <mutz@kde.org>
+
+    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 "stringhtmlwriter.h"
+
+#include <QDebug>
+#include <QTextStream>
+#include <QUrl>
+
+StringHtmlWriter::StringHtmlWriter()
+    : MimeTreeParser::HtmlWriter()
+    , mState(Ended)
+{
+}
+
+StringHtmlWriter::~StringHtmlWriter()
+{
+}
+
+void StringHtmlWriter::begin(const QString &css)
+{
+    if (mState != Ended) {
+        qWarning() << "begin() called on non-ended session!";
+        reset();
+    }
+
+    mState = Begun;
+    mExtraHead.clear();
+    mHtml.clear();
+
+    if (!css.isEmpty()) {
+        write(QLatin1String("\n"));
+    }
+}
+
+void StringHtmlWriter::end()
+{
+    if (mState != Begun) {
+        qWarning() << "Called on non-begun or queued session!";
+    }
+
+    if (!mExtraHead.isEmpty()) {
+        insertExtraHead();
+        mExtraHead.clear();
+    }
+    resolveCidUrls();
+    mState = Ended;
+}
+
+void StringHtmlWriter::reset()
+{
+    if (mState != Ended) {
+        mHtml.clear();
+        mExtraHead.clear();
+        mState = Begun; // don't run into end()'s warning
+        end();
+        mState = Ended;
+    }
+}
+
+void StringHtmlWriter::write(const QString &str)
+{
+    if (mState != Begun) {
+        qWarning() << "Called in Ended or Queued state!";
+    }
+    mHtml.append(str);
+}
+
+void StringHtmlWriter::queue(const QString &str)
+{
+    write(str);
+}
+
+void StringHtmlWriter::flush()
+{
+    mState = Begun; // don't run into end()'s warning
+    end();
+}
+
+void StringHtmlWriter::embedPart(const QByteArray &contentId, const QString &url)
+{
+    write("\n");
+    mEmbeddedPartMap.insert(contentId, url);
+}
+
+void StringHtmlWriter::resolveCidUrls()
+{
+    for (const auto &cid : mEmbeddedPartMap.keys()) {
+        mHtml.replace(QString("src=\"cid:%1\"").arg(QString(cid)), QString("src=\"%1\"").arg(mEmbeddedPartMap.value(cid).toString()));
+    }
+}
+
+void StringHtmlWriter::extraHead(const QString &extraHead)
+{
+    if (mState != Ended) {
+        qWarning() << "Called on non-started session!";
+    }
+    mExtraHead.append(extraHead);
+}
+
+
+void StringHtmlWriter::insertExtraHead()
+{
+    const QString headTag(QStringLiteral("<head>"));
+    const int index = mHtml.indexOf(headTag);
+    if (index != -1) {
+        mHtml.insert(index + headTag.length(), mExtraHead);
+    }
+}
+
+QMap<QByteArray, QUrl> StringHtmlWriter::embeddedParts() const
+{
+    return mEmbeddedPartMap;
+}
+
+QString StringHtmlWriter::html() const
+{
+    if (mState != Ended) {
+        qWarning() << "Called on non-ended session!";
+    }
+    return mHtml;
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/stringhtmlwriter.h Added

@@ -0,0 +1,71 @@
+/*  -*- c++ -*-
+
+    Copyright (c) 2016 Sandro Knauß <sknauss@kde.org>
+
+    Kube 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.
+
+    Kube 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 __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__
+#define __KUBE_FRAMEWORK_MAIL_STRINGHTMLWRITER_H__
+
+#include <MimeTreeParser/HtmlWriter>
+
+#include <QFile>
+#include <QTextStream>
+
+class QString;
+
+class StringHtmlWriter : public MimeTreeParser::HtmlWriter
+{
+public:
+    explicit StringHtmlWriter();
+    virtual ~StringHtmlWriter();
+
+    void begin(const QString &cssDefs) Q_DECL_OVERRIDE;
+    void end() Q_DECL_OVERRIDE;
+    void reset() Q_DECL_OVERRIDE;
+    void write(const QString &str) Q_DECL_OVERRIDE;
+    void queue(const QString &str) Q_DECL_OVERRIDE;
+    void flush() Q_DECL_OVERRIDE;
+    void embedPart(const QByteArray &contentId, const QString &url) Q_DECL_OVERRIDE;
+    void extraHead(const QString &str) Q_DECL_OVERRIDE;
+
+    QString html() const;
+    QMap<QByteArray, QUrl> embeddedParts() const;
+private:
+    void insertExtraHead();
+    void resolveCidUrls();
+
+    QString mHtml;
+    QString mExtraHead;
+    enum State {
+        Begun,
+        Queued,
+        Ended
+    } mState;
+    QMap<QByteArray, QUrl> mEmbeddedPartMap;
+};
+
+#endif // __MESSAGEVIEWER_FILEHTMLWRITER_H__

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/CMakeLists.txt Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/alternative.mbox Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/cid-links.mbox Added

@@ -0,0 +1,1384 @@
+Message-ID: <851f01d15e53$31734730$790bc9ad@info>
+From: "OculusLab" <info@findermanze.co.ua>
+To: <info@example.org>
+Subject: CID links for images
+Date: Wed, 03 Feb 2016 07:19:17 +0200
+MIME-Version: 1.0
+Content-Type: multipart/related;
+	type="multipart/alternative";
+	boundary="----=_NextPart_000_000F_01D15E52.0BD654A0"
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Windows Live Mail 14.0.8117.416
+X-MimeOLE: Produced By Microsoft MimeOLE V14.0.8117.416
+
+ This is a multi-part message in MIME format.
+
+------=_NextPart_000_000F_01D15E52.0BD654A0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0010_01D15E52.0BD654A0"
+
+------=_NextPart_000_0010_01D15E52.0BD654A0
+Content-Type: text/plain;
+	charset="windows-1251"
+Content-Transfer-Encoding: quoted-printable
+
+=0D=0A=0D=0A=0D=0A=0D=0ASuperkombipackung f&#252;r nur 45 Euro=0D=
+=0A=0D=0A
+------=_NextPart_000_0010_01D15E52.0BD654A0
+Content-Type: text/html;
+	charset="windows-1251"
+Content-Transfer-Encoding: quoted-printable
+
+<HTML><HEAD>=0D=0A<META http-equiv=3D"Content-Type" content=3D"te=
+xt/html; charset=3Dwindows-1251">=0D=0A</HEAD>=0D=0A<BODY bgColor=
+=3D#ffffff>=0D=0A<DIV align=3Dcenter><FONT size=3D2 face=3DArial>=
+<A =0D=0Ahref=3D"http://intenices.co.ua/drugs-store/index.html"><=
+STRONG><FONT =0D=0Asize=3D4>Superkombipackung f&#252;r nur 45 Eur=
+o</FONT></STRONG></A><BR><BR><A =0D=0Ahref=3D"http://intenices.co=
+.ua/drugs-store/index.html"><IMG border=3D0 hspace=3D0 alt=3D""=20=
+src=3D"cid:9359201d15e53f31a68c307b3369b6@info" width=3D650 heigh=
+t=3D763></A></FONT></DIV></BODY></HTML>
+
+------=_NextPart_000_0010_01D15E52.0BD654A0--
+
+------=_NextPart_000_000F_01D15E52.0BD654A0
+Content-Type: image/jpeg;
+	name="aqnaozisxya.jpeg"
+Content-Transfer-Encoding: base64
+Content-ID: <9359201d15e53f31a68c307b3369b6@info>
+
+/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/sABFEdWNreQABAAQAAAA8AAD/4QMqaHR0cDov
+L25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENl
+aGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4
+OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA1LjUtYzAxNCA3OS4xNTE0ODEsIDIwMTMvMDMvMTMtMTI6
+MDk6MTUgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5
+OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHht
+bG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6
+Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUu
+Y29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBo
+b3Rvc2hvcCBDQyAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjdCRTg5MTBD
+OUNGMTFFNUJBOTdEMkQyNzU0ODI3RDciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjdCRTg5
+MTFDOUNGMTFFNUJBOTdEMkQyNzU0ODI3RDciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5z
+dGFuY2VJRD0ieG1wLmlpZDpCN0JFODkwRUM5Q0YxMUU1QkE5N0QyRDI3NTQ4MjdENyIgc3RSZWY6
+ZG9jdW1lbnRJRD0ieG1wLmRpZDpCN0JFODkwRkM5Q0YxMUU1QkE5N0QyRDI3NTQ4MjdENyIvPiA8
+L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0i
+ciI/Pv/uAA5BZG9iZQBkwAAAAAH/2wCEAAYEBAQFBAYFBQYJBgUGCQsIBgYICwwKCgsKCgwQDAwM
+DAwMEAwODxAPDgwTExQUExMcGxsbHB8fHx8fHx8fHx8BBwcHDQwNGBAQGBoVERUaHx8fHx8fHx8f
+Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fH//AABEIAvsCigMBEQACEQED
+EQH/xADJAAEAAgMBAQEAAAAAAAAAAAAAAwQBAgUGBwgBAQEBAQEBAQAAAAAAAAAAAAABAgMEBQYQ
+AAEEAgEDAgQCBAgKCQMACwIAAQMEEQUSIRMGMUFRIjIUYXGBQhUHkaGxUiMzFhfB0WJy0+OkZZVW
+8ILSsyQ0lFU24UN1U4MlssJzhLQ1djcRAQABAgMEBQkFBwQBBAIDAAABEQIhMQNBUWEScYGRoQTw
+scHRIjJSYhPhQpKyFfFygqIzUwXCI2Nzk9JDsxSDNPLD0//aAAwDAQACEQMRAD8A/VKAgICAgICA
+gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA
+gICAgICAgICAgICAgICAgICAg1y6Bl0DLoGXQMugZdBrIZMBOz9WZBpWkM68Zk+SIWd3QS8nQOTo
+HJ0Dk6BydA5OgcnQOToGXQMugZdAy6Bl0DLoGXQMugOT4dAYnwyA7ughaWTPqgkIyaNnz16INQkN
+3bL+6BJIbHhn6INozJ2fL+6DbLoI5JDYmZn6KDJGTR8s9VQiM39Xyg1GWRy6v0ygkMiYXdn6sghG
+aRxd8/yItGAnldupfxMoUZ70nx/kQO9J8f5EKAzSO3r/ABMhRnuyfH+RCg0snXqgNNI/v/Igd2T4
+/wAiDLSyfFCjDSyfH+RUZ7snx/kUBpTz6oMd2TPr/Igz3JPj/Igy0knx/kQY7smX6oMd2T4/yIMj
+Kb+6B3T5O2eiVKHdP4oUO5J8UqtGHlk5Yz/IpUoz3ZPiqUO7J8UKDynluqIy8h/FA7h/FKlApDZv
+VAaU/ilSjPcP4oDyHjOUGO4eG6oUZ5l8UGeZY9VUatIePVRR5Dz6pUoyxnn1QBkN3fqgy5l8UQYy
++KDcXd2fPxVGUBBqgICAgICDSb+qL8nQR0//ACkP+YyEpkBAQEBAQEBEEBAQEBAQEBAL0dAb0ZFH
+9HQQD6oJJP6pv0INY/Vvz/wIMS/1n8CCSL6X/N0G6CKT62UGS/qv0/4VQhQRh9Tfmglm/qyQQD9D
+qNNY/pQbeyIN7ooHogyiDe6KwPoiMorLIA+6IOisj6ojA+roNnQG9UGG9XQY90VkcZwlUox+u/5I
+CKZdBh/qUGVQZQZf1ZVGSRWGUGS9FUYZRWW9FRkvpRGG9kGXQBfogx7IMe7KKzyVQjz1yg2QZZEb
+h6P+ao2QEGqAgICAgII5v6ovydBrU/8AKw/5jfyISlQEBAQEBAQEBEEBAQEBAQEGC9H/ACRWWQH9
+HQQA/VBJJ/Vt+hBrF6t+f+BBiX6/4EEkX0v+boNkEUn1fwINj/qkCH0QRx45t+aCWb+rJCFdiHi7
+Z6qNNQdmH1QZcm+KAxNh+qAJizdXQbcw+KIx3A69UATHHqgzzFAYx69UBjFAcx/FAaQW+KA0jdej
+oM9xvg6VBpWz6Og1KVhZ3wpMqoWLcT5Zn5l/E36FiZbiEMcxM/yk7fBn9FKrRdrWib+s+b4EtRLM
+wsjIxNkevxWmWWd3b0VSrHVy9FFqy7v8FSpyf4IlRyd39EByf4KByL4ItRyJ/ZEORfBFqMRfBBly
+LGMKoMT/AAQZ5O/sgMRM2MIGS+CB83rhCo3L4IMixNnp6oM/N8EGW5fBESR+j/mqNkBBqgICAgIC
+COb+pP8AJ0Ia1f8AysX+YP8AIhKVAQEBAQEBAQEQQEUQEBAQEGC+l/yQZZEH9HRUIt1dBvJ/Vsg1
+j9W/NBiX63QSR/S/5ug2QRyN8yDJf1aBH/gQaRt87fmiJJGyDsiq/bH4IHBvggcWQOLIHFkoM8UD
+igcUDCDOEDCBhAw6BxQOKUEdiUII3kP0b0/F1JlYhxLV6WZ85wDensy5TLrEIBlZ/R/8ClFSx8fV
+mf8AHDqKTW3hw7Pyz6P/AIHVhmUsV83wYu3zdOnXL/irWhRcr7VsfMPp649cfktRezNjoQyxzNzB
+8t7t8FuJYmEhMqjGEDCBhQMICAgICBhUZwgYUGcKjOEDCBhBnCAiNw9EVlAQaoCAgICAgjn/AKk/
+ydCGK3/lov8AMH+RQlIqCAgICAgICAgIgiqNvcU6zuJE5G36rLya3jdPTzl30/DX35OdN5KT9Yos
+N/le/wDAvBd/l91r1W+A3ygfyW2xdAFm/HLrl+q37odP/oWpI/KDb+siZ/yddbf8tvhi7wG6V+p5
+DQndhd3jN/Yv/ovZo+P078MpebU8JfbxdHmJA7i+WdvVe2HmbMqD+joIvig3P6GQah6sgxJ9SDeP
+6f0ug2QaH9SDL/QyBH7/AJIjQPqb80EhfS6KjQYwqGEDCBhAwoGEGcIGEDCBhAx1QMIM4QV7dyGs
+GTf5n+gPd1JlYhwLmxlmfMjtxz8oN6MuczV0iFXu8ny7cvglFqzgjdnF8v8AzSSglA3jJhJuLH9L
+/AlKFUdkWlDmPQmd+Y/l7stQksRs4VzIX/ml/A6ysJ2L5mkF/mf6g+P4skrC3RtPDNkX+V/b8Pg/
+5JEpdFXoGJiFib0fqy6w4yKjGEDCAgYQMICBhAwgygIMoggICDKAg2H0RWUBBqgICAgICCOdv6E/
+ydAgbEEbfAR/kUJbqggICAgICAgINZJAjBzN2EW9XdZuui2KzkttszNIed2O6nmJwhJwib3b1f8A
+SvgeK/yF12FuEPq6HhItxuzcp+r9fV/dfLmXtho/RZmVRv6qVaY6f41ao1J2Z+nqt2osVNtcqP8A
+0Zu4+4P1b+NezQ8ZfZOE4PPq+Htvzeq1m4r3Y2diZpf1g92/hX6DQ8RbqRhm+TraM2Ti6OWcXwvQ
+4ovb9CI3P6WQah9TIof1Og2i+j9LoNkGhfUgy/0MiAe/5INA+pvzQSF6OitEGEBUEBQEBBlAwgYQ
+EBkGUGHQeW2l0p7BOz/Kz8Rb4MucukKMZOTkzv6YVoDdxy+Qmz8EEwETfV8pe7/UP8HspKwnHq3t
++Wen54dZVGdaYMkP0/BnyrUo2qj8pRF6Y/l/xKStGQZhftn1cOjfiyC2Ds7YHHX3wpJDr6+bI9p/
+X1H/AAst2S53wuLowwgICAgICAgICAgyiCDKgwqMoCDYfRFZQEGqAgICAgII5/6k/wDNf+RAh/qY
+/wDNH+RCW6AgICAgICAgP0Qeb2+xKxIUMf8AUg+Pzdl+f8f4qb55Yyh9XwuhyxzTm5jr5s2vbVo7
+sy5y0qlcjY+LO5P+DZUWjdiY8O36VlWCd8KwNHW6owTqxKNY5zhkaSN8EL5ZdtPVm2aw532xdFJe
+w1O4C3E+ekjN8zL9N4fxEaltdr4utozZLoiTO36F6HBLJ9LIrUH+Zv0oBv8AMg2j+j9LoNkGhfUg
+y/0MiAe/5INA+pvzQSF6IrTCBhAQEDCBhAQEBBlAwgICCtsZOFYm5cOXRy+De7qSsPKSNxFibrl/
+RYdIRkOBZh9/qZBhoHJ2cXw/4JUouhVnN26fN74UqtFmPXyZ9MP7/BRVptezD1UVUmrlCXJvRRUM
+g8nGRs/B/wBCrKeFwd/Vs+7oLlWXjIz5y7Plnb3+KsZsy7LOztlvR12hykQYQHygxl0DqgdVAy6B
+1VGcugdUDqgZdAy6DPVARBBuPoisoCDVAQEBAQEEc/8AUn/mv/IgQ/1Mf+aP8iDdAQEBAQEBARHP
+3Nx69bAvg5OjLx+O1/p2cZenw2lz3cHm2Z36v1+Lr85ES+xLBP0d1LpIVZ2IgJh9XXCXWGkNeKMe
+vQn9XZShUZwaTgz/ADerOpRWZGf1WkhC5deqojN3/QrA0zlnZ10iWaJKV+SpZA2L5c4Jvwdevwmv
+yXxOxw8Rpc9r21G00sYkz5Ymyy/SxNYq+HMUmjom/wArKjAfUyDB/W6CQPpZBlQaF9SqMv8AQyAH
+q/5INA+tkEr+iK0QEBBhBlAQYylRSsbWvE7iH9ITfD0/hWZuai1Rk3kz9G4h/G6zzNcqD9pXTfpI
+X6FKytIavPZfryN3/N/8aVlaQnh2NyP15OzfqkyRdKTa61O7HZDI9Cb6hXSJq5zFFHcvKRRxsPR2
+LH4+nRZuatcEMmOP1gf0+LLLS1TrjIXpkVKtxDpxVIQfoLILIADejIiQWZ3VG+ESqvZrsUb49VJh
+Ylxi5xScXZ/zZRUjkWMMwv8AFjRlmKRmPp0dvUX9WdUegrSc4RL8F1tcrkqqCIOisICAgICAgICD
+KAgIggINx9EVlAQaoCAgICAgjn/qT/zX/kQZi/qg/wA1v5EGyAgICAgICBnCDyu7td638r/KPRl+
+e/yWrzXU2Pr+D06WqjE+MLwxk9NGkh9HbKxMrEObJscy9qEXMm9X9GZcrpdIg43JHzlh+KZKkgq9
+s3kM+cjthn9mWRrbsBG2P4FuiKJBen+YH4j6rFWm0LWhfjK7E3tj1Vi8olJnbC6RLKCTPwXSGZel
+8ftuVZgd+oPj9C/SeB1ObTjg+L4uyl/S9UBsUYr2PM3D6mQJPqdBtH9DINkGhfUgy/0MiAe/5INQ
++pkEj+iK1dBhUFAQYQRzTxwg5yPhm/h/QkyRDhbDcyzM4RC8cXu7+rrEy3EOY0sj9Gzj+BZo0lir
+yk7Zd2z7e6EOpV1uWZzf9Cir8dSEPQWVoVSPFHjHFsJRKq0lTi/OAnik+LeiGbE5jbpSNM3GaFnJ
+mHp1ZvVvzW82MnmwJiMWy+Xf0WZdLXaqRNGLN8errm6LguqjdlUbi6sIkZ1UZJmJsKI5luu+XfHV
+lltVNmLDtjPuLoiM8i/p83t1/wASIvUdjLGLATfJnHxdbiWbrXbZ8tn1XRzEB0GEBBnCAgIggIog
+IggICDKDYfRFZQEGqAgICAgII5/6mT/Nf+RBmP8Aqw/zW/kQbICAgINJJoomzIbA3xJ8KTMRmREy
+oT+Q6uJnxKxu3sPX+NcLvE2RtdY0L52OdN5hE3SKHl+Lu/8AiXC7x0bIdo8JO2VKXy+6TOwxgOWf
+4v8A4Vxu8ddudY8Ja5El+U3cn9V4L7YumsvXbhk0a7Mz/V/IpyQtZay25TFxd8s/uPR1yv0NzcXp
+acUEcWY25O/u/qvHdp0l05kss7DgePF0mGoakeWzlZVQiF7N92LqAN+j1S6dw6UztCPEWZmwpEJD
+myzcLMbfzss6t0NQszC3b5M3srbKSpG/o/w9WXaJYdLx+V+5J16PjDL7X+Luzh83x8ZS9tUkyAsv
+rvnLgev6EGD+p0RtH9DIrIkJDyF8t8WUGpeqqMv9DIAe6DUPqZBI6K1QYVBQEGpkwi5P6M2XSR5z
+Y7J5ZHx0Fugs3q65zi6Rg5fM5C+DfH4K0KrEAuT4D9Jv7rMrDsUqrN19/d1FdEWZmWkbIjKg1cco
+tVeUTB+Ytl/dvYm+CRJMPNHEMN5xb6eeR/Bn6s36PRanJLXbhZ3FlydloWZaZlvhEZHCsDdzEfV8
+IgEgF6E2USWZIhNuqUKuLYrnHO7M/R36LLTcK+XZnLDt9TejosQmKs4kwv8ATkWz/CrBdLtMzMzM
+3o3Rl1eeRUHUGFRlEEBFEBEEUQEQQEBBlQbD6KqygINUBAQEBBhBpP8A1Mn+a/8AIgzH/Vj+TfyI
+NkGHdmbLvhm9XdQc63v9dWyzn3Db9UOq4anibLXazQuucO75ValyNce0L++cuvFqeNmcsHqs8LEZ
+4uPNZnmLlIbm/wCLrx3Xzdm9MWxGSF1lpjig1f4JVWEGroNX6JVG0Vh4ZAL/AO2b4L8HdYvsqtV5
+jHOH915LraOtstTJnbDLlLpCvQFo55M9Hfrlc7mk9qUM+uWXSIZceEjt32cG+SP39lL2odu0fGDg
+3q6zaztcmR+vT1XotSXS0L/PI+PTHVfZ/wAXGcvm+PnJ7Ki/ysvsPmulG+XQayt87u7+j9ERIH9W
+osKEeulGJyKYnmw/04Yc/DClFqQfe8XITZ+HQoS9en4pAugYnEJN6OrCNh9/yVRoH1Mglf0RWqDC
+Agwg5+7ttBUcR6yS/KLfh7upKw807devV/dZbZAOXT0b1J1KizA7MbMPRmWZWHbqvkG+CCcpBFsk
+/wCTfFUac7ZP8kYiP+W/X+JFbhJZziQG/NnRKJuiqKs/3BE4g7AH871dRqHG2tQo5Ip+XP5mYnxj
+8sqlEoWbIj0YXb4O+Fh0mEkd8s4MW/MXZ1WV1pHIcs2UWivPLMw559tvgzdUqUQDKwOLuByufo7v
+/gZVmV+I5W6vE4t7P0UF0Xy2fT8FpiVOxHylZsdfisy3CvPXflydvT3brn8OijdqefPCJ3yzthyb
+8vj/AArTFzpA+RZdHCWVUHUVhUZQEBAQEBARBAQEBAQbj6IrKAg1QEBAQEBBpN/Un/mv/IgyP0D+
+TIObst7Wp5Af6Sb+az9G/NebW8TbZ0u2loTd0PNXd3ftO7FJwD+aHRfO1PFX3cHvs8Pba5zu7vl/
+4V55l2owpUY/FRWBMSLi3X8VmZWiYoHZst1SJEDt6qojL0VGH6IIzf0SBU2UhR0TNnwWWcfzyy1b
+mk5OhSsfcVwlZ/qbquetp0TTuTu74wvFda9Nste2+WJuj+65zDVVS1RtTE/akdmf2WcYaii7Q18d
+OLLvkv1nStUlFbsOZPjo3stxFEo5xG/J8fxLrCS7ujhIa/N2w8j/AMTdF+i/x2ny6dd743jL6303
+PW0mfiOF73kdCH6v0INJSfk7f5SgnD6GVBywzv1fHXp6qDn1JZAeUpYyBn5Ezuz/AByswrfWycoO
+BZY85w/4q2pK6P6y0jQPqZBK/oitUGEBAQec8ikL7sG/VEG4/m6zLUOWTsLM3v7/AIu6y0kZ3wwM
+/wCJOoqxTDnIwt6fFRYd6MWAWZlUH4i7mXt6P8GRVVr0k0rhGbRi3qRKkkdicLXZI+6D44mzdOqg
+vAbuPVEogsA5Fg+Xb93H1RXIkhsN3YyYuy+Xjcuvo+WSWobx1g+o2d8tjPr/ABKVamGWqQsLsDP1
+9/41ZlIhfoM7Bh+uOikEpZoBPLOyJEogiIH+XH4dFVWYhd/qfLqJKdui1DEsuIu+XbqqlWnAe7zx
+1ZsZWWnNOyMlp8FiIflbHv16ukpLsA2AZvddIcpbKoOisMgygICAgICIICAgICAg3H0RWUBBqgIC
+AgICCOb+pPP81/5EHn9vvch9vVf0bByf4l83xHi9lr3aHhttzzxu5Pl3y/uvnTL2xDR2UlWr9PV1
+BkB7mePVKlFXYc4wZvTL9fyRYTtCI1wdv1my7rMCCC0dS00cju8Ev0u/s6Sua1ZjYT6fS/VlYRWL
+qqjTLKjQsu7MyDj762Hy1xf6Op/mumnGNWb5dPSgUeviYujv1/hW9WKuVsujlfN1IeuxhzZmd/4l
+wmHWGoz490iBpNZ6fgrEEqckuc9VeUq1pxPZnaIP1n6/k3q69Xh9Gb74iHHW1IstmZetpwMABGLf
+KDMy/UW28sRD4N01mr0dePACtItRfV+hEaG/zl+aipg+hlRh3+V1Bq7/ACoDZx0SCWwO+CyqNQ+t
+v0oiV/RFaoMIDoCDzvkMMjW45n/q3HDfg7dXWZahxhdykz7N1UaS8sNj4qKu6w2aVvxUWHc9lAIB
+McF1b3ZFbRxRi2BFm/JsKo24Ogenyt6oAlERODuzu31Nlun5oNHhAmfGHF/ZFVhi7RcH9P1X/BSj
+dWDcfRvV1BJW6O6sJKyWHbD+6rCvJLwd2cHw3q7KNwlhlAmyLqwzMLAuzsqyyiKliGSaQIhNwZ3c
+pcfzW6Y/S6sRUmcE7Ua3RiFnwt8rHMs4w2PZGRAdFYZBlAQEBEEBAQEBAQEBBuPoisoCDVAQEBAQ
+EHF8g2BxD9tG+CkH53/B14vGa/LHLG16vDaXNNZeZJfIl9GGjsorR2QVJ2OSYYvQH6u6krDexLJB
+CRwvjh1x8UoN5Xa5rwMmwRs7LMSTFGmtnaau9aTpNF0/gVyVR27E4DGPWXORwkyQ6kpP9vGxdSZm
+ykIqE/VbRE7sgguWxqwvIX1v0Bv8K1FtSZebijku3hj9XkLJl+Hq69NsUcLpexjZhFhH0ZsMuepK
+WQ3InFvyXz9R67FdybGX9Vwl1aOWXSFaSyMwqooTWBAHz6v6LpbCTL0XjutKCu9iVv6aZujfzR9V
++h8F4b6dtZzl8fxWvzzSMoejpQO7s7svc8jv8OIig3i+r9CIiL6y/NRU4f1bKjUvpdQav9L/AJMo
+Mj7/AJqwNh/WVGgfWP6URK/oisIMIDoCDnb0GOg7O+MEzrMrDzDC3V29HWatjtl+n8SLRd10Zd1n
+duizMtRDuMXRRWwvlUSitMt/ZEQlG7k7sT9fVlFax14ImwAsOfgitmJh6t9Po7IILpMzCXwf+VlJ
+atUSl+dibrj2UbosVrcb9H6P8HVhmYWnsM+GHGfirVmg7OTdWy7olVZxcJcj0+LLLVVxjdnD8c5S
+rMwl5thaZo2gHqUj+pPhvyZdLYc7pbG+P0rbDbn8vT1UorbLe6UB+qlFYQZQEBARBAQEBAQEBAQb
+j6IrKAg1QEBAQEGHfDIPHbKV5rsx/jhv0dF8LxF3NfMvraNtLYhTdlwdmpD1UGhD0QhETe6CjtDd
+qpC3qbsLfpdSVhaYwr0YYy9cdGb1dSJWmKEqjmzWG/o5G/hwrWo2Do/Iup/FTlSrEkjl6utIhI/Z
+WFQTTBEDyydAH+N/grEJLzl+5Lamz1d36AK9FltHK65f10D1I+bv/Tl1J/h+C78uDhN1ZXX2oi2D
+Z/zZeXVtl2sbjtKsmG5dfg/RfPviXrtCtxYy5Nj82XOkt1QnsarZ/pG/QnJKVUZdm59I2x8Hf/Eu
+9mhMsXakOv4/opZ5Ru2x+RnyAF6l+OF9jwnhKYy+f4jxGyHs4IXL0ZfTfPdipXcRbog6EvoyDEf1
+P+SCIvrf83UROH9WyqtX+l1Bo7/L/AoMirBLcfQlRoH1j+lBK/ogwgwgIMIObuYpTqk4tlmdsv8A
+BlmVteeYgEx5f1bOzO34ZWKOsOvBWFhN2Fvlf0x69PRR0WI4xdssPH0y3wypRiUrM+MINxVEjKoH
+IwM7k+Gb3QoiEpZX+X5Q9cv6ujWEJhrM31yP+nC0zN6o2AuFGDuUZhyZ/wAfdZluZwRbN3CMP5vJ
+md/hllKJEufM5xtzYOTN6spDVU9RzmBjCJnZ/wAfxwrQrC/BWsZ+kY2zh/d1aMzdBMwMDcpDJ3z0
+H3fOESqOKnxzKee4ePld3dhZvZlJKrOfnz8G6KKwxORsLer9Fq1m6VxnZmw3oy7xDhMtCd3LDe3q
+qNm/gZQSNhQZwyDKgxhARREEBAQEBAQEBAQbj6IrKAg1QEBAQEGsn0F+T/yKTksZvFzN/Sm/xJ/5
+V+fvnGX2LckTssS01dkEZN0SgiNlFULkLyGD9flfOPxRU4t0EpG5GzYb8GWaLVsUjv0f0WqIhJ+q
+CJz6qiGWQAF5DfiP8qqVce3LZtlhh4RN9LOvf4bwV9+UPHr+Ms085Zq14IGcjHuSv6F6M36F9jS/
+xUR70vj6v+Wr7sN5J3frxwvTH+N0+LzfqWpsorHxL4rjf/iNOdsutv8AltSNkKxws7vgnZ/ZePV/
+wc/du7Xr0v8ANR96ERBKLt6l+S+XreBv084fU0fGWamUrVPUbK4bdqEuL/ruzsP8izp6F12UOl+r
+bGcvV6nxGvWdpbJd6X2Zugs6+hpeEi3GcXh1PEzOT08FbOGFsM3ozL1vM61apgcv8EFwQ4izIiaX
+2RWIvrf8kEUjuxM/s7uoJg/q2VGCYnF2H6sPjPplQhzq1y1MMuYwbtjy9X6v8P4lmGk1C1JYAjKP
+tszszdc5fGVbUlbF8sf/AE9lpGsf1t+lBK/ogwgwgICCG0DnXlFvqcXZv4FJIeONsuTP8WZYdHS1
+N5s/bSvg2+gs+uPbr7qy3F1XWxxdzZ3diZsj+XusDDPn09FESMrA3F1QkATHDtnHoiK5w2M4aTp+
+WPVHSKNgruzfM7k/4qnMyFYI5Hkbo5dHZSUm7BsdcLISxH9JNjPwf2f9CsOUzRxHaWKQoJv6yPo/
+4t7OszDtbODasBxlmM3Fs54t6ZSJbpEuiE85OzOX6cK1ZmyE8YCz8n+Yvi6MTLY8+ykogklZsv6J

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/html.mbox Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox Added

@@ -0,0 +1,115 @@
+From test@kolab.org Fri May 01 15:12:47 2015
+From: testkey <test@kolab.org>
+To: you@you.com
+Subject: enc & non enc attachment
+Date: Fri, 01 May 2015 17:12:47 +0200
+Message-ID: <13897561.XENKdJMSlR@tabin.local>
+X-KMail-Identity: 1197256126
+User-Agent: KMail/4.13.0.1 (Linux/3.19.1-towo.1-siduction-amd64; KDE/4.14.2; x86_64; git-cd33034; 2015-04-11)
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="nextPart1939768.sIoLGH0PD8"
+Content-Transfer-Encoding: 7Bit
+
+This is a multi-part message in MIME format.
+
+--nextPart1939768.sIoLGH0PD8
+Content-Type: multipart/encrypted; boundary="nextPart2814166.CHKktCGlQ3"; protocol="application/pgp-encrypted"
+
+
+--nextPart2814166.CHKktCGlQ3
+Content-Type: application/pgp-encrypted
+Content-Disposition: attachment
+Content-Transfer-Encoding: 7Bit
+
+Version: 1
+--nextPart2814166.CHKktCGlQ3
+Content-Type: application/octet-stream
+Content-Disposition: inline; filename="msg.asc"
+Content-Transfer-Encoding: 7Bit
+
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2
+
+hIwDGJlthTT7oq0BA/9cXFQ6mN9Vxnc2B9M10odS3/6z1tsIY9oJdsiOjpfxqapX
+P7nOzR/jNWdFQanXoG1SjAcY2FeZEN0c3SkxEM6R5QVF1vMh/Xsni1clI+peZyVT
+Z4OSU74YCfYLg+cgDnPCF3kyNPVe6Z1pnfWOCZNCG3rpApw6UVLN63ScWC6eQIUB
+DAMMzkNap8zaOwEIANKHn1svvj+hBOIZYf8R+q2Bw7cd4xEChiJ7uQLnD98j0Fh1
+85v7/8JbZx6rEDDenPp1mCciDodb0aCmi0XLuzJz2ANGTVflfq+ZA+v1pwLksWCs
+0YcHLEjOJzjr3KKmvu6wqnun5J2yV69K3OW3qTTGhNvcYZulqQ617pPa48+sFCgh
+nM8TMAD0ElVEwmMtrS3AWoJz52Af+R3YzpAnX8NzV317/JG+b6e2ksl3tR7TWp1q
+2FOqC1sXAxuv+DIz4GgRfaK1+xYr2ckkg+H/3HJqa5LmJ7rGCyv+Epfp9u+OvdBG
+PBvuCtO3tm0crmnttMw57Gy35BKutRf/8MpBj/nS6QFX0t7XOLeL4Me7/a2H20wz
+HZsuRGDXMCh0lL0FYCBAwdbbYvvy0gz/5iaNvoADtaIu+VtbFNrTUN0SwuL+AIFS
++WIiaSbFt4Ng3t9YmqL6pqB7fjxI10S+PK0s7ABqe4pgbzUWWt1yzBcxfk8l/47Q
+JrlvcE7HuDOhNOHfZIgUP2Dbeu+pVvHIJbmLsNWpl4s+nHhoxc9HrVhYG/MTZtQ3
+kkUWviegO6mwEZjQvgBxjWib7090sCxkO847b8A93mfQNHnuy2ZEEJ+9xyk7nIWs
+4RsiNR8pYc/SMvdocyAvQMH/qSvmn/IFJ+jHhtT8UJlXJ0bHvXTHjHMqBp6fP69z
+Jh1ERadWQdMaTkzQ+asl+kl/x3p6RZP8MEVbZIl/3pcV+xiFCYcFu2TETKMtbW+b
+NYOlrltFxFDvyu3WeNNp0g9k0nFpD/T1OXHRBRcbUDWE4QF6NWTm6NO9wy2UYHCi
+7QTSecBWgMaw7cUdwvnW6chIVoov1pm69BI9D0PoV76zCI7KzpiDsTFxdilKwbQf
+K/PDnv9Adx3ERh0/F8llBHrj2UGsRs4aHSEBDBJIHDCp8+lqtsRcINQBKEU3qIjt
+wf5vizdaVIgQnsD2z8QmBQ7QCCipI0ur6GKl+YWDDOSDLDUs9dK4A6xo/4Q0bsnI
+rH63ti5HslGq6uArfFkewH2MWff/8Li3uGEqzpK5NhP5UpbArelK+QaQQP5SdsmW
+XFwUqDS4QTCKNJXw/5SQMl8UE10l2Xaav3TkiOYTcBcvPNDovYgnMyRff/tTeFa8
+83STkvpGtkULkCntp22fydv5rg6DZ7eJrYfC2oZXdM87hHhUALUO6Y/VtVmNdNYw
+F3Uim4PDuLIKt+mFqRtFqnWm+5X/AslC31qLkjH+Fbb83TY+mC9gbIn7CZGJRCjn
+zzzMX2h15V/VHzNUgx9V/h28T0/z25FxoozZiJxpmhOtqoxMHp+y6nXXfMoIAD1D
+963Pc7u1HS0ny54A7bqc6KKd4W9IF7HkXn3SoBwCyn0IOPoKQTDD8mW3lbBI6+h9
+vP+MAQpfD8s+3VZ9r7OKYCVmUv47ViTRlf428Co6WT7rTHjGM09tqz826fTOXA==
+=6Eu9
+-----END PGP MESSAGE-----
+
+--nextPart2814166.CHKktCGlQ3--
+
+--nextPart1939768.sIoLGH0PD8
+Content-Disposition: attachment; filename="image.png"
+Content-Transfer-Encoding: base64
+Content-Type: image/png; name="image.png"
+
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAb
+rwAAG68BXhqRHAAAAAd0SU1FB9gHFg8aNG8uqeIAAAAGYktHRAD/AP8A/6C9p5MAAAkqSURBVHja
+5VV7cFTVGf/OPefeu3fv3t1NdhMSCHkKASEpyEsaGwalWEWntLV1Wu0fdOxAx9Iq0xntAwac6ehY
+p+rwKLbjjLRFh9JadURKRGgFQTTECCYQE9nNgzzYZDe7m33d1+l3tpOOU61T2tF/+s1s7pzn9/t+
+v993Av/3QT6FO6WdO/d+M55Il8rMOdrT0x3Zt++3+c8EgM/nozseeviJiYmpe1zOQdM8BOOCIku/
+lIj1VrQ/0r9n9+78xwLgeAA3w4fHXV1d5Omnn6aapumlJSVVqalUJJvJZRdcu0RSfZQsaW7mjfPm
+cbF9+/btEIlEaq6Z03whXyhIjDFuGIZEKSP5fMFRVcVNT2Vf0jzsmMxYGtel9rff/vM/M8bjcZpM
+Jp1XX32VNDc3e7ovRP3JyZGVNdXVd1FGGwKBQEM8njiWTKV36IHgEACwibGx62LjU/cBd01Zljoc
+p9DHmLbHsmyK1UuKooJt24IMcLE+y3L45eEYLS8LgWH4YXR0bAPZtGmTVFvfoBZMEzKpFKmqqmqp
+qane4DhOteH3L1FkWZVlGSzLAtd1Oe4773C4LxoZvDWXh82OY2MtwAuFvCvSyDIFXdelYDDIvF4d
+xPzA0AgXFStMcWPxBPGoKvXpPh6JDG5hK1Zcv1H36Xc6tsMs21EMQ69CLSts2wGkDygTyW2CP8gX
+TKLIyvx0OrdDUXyLKXVUkdSne4QKtFAwuWmabjAYkDyqAgG/jziORh1EKaonkkQt2yRZRC5JHEGn
+L7OKyopNqqo2IbWQjqWgLOwFBFKsuGDa4PVyIssMk1sCACCjimXbrbquYKW41zJJOpXkeARyeZNQ
+SUKwHEqCKnBuAybkZeFSmssVSDKdhlBpCRgIcnQsdvKPB19sY4rMNIaH0BhQUVHKvXgpIiQF0wK/
+4QORnOEayoDzOSBMXK4BSgpeTcMECqiqTDKZHDKmct3LCI55Kp0mQgK/3yDYkgIc3kNhfHzCkRk9
+p6nk+yPD3SmWzeZiKNkciUrg2g5BjQWdSBchiEvQjzoWAFkUYPDrCjBFUEJ8AhSIRyl2jcfjEL9h
+AFJODL8B6H7IZrNIt2g3B1mysShdQhmbT58+ExRdx3L5/PNomGU4kJkuA9ILYn+JP4CXOoDUoWO9
+IBhCSBCLTYCK+rqOg8CKvY6JPQhGxjkX1zyAdwrgAhTKWBDmxTUTC7Tcy5dHBiilL7cdaTsNGAwP
+7o32D4Q9HnWTrvsCiqIgdWgqDkJfkKgDU1MZcBGMhbKgj2B0LIle8eNhgiBsoMwFEY7rQDqVwlo5
+esUE/AAR81gUYIUT8UR2//4/rK+pLjs3MhIFEVJN9WwXK2oM+P1BREpQO0hjwkw+BzJWY1oOXB5L
+w9DIOGTQvYS4UFqigR9ZwUqEXFghVop059AjonqcAIZrqCKg31AS3OU66Adf4sabWqKvvHIYpoNh
+y+Vj4xMHVEW93eUuo0izhT4oRbcSIoALbRle4AVVkfBup6g9thwCzRX1VRQmdMeqLVETEIkW2ZNx
+H8oqzqAfXCGJEQ6XBQEgNQ2A7tq1C1a1tvaattOOrVFOqVSLCQhqU6QPx+DTsOU0GavLYUV20Qv4
+rEIymYNQuB48Wkg8QTA0NIQeYKB6NGTgH90jIcJEMikAi1dRRo9NLV583ek33jjpFAGIPw8++IAj
+e9SIRGm5wliraVosnTWLmmemUugBkTiPSS3AtgV8VQA9A8LxdfULYXBoEKv2wMhIn2BHGFR0DZ6d
+glQ6hUDT6A/RWVSSmfx5DjxRV1vzVkdHBzDAWLNmDezc+aQVqqz5dSY52Z63nLn9A33lI9myLXNL
+xv0Fq3gWutMN0BToxcso+AN+cKmOXI5A9P12mKDzYNXcZXDq1F+h+IboFgzb1VAhDULeJpxwC19G
+g/uMgOXVfXW1tbWCYM6mtdi8+YfiM4m/Y1UrHzkergyXz/3czImCnRjuHiW3qxpPqGFPy6SpHJC9
+IR+Sm+2N8i/dcMOMZdGeshcrS/S58+c3zU2Z8oVD50cbVfP8M4pGkymoUxLxsUzOVhtmQ+5432Rg
+oj6QOLFj28/caQk+EjMXraUV1eW+8dH06StQZnlnNbQefGTD92pWfu3I6TOT8oY7brv4hWUt3xiw
+2OrlDVVdRslsd2Fd469Q8sUB3c8uOW49SdHX1rbcePhoz3B7feuqlt5oZtBTv+ioSdXc7q3fHQaM
+fwtg6Vd/dEvn8Qssnzg/0Ns56jRcO6Nw4d1Af+/RH0/cdv+O/fRK7KnmBXPWGsQeDPhK9oWC6hdd
+R3pdUcg88Tx7U7Ej1y1qMjreGwjt/cnaF2YtvCXQe7bzxLkj+/sunT0Ry00OwHRI8DERLqeNmqGV
+JZJVC6Yu7UxMOfLFlV9pWQcYp57/013rb1u9ua29b0Ch4bsl4tKLY5P1sgxNJzsHDj136KzS3NTk
+9mTNusPvXJLrbnjUe/b16FDfsZ/3xC8d4/HoCQ4Anwzg91vWPL7+3pvvDM806sTY4IVyMxfrojO3
+BVubbyJMhnVVM3y+l187/nChIJ2ZpSs9hMD4qC6t6x6+0gkAoRC33/Sb8RdmXj9nzvWraivhP47g
+AyHxKb1mfWkRYHCjMb30nafeeWzerU9963w3L3/02c4f7D0y0NXTx3f3D/JTb7bzxpeODu55+PGT
+yy5F+ZmeD/iSrh5efeJd/hGZP5GBux+6cysY3w7H+16IVy65V6trnn3P9JqVjQ3JuSsdHhWW6hIL
+NuhyUpJgEF/ofSVBeLBuVtVjd3y55SHXhQ8UBht0DR4r98Fs+IRg/zrxlz2/2A7p5yYBY93Gu+4f
+H5xojLwOxfjd/WufOHhQ/IcD7eYVC5YyCjFMfkVV4NpMFvpTachoZeDaNryLnliOczsUCv1XBWD8
+YjF5MWJ9kcT757qenR7vf4bDoqWwHCvUUfPNsQQMWSZAZTlsw7nxYQQTcuDrjgQuPn7z/D7YivNt
+nPPfEDzwqcU75/j6SD/f8uG5vXs5dL7Hjb+d4gp8mnF8nAOabjcac+OBAxyuNiT4HyNwGZYgu0RW
+IDt/Icz4zAC0tXE4183rQ6XwU9uBXgLQ5Teg7GIv1+EqgsF/GY4DtCQALZMp2ITttmqoHzpWr756
+o/0d59+Lh3Y1HHcAAAAASUVORK5CYII=
+
+--nextPart1939768.sIoLGH0PD8--
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox Added

@@ -0,0 +1,40 @@
+From test@example.com Thu, 17 Oct 2013 02:13:03 +0200
+Return-Path: <test@example.com>
+Delivered-To: you@you.com
+Received: from localhost (localhost [127.0.0.1])
+	by test@example.com (Postfix) with ESMTP id B30D8120030
+	for <you@you.com>; Thu, 17 Oct 2013 02:13:05 +0200 (CEST)
+From: test <test@example.com>
+To: you@you.com
+Subject: charset
+Date: Thu, 17 Oct 2013 02:13:03 +0200
+Message-ID: <4081645.yGjUJ4o4Se@example.local>
+User-Agent: KMail/4.12 pre (Linux/3.11-4.towo-siduction-amd64; KDE/4.11.2; x86_64; git-f7f14e3; 2013-10-15)
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="ISO-8859-15"
+
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+hIwDGJlthTT7oq0BBACbaRZudMigMTetPZNRgkfEXv4QQowR1jborw0dcgKKqMQ1
+6o67NkpxvmXKGJTfTVCLBX3nk6FKYo6NwlPCyU7X9X0DDk8hvaBdR9wGfrdm5YWX
+GKOzcqJY1EypiMsspXeZvjzEW7O8I956c3vBb/2pM3xqYEK1kh8+d9bVH+cjf4UB
+DAMMzkNap8zaOwEH/1rPShyYL8meJN+/GGgS8+Nf1BW5pSHdAPCg0dnX4QCLEx7u
+GkBU6N4JGYayaCBofibOLacQPhYZdnR5Xb/Pvrx03GrzyzyDp0WyeI9nGNfkani7
+sCRWbzlMPsEvGEvJVnMLNRSk4xhPIWumL4APkw+Mgi6mf+Br8z0RhfnGwyMA53Mr
+pG9VQKlq3v7/aaN40pMjAsxiytcHS515jXrb3Ko4pWbTlAr/eytOEfkLRJgSOpQT
+BY7lWs+UQJqiG8Yn65vS9LMDNJgX9EOGx77Z4u9wvv4ZieOxzgbHGg5kYCoae7ba
+hxZeNjYKscH+E6epbOxM/wlTdr4UTiiW9dMsH0zSwMUB891gToeXq+LDGEPTKVSX
+tsJm4HS/kISJBwrCI4EUqWZML6xQ427NkZGmF2z/sD3kmL66GjspIKnb4zHmXacp
+84n2KrI9s7p6AnKnQjsxvB/4/lpXPCIY5GH7KjySEJiMsHECzeN1dJSL6keykBsx
+DtmYDA+dhZ6UWbwzx/78+mjNREhyp/UiSAmLzlJh89OH/xelAPvKcIosYwz4cY9N
+wjralTmL+Y0aHKeZJOeqPLaXADcPFiZrCNPCH65Ey5GEtDpjLpEbjVbykPV9+YkK
+7JKW6bwMraOl5zmAoR77PWMo3IoYb9q4GuqDr1V2ZGlb7eMH1gj1nfgfVintKC1X
+3jFfy7aK6LIQDVKEwbi0SxVXTKStuliVUy5oX4woDOxmTEotJf1QlKZpn5oF20UP
+tumYrp0SPoP8Bo4EVRVaLupduI5cYce1q/kFj9Iho/wk56MoG9PxMMfsH7oKg3AA
+CqQ6/kM4oJNdN5xIf1EH5HeaNFkDy1jlLznnhwVAZKPo/9ffpg==
+=bPqu
+-----END PGP MESSAGE-----
+
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox Added

@@ -0,0 +1,31 @@
+From test@kolab.org Wed, 25 May 2011 23:49:40 +0100
+From: OpenPGP Test <test@kolab.org>
+To: test@kolab.org
+Subject: inlinepgpencrypted + non enc text
+Date: Wed, 25 May 2011 23:49:40 +0100
+Message-ID: <1786696.yKXrOjjflF@herrwackelpudding.localhost>
+X-KMail-Transport: GMX
+X-KMail-Fcc: 28
+X-KMail-Drafts: 7
+X-KMail-Templates: 9
+User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7Bit
+Content-Type: text/plain; charset="us-ascii"
+
+Not encrypted not signed :(
+
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+hQEMAwzOQ1qnzNo7AQf/a3aNTLpQBfcUr+4AKsZQLj4h6z7e7a5AaCW8AG0wrbxN
+kBYB7E5jdZh45DX/99gvoZslthWryUCX2kKZ3LtIllxKVjqNuK5hSt+SAuKkwiMR
+Xcbf1KFKENKupgGSO9B2NJRbjoExdJ+fC3mGXnO3dT7xJJAo3oLE8Nivu+Bj1peY
+E1wCf+vcTwVHFrA7SV8eMRb9Z9wBXmU8Q8e9ekJ7ZsRX3tMeBs6jvscVvfMf6DYY
+N14snZBZuGNKT9a3DPny7IC1S0lHcaam34ogWwMi3FxPGJt/Lg52kARlkF5TDhcP
+N6H0EB/iqDRjOOUoEVm8um5XOSR1FpEiAdD0DON3y9JPATnrYq7sgYZz3BVImYY+
+N/jV8fEiN0a34pcOq8NQedMuOsJHNBS5MtbQH/kJLq0MXBpXekGlHo4MKw0trISc
+Rw3pW6/BFfhPJLni29g9tw==
+=fRFW
+-----END PGP MESSAGE-----
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/plaintext.mbox Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/data/smime-encrypted.mbox Added

@@ -0,0 +1,22 @@
+From test@example.com Sat, 13 Apr 2013 01:54:30 +0200
+From: test <test@example.com>
+To: you@you.com
+Subject: test
+Date: Sat, 13 Apr 2013 01:54:30 +0200
+Message-ID: <1576646.QQxzHWx8dA@tabin>
+X-KMail-Identity: 505942601
+User-Agent: KMail/4.10.2 (Linux/3.9.0-rc4-experimental-amd64; KDE/4.10.60; x86_64; git-fc9b82c; 2013-04-11)
+MIME-Version: 1.0
+Content-Type: application/pkcs7-mime; name="smime.p7m"; smime-type="enveloped-data"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7m"
+
+MIAGCSqGSIb3DQEHA6CAMIACAQAxgfwwgfkCAQAwYjBVMQswCQYDVQQGEwJVUzENMAsGA1UECgwE
+S0RBQjEWMBQGA1UEAwwNdW5pdHRlc3QgY2VydDEfMB0GCSqGSIb3DQEJARYQdGVzdEBleGFtcGxl
+LmNvbQIJANNFIDoYY4XJMA0GCSqGSIb3DQEBAQUABIGAJwmmaOeidXUHSQGOf2OBIsPYafVqdORe
+y54pEXbXiAfSVUWgI4a9CsiWwcDX8vlaX9ZLLr+L2VmOfr6Yc5214yxzausZVvnUFjy6LUXotuEX
+tSar4EW7XI9DjaZc1l985naMsTx9JUa5GyQ9J6PGqhosAKpKMGgKkFAHaOwE1/IwgAYJKoZIhvcN
+AQcBMBQGCCqGSIb3DQMHBAieDfmz3WGbN6CABHgEpsLrNn0PAZTDUfNomDypvSCl5bQH+9cKm80m
+upMV2r8RBiXS7OaP4SpCxq18afDTTPatvboHIoEX92taTbq8soiAgEs6raSGtEYZNvFL0IYqm7MA
+o5HCOmjiEcInyPf14lL3HnPk10FaP3hh58qTHUh4LPYtL7UECOZELYnUfUVhAAAAAAAAAAAAAA==
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/gpg.conf Added

@@ -0,0 +1,244 @@
+# Options for GnuPG
+# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Unless you specify which option file to use (with the command line
+# option "--options filename"), GnuPG uses the file ~/.gnupg/gpg.conf
+# by default.
+#
+# An options file can contain any long options which are available in
+# GnuPG. If the first non white space character of a line is a '#',
+# this line is ignored.  Empty lines are also ignored.
+#
+# See the man page for a list of options.
+
+# Uncomment the following option to get rid of the copyright notice
+
+#no-greeting
+
+# If you have more than 1 secret key in your keyring, you may want to
+# uncomment the following option and set your preferred keyid.
+
+#default-key 621CC013
+
+# If you do not pass a recipient to gpg, it will ask for one.  Using
+# this option you can encrypt to a default key.  Key validation will
+# not be done in this case.  The second form uses the default key as
+# default recipient.
+
+#default-recipient some-user-id
+#default-recipient-self
+
+# Use --encrypt-to to add the specified key as a recipient to all
+# messages.  This is useful, for example, when sending mail through a
+# mail client that does not automatically encrypt mail to your key.
+# In the example, this option allows you to read your local copy of
+# encrypted mail that you've sent to others.
+
+#encrypt-to some-key-id
+
+# By default GnuPG creates version 3 signatures for data files.  This
+# is not strictly OpenPGP compliant but PGP 6 and most versions of PGP
+# 7 require them.  To disable this behavior, you may use this option
+# or --openpgp.
+
+#no-force-v3-sigs
+
+# Because some mailers change lines starting with "From " to ">From "
+# it is good to handle such lines in a special way when creating
+# cleartext signatures; all other PGP versions do it this way too.
+
+#no-escape-from-lines
+
+# If you do not use the Latin-1 (ISO-8859-1) charset, you should tell
+# GnuPG which is the native character set.  Please check the man page
+# for supported character sets.  This character set is only used for
+# metadata and not for the actual message which does not undergo any
+# translation.  Note that future version of GnuPG will change to UTF-8
+# as default character set.  In most cases this option is not required
+# as GnuPG is able to figure out the correct charset at runtime.
+
+#charset utf-8
+
+# Group names may be defined like this:
+#   group mynames = paige 0x12345678 joe patti
+#
+# Any time "mynames" is a recipient (-r or --recipient), it will be
+# expanded to the names "paige", "joe", and "patti", and the key ID
+# "0x12345678".  Note there is only one level of expansion - you
+# cannot make an group that points to another group.  Note also that
+# if there are spaces in the recipient name, this will appear as two
+# recipients.  In these cases it is better to use the key ID.
+
+#group mynames = paige 0x12345678 joe patti
+
+# Lock the file only once for the lifetime of a process.  If you do
+# not define this, the lock will be obtained and released every time
+# it is needed, which is usually preferable.
+
+#lock-once
+
+# GnuPG can send and receive keys to and from a keyserver.  These
+# servers can be HKP, email, or LDAP (if GnuPG is built with LDAP
+# support).
+#
+# Example HKP keyserver:
+#      hkp://keys.gnupg.net
+#      hkp://subkeys.pgp.net
+#
+# Example email keyserver:
+#      mailto:pgp-public-keys@keys.pgp.net
+#
+# Example LDAP keyservers:
+#      ldap://keyserver.pgp.com
+#
+# Regular URL syntax applies, and you can set an alternate port
+# through the usual method:
+#      hkp://keyserver.example.net:22742
+#
+# Most users just set the name and type of their preferred keyserver.
+# Note that most servers (with the notable exception of
+# ldap://keyserver.pgp.com) synchronize changes with each other.  Note
+# also that a single server name may actually point to multiple
+# servers via DNS round-robin.  hkp://keys.gnupg.net is an example of
+# such a "server", which spreads the load over a number of physical
+# servers.  To see the IP address of the server actually used, you may use
+# the "--keyserver-options debug".
+
+keyserver hkp://keys.gnupg.net
+#keyserver mailto:pgp-public-keys@keys.nl.pgp.net
+#keyserver ldap://keyserver.pgp.com
+
+# Common options for keyserver functions:
+#
+# include-disabled : when searching, include keys marked as "disabled"
+#                    on the keyserver (not all keyservers support this).
+#
+# no-include-revoked : when searching, do not include keys marked as
+#                      "revoked" on the keyserver.
+#
+# verbose : show more information as the keys are fetched.
+#           Can be used more than once to increase the amount
+#           of information shown.
+#
+# use-temp-files : use temporary files instead of a pipe to talk to the
+#                  keyserver.  Some platforms (Win32 for one) always
+#                  have this on.
+#
+# keep-temp-files : do not delete temporary files after using them
+#                   (really only useful for debugging)
+#
+# http-proxy="proxy" : set the proxy to use for HTTP and HKP keyservers.
+#                      This overrides the "http_proxy" environment variable,
+#                      if any.
+#
+# auto-key-retrieve : automatically fetch keys as needed from the keyserver
+#                     when verifying signatures or when importing keys that
+#                     have been revoked by a revocation key that is not
+#                     present on the keyring.
+#
+# no-include-attributes : do not include attribute IDs (aka "photo IDs")
+#                         when sending keys to the keyserver.
+
+#keyserver-options auto-key-retrieve
+
+# Display photo user IDs in key listings
+
+# list-options show-photos
+
+# Display photo user IDs when a signature from a key with a photo is
+# verified
+
+# verify-options show-photos
+
+# Use this program to display photo user IDs
+#
+# %i is expanded to a temporary file that contains the photo.
+# %I is the same as %i, but the file isn't deleted afterwards by GnuPG.
+# %k is expanded to the key ID of the key.
+# %K is expanded to the long OpenPGP key ID of the key.
+# %t is expanded to the extension of the image (e.g. "jpg").
+# %T is expanded to the MIME type of the image (e.g. "image/jpeg").
+# %f is expanded to the fingerprint of the key.
+# %% is %, of course.
+#
+# If %i or %I are not present, then the photo is supplied to the
+# viewer on standard input.  If your platform supports it, standard
+# input is the best way to do this as it avoids the time and effort in
+# generating and then cleaning up a secure temp file.
+#
+# If no photo-viewer is provided, GnuPG will look for xloadimage, eog,
+# or display (ImageMagick).  On Mac OS X and Windows, the default is
+# to use your regular JPEG image viewer.
+#
+# Some other viewers:
+# photo-viewer "qiv %i"
+# photo-viewer "ee %i"
+#
+# This one saves a copy of the photo ID in your home directory:
+# photo-viewer "cat > ~/photoid-for-key-%k.%t"
+#
+# Use your MIME handler to view photos:
+# photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
+
+# Passphrase agent
+#
+# We support the old experimental passphrase agent protocol as well as
+# the new Assuan based one (currently available in the "newpg" package
+# at ftp.gnupg.org/gcrypt/alpha/aegypten/).  To make use of the agent,
+# you have to run an agent as daemon and use the option
+#
+# use-agent
+#

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/pubring.gpg Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/pubring.kbx Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/secring.gpg Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gnupg_home/trustlist.txt Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/gpgerrortest.cpp Added

@@ -0,0 +1,214 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsystems.com>
+
+    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 "interface.h"
+#include "interface_p.h"
+
+#include <QGpgME/Protocol>
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
+#include <gpgme.h>
+
+#include <QDebug>
+#include <QDir>
+#include <QProcess>
+#include <QTest>
+
+QByteArray readMailFromFile(const QString &mailFile)
+{
+    QFile file(QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + mailFile);
+    file.open(QIODevice::ReadOnly);
+    Q_ASSERT(file.isOpen());
+    return file.readAll();
+}
+
+void killAgent(const QString& dir)
+{
+    QProcess proc;
+    proc.setProgram(QStringLiteral("gpg-connect-agent"));
+    QStringList arguments;
+    arguments << "-S " << dir + "/S.gpg-agent";
+    proc.start();
+    proc.waitForStarted();
+    proc.write("KILLAGENT\n");
+    proc.write("BYE\n");
+    proc.closeWriteChannel();
+    proc.waitForFinished();
+}
+
+class GpgErrorTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+
+    void testGpgConfiguredCorrectly()
+    {
+        setEnv("GNUPGHOME", GNUPGHOME);
+
+        Parser parser(readMailFromFile("openpgp-inline-charset-encrypted.mbox"));
+
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QVERIFY(contentList[0]->content().startsWith("asdasd"));
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        auto enc = contentList[0]->encryptions()[0];
+        QCOMPARE(enc->errorType(), Encryption::NoError);
+        QCOMPARE(enc->errorString(), QString());
+        QCOMPARE((int) enc->recipients().size(), 2);
+    }
+
+    void testNoGPGInstalled_data()
+    {
+        QTest::addColumn<QString>("mailFileName");
+
+        QTest::newRow("openpgp-inline-charset-encrypted") << "openpgp-inline-charset-encrypted.mbox";
+        QTest::newRow("openpgp-encrypted-attachment-and-non-encrypted-attachment") << "openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox";
+        QTest::newRow("smime-encrypted") << "smime-encrypted.mbox";
+    }
+
+    void testNoGPGInstalled()
+    {
+        QFETCH(QString, mailFileName);
+
+        setEnv("PATH", "/nonexististing");
+        setGpgMEfname("/nonexisting/gpg", "");
+
+        Parser parser(readMailFromFile(mailFileName));
+        auto contentPartList = parser.collectContentParts();
+
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        QVERIFY(contentList[0]->content().isEmpty());
+        auto enc = contentList[0]->encryptions()[0];
+        qDebug() << "HUHU"<< enc->errorType();
+        QCOMPARE(enc->errorType(), Encryption::UnknownError);
+        QCOMPARE(enc->errorString(), QString("Crypto plug-in \"OpenPGP\" could not decrypt the data.<br />Error: No data"));
+        QCOMPARE((int) enc->recipients().size(), 0);
+    }
+
+    void testGpgIncorrectGPGHOME_data()
+    {
+        QTest::addColumn<QString>("mailFileName");
+
+        QTest::newRow("openpgp-inline-charset-encrypted") << "openpgp-inline-charset-encrypted.mbox";
+        QTest::newRow("openpgp-encrypted-attachment-and-non-encrypted-attachment") << "openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox";
+        QTest::newRow("smime-encrypted") << "smime-encrypted.mbox";
+    }
+
+    void testGpgIncorrectGPGHOME()
+    {
+        QFETCH(QString, mailFileName);
+        setEnv("GNUPGHOME", QByteArray(GNUPGHOME) + QByteArray("noexist"));
+
+        Parser parser(readMailFromFile(mailFileName));
+
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+        QVERIFY(contentList[0]->content().isEmpty());
+        auto enc = contentList[0]->encryptions()[0];
+        qDebug() << enc->errorType();
+        QCOMPARE(enc->errorType(), Encryption::KeyMissing);
+        QCOMPARE(enc->errorString(), QString("Crypto plug-in \"OpenPGP\" could not decrypt the data.<br />Error: Decryption failed"));
+        QCOMPARE((int) enc->recipients().size(), 2);
+    }
+
+public Q_SLOTS:
+    void init()
+    {
+        mResetGpgmeEngine = false;
+        mModifiedEnv.clear();
+        {
+            QGpgME::openpgp();      // We need to intialize it, otherwise ctx will be a nullpointer
+            const GpgME::Context *ctx = GpgME::Context::createForProtocol(GpgME::Protocol::OpenPGP);
+            const auto engineinfo = ctx->engineInfo();
+            mGpgmeEngine_fname = engineinfo.fileName();
+        }
+        mEnv = QProcessEnvironment::systemEnvironment();
+        unsetEnv("GNUPGHOME");
+    }
+
+    void cleanup()
+    {
+        QCoreApplication::sendPostedEvents();
+
+        const QString &gnupghome = qgetenv("GNUPGHOME");
+        if (!gnupghome.isEmpty()) {
+            killAgent(gnupghome);
+        }
+
+        resetGpgMfname();
+        resetEnv();
+    }
+private:
+    void unsetEnv(const QByteArray &name) 
+    {
+        mModifiedEnv << name;
+        unsetenv(name);
+    }
+
+    void setEnv(const QByteArray &name, const QByteArray &value)
+    {
+        mModifiedEnv << name;
+        setenv(name, value , 1);
+    }
+
+    void resetEnv()
+    {
+        foreach(const auto &i, mModifiedEnv) {
+            if (mEnv.contains(i)) {
+                setenv(i, mEnv.value(i).toUtf8(), 1);
+            } else {
+                unsetenv(i);
+            }
+        }
+    }
+
+    void resetGpgMfname()
+    {
+        if (mResetGpgmeEngine) {
+            gpgme_set_engine_info (GPGME_PROTOCOL_OpenPGP, mGpgmeEngine_fname, NULL);
+        }
+    }

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/interfacetest.cpp Added

@@ -0,0 +1,310 @@
+/*
+    Copyright (c) 2016 Sandro Knauß <knauss@kolabsystems.com>
+
+    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 "interface.h"
+#include "interface_p.h"
+
+#include <QTest>
+
+QByteArray readMailFromFile(const QString &mailFile)
+{
+    QFile file(QLatin1String(MAIL_DATA_DIR) + QLatin1Char('/') + mailFile);
+    file.open(QIODevice::ReadOnly);
+    Q_ASSERT(file.isOpen());
+    return file.readAll();
+}
+
+QByteArray join(QVector<QByteArray> vec, QByteArray sep)
+{
+    QByteArray ret;
+    bool bInit = true;
+    foreach(const auto &entry, vec) {
+        if (!bInit) {
+            ret += sep;
+        }
+        bInit = false;
+        ret += entry;
+    }
+    return ret;
+}
+
+class InterfaceTest : public QObject
+{
+    Q_OBJECT
+private:
+    void printTree(const Part::Ptr &start, QString pre)
+    {
+        foreach (const auto &part, start->subParts()) {
+            qWarning() << QStringLiteral("%1* %2(%3)")
+                            .arg(pre)
+                            .arg(QString::fromLatin1(part->type()))
+                            .arg(QString::fromLatin1(join(part->availableContents(),", ")));
+            printTree(part,pre + QStringLiteral("  "));
+        }
+    }
+
+private slots:
+
+    void testTextMail()
+    {
+        Parser parser(readMailFromFile("plaintext.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("If you can see this text it means that your email client couldn't display our newsletter properly.\nPlease visit this link to view the newsletter on our website: http://www.gog.com/newsletter/").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+
+        contentList = contentPart->content("html");
+        QCOMPARE(contentList.size(), 0);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 0);
+    }
+
+    void testTextAlternative()
+    {
+        Parser parser(readMailFromFile("alternative.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), QVector<QByteArray>() << "html" << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("If you can see this text it means that your email client couldn't display our newsletter properly.\nPlease visit this link to view the newsletter on our website: http://www.gog.com/newsletter/\n").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+
+        contentList = contentPart->content("html");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("<html><body><p><span>HTML</span> text</p></body></html>\n\n").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 0);
+    }
+
+     void testTextHtml()
+    {
+        Parser parser(readMailFromFile("html.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "html");
+
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 0);
+
+        contentList = contentPart->content("html");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("<html><body><p><span>HTML</span> text</p></body></html>").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 0);
+    }
+
+    void testSMimeEncrypted()
+    {
+        Parser parser(readMailFromFile("smime-encrypted.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("The quick brown fox jumped over the lazy dog.").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("us-ascii").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 0);
+    }
+
+    void testOpenPGPEncryptedAttachment()
+    {
+        Parser parser(readMailFromFile("openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("test text").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("us-ascii").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        QCOMPARE(contentList[0]->signatures().size(), 1);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 2);
+        QCOMPARE(contentAttachmentList[0]->availableContents(), QVector<QByteArray>() << "text/plain");
+        QCOMPARE(contentAttachmentList[0]->content().size(), 1);
+        QCOMPARE(contentAttachmentList[0]->encryptions().size(), 1);
+        QCOMPARE(contentAttachmentList[0]->signatures().size(), 1);
+        QCOMPARE(contentAttachmentList[1]->availableContents(), QVector<QByteArray>() << "image/png");
+        QCOMPARE(contentAttachmentList[1]->content().size(), 1);
+        QCOMPARE(contentAttachmentList[1]->encryptions().size(), 0);
+        QCOMPARE(contentAttachmentList[1]->signatures().size(), 0);
+    }
+
+    void testOpenPGPInline()
+    {
+        Parser parser(readMailFromFile("openpgp-inline-charset-encrypted.mbox"));
+        printTree(parser.d->mTree,QString());
+        auto contentPartList = parser.collectContentParts();
+        QCOMPARE(contentPartList.size(), 1);
+        auto contentPart = contentPartList[0];
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(),  QVector<QByteArray>() << "plaintext");
+        QCOMPARE(contentPart->encryptions().size(), 0);
+        QCOMPARE(contentPart->signatures().size(), 0);
+        auto contentList = contentPart->content("plaintext");
+        QCOMPARE(contentList.size(), 1);
+        QCOMPARE(contentList[0]->content(), QStringLiteral("asdasd asd asd asdf sadf sdaf sadf äöü").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("ISO-8859-15").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 1);
+        QCOMPARE(contentList[0]->signatures().size(), 1);
+        auto contentAttachmentList = parser.collectAttachmentParts();
+        QCOMPARE(contentAttachmentList.size(), 0);

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake Added

@@ -0,0 +1,60 @@
+# Copyright (c) 2013 Sandro Knauß <mail@sandroknauss.de>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+set( GNUPGHOME ${CMAKE_BINARY_DIR}/framework/domain/mimetreeparser/tests/gnupg_home )
+add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
+
+macro (ADD_GPG_CRYPTO_TEST _target _testname)
+   if (UNIX)
+      if (APPLE)
+         set(_library_path_variable "DYLD_LIBRARY_PATH")
+      elseif (CYGWIN)
+         set(_library_path_variable "PATH")
+      else (APPLE)
+         set(_library_path_variable "LD_LIBRARY_PATH")
+      endif (APPLE)
+
+      if (APPLE)
+         # DYLD_LIBRARY_PATH does not work like LD_LIBRARY_PATH
+         # OSX already has the RPATH in libraries and executables, putting runtime directories in
+         # DYLD_LIBRARY_PATH actually breaks things
+         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/")
+      else (APPLE)
+         set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${QT_LIBRARY_DIR}")
+      endif (APPLE)
+      set(_executable "$<TARGET_FILE:${_target}>")
+
+      # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time
+      add_custom_command(TARGET ${_target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable}
+        -D_ld_library_path="${_ld_library_path}" -D_executable=$<TARGET_FILE:${_target}>
+        -D_gnupghome="${GNUPGHOME}"
+        -P ${CMAKE_SOURCE_DIR}/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+      )
+
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_executable}.shell" )
+      add_test(NAME ${_testname} COMMAND ${_executable}.shell)
+
+   else (UNIX)
+      # under windows, set the property WRAPPER_SCRIPT just to the name of the executable
+      # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found)
+      set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}\;${LIB_INSTALL_DIR}\;${QT_LIBRARY_DIR}")
+      set(_executable "$<TARGET_FILE:${_target}>")
+
+      # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time
+      add_custom_command(TARGET ${_target} POST_BUILD
+         COMMAND ${CMAKE_COMMAND}
+         -D_filename="${_executable}.bat"
+         -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}"
+         -D_gnupghome="${GNUPGHOME}"
+         -P ${CMAKE_SOURCE_DIR}/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+         )
+
+      add_test(NAME ${_testname} COMMAND ${_executable}.bat)
+
+   endif (UNIX)
+endmacro (ADD_GPG_CRYPTO_TEST)
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake Added

@@ -0,0 +1,45 @@
+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2013, Sandro Knauß <mail@sandroknauss.de>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (UNIX)
+
+file(WRITE "${_filename}"
+"#!/bin/sh
+# created by cmake, don't edit, changes will be lost
+
+# don't mess with a gpg-agent already running on the system
+unset GPG_AGENT_INFO
+
+${_library_path_variable}=${_ld_library_path}\${${_library_path_variable}:+:\$${_library_path_variable}} GNUPGHOME=${_gnupghome} gpg-agent --daemon \"${_executable}\" \"$@\"
+_result=$?
+_pid=`echo GETINFO pid | GNUPGHOME=${_gnupghome} gpg-connect-agent | grep 'D' | cut -d' ' -f2`
+if [ ! -z \"\$_pid\" ]; then
+    echo \"Waiting for gpg-agent to terminate (PID: $_pid)...\"
+    while kill -0 \"\$_pid\"; do
+        sleep 1
+    done
+fi
+exit \$_result
+")
+
+# make it executable
+# since this is only executed on UNIX, it is safe to call chmod
+exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy )
+
+else (UNIX)
+
+file(TO_NATIVE_PATH "${_ld_library_path}" win_path)
+file(TO_NATIVE_PATH "${_gnupghome}" win_gnupghome)
+
+file(WRITE "${_filename}"
+"
+set PATH=${win_path};$ENV{PATH}
+set GNUPGHOME=${win_gnupghome};$ENV{GNUPGHOME}
+gpg-agent --daemon \"${_executable}\" %*
+")
+
+endif (UNIX)

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/mimetreeparser/thoughts.txt Added

@@ -0,0 +1,148 @@
+Usecases:
+
+# plaintext msg + attachment
+* ContentPart => cp1
+* AttachmentPart => ap1
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+(PlainText) == cp1.availableContent()
+
+# html msg + related attachment + normal attachment
+* ContentPart => cp1
+* AttachmentPart(mimetype="*/related", cid="12345678") => ap1
+* AttachmentPart => ap2
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1, ap2) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+(ap2) == collect<AttachmentParts>(select=NoEncapsulatedMessages, filter=filterelated)
+
+ap1 == getPart("cid:12345678")
+
+(Html) == cp1.availableContent()
+
+# alternative msg + attachment
+* ContentPart(html=[Content("HTML"),], plaintext=[Content("Text"),]) => cp1
+* AttachmentPart => ap1
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+(Html, PlainText) == cp1.availableContent()
+[Content("HTML"),] == cp1.content(Html)
+[Content("Text"),] == cp1.content(Plaintext)
+
+# alternative msg with GPGInlin
+* ContentPart(
+    plaintext=[Content("Text"), Content("foo", encryption=(enc1))],
+    html=[Content("HTML"),]
+  ) => cp1
+
+(Html, PlainText) == cp1.availableContent()
+
+[Content("HTML"),] == cp1.content(Html)
+[Content("Text"),Content("foo", encryption=(enc1))] == cp1.content(Plaintext)
+
+
+# encrypted msg (not encrypted/error) with unencrypted attachment
+* EncryptionErrorPart => cp1
+* AttachmentPart => ap1
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+#encrypted msg (decrypted with attachment) + unencrypted attachment
+* encrytion=(rec1,rec2) => enc1
+    * ContentPart(encrytion = (enc1,)) => cp1 
+    * AttachmentPart(encryption = (enc1,)) => ap1
+* AttachmentPart => ap2
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1, ap2) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+#INLINE GPG encrypted msg + attachment
+* ContentPart => cp1 with
+  plaintext=[Content, Content(encrytion = (enc1(rec1,rec2),)), Content(signed = (sig1,)), Content]
+* AttachmentPart => ap1
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1) == collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+[Content, Content(encrytion = (enc1(rec1,rec2),)), Content(signed = (sig1,)), Content] == cp1.content(Plaintext)
+
+#forwared encrypted msg + attachments
+* ContentPart => cp1
+* EncapsulatedPart => ep1
+    * Encrytion=(rec1,rec2) => enc1
+        * Signature => sig1
+            * ContentPart(encrytion = (enc1,), signature = (sig1,)) => cp2
+                * Content(encrytion = (enc1,), signature = (sig1,))
+                * Content(encrytion = (enc1, enc2(rec3,rec4),), signature = (sig1,))
+            * AttachmentPart(encrytion = (enc1,), signature = (sig1,)) => ap1
+* AttachmentPart => ap2
+
+(cp1) = collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap2) = collect<AttachmentParts>(select=NoEncapsulatedMessages)
+
+(cp2) = collect<ContentPart>(ep1, select=NoEncapsulatedMessages)
+(ap1) = collect<AttachmentParts>(ep1, select=NoEncapsulatedMessages)
+
+(cp1, cp2) == collect<ContentPart>()
+(ap1, ap2) == collect<AttachmentParts>()[Content, Content(encrytion = (enc1(rec1,rec2),)), Content(signed = (sig1,)), Content]
+
+
+# plaintext msg + attachment + cert
+* ContentPart => cp1
+* AttachmentPart => ap1
+* CertPart => cep1
+
+(cp1) == collect<ContentPart>(select=NoEncapsulatedMessages)
+(ap1, cep1) == collect<AttachmentPart>(select=NoEncapsulatedMessages)
+(ap1) == collect<AttachmentPart>(select=NoEncapsulatedMessages, filter=filterSubAttachmentParts)
+
+(cep1) == collect<CertPart>(select=NoEncapsulatedMessages)
+
+
+collect function:
+
+bool noEncapsulatedMessages(Part part)
+{
+    if (is<EncapsulatedPart>(part)) {
+        return false;
+    }
+    return true;
+}
+
+bool filterRelated(T part)
+{
+    if (part.mimetype == related && !part.cid.isEmpty()) {
+        return false; //filter out related parts
+    }
+    return true;
+}
+
+bool filterSubAttachmentParts(AttachmentPart part)
+{
+    if (isSubPart<AttachmentPart>(part)) {
+        return false; // filter out CertPart f.ex.
+    }
+    return true;
+}
+
+List<T> collect<T>(Part start, std::function<bool(const Part &)> select, std::function<bool(const std::shared_ptr<T> &)> filter) {
+    List<T> col;
+    if (!select(start)) {
+        return col;
+    }
+
+    if(isOrSubTypeIs<T>(start) && filter(start.staticCast<T>)){
+        col.append(p);
+    }
+    foreach(childs as child) {
+        if (select(child)) {
+            col.expand(collect(child,select,filter);
+        }
+    }
+    return col;
+}
\ No newline at end of file

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/modeltest.cpp Added

@@ -0,0 +1,588 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "modeltest.h"
+
+#include <QtCore/QtCore>
+#include <QtTest/QtTest>
+
+#include <QDebug>
+/*!
+    Connect to all of the models signals.  Whenever anything happens recheck everything.
+*/
+ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false )
+{
+    if (!model)
+        qFatal("%s: model must not be null", Q_FUNC_INFO);
+
+    connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(runAllTests()) );
+
+    // Special checks for changes
+    connect(model, SIGNAL(layoutAboutToBeChanged()),
+            this, SLOT(layoutAboutToBeChanged()) );
+    connect(model, SIGNAL(layoutChanged()),
+            this, SLOT(layoutChanged()) );
+
+    connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(rowsInserted(QModelIndex,int,int)) );
+    connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsRemoved(QModelIndex,int,int)) );
+    connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(dataChanged(QModelIndex,QModelIndex)) );
+    connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)),
+            this, SLOT(headerDataChanged(Qt::Orientation,int,int)) );
+
+    runAllTests();
+}
+
+void ModelTest::runAllTests()
+{
+    if ( fetchingMore )
+        return;
+    nonDestructiveBasicTest();
+    rowCount();
+    columnCount();
+    hasIndex();
+    index();
+    parent();
+    data();
+}
+
+/*!
+    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
+    to make sure the model doesn't outright segfault, testing the functions that makes sense.
+*/
+void ModelTest::nonDestructiveBasicTest()
+{
+    QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() );
+    model->canFetchMore ( QModelIndex() );
+    QVERIFY( model->columnCount ( QModelIndex() ) >= 0 );
+    QVERIFY( model->data ( QModelIndex() ) == QVariant() );
+    fetchingMore = true;
+    model->fetchMore ( QModelIndex() );
+    fetchingMore = false;
+    Qt::ItemFlags flags = model->flags ( QModelIndex() );
+    QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 );
+    model->hasChildren ( QModelIndex() );
+    model->hasIndex ( 0, 0 );
+    model->headerData ( 0, Qt::Horizontal );
+    model->index ( 0, 0 );
+    model->itemData ( QModelIndex() );
+    QVariant cache;
+    model->match ( QModelIndex(), -1, cache );
+    model->mimeTypes();
+    QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
+    QVERIFY( model->rowCount() >= 0 );
+    QVariant variant;
+    model->setData ( QModelIndex(), variant, -1 );
+    model->setHeaderData ( -1, Qt::Horizontal, QVariant() );
+    model->setHeaderData ( 999999, Qt::Horizontal, QVariant() );
+    QMap<int, QVariant> roles;
+    model->sibling ( 0, 0, QModelIndex() );
+    model->span ( QModelIndex() );
+    model->supportedDropActions();
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren()
+
+    Models that are dynamically populated are not as fully tested here.
+ */
+void ModelTest::rowCount()
+{
+//     qDebug() << "rc";
+    // check top row
+    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
+    int rows = model->rowCount ( topIndex );
+    QVERIFY( rows >= 0 );
+    if ( rows > 0 )
+        QVERIFY( model->hasChildren ( topIndex ) );
+
+    QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex );
+    if ( secondLevelIndex.isValid() ) { // not the top level
+        // check a row count where parent is valid
+        rows = model->rowCount ( secondLevelIndex );
+        QVERIFY( rows >= 0 );
+        if ( rows > 0 )
+            QVERIFY( model->hasChildren ( secondLevelIndex ) );
+    }
+
+    // The models rowCount() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren()
+ */
+void ModelTest::columnCount()
+{
+    // check top row
+    QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
+    QVERIFY( model->columnCount ( topIndex ) >= 0 );
+
+    // check a column count where parent is valid
+    QModelIndex childIndex = model->index ( 0, 0, topIndex );
+    if ( childIndex.isValid() )
+        QVERIFY( model->columnCount ( childIndex ) >= 0 );
+
+    // columnCount() is tested more extensively in checkChildren(),
+    // but this catches the big mistakes
+}
+
+/*!
+    Tests model's implementation of QAbstractItemModel::hasIndex()
+ */
+void ModelTest::hasIndex()
+{
+//     qDebug() << "hi";
+    // Make sure that invalid values returns an invalid index
+    QVERIFY( !model->hasIndex ( -2, -2 ) );
+    QVERIFY( !model->hasIndex ( -2, 0 ) );
+    QVERIFY( !model->hasIndex ( 0, -2 ) );
+
+    int rows = model->rowCount();
+    int columns = model->columnCount();
+
+    // check out of bounds
+    QVERIFY( !model->hasIndex ( rows, columns ) );
+    QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) );

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/modeltest.h Added

@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef MODELTEST_H
+#define MODELTEST_H
+
+#include <QtCore/QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QStack>
+
+class ModelTest : public QObject
+{
+  Q_OBJECT
+
+public:
+  ModelTest( QAbstractItemModel *model, QObject *parent = 0 );
+
+private Q_SLOTS:
+  void nonDestructiveBasicTest();
+  void rowCount();
+  void columnCount();
+  void hasIndex();
+  void index();
+  void parent();
+  void data();
+
+protected Q_SLOTS:
+  void runAllTests();
+  void layoutAboutToBeChanged();
+  void layoutChanged();
+  void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end );
+  void rowsInserted( const QModelIndex & parent, int start, int end );
+  void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end );
+  void rowsRemoved( const QModelIndex & parent, int start, int end );
+  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+  void headerDataChanged(Qt::Orientation orientation, int start, int end);
+
+private:
+  void checkChildren( const QModelIndex &parent, int currentDepth = 0 );
+
+  QAbstractItemModel *model;
+
+  struct Changing {
+    QModelIndex parent;
+    int oldSize;
+    QVariant last;
+    QVariant next;
+  };
+  QStack<Changing> insert;
+  QStack<Changing> remove;
+
+  bool fetchingMore;
+
+  QList<QPersistentModelIndex> changing;
+};
+
+#endif

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/objecttreesource.cpp -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/objecttreesource.cpp Changed

@@ -29,28 +29,24 @@
 public:
     ObjectSourcePrivate()
         : mWriter(0)
-        , mCSSHelper(0)
         , mAllowDecryption(true)
         , mHtmlLoadExternal(true)
-        , mHtmlMail(true)
+        , mPreferredMode(MimeTreeParser::Util::Html)
     {
 
     }
     MimeTreeParser::HtmlWriter *mWriter;
-    MimeTreeParser::CSSHelperBase *mCSSHelper;
     MimeTreeParser::BodyPartFormatterBaseFactory mBodyPartFormatterBaseFactory;
     bool mAllowDecryption;
     bool mHtmlLoadExternal;
-    bool mHtmlMail;
+    MimeTreeParser::Util::HtmlMode mPreferredMode;
 };
 
-ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer,
-                                   MimeTreeParser::CSSHelperBase *cssHelper)
+ObjectTreeSource::ObjectTreeSource(MimeTreeParser::HtmlWriter *writer)
         : MimeTreeParser::Interface::ObjectTreeSource()
         , d(new ObjectSourcePrivate)
     {
         d->mWriter = writer;
-        d->mCSSHelper = cssHelper;
     }
 
 ObjectTreeSource::~ObjectTreeSource()
@@ -67,10 +63,6 @@
 {
     return d->mWriter;
 }
-MimeTreeParser::CSSHelperBase *ObjectTreeSource::cssHelper()
-{
-    return d->mCSSHelper;
-}
 
 bool ObjectTreeSource::htmlLoadExternal() const
 {
@@ -82,16 +74,6 @@
     d->mHtmlLoadExternal = loadExternal;
 }
 
-bool ObjectTreeSource::htmlMail() const
-{
-    return d->mHtmlMail;
-}
-
-void ObjectTreeSource::setHtmlMail(bool htmlMail)
-{
-    d->mHtmlMail = htmlMail;
-}
-
 bool ObjectTreeSource::decryptMessage() const
 {
     return d->mAllowDecryption;
@@ -127,9 +109,15 @@
     return Q_NULLPTR;
 }
 
-void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode)
+void ObjectTreeSource::setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes)
 {
       Q_UNUSED(mode);
+      Q_UNUSED(availableModes);
+}
+
+MimeTreeParser::Util::HtmlMode ObjectTreeSource::preferredMode() const
+{
+    return d->mPreferredMode;
 }
 
 bool ObjectTreeSource::autoImportKeys() const
@@ -147,6 +135,11 @@
     return false;
 }
 
+bool ObjectTreeSource::isPrinting() const
+{
+    return false;
+}
+
 const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFormatterFactory()
 {
     return &(d->mBodyPartFormatterBaseFactory);

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/domain/objecttreesource.h -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/objecttreesource.h Changed

@@ -28,27 +28,25 @@
 class ObjectTreeSource : public MimeTreeParser::Interface::ObjectTreeSource
 {
 public:
-    ObjectTreeSource(MimeTreeParser::HtmlWriter *writer,
-                     MimeTreeParser::CSSHelperBase *cssHelper);
+    ObjectTreeSource(MimeTreeParser::HtmlWriter *writer);
     virtual ~ObjectTreeSource();
     void setHtmlLoadExternal(bool loadExternal);
-    void setHtmlMail(bool htmlMail);
-    bool htmlMail() const Q_DECL_OVERRIDE;
     bool decryptMessage() const Q_DECL_OVERRIDE;
     bool htmlLoadExternal() const Q_DECL_OVERRIDE;
     bool showSignatureDetails() const Q_DECL_OVERRIDE;
-    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode) Q_DECL_OVERRIDE;
+    void setHtmlMode(MimeTreeParser::Util::HtmlMode mode, const QList<MimeTreeParser::Util::HtmlMode> &availableModes) Q_DECL_OVERRIDE;
+    MimeTreeParser::Util::HtmlMode preferredMode() const Q_DECL_OVERRIDE;
     void setAllowDecryption(bool allowDecryption);
     int levelQuote() const Q_DECL_OVERRIDE;
     const QTextCodec *overrideCodec() Q_DECL_OVERRIDE;
     QString createMessageHeader(KMime::Message *message) Q_DECL_OVERRIDE;
     const MimeTreeParser::AttachmentStrategy *attachmentStrategy() Q_DECL_OVERRIDE;
     MimeTreeParser::HtmlWriter *htmlWriter() Q_DECL_OVERRIDE;
-    MimeTreeParser::CSSHelperBase *cssHelper() Q_DECL_OVERRIDE;
     QObject *sourceObject() Q_DECL_OVERRIDE;
     bool autoImportKeys() const Q_DECL_OVERRIDE;
     bool showEmoticons() const Q_DECL_OVERRIDE;
     bool showExpandQuotesMark() const Q_DECL_OVERRIDE;
+    bool isPrinting() const Q_DECL_OVERRIDE;
     const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE;
     MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE;
 private:

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/outboxmodel.cpp Added

@@ -0,0 +1,113 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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 "outboxmodel.h"
+
+#include <QFile>
+#include <QDateTime>
+
+#include <sink/standardqueries.h>
+
+
+OutboxModel::OutboxModel(QObject *parent)
+    : QSortFilterProxyModel()
+{
+    setDynamicSortFilter(true);
+    sort(0, Qt::DescendingOrder);
+
+    using namespace Sink::ApplicationDomain;
+    auto query = Sink::StandardQueries::outboxMails();
+    query.setFlags(Sink::Query::LiveQuery);
+    query.request<Mail::Subject>();
+    query.request<Mail::Sender>();
+    query.request<Mail::Date>();
+    query.request<Mail::Unread>();
+    query.request<Mail::Important>();
+    query.request<Mail::Draft>();
+    query.request<Mail::Folder>();
+    runQuery(query);
+}
+
+OutboxModel::~OutboxModel()
+{
+
+}
+
+QHash< int, QByteArray > OutboxModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[Subject] = "subject";
+    roles[Sender] = "sender";
+    roles[SenderName] = "senderName";
+    roles[Date] = "date";
+    roles[Unread] = "unread";
+    roles[Important] = "important";
+    roles[Draft] = "draft";
+    roles[Id] = "id";
+    roles[MimeMessage] = "mimeMessage";
+    roles[DomainObject] = "domainObject";
+
+    return roles;
+}
+
+QVariant OutboxModel::data(const QModelIndex &idx, int role) const
+{
+    auto srcIdx = mapToSource(idx);
+    auto mail = srcIdx.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>();
+    switch (role) {
+        case Subject:
+            return mail->getSubject();
+        case Sender:
+            return mail->getSender().emailAddress;
+        case SenderName:
+            return mail->getSender().name;
+        case Date:
+            return mail->getDate();
+        case Unread:
+            return mail->getUnread();
+        case Important:
+            return mail->getImportant();
+        case Draft:
+            return mail->getDraft();
+        case Id:
+            return mail->identifier();
+        case DomainObject:
+            return QVariant::fromValue(mail);
+        case MimeMessage: {
+            return mail->getMimeMessage();
+        }
+    }
+    return QSortFilterProxyModel::data(idx, role);
+}
+
+bool OutboxModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const auto leftDate = left.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>()->getDate();
+    const auto rightDate = right.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>()->getDate();
+    return leftDate < rightDate;
+}
+
+void OutboxModel::runQuery(const Sink::Query &query)
+{
+    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+    setSourceModel(m_model.data());
+}
+

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/outboxmodel.h Added

@@ -0,0 +1,60 @@
+/*
+    Copyright (c) 2016 Michael Bohlender <michael.bohlender@kdemail.net>
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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.
+*/
+
+#pragma once
+
+#include <sink/store.h>
+
+#include <QSortFilterProxyModel>
+#include <QSharedPointer>
+#include <QStringList>
+
+class OutboxModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    OutboxModel(QObject *parent = Q_NULLPTR);
+    ~OutboxModel();
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
+
+    enum Roles {
+        Subject  = Qt::UserRole + 1,
+        Sender,
+        SenderName,
+        Date,
+        Unread,
+        Important,
+        Draft,
+        Id,
+        MimeMessage,
+        DomainObject
+    };
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+
+    void runQuery(const Sink::Query &query);
+
+private:
+    QSharedPointer<QAbstractItemModel> m_model;
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/recepientautocompletionmodel.cpp Added

@@ -0,0 +1,110 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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 "recepientautocompletionmodel.h"
+
+#include <QStandardItemModel>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QSet>
+#include <QDebug>
+#include <QTimer>
+
+RecipientAutocompletionModel::RecipientAutocompletionModel(QObject *parent)
+    : QSortFilterProxyModel(),
+    mSourceModel(new QStandardItemModel),
+    mTimer(new QTimer)
+{
+    setSourceModel(mSourceModel.data());
+    setDynamicSortFilter(true);
+    setFilterCaseSensitivity(Qt::CaseInsensitive);
+    mTimer->setSingleShot(true);
+    QObject::connect(mTimer.data(), &QTimer::timeout, this, &RecipientAutocompletionModel::save);
+
+    load();
+}
+
+RecipientAutocompletionModel::~RecipientAutocompletionModel()
+{
+    save();
+}
+
+static QString getPath()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kube/recepientautocompletion.ini";
+}
+
+void RecipientAutocompletionModel::save()
+{
+    QSet<QString> list;
+    for (int row = 0; row < mSourceModel->rowCount(); row++) {
+        list << mSourceModel->item(row)->data(Text).toString();
+    }
+
+    qWarning() << "Path " <<  getPath();
+    QSettings settings(getPath(), QSettings::IniFormat);
+    settings.setValue("list", QStringList{list.toList()});
+}
+
+void RecipientAutocompletionModel::load()
+{
+    qWarning() << "Path " <<  getPath();
+    QSettings settings(getPath(), QSettings::IniFormat);
+    auto list = settings.value("list").toStringList();
+    auto add = [] (const QString &n) {
+        auto item = new QStandardItem{n};
+        item->setData(n, Text);
+        return item;
+    };
+    for (const auto &entry : list) {
+        mSourceModel->appendRow(add(entry));
+    }
+}
+
+QHash< int, QByteArray > RecipientAutocompletionModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Text] = "text";
+    roles[Color] = "color";
+    return roles;
+}
+
+void RecipientAutocompletionModel::addEntry(const QByteArray &address, const QByteArray &name)
+{
+    auto add = [] (const QString &n) {
+        auto item = new QStandardItem{n};
+        item->setData(n, Text);
+        return item;
+    };
+    auto formattedName = [&] () {
+        if (name.isEmpty()) {
+            return QString(address);
+        }
+        return QString("%1 <%2>").arg(QString(address), QString(name));
+    }();
+    auto matches = mSourceModel->findItems(formattedName);
+    if (matches.isEmpty()) {
+        mSourceModel->appendRow(add(formattedName));
+        mTimer->start(100);
+    }
+}
+
+void RecipientAutocompletionModel::setFilter(const QString &filter)
+{
+    setFilterWildcard("*" + filter +"*");
+}

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/recepientautocompletionmodel.h Added

@@ -0,0 +1,55 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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.
+*/
+
+#pragma once
+
+#include <QSortFilterProxyModel>
+#include <QScopedPointer>
+
+class QStandardItemModel;
+class QTimer;
+
+class RecipientAutocompletionModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    RecipientAutocompletionModel(QObject *parent = Q_NULLPTR);
+    ~RecipientAutocompletionModel();
+
+    enum Roles {
+        Text  = Qt::UserRole + 1,
+        Color
+    };
+    Q_ENUMS(Roles)
+
+    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+
+    void addEntry(const QByteArray &address, const QByteArray &name);
+    void setFilter(const QString &);
+
+private slots:
+    void save();
+
+private:
+    void load();
+
+    QScopedPointer<QStandardItemModel> mSourceModel;
+    QScopedPointer<QTimer> mTimer;
+};

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/settings Added

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/settings/accountsettings.cpp Added

@@ -0,0 +1,338 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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 "accountsettings.h"
+
+#include <sink/store.h>
+#include <QDebug>
+#include <QDir>
+#include <QUrl>
+
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
+AccountSettings::AccountSettings(QObject *parent)
+    : QObject(parent)
+{
+}
+
+
+void AccountSettings::setAccountIdentifier(const QByteArray &id)
+{
+    if (id.isEmpty()) {
+        return;
+    }
+    mAccountIdentifier = id;
+
+    //Clear
+    mIcon = QString();
+    mName = QString();
+    mImapServer = QString();
+    mImapUsername = QString();
+    mImapPassword = QString();
+    mSmtpServer = QString();
+    mSmtpUsername = QString();
+    mSmtpPassword = QString();
+    emit changed();
+    emit imapResourceChanged();
+    emit smtpResourceChanged();
+
+    load();
+
+}
+
+QByteArray AccountSettings::accountIdentifier() const
+{
+    return mAccountIdentifier;
+}
+
+void AccountSettings::setPath(const QUrl &path)
+{
+    auto normalizedPath = path.path();
+    if (mPath != normalizedPath) {
+        mPath = normalizedPath;
+        emit pathChanged();
+    }
+}
+
+QUrl AccountSettings::path() const
+{
+    return QUrl(mPath);
+}
+
+QValidator *AccountSettings::pathValidator() const
+{
+    class PathValidator : public QValidator {
+        State validate(QString &input, int &pos) const {
+            Q_UNUSED(pos);
+            if (!input.isEmpty() && QDir(input).exists()) {
+                return Acceptable;
+            } else {
+                return Intermediate;
+            }
+        }
+    };
+    static PathValidator *pathValidator = new PathValidator;
+    return pathValidator;
+}
+
+QValidator *AccountSettings::imapServerValidator() const
+{
+    class ImapServerValidator : public QValidator {
+        State validate(QString &input, int &pos) const {
+            Q_UNUSED(pos);
+            // imaps://mainserver.example.net:475
+            const QUrl url(input);
+            static QSet<QString> validProtocols = QSet<QString>() << "imap" << "imaps";
+            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
+                return Acceptable;
+            } else {
+                return Intermediate;
+            }
+        }
+    };
+    static ImapServerValidator *validator = new ImapServerValidator;
+    return validator;
+}
+
+QValidator *AccountSettings::smtpServerValidator() const
+{
+    class SmtpServerValidator : public QValidator {
+        State validate(QString &input, int &pos) const {
+            Q_UNUSED(pos);
+            // smtps://mainserver.example.net:475
+            const QUrl url(input);
+            static QSet<QString> validProtocols = QSet<QString>() << "smtp" << "smtps";
+            if (url.isValid() && validProtocols.contains(url.scheme().toLower())) {
+                return Acceptable;
+            } else {
+                return Intermediate;
+            }
+        }
+    };
+    static SmtpServerValidator *validator = new SmtpServerValidator;
+    return validator;
+}
+
+void AccountSettings::saveAccount()
+{
+    qDebug() << "Saving account " << mAccountIdentifier << mMailtransportIdentifier;
+    Q_ASSERT(!mAccountIdentifier.isEmpty());
+    SinkAccount account(mAccountIdentifier);
+    account.setAccountType("imap");
+    account.setName(mName);
+    account.setIcon(mIcon);
+    Q_ASSERT(!account.identifier().isEmpty());
+    Store::modify(account)
+        .onError([](const KAsync::Error &error) {
+            qWarning() << "Error while creating account: " << error.errorMessage;;
+        })
+        .exec();
+}
+
+void AccountSettings::loadAccount()
+{
+    Q_ASSERT(!mAccountIdentifier.isEmpty());
+    Store::fetchOne<SinkAccount>(Query().filter(mAccountIdentifier))
+        .syncThen<void, SinkAccount>([this](const SinkAccount &account) {
+            mIcon = account.getIcon();
+            mName = account.getName();
+            emit changed();
+        }).exec();
+}
+
+void AccountSettings::loadImapResource()
+{
+    Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::storage))
+        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+            mImapIdentifier = resource.identifier();
+            mImapServer = resource.getProperty("server").toString();
+            mImapUsername = resource.getProperty("username").toString();
+            mImapPassword = resource.getProperty("password").toString();
+            emit imapResourceChanged();
+        }).onError([](const KAsync::Error &error) {
+            qWarning() << "Failed to find the imap resource: " << error.errorMessage;
+        }).exec();
+}
+
+void AccountSettings::loadMaildirResource()
+{
+    Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::storage))
+        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+            mMaildirIdentifier = resource.identifier();
+            auto path = resource.getProperty("path").toString();
+            if (mPath != path) {
+                mPath = path;
+                emit pathChanged();
+            }
+        }).onError([](const KAsync::Error &error) {
+            qWarning() << "Failed to find the maildir resource: " << error.errorMessage;
+        }).exec();
+}
+
+void AccountSettings::loadMailtransportResource()
+{
+    Store::fetchOne<SinkResource>(Query().filter<SinkResource::Account>(mAccountIdentifier).containsFilter<SinkResource::Capabilities>(ResourceCapabilities::Mail::transport))
+        .syncThen<void, SinkResource>([this](const SinkResource &resource) {
+            mMailtransportIdentifier = resource.identifier();
+            mSmtpServer = resource.getProperty("server").toString();
+            mSmtpUsername = resource.getProperty("username").toString();
+            mSmtpPassword = resource.getProperty("password").toString();
+            emit smtpResourceChanged();
+        }).onError([](const KAsync::Error &error) {
+            qWarning() << "Failed to find the smtp resource: " << error.errorMessage;
+        }).exec();

_service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/domain/settings/accountsettings.h Added

@@ -0,0 +1,110 @@
+/*
+    Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    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.
+*/
+#pragma once
+
+#include <QObject>
+#include <QValidator>
+
+class AccountSettings : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QByteArray accountIdentifier READ accountIdentifier WRITE setAccountIdentifier)
+    Q_PROPERTY(QString icon MEMBER mIcon NOTIFY changed)
+    Q_PROPERTY(QString accountName MEMBER mName NOTIFY changed)
+
+    Q_PROPERTY(QString userName MEMBER mUsername NOTIFY identityChanged)
+    Q_PROPERTY(QString emailAddress MEMBER mEmailAddress NOTIFY identityChanged)
+
+    Q_PROPERTY(QString imapServer MEMBER mImapServer NOTIFY imapResourceChanged)
+    Q_PROPERTY(QValidator* imapServerValidator READ imapServerValidator CONSTANT)
+    Q_PROPERTY(QString imapUsername MEMBER mImapUsername NOTIFY imapResourceChanged)
+    Q_PROPERTY(QString imapPassword MEMBER mImapPassword NOTIFY imapResourceChanged)
+
+    Q_PROPERTY(QString smtpServer MEMBER mSmtpServer NOTIFY smtpResourceChanged)
+    Q_PROPERTY(QValidator* smtpServerValidator READ smtpServerValidator CONSTANT)
+    Q_PROPERTY(QString smtpUsername MEMBER mSmtpUsername NOTIFY smtpResourceChanged)
+    Q_PROPERTY(QString smtpPassword MEMBER mSmtpPassword NOTIFY smtpResourceChanged)
+
+    Q_PROPERTY(QUrl path READ path WRITE setPath NOTIFY pathChanged)
+    Q_PROPERTY(QValidator* pathValidator READ pathValidator CONSTANT)
+
+public:
+    AccountSettings(QObject *parent = 0);
+
+    void setAccountIdentifier(const QByteArray &);
+    QByteArray accountIdentifier() const;
+
+    void setPath(const QUrl &);
+    QUrl path() const;
+
+    virtual QValidator *imapServerValidator() const;
+    virtual QValidator *smtpServerValidator() const;
+    virtual QValidator *pathValidator() const;
+
+    Q_INVOKABLE virtual void load() = 0;
+    Q_INVOKABLE virtual void save() = 0;
+    Q_INVOKABLE virtual void remove() = 0;
+
+signals:
+    void imapResourceChanged();
+    void smtpResourceChanged();
+    void identityChanged();
+    void pathChanged();
+    void changed();
+
+protected:
+    void saveAccount();
+    void saveImapResource();
+    void saveMaildirResource();
+    void saveMailtransportResource();
+    void saveIdentity();
+
+    void loadAccount();
+    void loadImapResource();
+    void loadMaildirResource();
+    void loadMailtransportResource();
+    void loadIdentity();
+
+    void removeAccount();
+    void removeResource(const QByteArray &identifier);
+
+    void removeIdentity();
+
+    QByteArray mAccountIdentifier;
+    QString mIcon;
+    QString mName;
+
+    QByteArray mImapIdentifier;
+    QString mImapServer;
+    QString mImapUsername;
+    QString mImapPassword;
+
+    QByteArray mMaildirIdentifier;
+    QString mPath;
+
+    QByteArray mMailtransportIdentifier;
+    QString mSmtpServer;
+    QString mSmtpUsername;
+    QString mSmtpPassword;
+
+    QByteArray mIdentityIdentifier;
+    QString mUsername;
+    QString mEmailAddress;
+};
+

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/framework/settings/CMakeLists.txt -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/framework/settings/CMakeLists.txt Changed

_service:recompress:tar_scm:kube-0.1.git20160622.2961dd4.tar.gz/mkdocs.yml -> _service:recompress:tar_scm:kube-0.1.git20161211.d33a516.tar.gz/mkdocs.yml Changed

Changes of Revision 15