Timeline: Stretch date section sections across the whole ListView width

With paddings, it looked sort of glitched, especially in RTL layouts, because messages from the top were highlighting all around the padded section delegate.
Adapt to QML api changes
2023-09-13 13:05:07 +00:00 · 2023-09-13 12:57:27 +00:00 · 2023-09-13 12:57:27 +00:00 · 2023-09-13 14:53:07 +02:00 · 2023-09-13 14:16:48 +02:00 · 2023-09-13 12:05:40 +00:00
30 changed files with 650 additions and 767 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,8 @@

 include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
 #  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -2,35 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause

 Dependencies:
- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
-  'require':
-    'frameworks/extra-cmake-modules': '@stable'
-    'frameworks/kcoreaddons': '@stable'
-    'frameworks/kirigami': '@stable'
-    'frameworks/ki18n': '@stable'
-    'frameworks/kconfig': '@stable'
-    'frameworks/syntax-highlighting': '@stable'
-    'frameworks/kitemmodels': '@stable'
-    'frameworks/kquickcharts': '@stable'
-    'frameworks/knotifications': '@stable'
-    'frameworks/kconfigwidgets': '@stable'
-    'libraries/kquickimageeditor': '@stable'
-    'frameworks/sonnet': '@stable'
-    'libraries/kirigami-addons': '@latest'
-    'third-party/libquotient': '@latest'
-    'third-party/qtkeychain': '@latest'
-    'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
-  'require':
-    'frameworks/qqc2-desktop-style': '@stable'
-    'frameworks/kio': '@stable'
-    'frameworks/kwindowsystem': '@stable'
- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
-  'require':
-    'frameworks/kdbusaddons': '@stable'
-
- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
+- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows']
  'require':
    'frameworks/extra-cmake-modules': '@latest-kf6'
    'frameworks/kcoreaddons': '@latest-kf6'
@@ -48,21 +20,21 @@ Dependencies:
    'third-party/qtkeychain': '@latest'
    'third-party/cmark': '@latest'
    'third-party/qcoro': '@latest'
- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6']
+- 'on': ['Windows', 'Linux', 'FreeBSD']
  'require':
    'frameworks/qqc2-desktop-style': '@latest-kf6'
    'frameworks/kio': '@latest-kf6'
    'frameworks/kwindowsystem': '@latest-kf6'
    'frameworks/kconfigwidgets': '@latest-kf6'
- 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
+- 'on': ['Linux', 'FreeBSD']
  'require':
    'frameworks/kdbusaddons': '@latest-kf6'
    'frameworks/kstatusnotifieritem': '@latest-kf6'

- 'on': ['Linux/Qt6', 'Linux/Qt5']
+- 'on': ['Linux']
  'require':
    'sdk/selenium-webdriver-at-spi': '@latest-kf6'

 Options:
  per-test-timeout: 90
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'FreeBSD', 'Windows' ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

-set(KF_MIN_VERSION "5.105.0")
-set(QT_MIN_VERSION "5.15.2")
-if (ANDROID)
-    set(QT_MIN_VERSION "5.15.10")
-endif()
+set(KF_MIN_VERSION "5.240.0")
+set(QT_MIN_VERSION "6.5")

 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)

@@ -48,28 +45,6 @@ if(NEOCHAT_FLATPAK)
    include(cmake/Flatpak.cmake)
 endif()

