diff --git a/src/apps/qml/ShowDiscussionsInRoomDialog.qml b/src/apps/qml/ShowDiscussionsInRoomDialog.qml index 91c57022..959a98a8 100644 --- a/src/apps/qml/ShowDiscussionsInRoomDialog.qml +++ b/src/apps/qml/ShowDiscussionsInRoomDialog.qml @@ -1,116 +1,117 @@ /* Copyright (c) 2019 Montel Laurent 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 ) version 3 or, at the discretion of KDE e.V. ( which shall act as a proxy as in section 14 of the GPLv3 ), 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. */ import QtQuick.Layouts 1.12 import QtQuick.Controls 2.5 as QQC2 import QtQuick.Window 2.2 import QtQuick 2.9 import KDE.Ruqola.UsersForRoomFilterProxyModel 1.0 import org.kde.kirigami 2.7 as Kirigami QQC2.Dialog { id: showDiscussionsInRoomDialog title: i18n("Discussions") signal openDiscussion(string discussionId) property QtObject discussionsModel property string roomId x: parent.width / 2 - width / 2 y: parent.height / 2 - height / 2 modal: true focus: true standardButtons: QQC2.Dialog.Close function initializeAndOpen() { searchField.text = ""; open(); } ColumnLayout { LineEditWithClearButton { id: searchField placeholderText: i18n("Search Discussions...") Layout.fillWidth: true onTextChanged: { discussionsModel.setFilterString(text); } } QQC2.Label { text: listview.count === 0 ? i18n("No Discussion found") : "" Component.onCompleted: { font.italic = true font.bold = true } } ListView { id: listview width: 400; height: 200 clip: true // Scrollars QQC2.ScrollIndicator.vertical: QQC2.ScrollIndicator { } QQC2.ScrollIndicator.horizontal: QQC2.ScrollIndicator { } model: discussionsModel delegate: Kirigami.BasicListItem { + reserveSpaceForIcon: false RowLayout { ColumnLayout { QQC2.Label { text: description elide: Text.ElideRight wrapMode: QQC2.Label.Wrap } RowLayout { QQC2.Label { text: i18np("1 message", "%1 messages", numberofmessages) elide: Text.ElideRight wrapMode: QQC2.Label.Wrap } QQC2.Label { id: timestampText Layout.alignment: Qt.AlignTop | Qt.AlignRight text: lastmessage opacity: .5 } } QQC2.Label { text: i18n("Open Discussion") elide: Text.ElideRight wrapMode: QQC2.Label.Wrap color: Kirigami.Theme.negativeTextColor MouseArea { anchors.fill: parent onClicked: { showDiscussionsInRoomDialog.openDiscussion(discussionid) showDiscussionsInRoomDialog.close() //Allow to close it. } } } } } } } } } diff --git a/src/apps/qml/ShowFilesInRoomDialog.qml b/src/apps/qml/ShowFilesInRoomDialog.qml index 670069e6..d3afa1a9 100644 --- a/src/apps/qml/ShowFilesInRoomDialog.qml +++ b/src/apps/qml/ShowFilesInRoomDialog.qml @@ -1,140 +1,140 @@ /* Copyright (c) 2018-2019 Montel Laurent 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 ) version 3 or, at the discretion of KDE e.V. ( which shall act as a proxy as in section 14 of the GPLv3 ), 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. */ import QtQuick.Layouts 1.12 import QtQuick.Controls 2.5 as QQC2 import QtQuick.Window 2.2 import QtQuick 2.9 import KDE.Ruqola.FilesForRoomFilterProxyModel 1.0 import org.kde.kirigami 2.7 as Kirigami import "common" QQC2.Dialog { id: showFilesInRoomDialog title: i18n("Show Files In Room") signal downloadFile(string file) signal deleteFile(string fileid) property QtObject filesModel x: parent.width / 2 - width / 2 y: parent.height / 2 - height / 2 modal: true standardButtons: QQC2.Dialog.Close function initializeAndOpen() { searchField.text = ""; open(); } ColumnLayout { LineEditWithClearButton { id: searchField placeholderText: i18n("Search File...") Layout.fillWidth: true onTextChanged: { filesModel.setFilterString(text); } } QQC2.Label { text: listview.count === 0 ? i18n("No Attachment found") : i18np("%1 attachment in room", "%1 attachments in room", listview.count) Component.onCompleted: { font.italic = true font.bold = true } } //Add scrollview ListView { id: listview width: 400 height: 200 clip: true // Scrollars QQC2.ScrollIndicator.vertical: QQC2.ScrollIndicator { } QQC2.ScrollIndicator.horizontal: QQC2.ScrollIndicator { } model: filesModel delegate: Kirigami.BasicListItem { + reserveSpaceForIcon: false RowLayout { - //width: ListView.view.width ColumnLayout { QQC2.Label { text: filename elide: Text.ElideRight wrapMode: QQC2.Label.Wrap } QQC2.Label { text: (description !== "" ? description : "") visible: description !== "" wrapMode: QQC2.Label.Wrap Component.onCompleted: { font.italic = true } } QQC2.Label { text: username wrapMode: QQC2.Label.NoWrap elide: Text.ElideRight color: Kirigami.Theme.disabledTextColor Component.onCompleted: { font.italic = true } } QQC2.Label { text: timestamp wrapMode: QQC2.Label.NoWrap color: Kirigami.Theme.disabledTextColor Component.onCompleted: { font.italic = true } } } Item { Layout.fillWidth: true } DownloadButton { onDownloadButtonClicked: { showFilesInRoomDialog.downloadFile(url) } } DeleteButton { visible: canbedeleted onDeleteButtonClicked: { deleteFileAttachmentDialog.fileId = fileid; deleteFileAttachmentDialog.open(); } } } } } } DeleteFileAttachmentDialog { id: deleteFileAttachmentDialog onDeleteAttachment: { showFilesInRoomDialog.deleteFile(fileId) } } }