diff --git a/source/qml/components/globaldrawer/Globaldrawer4.qml b/source/qml/components/globaldrawer/Globaldrawer4.qml index 7e4370a..d7c47be 100644 --- a/source/qml/components/globaldrawer/Globaldrawer4.qml +++ b/source/qml/components/globaldrawer/Globaldrawer4.qml @@ -1,72 +1,72 @@ /* * Copyright 2018 Fabian Riethmayer * * 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.6 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 import org.kde.kirigami 2.4 as Kirigami import "../../models/" as Models import "../../addr/" as Addr import "../../lib/annotate.js" as A Rectangle { - width: 800 + width: 1100 height: 600 id: root Addr.Addressbook { id: addrbook index: 2 gDrawer { modal: false; collapsible: true; collapsed: true; } Component.onCompleted: { - addrbook.pageStack.push(addrbook.detailPage) + //addrbook.pageStack.push(addrbook.detailPage) } } // HACK Timer { interval: 3000 repeat: false running: true onTriggered: { addrbook.gDrawer.collapsed = false; } } Timer { - interval: 7000 + interval: 6000 repeat: false running: true onTriggered: { addrbook.gDrawer.collapsed = true; } } Timer { interval: 500 repeat: false running: true onTriggered: { qmlControler.start(); } } } diff --git a/source/qml/components/globaldrawer/config.json b/source/qml/components/globaldrawer/config.json index 2a15e74..cfcc03d 100644 --- a/source/qml/components/globaldrawer/config.json +++ b/source/qml/components/globaldrawer/config.json @@ -1,20 +1,20 @@ { "Globaldrawer1.qml": { "type": "png", "controls": "mobile", "autostart": 0 }, "Globaldrawer2.qml": { "type": "png", "autostart": 0 }, "Globaldrawer3.qml": { "type": "png", "autostart": 0 }, "Globaldrawer4.qml": { "type": "webm", "autostart": 0, - "duration": 6 + "duration": 5 } } diff --git a/source/qml/models/Contacts.qml b/source/qml/models/Contacts.qml index 23c6b03..bd410e3 100644 --- a/source/qml/models/Contacts.qml +++ b/source/qml/models/Contacts.qml @@ -1,184 +1,209 @@ /* * Copyright 2018 Fabian Riethmayer * * 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.6 ListModel { id: model // Pattern ListElement { firstname: "" lastname: "" image: "" communication: [ ListElement { icon: "" text: "+12 34 1234 5678" description: "mobile" type: "phone" actions: [ ListElement { icon: "" } ] } ] } Component.onCompleted: { model.clear() var data = [{ "firstname": "Berna", "lastname": "Hicks", "image": "BernaFace.jpg", "communication": [{ "icon": "call-start", "type": "phone", "text": "+12 34 1234 5678", "description": "Mobile private", "default": true, "actions": [{ "icon": "kmouth-phrase-new", "text": "SMS" }] }, { "icon": "", "type": "phone", "text": "+12 34 1234 5678", "description": "VOIP" }, { "type": "email", "icon": "mail-message", "text": "susan@kde.org", "default": true, "description": "E-Mail private" }], "history": [{ "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" }, { "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" },{ "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" }] }, { "firstname": "Matt", "lastname": "Byrne", "image": "MattFace.jpg" }, { "firstname": "Santiago", "lastname": "Thorne", "image": "SantiagoFace.jpg", "communication": [{ "icon": "call-start", "type": "phone", "text": "+12 34 1234 5678", "description": "Mobile private", "default": true, "actions": [{ "icon": "kmouth-phrase-new", "text": "SMS" }] }, { "icon": "", "type": "phone", "text": "+12 34 1234 5678", "description": "VOIP" }, { "type": "email", "icon": "mail-message", "text": "susan@kde.org", "default": true, "description": "E-Mail private" + }], + "history": [{ + "icon": "call-start", + "text": "+12 34 1234 5678", + "date": "2018-10-10" + }, { + "icon": "mail-message", + "text": "Lorem ipsum", + "date": "2018-10-10" + }, { + "icon": "call-start", + "text": "+12 34 1234 5678", + "date": "2018-10-10" + }, { + "icon": "mail-message", + "text": "Lorem ipsum", + "date": "2018-10-10" + },{ + "icon": "call-start", + "text": "+12 34 1234 5678", + "date": "2018-10-10" + }, { + "icon": "mail-message", + "text": "Lorem ipsum", + "date": "2018-10-10" }] }, { "firstname": "Susan", "lastname": "Hoffman", "image": "SusanFace.jpg", "communication": [{ "icon": "call-start", "type": "phone", "text": "+12 34 1234 5678", "description": "Mobile private", "default": true, "actions": [{ "icon": "kmouth-phrase-new", "text": "SMS" }] }, { "icon": "", "type": "phone", "text": "+12 34 1234 5678", "description": "VOIP" }, { "type": "email", "icon": "mail-message", "text": "susan@kde.org", "default": true, "description": "E-Mail private" }], "history": [{ "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" }, { "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" },{ "icon": "call-start", "text": "+12 34 1234 5678", "date": "2018-10-10" }, { "icon": "mail-message", "text": "Lorem ipsum", "date": "2018-10-10" }] }, { "firstname": "Philip", "lastname": "Steele", "image": "PhilipFace.jpg" }] model.insert(0, data) } }