From 9fbae5e1910d08cfeaf0002e881923dacb4c18bf Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 9 Feb 2018 12:30:38 +0100 Subject: Searchview --- views/CMakeLists.txt | 1 + views/search/main.qml | 100 ++++++++++++++++++++++++++++ views/search/metadata.json | 4 ++ views/search/qml/View.qml | 39 +++++++++++ views/search/tests/tst_searchview.qml | 120 ++++++++++++++++++++++++++++++++++ 5 files changed, 264 insertions(+) create mode 100644 views/search/main.qml create mode 100644 views/search/metadata.json create mode 100644 views/search/qml/View.qml create mode 100644 views/search/tests/tst_searchview.qml diff --git a/views/CMakeLists.txt b/views/CMakeLists.txt index 5b19620d..565b48b0 100644 --- a/views/CMakeLists.txt +++ b/views/CMakeLists.txt @@ -9,6 +9,7 @@ install_view(conversation) install_view(people) install_view(log) install_view(accounts) +install_view(search) if (${EXPERIMENTAL_VIEWS}) install_view(inboxcrusher) endif() diff --git a/views/search/main.qml b/views/search/main.qml new file mode 100644 index 00000000..06b59b42 --- /dev/null +++ b/views/search/main.qml @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2018 Christian Mollekopf, + * + * 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.Window 2.0 + +import org.kube.framework 1.0 as Kube +import org.kube.test 1.0 +import "qml" + +ApplicationWindow { + id: app + height: Screen.desktopAvailableHeight * 0.8 + width: Screen.desktopAvailableWidth * 0.8 + + Component.onCompleted: { + var initialState = { + accounts: [{ + id: "account1", + name: "Test Account" + }], + identities: [{ + account: "account1", + name: "Test Identity", + address: "identity@example.org" + }], + resources: [{ + id: "resource1", + account: "account1", + type: "dummy" + }, + { + id: "resource2", + account: "account1", + type: "mailtransport" + }], + folders: [{ + id: "folder1", + resource: "resource1", + name: "Folder 1", + mails: [{ + resource: "resource1", + messageId: "", + date: "2017-07-24T15:46:29", + subject: "subject1", + body: "body", + to: ["to@example.org"], + cc: ["cc@example.org"], + bcc: ["bcc@example.org"], + }, + { + resource: "resource1", + inReplyTo: "", + date: "2017-07-24T16:46:29", + subject: "subject2", + body: "body2", + to: ["to@example.org"], + }, + { + resource: "resource1", + inReplyTo: "", + date: "2017-07-24T17:46:29", + subject: "subject3", + body: "body3\n\n\n\nfoo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nThe End", + to: ["to@example.org"], + }, + { + resource: "resource1", + inReplyTo: "", + date: "2017-07-24T18:46:29", + subject: "subject4", + body: "body4", + to: ["to@example.org"], + }, + ] + }], + } + TestStore.setup(initialState) + } + + View { + anchors.fill: parent + } +} diff --git a/views/search/metadata.json b/views/search/metadata.json new file mode 100644 index 00000000..870ff2aa --- /dev/null +++ b/views/search/metadata.json @@ -0,0 +1,4 @@ +{ + "icon": "mail-message-inverted", + "tooltip": "Follow conversations." +} diff --git a/views/search/qml/View.qml b/views/search/qml/View.qml new file mode 100644 index 00000000..d2c8ae65 --- /dev/null +++ b/views/search/qml/View.qml @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 Michael Bohlender, + * Copyright (C) 2017 Christian Mollekopf, + * + * 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.Controls 2.0 as Controls2 +import QtQuick.Layouts 1.1 + +import org.kube.framework 1.0 as Kube + +FocusScope { + Rectangle { + anchors.fill: parent + Kube.MailListView { + id: mailListView + anchors.fill: parent + activeFocusOnTab: true + Layout.minimumWidth: Kube.Units.gridUnit * 10 + } + } + } +} diff --git a/views/search/tests/tst_searchview.qml b/views/search/tests/tst_searchview.qml new file mode 100644 index 00000000..610c28b3 --- /dev/null +++ b/views/search/tests/tst_searchview.qml @@ -0,0 +1,120 @@ +/* + * Copyright 2017 Christian Mollekopf + * + * This program 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, 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 Library General Public License for more details + * + * You should have received a copy of the GNU Library 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 QtTest 1.0 +import "../qml" +import org.kube.framework 1.0 as Kube +import org.kube.test 1.0 + +TestCase { + id: testCase + width: 400 + height: 400 + name: "MailView" + + Component { + id: mailViewComponent + View { + focus: true + } + } + + function test_1start() { + var mailView = createTemporaryObject(mailViewComponent, testCase, {}) + verify(mailView) + } + + function test_2verifyInitialFocus() { + var mailView = createTemporaryObject(mailViewComponent, testCase, {}) + var newMailButton = findChild(mailView, "newMailButton"); + verify(newMailButton) + // verify(newMailButton.activeFocus) + } + + function test_3selectMessage() { + var initialState = { + accounts: [{ + id: "account1", + name: "Test Account" + }], + identities: [{ + account: "account1", + name: "Test Identity", + address: "identity@example.org" + }], + resources: [{ + id: "resource1", + account: "account1", + type: "dummy" + }, + { + id: "resource2", + account: "account1", + type: "mailtransport" + }], + folders: [{ + id: "folder1", + resource: "resource1", + name: "Folder 1", + specialpurpose: ["inbox"], + mails: [{ + resource: "resource1", + subject: "subject1", + body: "body", + to: ["to@example.org"], + cc: ["cc@example.org"], + bcc: ["bcc@example.org"], + draft: true + }, + { + resource: "resource1", + subject: "subject2", + body: "body", + to: ["to@example.org"], + cc: ["cc@example.org"], + bcc: ["bcc@example.org"], + draft: true + } + ], + }], + } + TestStore.setup(initialState) + var mailView = createTemporaryObject(mailViewComponent, testCase, {}) + var folderListView = findChild(mailView, "folderListView"); + verify(folderListView) + + var folder = TestStore.load("folder", {resource: "resource1"}) + verify(folder) + + Kube.Fabric.postMessage(Kube.Messages.folderSelection, {"folder": folder, "trash": false}); + + var mailListView = findChild(mailView, "mailListView"); + verify(mailListView) + var listView = findChild(mailListView, "listView"); + verify(listView) + tryCompare(listView, "count", 2) + + var conversationView = findChild(mailView, "mailView"); + verify(conversationView) + var listView = findChild(conversationView, "listView"); + verify(listView) + // tryCompare(listView, "count", 2) + } +} -- cgit v1.2.3