mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-11-04 08:10:18 +08:00
24edba9a2f
This commit makes the necessary changes to migrate from Qt 6.5.3 to Qt 6.6.1 and fixes the following issues: - EditedPopup.qml: "layout polish loop" and "recursive rearrange" errors (GitLab: #1510) as well as an unreported bug where text was clipped instead of elided - BaseContextMenu.qml: QML warning ("Created graphical object was not placed in the graphics scene.") The daemon is also bumped in order to include a patch for a build issue on openSUSE Leap (GitLab: #1552). GitLab: #1466 Change-Id: I12df2f84067ebe961368879e08ff7ef275d93395
69 lines
2.2 KiB
QML
69 lines
2.2 KiB
QML
/*
|
|
* Copyright (C) 2022-2024 Savoir-faire Linux Inc.
|
|
*
|
|
* 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import Qt5Compat.GraphicalEffects
|
|
import net.jami.Models 1.1
|
|
import net.jami.Adapters 1.1
|
|
import net.jami.Constants 1.1
|
|
|
|
BaseModalDialog {
|
|
id: root
|
|
|
|
property var previousBodies: undefined
|
|
|
|
popupContent: JamiListView {
|
|
id: editsList
|
|
|
|
width: 400 - 2 * root.popupMargins
|
|
height: Math.min(count * 50, 150)
|
|
|
|
model: root.previousBodies
|
|
|
|
delegate: Rectangle {
|
|
width: editsList.width
|
|
height: Math.max(JamiTheme.menuItemsPreferredHeight, rowBody.implicitHeight)
|
|
color: index % 2 === 0 ? JamiTheme.backgroundColor : JamiTheme.secondaryBackgroundColor
|
|
|
|
RowLayout {
|
|
id: rowBody
|
|
spacing: JamiTheme.preferredMarginSize
|
|
anchors.fill: parent
|
|
|
|
Text {
|
|
Layout.maximumWidth: root.width / 2
|
|
Layout.leftMargin: JamiTheme.settingsMarginSize
|
|
elide: Text.ElideRight
|
|
|
|
text: MessagesAdapter.getFormattedDay(modelData.timestamp.toString()) + " - " + MessagesAdapter.getFormattedTime(modelData.timestamp.toString())
|
|
color: JamiTheme.textColor
|
|
opacity: 0.5
|
|
}
|
|
|
|
Text {
|
|
Layout.fillWidth: true
|
|
elide: Text.ElideRight
|
|
|
|
text: modelData.body === "" ? JamiStrings.deletedMessage : modelData.body
|
|
color: JamiTheme.textColor
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|