-if(QT_MAJOR_VERSION STREQUAL "6")
-    set(BASICLISTITEM_BOLD "font.bold")
-    set(OVERLAYSHEET_OPEN "onOpened")
-    set(QTQUICK_MODULE_QML_VERSION "")
-    set(QTLOCATION_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "")
-    set(QTMULTIMEDIA_AUDIO "MediaPlayer")
-    # in Audio qt6 we don't have it but we disable it in qt5 => it seems ok
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "")
-    # In Video qml qt6 we don't have it.
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "")
-else()
-    set(BASICLISTITEM_BOLD "bold")
-    set(OVERLAYSHEET_OPEN "onSheetOpenChanged")
-    set(QTQUICK_MODULE_QML_VERSION "2.15")
-    set(QTLOCATION_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_MODULE_QML_VERSION "5.15")
-    set(QTMULTIMEDIA_AUDIO "Audio")
-    set(QTMULTIMEDIA_AUDIO_AUTOLOAD "autoLoad: false")
-    set(QTMULTIMEDIA_VIDEO_FLUSHMODE "flushMode: VideoOutput.FirstFrame")
-endif()
-
 set(QUOTIENT_FORCE_NAMESPACED_INCLUDES TRUE)

 ecm_setup_version(${PROJECT_VERSION}
@@ -77,25 +52,21 @@ ecm_setup_version(${PROJECT_VERSION}
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )

-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
-set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+set_package_properties(Qt6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels ConfigWidgets)
-set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
+find_package(KF6 ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
+set_package_properties(KF6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
+set_package_properties(KF6Kirigami2 PROPERTIES
        TYPE REQUIRED
        PURPOSE "Kirigami application UI framework"
        )
-find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
-
-if(QT_MAJOR_VERSION STREQUAL "6")
-    find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} REQUIRED)
-endif()
+find_package(KF6KirigamiAddons 0.7.2 REQUIRED)

 if(ANDROID)
    find_package(OpenSSL)
@@ -104,24 +75,20 @@ if(ANDROID)
        PURPOSE "Encrypted communications"
    )
 else()
-    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem)
-    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
+    find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets)
+    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem StatusNotifierItem)
+    set_package_properties(KF6QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
    )
    ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
+    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

-if(QT_MAJOR_VERSION STREQUAL "6" AND NOT ANDROID AND NOT WIN32)
-    set(QUOTIENT_SUFFIX "Qt6")
-endif()
-
-find_package(Quotient${QUOTIENT_SUFFIX} 0.7)
-set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
+find_package(QuotientQt6 0.7)
+set_package_properties(QuotientQt6 PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
    URL "https://github.com/quotient-im/libQuotient/"
@@ -154,12 +121,12 @@ set_package_properties(KQuickImageEditor PROPERTIES
    PURPOSE "Add image editing capability to image attachments"
 )

-find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)
+find_package(QCoro6 0.4 COMPONENTS Core REQUIRED)

 qcoro_enable_coroutines()

-find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
-set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
+find_package(KF6DocTools ${KF_MIN_VERSION})
+set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
    "Tools to generate documentation"
    TYPE OPTIONAL
 )
@@ -181,12 +148,12 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)

 if (BUILD_TESTING)
-    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
    add_subdirectory(autotests)
    add_subdirectory(appiumtests)
 endif()

-if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
+if(KF6DocTools_FOUND)
    kdoctools_install(po)
    add_subdirectory(doc)
 endif()
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,15 +3,6 @@
 # SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

-configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
-configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
-configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
-configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
-configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
-configure_file(qml/Component/Timeline/OsmLocationPlugin.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/OsmLocationPlugin.qml)
-
-configure_file(res.qrc ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc)
-
 add_library(neochat STATIC
    controller.cpp
    controller.h
@@ -136,7 +127,6 @@ add_library(neochat STATIC
    mediasizehelper.h
    eventhandler.cpp
    enums/delegatetype.h
-    colorschemer.cpp
 )

 ecm_qt_declare_logging_category(neochat
@@ -157,7 +147,7 @@ ecm_qt_declare_logging_category(neochat

 add_executable(neochat-app
    main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/res.generated.qrc
+    res.qrc
 )

 if(TARGET Qt::WebView)
@@ -176,15 +166,15 @@ ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})

 if(NOT ANDROID)
+    target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
    if (NOT WIN32 AND NOT APPLE)
        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        if(QT_MAJOR_VERSION STREQUAL "6")
-            target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
-        endif()
+        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
    else()
        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
    endif()
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF6::ConfigWidgets KF6::WindowSystem)
+    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()

@@ -198,7 +188,7 @@ else()
 endif()

 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels KF${QT_MAJOR_VERSION}::ConfigWidgets Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF6::I18n KF6::Kirigami2 KF6::Notifications KF6::ConfigCore KF6::ConfigGui KF6::CoreAddons KF6::SonnetCore  KF6::ItemModels QuotientQt6 cmark::cmark QCoro::Core)

 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)

@@ -286,7 +276,7 @@ if(ANDROID)
        "gps"
    )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()

@@ -294,12 +284,12 @@ if(NOT ANDROID)
    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()

-if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
+if(TARGET KF6::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()

-if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
+if (TARGET KF6::KIOWidgets)
    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()

--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -134,7 +134,7 @@ int ChatDocumentHandler::completionStartIndex() const
        return 0;
    }

