diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-10-18 22:43:45 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-10-18 22:43:45 +0200 |
| commit | 78fac7dced05c8c020aa84d3e403dd72ecf76027 (patch) | |
| tree | c1928873f1854bc8e903f8bc39f581c6c2a1c8bc | |
| parent | fab78056104eae4149d54514c273936f8f48c36f (diff) | |
Small qml fixes
| -rw-r--r-- | resources/qml/CommunitiesList.qml | 6 | ||||
| -rw-r--r-- | resources/qml/MatrixText.qml | 3 | ||||
| -rw-r--r-- | resources/qml/ReplyPopup.qml | 2 | ||||
| -rw-r--r-- | resources/qml/dialogs/AliasEditor.qml | 8 | ||||
| -rw-r--r-- | src/timeline/TimelineFilter.cpp | 22 |
5 files changed, 22 insertions, 19 deletions
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml index 81f0640e..37a44163 100644 --- a/resources/qml/CommunitiesList.qml +++ b/resources/qml/CommunitiesList.qml @@ -143,11 +143,11 @@ Page { enabled: false height: avatarSize roomid: model.id - textColor: model.avatarUrl.startsWith(":/") ? communityItem.unimportantText : communityItem.importantText + textColor: model.avatarUrl?.startsWith(":/") == true ? communityItem.unimportantText : communityItem.importantText url: { - if (model.avatarUrl.startsWith("mxc://")) + if (model.avatarUrl?.startsWith("mxc://") == true) return model.avatarUrl.replace("mxc://", "image://MxcImage/"); - else if (model.avatarUrl.length > 0) + else if ((model.avatarUrl?.length ?? 0) > 0) return model.avatarUrl; else return ""; diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml index c804e72e..bdc0cb6b 100644 --- a/resources/qml/MatrixText.qml +++ b/resources/qml/MatrixText.qml @@ -2,9 +2,6 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -// TODO: using any Qt 6 API version will screw up the reply text color. We need to -// figure out a more permanent fix than just importing the old version. -//import QtQuick 2.15 import QtQuick import QtQuick.Controls import im.nheko diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml index 5657c08a..17ce7ee4 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml @@ -29,7 +29,7 @@ Rectangle { anchors.rightMargin: replyPopup.width < 450 ? 2 * (22 + 16) : 3 * (22 + 16) anchors.top: parent.top anchors.topMargin: Nheko.paddingSmall - eventId: room.reply ?? "" + eventId: room?.reply ?? "" userColor: TimelineManager.userColor(modelData.userId, palette.window) visible: room && room.reply maxWidth: parent.width - anchors.leftMargin - anchors.rightMargin diff --git a/resources/qml/dialogs/AliasEditor.qml b/resources/qml/dialogs/AliasEditor.qml index c49ad321..df2938ef 100644 --- a/resources/qml/dialogs/AliasEditor.qml +++ b/resources/qml/dialogs/AliasEditor.qml @@ -4,10 +4,10 @@ import ".." import "../components" -import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Layouts 1.3 -import im.nheko 1.0 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import im.nheko ApplicationWindow { diff --git a/src/timeline/TimelineFilter.cpp b/src/timeline/TimelineFilter.cpp index 6f2f9e7a..c2d9e31b 100644 --- a/src/timeline/TimelineFilter.cpp +++ b/src/timeline/TimelineFilter.cpp @@ -163,14 +163,20 @@ TimelineFilter::setSource(TimelineModel *s) this->setSourceModel(s); - connect(s, &TimelineModel::currentIndexChanged, this, &TimelineFilter::currentIndexChanged); - connect( - s, &TimelineModel::fetchedMore, this, &TimelineFilter::fetchAgain, Qt::QueuedConnection); - connect(s, - &TimelineModel::dataChanged, - this, - &TimelineFilter::sourceDataChanged, - Qt::QueuedConnection); + if (s) { + connect( + s, &TimelineModel::currentIndexChanged, this, &TimelineFilter::currentIndexChanged); + connect(s, + &TimelineModel::fetchedMore, + this, + &TimelineFilter::fetchAgain, + Qt::QueuedConnection); + connect(s, + &TimelineModel::dataChanged, + this, + &TimelineFilter::sourceDataChanged, + Qt::QueuedConnection); + } // reset the search index a second time just to be safe. incrementalSearchIndex = 0; |