-#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+#if !defined(Q_OS_ANDROID)
    const long long cursor = cursorPosition();
 #else
    const auto cursor = cursorPosition();
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -4,11 +4,7 @@

 #include "controller.h"

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <qt5keychain/keychain.h>
-#else
 #include <qt6keychain/keychain.h>
-#endif

 #include <KConfig>
 #include <KConfigGroup>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,7 +45,6 @@
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
-#include "colorschemer.h"
 #include "controller.h"
 #include "delegatesizehelper.h"
 #include "enums/delegatetype.h"
@@ -92,6 +91,9 @@
 #include "urlhelper.h"
 #include "windowcontroller.h"

+#ifdef HAVE_COLORSCHEME
+#include "colorschemer.h"
+#endif
 #include "models/completionmodel.h"
 #include "models/statemodel.h"

@@ -138,19 +140,13 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-
    QNetworkProxyFactory::setUseSystemConfiguration(true);

 #ifdef HAVE_WEBVIEW
    QtWebView::initialize();
    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
    QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 #endif
-#endif

 #ifdef Q_OS_ANDROID
    QGuiApplication app(argc, argv);
@@ -226,11 +222,13 @@ int main(int argc, char *argv[])
    Login *login = new Login();
    UrlHelper urlHelper;

+#ifdef HAVE_COLORSCHEME
    ColorSchemer colorScheme;
    qmlRegisterSingletonInstance<ColorSchemer>("org.kde.neochat", 1, 0, "ColorSchemer", &colorScheme);
    if (!config->colorScheme().isEmpty()) {
        colorScheme.apply(config->colorScheme());
    }
+#endif

    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());
@@ -307,10 +305,6 @@ int main(int argc, char *argv[])
        return engine->toScriptValue(LocationHelper());
    });

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    qRegisterMetaTypeStreamOperators<Emoji>();
-#endif
-
    QQmlApplicationEngine engine;

 #ifdef HAVE_KDBUSADDONS
--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -145,7 +145,7 @@ void CompletionModel::updateCompletion()
        m_filterModel->setFullText(m_fullText);
        m_filterModel->setFilterText(m_text);
        m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':')) && text().size() > 1 && !text()[1].isUpper()
               && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                   || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
        m_filterModel->setSourceModel(m_emojiModel);
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
@@ -22,11 +22,7 @@ bool CompletionProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &so
            && sourceModel()
                   ->data(sourceModel()->index(sourceRow, 0), secondaryFilterRole())
                   .toString()
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
                   .startsWith(QStringView(m_filterText).sliced(1), Qt::CaseInsensitive));
-#else
-                   .startsWith(m_filterText.midRef(1), Qt::CaseInsensitive));
-#endif
 }

 bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
--- a/src/neochatconnection.cpp
+++ b/src/neochatconnection.cpp
@@ -10,11 +10,7 @@
 #include "jobs/neochatdeactivateaccountjob.h"
 #include "roommanager.h"

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <qt5keychain/keychain.h>
-#else
 #include <qt6keychain/keychain.h>
-#endif

 #include <KLocalizedString>

--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -178,17 +178,9 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
        content = new EventContent::AudioContent(url, fileInfo.size(), mime, fileInfo.fileName());
    } else if (mime.name().startsWith("video/"_ls)) {
        QMediaPlayer player;
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
        player.setSource(url);
-#else
-        player.setMedia(url);
-#endif
        co_await qCoro(&player, &QMediaPlayer::mediaStatusChanged);
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
        auto resolution = player.metaData().value(QMediaMetaData::Resolution).toSize();
-#else
-        auto resolution = player.metaData(QMediaMetaData::Resolution).toSize();
-#endif
        content = new EventContent::VideoContent(url, fileInfo.size(), mime, resolution, fileInfo.fileName());
    } else {
        content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
--- a/src/qml/Component/Timeline/AudioDelegate.qml
+++ b/src/qml/Component/Timeline/AudioDelegate.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
-import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@ 
+import QtMultimedia

 import org.kde.kirigami 2.15 as Kirigami

@@ -42,10 +42,9 @@ TimelineContainer {
        Layout.fillWidth: true
        Layout.maximumWidth: root.contentMaxWidth

-        @QTMULTIMEDIA_AUDIO@ {
+        MediaPlayer {
            id: audio
            source: root.progressInfo.localPath
-            @QTMULTIMEDIA_AUDIO_AUTOLOAD@
        }

        states: [
--- a/src/qml/Component/Timeline/OsmLocationPlugin.qml
+++ b/src/qml/Component/Timeline/OsmLocationPlugin.qml
@@ -3,8 +3,8 @@

 pragma Singleton

-import QtQuick @QTQUICK_MODULE_QML_VERSION@
-import QtLocation @QTLOCATION_MODULE_QML_VERSION@
+import QtQuick
+import QtLocation

 QtObject {
    property var plugin: Plugin {
--- a/src/qml/Component/Timeline/SectionDelegate.qml
+++ b/src/qml/Component/Timeline/SectionDelegate.qml
@@ -19,6 +19,8 @@ QQC2.ItemDelegate {
    property int colorSet: Kirigami.Theme.Window

    topPadding: Kirigami.Units.largeSpacing
+    leftPadding: 0
+    rightPadding: 0
    bottomPadding: 0 // Note not 0 by default

    contentItem: ColumnLayout {
--- a/src/qml/Component/Timeline/TimelineContainer.qml
+++ b/src/qml/Component/Timeline/TimelineContainer.qml
@@ -342,6 +342,8 @@ ColumnLayout {
    SectionDelegate {
        id: sectionDelegate
        Layout.fillWidth: true
+        // Fill ListView width without affecting size helper and the rest of components too much
+        Layout.rightMargin: root.parent ? root.width - root.parent.width : 0
        visible: root.showSection
        labelText: root.section
        colorSet: Config.compactLayout || root.alwaysMaxWidth ? Kirigami.Theme.View : Kirigami.Theme.Window
@@ -622,7 +624,7 @@ ColumnLayout {
            selectedText: selectedText,
            author: root.author,
            eventId: root.eventId,
-            source: root.jsonSource,
+            eventSource: root.jsonSource,
            eventType: root.delegateType,
            plainText: root.plainText,
            htmlText: root.display,
--- a/src/qml/Component/Timeline/VideoDelegate.qml
+++ b/src/qml/Component/Timeline/VideoDelegate.qml
@@ -4,7 +4,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
-import QtMultimedia @QTMULTIMEDIA_MODULE_QML_VERSION@ 
+import QtMultimedia
 import Qt.labs.platform 1.1 as Platform

 import org.kde.kirigami 2.13 as Kirigami
@@ -73,7 +73,6 @@ TimelineContainer {
        Layout.preferredHeight: mediaSizeHelper.currentSize.height

        fillMode: VideoOutput.PreserveAspectFit
-        @QTMULTIMEDIA_VIDEO_FLUSHMODE@

        states: [
            State {
--- a/src/qml/Component/TimelineView.qml
+++ b/src/qml/Component/TimelineView.qml
@@ -36,7 +36,7 @@ QQC2.ScrollView {
        readonly property NeoChatRoom currentRoom: root.currentRoom

        readonly property int largestVisibleIndex: count > 0 ? indexAt(contentX + (width / 2), contentY + height - 1) : -1
-        readonly property var sectionBannerItem: contentHeight >= height ? itemAtIndex(sectionBannerIndex()) : undefined
+        readonly property Item sectionBannerItem: contentHeight >= height ? itemAtIndex(sectionBannerIndex()) : null

        // Spacing needs to be zero or the top sectionLabel overlay will be disrupted.
        // This is because itemAt returns null in the spaces.
@@ -108,13 +108,11 @@ QQC2.ScrollView {
        footer: SectionDelegate {
            id: sectionBanner

-            anchors.left: parent.left
-            anchors.leftMargin: messageListView.sectionBannerItem ? messageListView.sectionBannerItem.x : 0
-            anchors.right: parent.right
+            width: ListView.view ? ListView.view.width : 0

            maxWidth: Config.compactLayout ? messageListView.width : (messageListView.sectionBannerItem ? messageListView.sectionBannerItem.width - Kirigami.Units.largeSpacing * 2 : 0)
            z: 3
-            visible: !!messageListView.sectionBannerItem && messageListView.sectionBannerItem.ListView.section !== "" && !Config.blur
+            visible: messageListView.sectionBannerItem && messageListView.sectionBannerItem.ListView.section !== "" && !Config.blur
            labelText: messageListView.sectionBannerItem ? messageListView.sectionBannerItem.ListView.section : ""
            colorSet: Config.compactLayout ? Kirigami.Theme.View : Kirigami.Theme.Window
        }
--- a/src/qml/Dialog/PowerLevelDialog.qml
+++ b/src/qml/Dialog/PowerLevelDialog.qml
@@ -17,7 +17,7 @@ Kirigami.OverlaySheet {
    property var userId
    property int powerLevel

-    @OVERLAYSHEET_OPEN@: {
+    onOpened: {
        if (sheetOpen) {
            powerLevelComboBox.currentIndex = powerLevelComboBox.indexOfValue(root.powerLevel)
        }
--- a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml
+++ b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml
@@ -92,7 +92,7 @@ MessageDelegateContextMenu {
            icon.name: "code-context"
            onTriggered: {
                applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
-                    sourceText: root.source
+                    sourceText: root.eventSource
                }, {
                    title: i18n("Message Source"),
                    width: Kirigami.Units.gridUnit * 25
--- a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -16,7 +16,7 @@ Loader {
    required property var author
    required property string eventId
    property var eventType
-    required property string source
+    required property string eventSource
    property string selectedText: ""
    required property string plainText
    property string htmlText: undefined
@@ -80,6 +80,7 @@ Loader {
            })
        },
        Kirigami.Action {
+            visible: Config.developerTools
            text: i18n("View Source")
            icon.name: "code-context"
            onTriggered: {
--- a/src/qml/Page/ImageEditorPage.qml
+++ b/src/qml/Page/ImageEditorPage.qml
@@ -31,15 +31,15 @@ Kirigami.Page {
        imageDoc.crop(selectionTool.selectionX / ratioX, selectionTool.selectionY / ratioY, selectionTool.selectionWidth / ratioX, selectionTool.selectionHeight / ratioY);
    }

-    actions {
-        left: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
            id: undoAction
            text: i18nc("@action:button Undo modification", "Undo")
            icon.name: "edit-undo"
            onTriggered: imageDoc.undo();
            visible: imageDoc.edited
-        }
-        main: Kirigami.Action {
+        },
+        Kirigami.Action {
            id: okAction
            text: i18nc("@action:button Accept image modification", "Accept")
            icon.name: "dialog-ok"
@@ -54,7 +54,7 @@ Kirigami.Page {
                }
            }
        }
-    }
+    ]



--- a/src/qml/Page/JoinRoomPage.qml
+++ b/src/qml/Page/JoinRoomPage.qml
@@ -138,10 +138,10 @@ Kirigami.ScrollablePage {

                    title: i18nc("@title:window", "Add server")

-                    onSheetOpenChanged: if (!serverUrlField.isValidServer && !sheetOpen) {
+                    onOpened: if (!serverUrlField.isValidServer && !opened) {
                            serverField.currentIndex = 0
                            server = serverField.currentValue
-                        } else if (sheetOpen) {
+                        } else if (opened) {
                            serverUrlField.forceActiveFocus()
                        }

--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -27,13 +27,13 @@ Kirigami.Page {
    focus: true
    padding: 0

-    actions {
-        main: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
            visible: Kirigami.Settings.isMobile || !applicationWindow().pageStack.wideMode
            icon.name: "view-right-new"
            onTriggered: applicationWindow().openRoomDrawer()
        }
-    }
+    ]

    KeyNavigation.left: pageStack.get(0)

--- a/src/qml/RoomDrawer/RoomDrawerPage.qml
+++ b/src/qml/RoomDrawer/RoomDrawerPage.qml
@@ -38,14 +38,14 @@ Kirigami.Page {

    Component.onCompleted: infoAction.toggle()

-    actions {
-        main: Kirigami.Action {
+    actions: [
+        Kirigami.Action {
            displayHint: Kirigami.DisplayHint.IconOnly
            text: i18n("Settings")
            icon.name: "settings-configure"
            onTriggered: applicationWindow().pageStack.pushDialogLayer('qrc:/Categories.qml', {room: root.room}, { title: i18n("Room Settings") })
        }
-    }
+    ]

    Loader {
        id: drawerItemLoader
--- a/src/qml/RoomDrawer/RoomInformation.qml
+++ b/src/qml/RoomDrawer/RoomInformation.qml
@@ -173,9 +173,9 @@ QQC2.ScrollView {
                room: root.room
            }

-            sortRole: "powerLevel"
+            sortRoleName: "powerLevel"
            sortOrder: Qt.DescendingOrder
-            filterRole: "name"
+            filterRoleName: "name"
            filterCaseSensitivity: Qt.CaseInsensitive
        }

--- a/src/res.qrc
+++ b/src/res.qrc
@@ -9,7 +9,7 @@
        <file alias="RoomList/ExploreComponent.qml">qml/Page/RoomList/ExploreComponent.qml</file>
        <file alias="RoomList/ContextMenu.qml">qml/Page/RoomList/ContextMenu.qml</file>
        <file alias="RoomList/CollapsedRoomDelegate.qml">qml/Page/RoomList/CollapsedRoomDelegate.qml</file>
-        <file alias="RoomList/RoomDelegate.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Page/RoomList/RoomDelegate.qml</file>
+        <file alias="RoomList/RoomDelegate.qml">qml/Page/RoomList/RoomDelegate.qml</file>
        <file alias="RoomList/Page.qml">qml/Page/RoomList/Page.qml</file>
        <file alias="SpaceListContextMenu.qml">qml/Page/RoomList/SpaceListContextMenu.qml</file>
        <file alias="RoomList/UserInfo.qml">qml/Page/RoomList/UserInfo.qml</file>
@@ -32,7 +32,7 @@
        <file alias="FancyEffectsContainer.qml">qml/Component/FancyEffectsContainer.qml</file>
        <file alias="TypingPane.qml">qml/Component/TypingPane.qml</file>
        <file alias="ShimmerGradient.qml">qml/Component/ShimmerGradient.qml</file>
-        <file alias="QuickSwitcher.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/QuickSwitcher.qml</file>
+        <file alias="QuickSwitcher.qml">qml/Component/QuickSwitcher.qml</file>
        <file alias="HoverActions.qml">qml/Component/HoverActions.qml</file>
        <file alias="ChatBox.qml">qml/Component/ChatBox/ChatBox.qml</file>
        <file alias="ChatBar.qml">qml/Component/ChatBox/ChatBar.qml</file>
@@ -49,10 +49,10 @@
        <file alias="RichLabel.qml">qml/Component/Timeline/RichLabel.qml</file>
        <file alias="TimelineContainer.qml">qml/Component/Timeline/TimelineContainer.qml</file>
        <file alias="SectionDelegate.qml">qml/Component/Timeline/SectionDelegate.qml</file>
-        <file alias="VideoDelegate.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/Timeline/VideoDelegate.qml</file>
+        <file alias="VideoDelegate.qml">qml/Component/Timeline/VideoDelegate.qml</file>
        <file alias="ReactionDelegate.qml">qml/Component/Timeline/ReactionDelegate.qml</file>
        <file alias="LinkPreviewDelegate.qml">qml/Component/Timeline/LinkPreviewDelegate.qml</file>
-        <file alias="AudioDelegate.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/Timeline/AudioDelegate.qml</file>
+        <file alias="AudioDelegate.qml">qml/Component/Timeline/AudioDelegate.qml</file>
        <file alias="FileDelegate.qml">qml/Component/Timeline/FileDelegate.qml</file>
        <file alias="ImageDelegate.qml">qml/Component/Timeline/ImageDelegate.qml</file>
        <file alias="EncryptedDelegate.qml">qml/Component/Timeline/EncryptedDelegate.qml</file>
@@ -84,7 +84,7 @@
        <file alias="OpenFileDialog.qml">qml/Dialog/OpenFileDialog.qml</file>
        <file alias="KeyVerificationDialog.qml">qml/Dialog/KeyVerification/KeyVerificationDialog.qml</file>
        <file alias="Dialog/ConfirmLogout.qml">qml/Dialog/ConfirmLogout.qml</file>
-        <file alias="PowerLevelDialog.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Dialog/PowerLevelDialog.qml</file>
+        <file alias="PowerLevelDialog.qml">qml/Dialog/PowerLevelDialog.qml</file>
        <file alias="Message.qml">qml/Dialog/KeyVerification/Message.qml</file>
        <file alias="EmojiItem.qml">qml/Dialog/KeyVerification/EmojiItem.qml</file>
        <file alias="EmojiRow.qml">qml/Dialog/KeyVerification/EmojiRow.qml</file>
@@ -132,7 +132,7 @@
        <file alias="InvitationView.qml">qml/Component/InvitationView.qml</file>
        <file alias="AvatarTabButton.qml">qml/Component/AvatarTabButton.qml</file>
        <file alias="SpaceDrawer.qml">qml/Page/RoomList/SpaceDrawer.qml</file>
-        <file alias="OsmLocationPlugin.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Component/Timeline/OsmLocationPlugin.qml</file>
+        <file alias="OsmLocationPlugin.qml">qml/Component/Timeline/OsmLocationPlugin.qml</file>
        <file alias="LiveLocationDelegate.qml">qml/Component/Timeline/LiveLocationDelegate.qml</file>
        <file alias="FullScreenMap.qml">qml/Component/FullScreenMap.qml</file>
        <file alias="LocationsPage.qml">qml/Component/LocationPage.qml</file>
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -16,7 +16,7 @@ RemoteImage Runner::serializeImage(const QImage &image)
    RemoteImage remoteImage{
        convertedImage.width(),
        convertedImage.height(),
-        convertedImage.bytesPerLine(),
+        static_cast<int>(convertedImage.bytesPerLine()),
        true, // hasAlpha
        8, // bitsPerSample
        4, // channels
--- a/src/runner.h
+++ b/src/runner.h
@@ -64,7 +64,7 @@ struct RemoteImage {
    // iiibiiay (matching notification spec image-data attribute)
    int width;
    int height;
-    int rowStride;
+    qsizetype rowStride;
    bool hasAlpha;
    int bitsPerSample;
    int channels;
--- a/src/trayicon_sni.cpp
+++ b/src/trayicon_sni.cpp
@@ -17,11 +17,7 @@ TrayIcon::TrayIcon(QObject *parent)
    });

    connect(&WindowController::instance(), &WindowController::windowChanged, this, [this] {
-#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
        setAssociatedWindow(WindowController::instance().window());
-#else
-        Q_UNUSED(this);
-#endif
    });
 }
Author	SHA1	Message	Date
ivan tkachenko	5381c97999	Timeline: Stretch date section sections across the whole ListView width With paddings, it looked sort of glitched, especially in RTL layouts, because messages from the top were highlighting all around the padded section delegate.	2023-09-13 13:05:07 +00:00
Tobias Fella	6439fa48f9	Adapt to QML api changes	2023-09-13 12:57:27 +00:00
Tobias Fella	823f3cdd4e	Remove QML Qt5/Qt6 compatibility hacks	2023-09-13 12:57:27 +00:00
Tobias Fella	f542d0b9fd	Change rowStride in runner to qsizetype	2023-09-13 14:53:07 +02:00
Tobias Fella	a43990559b	Rename source property of MessageDelegateContextMenu Starting with Qt6.6, this collides with a FINAL property of Loader and thus doesn't run	2023-09-13 14:16:48 +02:00
Tobias Fella	feb2dbc9fb	Don't try finding KStatusNotifierItem on android	2023-09-13 12:05:40 +00:00
Tobias Fella	f299d5a245	Fix KF6 crash in emoji completion	2023-09-13 13:41:08 +02:00
Tobias Fella	d69b8fbf8c	Fix compilation on FreeBSD	2023-09-13 13:27:33 +02:00
Tobias Fella	234e5c49c4	Re-enable FreeBSD CI Was accidentally disabled during a merge	2023-09-13 13:23:45 +02:00
Tobias Fella	cee72b6d48	Remove Qt5 compatibility ifdefs	2023-09-13 11:16:02 +00:00
Tobias Fella	539fdcaf2e	Remove compatibility with Qt5 in CMake	2023-09-13 11:09:41 +00:00
Joshua Goins	32b3861c3e	Only show the "View Source" message action when dev tools are enabled This is a very developer-oriented action, and other uses of this dialog (such as interacting with room state events under a room debug page) is also locked behind this option.	2023-09-13 07:12:18 +00:00
l10n daemon script	f1076a5ced	GIT_SILENT Sync po/docbooks with svn	2023-09-13 02:24:16 +00:00
Joshua Goins	bf8f5705d0	Fix message event source dialog not showing any data	2023-09-12 17:10:23 -04:00
Tobias Fella	2656a93ee7	Disable Qt5 CI	2023-09-12 15:39:25 +00:00