From 1c26d9b8111f4562f3f7a5bec17afe0780cf6090 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 11 Sep 2023 00:33:11 +0200 Subject: [PATCH] Remove QML import versions --- src/qml/Component/AvatarTabButton.qml | 16 +- src/qml/Component/ChatBox/AttachmentPane.qml | 10 +- src/qml/Component/ChatBox/ChatBar.qml | 12 +- src/qml/Component/ChatBox/ChatBox.qml | 8 +- src/qml/Component/ChatBox/CompletionMenu.qml | 16 +- src/qml/Component/ChatBox/LocationChooser.qml | 16 +- src/qml/Component/ChatBox/PieProgressBar.qml | 6 +- src/qml/Component/ChatBox/QuickFormatBar.qml | 8 +- src/qml/Component/ChatBox/ReplyPane.qml | 12 +- src/qml/Component/Devtools/RoomData.qml | 12 +- src/qml/Component/Devtools/ServerData.qml | 14 +- src/qml/Component/Emoji/EmojiDelegate.qml | 6 +- src/qml/Component/Emoji/EmojiGrid.qml | 8 +- src/qml/Component/Emoji/EmojiPicker.qml | 10 +- src/qml/Component/Emoji/EmojiTonesPicker.qml | 8 +- src/qml/Component/FancyEffectsContainer.qml | 8 +- src/qml/Component/FullScreenMap.qml | 10 +- src/qml/Component/HoverActions.qml | 10 +- src/qml/Component/InvitationView.qml | 10 +- src/qml/Component/LocationMapItem.qml | 16 +- src/qml/Component/LocationPage.qml | 10 +- src/qml/Component/Login/Captcha.qml | 12 +- src/qml/Component/Login/Email.qml | 10 +- src/qml/Component/Login/Homeserver.qml | 10 +- src/qml/Component/Login/Loading.qml | 10 +- src/qml/Component/Login/Login.qml | 10 +- src/qml/Component/Login/LoginMethod.qml | 8 +- src/qml/Component/Login/LoginRegister.qml | 8 +- src/qml/Component/Login/LoginStep.qml | 6 +- src/qml/Component/Login/Password.qml | 10 +- src/qml/Component/Login/RegisterPassword.qml | 8 +- src/qml/Component/Login/Sso.qml | 10 +- src/qml/Component/Login/Terms.qml | 10 +- src/qml/Component/Login/Username.qml | 8 +- .../Component/NeochatMaximizeComponent.qml | 14 +- src/qml/Component/QuickSwitcher.qml | 12 +- src/qml/Component/ShimmerGradient.qml | 4 +- src/qml/Component/Timeline/AudioDelegate.qml | 10 +- src/qml/Component/Timeline/AvatarFlow.qml | 8 +- .../Component/Timeline/EncryptedDelegate.qml | 8 +- src/qml/Component/Timeline/EventDelegate.qml | 8 +- src/qml/Component/Timeline/FileDelegate.qml | 12 +- src/qml/Component/Timeline/ImageDelegate.qml | 14 +- .../Timeline/LinkPreviewDelegate.qml | 10 +- .../Timeline/LiveLocationDelegate.qml | 13 +- .../Component/Timeline/LocationDelegate.qml | 13 +- .../Component/Timeline/MessageDelegate.qml | 13 +- .../Timeline/MessageEditComponent.qml | 9 +- src/qml/Component/Timeline/MimeComponent.qml | 8 +- src/qml/Component/Timeline/PollDelegate.qml | 11 +- .../Component/Timeline/ReactionDelegate.qml | 6 +- .../Component/Timeline/ReadMarkerDelegate.qml | 12 +- src/qml/Component/Timeline/ReplyComponent.qml | 12 +- src/qml/Component/Timeline/RichLabel.qml | 8 +- .../Component/Timeline/SectionDelegate.qml | 10 +- src/qml/Component/Timeline/StateComponent.qml | 12 +- src/qml/Component/Timeline/StateDelegate.qml | 12 +- .../Component/Timeline/TimelineContainer.qml | 662 ++++++++++++++++++ src/qml/Component/Timeline/VideoDelegate.qml | 12 +- src/qml/Component/TimelineView.qml | 16 +- src/qml/Component/TypingPane.qml | 10 +- .../Dialog/ConfirmDeactivateAccountDialog.qml | 9 +- src/qml/Dialog/ConfirmEncryptionDialog.qml | 10 +- src/qml/Dialog/ConfirmLogout.qml | 10 +- src/qml/Dialog/CreateRoomDialog.qml | 6 +- src/qml/Dialog/CreateSpaceDialog.qml | 10 +- src/qml/Dialog/EmojiDialog.qml | 8 +- src/qml/Dialog/KeyVerification/EmojiItem.qml | 10 +- src/qml/Dialog/KeyVerification/EmojiRow.qml | 6 +- src/qml/Dialog/KeyVerification/EmojiSas.qml | 10 +- .../KeyVerification/KeyVerificationDialog.qml | 12 +- src/qml/Dialog/KeyVerification/Message.qml | 10 +- .../KeyVerification/VerificationCanceled.qml | 6 +- src/qml/Dialog/OpenFileDialog.qml | 4 +- src/qml/Dialog/PowerLevelDialog.qml | 10 +- src/qml/Dialog/UserDetailDialog.qml | 10 +- src/qml/Menu/EditMenu.qml | 6 +- src/qml/Menu/GlobalMenu.qml | 10 +- src/qml/Menu/ShareAction.qml | 8 +- src/qml/Menu/ShareActionAndroid.qml | 2 +- src/qml/Menu/ShareDialog.qml | 12 +- src/qml/Menu/Timeline/BanSheet.qml | 10 +- .../Menu/Timeline/FileDelegateContextMenu.qml | 10 +- .../Timeline/MessageDelegateContextMenu.qml | 12 +- src/qml/Menu/Timeline/MessageSourceSheet.qml | 9 +- src/qml/Menu/Timeline/RemoveSheet.qml | 10 +- src/qml/Menu/Timeline/ReportSheet.qml | 10 +- src/qml/Page/ChooseRoomDialog.qml | 8 +- src/qml/Page/DevtoolsPage.qml | 10 +- src/qml/Page/ExplorerDelegate.qml | 14 +- src/qml/Page/ImageEditorPage.qml | 14 +- src/qml/Page/InviteUserPage.qml | 14 +- src/qml/Page/JoinRoomPage.qml | 14 +- src/qml/Page/LoadingPage.qml | 4 +- src/qml/Page/RoomList/AccountMenu.qml | 10 +- .../Page/RoomList/CollapsedRoomDelegate.qml | 16 +- src/qml/Page/RoomList/ContextMenu.qml | 6 +- src/qml/Page/RoomList/ExploreComponent.qml | 4 +- src/qml/Page/RoomList/Page.qml | 12 +- src/qml/Page/RoomList/RoomDelegate.qml | 18 +- src/qml/Page/RoomList/SpaceDrawer.qml | 11 +- .../Page/RoomList/SpaceListContextMenu.qml | 12 +- src/qml/Page/RoomList/UserInfo.qml | 14 +- src/qml/Page/RoomPage.qml | 16 +- src/qml/Page/RoomWindow.qml | 10 +- src/qml/Page/SearchPage.qml | 10 +- src/qml/Page/StartChatPage.qml | 14 +- src/qml/Page/WelcomePage.qml | 12 +- src/qml/RoomDrawer/DirectChatDrawerHeader.qml | 12 +- src/qml/RoomDrawer/GroupChatDrawerHeader.qml | 10 +- src/qml/RoomDrawer/RoomDrawer.qml | 12 +- src/qml/RoomDrawer/RoomDrawerPage.qml | 10 +- src/qml/RoomDrawer/RoomInformation.qml | 16 +- src/qml/RoomDrawer/RoomMedia.qml | 11 +- src/qml/RoomSettings/Categories.qml | 10 +- src/qml/RoomSettings/General.qml | 16 +- src/qml/RoomSettings/Permissions.qml | 18 +- src/qml/RoomSettings/PushNotification.qml | 14 +- src/qml/RoomSettings/Security.qml | 8 +- src/qml/Settings/About.qml | 6 +- src/qml/Settings/AboutKDE.qml | 2 +- src/qml/Settings/AccountEditorPage.qml | 18 +- src/qml/Settings/AccountsPage.qml | 18 +- src/qml/Settings/AppearanceSettingsPage.qml | 14 +- src/qml/Settings/ColorScheme.qml | 8 +- src/qml/Settings/DeviceDelegate.qml | 12 +- src/qml/Settings/DevicesCard.qml | 10 +- src/qml/Settings/DevicesPage.qml | 12 +- src/qml/Settings/EmoticonEditorPage.qml | 16 +- src/qml/Settings/EmoticonFormCard.qml | 12 +- src/qml/Settings/EmoticonsPage.qml | 8 +- src/qml/Settings/GeneralSettingsPage.qml | 10 +- src/qml/Settings/GlobalNotificationsPage.qml | 14 +- src/qml/Settings/NetworkProxyPage.qml | 10 +- src/qml/Settings/NotificationRuleItem.qml | 12 +- src/qml/Settings/SettingsPage.qml | 10 +- src/qml/Settings/SonnetConfigPage.qml | 14 +- src/qml/Settings/ThemeRadioButton.qml | 8 +- src/qml/main.qml | 10 +- 139 files changed, 1389 insertions(+), 730 deletions(-) create mode 100644 src/qml/Component/Timeline/TimelineContainer.qml diff --git a/src/qml/Component/AvatarTabButton.qml b/src/qml/Component/AvatarTabButton.qml index 22dd9a2f1..f0686693b 100644 --- a/src/qml/Component/AvatarTabButton.qml +++ b/src/qml/Component/AvatarTabButton.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2021 Noah Davis // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Templates 2.15 as T -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import QtQuick.Templates as T +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents Delegates.RoundedItemDelegate { id: root @@ -37,4 +37,4 @@ Delegates.RoundedItemDelegate { source: root.source name: root.text } -} \ No newline at end of file +} diff --git a/src/qml/Component/ChatBox/AttachmentPane.qml b/src/qml/Component/ChatBox/AttachmentPane.qml index ae31cff60..da5137836 100644 --- a/src/qml/Component/ChatBox/AttachmentPane.qml +++ b/src/qml/Component/ChatBox/AttachmentPane.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Noah Davis // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/Component/ChatBox/ChatBar.qml b/src/qml/Component/ChatBox/ChatBar.qml index 2908bceee..771b9e2f3 100644 --- a/src/qml/Component/ChatBox/ChatBar.qml +++ b/src/qml/Component/ChatBox/ChatBar.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2020 Noah Davis // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Window 2.15 -import Qt.labs.platform 1.1 as Platform +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import QtQuick.Window +import Qt.labs.platform as Platform import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief The component which handles the message sending. diff --git a/src/qml/Component/ChatBox/ChatBox.qml b/src/qml/Component/ChatBox/ChatBox.qml index 3530595d0..2ebada030 100644 --- a/src/qml/Component/ChatBox/ChatBox.qml +++ b/src/qml/Component/ChatBox/ChatBox.qml @@ -2,11 +2,11 @@ // SPDX-FileCopyrightText: 2020 Noah Davis // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat /** * @brief A component for typing and sending chat messages. diff --git a/src/qml/Component/ChatBox/CompletionMenu.qml b/src/qml/Component/ChatBox/CompletionMenu.qml index 8d67dbaac..ec90d22d5 100644 --- a/src/qml/Component/ChatBox/CompletionMenu.qml +++ b/src/qml/Component/ChatBox/CompletionMenu.qml @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2020 Noah Davis // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import Qt.labs.qmlmodels -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Popup { id: root diff --git a/src/qml/Component/ChatBox/LocationChooser.qml b/src/qml/Component/ChatBox/LocationChooser.qml index a95da91bd..352e70fb6 100644 --- a/src/qml/Component/ChatBox/LocationChooser.qml +++ b/src/qml/Component/ChatBox/LocationChooser.qml @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: 2021 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtLocation +import QtPositioning -import org.kde.kirigamiaddons.labs.components 1.0 as Components +import org.kde.kirigamiaddons.labs.components as Components -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Components.AbstractMaximizeComponent { id: root diff --git a/src/qml/Component/ChatBox/PieProgressBar.qml b/src/qml/Component/ChatBox/PieProgressBar.qml index db2b8c7cc..0d986ee12 100644 --- a/src/qml/Component/ChatBox/PieProgressBar.qml +++ b/src/qml/Component/ChatBox/PieProgressBar.qml @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 +import QtQuick -import org.kde.kirigami 2.18 as Kirigami -import org.kde.quickcharts 1.0 as Charts +import org.kde.kirigami as Kirigami +import org.kde.quickcharts as Charts /** * @brief A circular progress bar that fills an arc as progress goes up. diff --git a/src/qml/Component/ChatBox/QuickFormatBar.qml b/src/qml/Component/ChatBox/QuickFormatBar.qml index 183260ebf..9266e8f29 100644 --- a/src/qml/Component/ChatBox/QuickFormatBar.qml +++ b/src/qml/Component/ChatBox/QuickFormatBar.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami QQC2.Popup { id: root diff --git a/src/qml/Component/ChatBox/ReplyPane.qml b/src/qml/Component/ChatBox/ReplyPane.qml index 5c268608e..63fcbd4cc 100644 --- a/src/qml/Component/ChatBox/ReplyPane.qml +++ b/src/qml/Component/ChatBox/ReplyPane.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2020 Noah Davis // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat GridLayout { id: root diff --git a/src/qml/Component/Devtools/RoomData.qml b/src/qml/Component/Devtools/RoomData.qml index 6225d8e57..1280341d1 100644 --- a/src/qml/Component/Devtools/RoomData.qml +++ b/src/qml/Component/Devtools/RoomData.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/Component/Devtools/ServerData.qml b/src/qml/Component/Devtools/ServerData.qml index 5038c3257..894ca1e59 100644 --- a/src/qml/Component/Devtools/ServerData.qml +++ b/src/qml/Component/Devtools/ServerData.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/Component/Emoji/EmojiDelegate.qml b/src/qml/Component/Emoji/EmojiDelegate.qml index 8dc3a5b29..610e24f6e 100644 --- a/src/qml/Component/Emoji/EmojiDelegate.qml +++ b/src/qml/Component/Emoji/EmojiDelegate.qml @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import QtQuick +import QtQuick.Controls as QQC2 +import org.kde.kirigami as Kirigami QQC2.ItemDelegate { id: root diff --git a/src/qml/Component/Emoji/EmojiGrid.qml b/src/qml/Component/Emoji/EmojiGrid.qml index 3f4d6c163..593d33c84 100644 --- a/src/qml/Component/Emoji/EmojiGrid.qml +++ b/src/qml/Component/Emoji/EmojiGrid.qml @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.neochat 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import org.kde.kirigami as Kirigami +import org.kde.neochat QQC2.ScrollView { id: root diff --git a/src/qml/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml index bf8938fa4..86676975e 100644 --- a/src/qml/Component/Emoji/EmojiPicker.qml +++ b/src/qml/Component/Emoji/EmojiPicker.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.neochat 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/Component/Emoji/EmojiTonesPicker.qml b/src/qml/Component/Emoji/EmojiTonesPicker.qml index e7e8a2e5a..ba846d86e 100644 --- a/src/qml/Component/Emoji/EmojiTonesPicker.qml +++ b/src/qml/Component/Emoji/EmojiTonesPicker.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.20 as Kirigami +import QtQuick +import QtQuick.Controls as QQC2 +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Popup { id: root diff --git a/src/qml/Component/FancyEffectsContainer.qml b/src/qml/Component/FancyEffectsContainer.qml index 0e0454c96..71b9b623d 100644 --- a/src/qml/Component/FancyEffectsContainer.qml +++ b/src/qml/Component/FancyEffectsContainer.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2021 Alexey Andreyev // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Particles 2.15 +import QtQuick +import QtQuick.Layouts +import QtQuick.Particles -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami Item { id: root diff --git a/src/qml/Component/FullScreenMap.qml b/src/qml/Component/FullScreenMap.qml index 79bfc7a3b..8ed7bf1ac 100644 --- a/src/qml/Component/FullScreenMap.qml +++ b/src/qml/Component/FullScreenMap.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2021 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtQuick.Controls +import QtLocation +import QtPositioning -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami ApplicationWindow { id: root diff --git a/src/qml/Component/HoverActions.qml b/src/qml/Component/HoverActions.qml index 061e7241e..bb5506985 100644 --- a/src/qml/Component/HoverActions.qml +++ b/src/qml/Component/HoverActions.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat /** * @brief A component that provides a set of actions when a message is hovered in the timeline. diff --git a/src/qml/Component/InvitationView.qml b/src/qml/Component/InvitationView.qml index c03b80858..1cf174d8e 100644 --- a/src/qml/Component/InvitationView.qml +++ b/src/qml/Component/InvitationView.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.PlaceholderMessage { id: root diff --git a/src/qml/Component/LocationMapItem.qml b/src/qml/Component/LocationMapItem.qml index 3ba68521a..f704e8b60 100644 --- a/src/qml/Component/LocationMapItem.qml +++ b/src/qml/Component/LocationMapItem.qml @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2023 Volker Krause // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtLocation +import QtPositioning -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** Location marker for any of the shared location maps. */ MapQuickItem { diff --git a/src/qml/Component/LocationPage.qml b/src/qml/Component/LocationPage.qml index 5a1867026..7b6073773 100644 --- a/src/qml/Component/LocationPage.qml +++ b/src/qml/Component/LocationPage.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtLocation +import QtPositioning -import org.kde.kirigami 2.20 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Component/Login/Captcha.qml b/src/qml/Component/Login/Captcha.qml index 982bf7f46..fd6b7b41a 100644 --- a/src/qml/Component/Login/Captcha.qml +++ b/src/qml/Component/Login/Captcha.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Layouts 1.14 -import QtWebView 1.15 +import QtQuick +import QtQuick.Layouts +import QtWebView -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Email.qml b/src/qml/Component/Login/Email.qml index b3efedca7..fd973083c 100644 --- a/src/qml/Component/Login/Email.qml +++ b/src/qml/Component/Login/Email.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Homeserver.qml b/src/qml/Component/Login/Homeserver.qml index 4ad880bd1..cc7cc9d8b 100644 --- a/src/qml/Component/Login/Homeserver.qml +++ b/src/qml/Component/Login/Homeserver.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Loading.qml b/src/qml/Component/Login/Loading.qml index 054c03f89..014e1bdb8 100644 --- a/src/qml/Component/Login/Loading.qml +++ b/src/qml/Component/Login/Loading.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Login.qml b/src/qml/Component/Login/Login.qml index 8ff1eaa02..d0da810d6 100644 --- a/src/qml/Component/Login/Login.qml +++ b/src/qml/Component/Login/Login.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/LoginMethod.qml b/src/qml/Component/Login/LoginMethod.qml index f8a8c7145..381797cc5 100644 --- a/src/qml/Component/Login/LoginMethod.qml +++ b/src/qml/Component/Login/LoginMethod.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/LoginRegister.qml b/src/qml/Component/Login/LoginRegister.qml index 21eb93901..6fe588e7c 100644 --- a/src/qml/Component/Login/LoginRegister.qml +++ b/src/qml/Component/Login/LoginRegister.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/LoginStep.qml b/src/qml/Component/Login/LoginStep.qml index 88dc069fb..c3d883ade 100644 --- a/src/qml/Component/Login/LoginStep.qml +++ b/src/qml/Component/Login/LoginStep.qml @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as QQC2 -import QtQuick.Layouts 1.14 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts /// Step for the login/registration flow ColumnLayout { diff --git a/src/qml/Component/Login/Password.qml b/src/qml/Component/Login/Password.qml index 4fe577dd6..7cbef1235 100644 --- a/src/qml/Component/Login/Password.qml +++ b/src/qml/Component/Login/Password.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/RegisterPassword.qml b/src/qml/Component/Login/RegisterPassword.qml index ea3a58afe..8310f73e5 100644 --- a/src/qml/Component/Login/RegisterPassword.qml +++ b/src/qml/Component/Login/RegisterPassword.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 +import QtQuick -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Sso.qml b/src/qml/Component/Login/Sso.qml index 2c4650e78..2e1aa88f0 100644 --- a/src/qml/Component/Login/Sso.qml +++ b/src/qml/Component/Login/Sso.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Terms.qml b/src/qml/Component/Login/Terms.qml index dce9f1f76..22e10ee58 100644 --- a/src/qml/Component/Login/Terms.qml +++ b/src/qml/Component/Login/Terms.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.12 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/Login/Username.qml b/src/qml/Component/Login/Username.qml index f5a88625f..3aabe1960 100644 --- a/src/qml/Component/Login/Username.qml +++ b/src/qml/Component/Login/Username.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 +import QtQuick -import org.kde.kirigami 2.12 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat LoginStep { id: root diff --git a/src/qml/Component/NeochatMaximizeComponent.qml b/src/qml/Component/NeochatMaximizeComponent.qml index c923bed69..0dee5a585 100644 --- a/src/qml/Component/NeochatMaximizeComponent.qml +++ b/src/qml/Component/NeochatMaximizeComponent.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 as Platform +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.platform as Platform -import org.kde.kirigami 2.13 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as Components +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as Components -import org.kde.neochat 1.0 +import org.kde.neochat Components.AlbumMaximizeComponent { id: root diff --git a/src/qml/Component/QuickSwitcher.qml b/src/qml/Component/QuickSwitcher.qml index b461a75ec..0514a1c3f 100644 --- a/src/qml/Component/QuickSwitcher.qml +++ b/src/qml/Component/QuickSwitcher.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat import './RoomList' as RoomList QQC2.Dialog { diff --git a/src/qml/Component/ShimmerGradient.qml b/src/qml/Component/ShimmerGradient.qml index 1550d5d40..72a7eb4fb 100644 --- a/src/qml/Component/ShimmerGradient.qml +++ b/src/qml/Component/ShimmerGradient.qml @@ -4,8 +4,8 @@ // Not to be confused with the Shimmer project. // I like their gradiented GTK themes though. -import QtQuick 2.15 -import org.kde.kirigami 2.15 as Kirigami +import QtQuick +import org.kde.kirigami as Kirigami Gradient { id: root diff --git a/src/qml/Component/Timeline/AudioDelegate.qml b/src/qml/Component/Timeline/AudioDelegate.qml index e3a8a3125..5907ae488 100644 --- a/src/qml/Component/Timeline/AudioDelegate.qml +++ b/src/qml/Component/Timeline/AudioDelegate.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import QtMultimedia -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for an audio message. diff --git a/src/qml/Component/Timeline/AvatarFlow.qml b/src/qml/Component/Timeline/AvatarFlow.qml index 86c93d61f..0bfa5a390 100644 --- a/src/qml/Component/Timeline/AvatarFlow.qml +++ b/src/qml/Component/Timeline/AvatarFlow.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents Flow { id: root diff --git a/src/qml/Component/Timeline/EncryptedDelegate.qml b/src/qml/Component/Timeline/EncryptedDelegate.qml index 67625c6a8..77bd37d8a 100644 --- a/src/qml/Component/Timeline/EncryptedDelegate.qml +++ b/src/qml/Component/Timeline/EncryptedDelegate.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2021 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat /** * @brief A timeline delegate for an encrypted message that can't be decrypted. diff --git a/src/qml/Component/Timeline/EventDelegate.qml b/src/qml/Component/Timeline/EventDelegate.qml index 1284970be..cc0965f17 100644 --- a/src/qml/Component/Timeline/EventDelegate.qml +++ b/src/qml/Component/Timeline/EventDelegate.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2021 Tobias Fella // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import Qt.labs.qmlmodels 1.0 +import Qt.labs.qmlmodels -import org.kde.neochat 1.0 +import org.kde.neochat DelegateChooser { id: root diff --git a/src/qml/Component/Timeline/FileDelegate.qml b/src/qml/Component/Timeline/FileDelegate.qml index 1c8096b14..34fe005e1 100644 --- a/src/qml/Component/Timeline/FileDelegate.qml +++ b/src/qml/Component/Timeline/FileDelegate.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2018-2019 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.platform -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for an file message. diff --git a/src/qml/Component/Timeline/ImageDelegate.qml b/src/qml/Component/Timeline/ImageDelegate.qml index 2297e0ec4..531dbd0bc 100644 --- a/src/qml/Component/Timeline/ImageDelegate.qml +++ b/src/qml/Component/Timeline/ImageDelegate.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2018-2020 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQml.Models 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQml.Models -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for an image message. diff --git a/src/qml/Component/Timeline/LinkPreviewDelegate.qml b/src/qml/Component/Timeline/LinkPreviewDelegate.qml index 4c649a80d..cf7ea6c68 100644 --- a/src/qml/Component/Timeline/LinkPreviewDelegate.qml +++ b/src/qml/Component/Timeline/LinkPreviewDelegate.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Loader { id: root diff --git a/src/qml/Component/Timeline/LiveLocationDelegate.qml b/src/qml/Component/Timeline/LiveLocationDelegate.qml index 7faa5689b..3f2a3c671 100644 --- a/src/qml/Component/Timeline/LiveLocationDelegate.qml +++ b/src/qml/Component/Timeline/LiveLocationDelegate.qml @@ -2,14 +2,13 @@ // SPDX-FileCopyrightText: 2023 Volker Krause // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtLocation +import QtPositioning - -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for a location message. diff --git a/src/qml/Component/Timeline/LocationDelegate.qml b/src/qml/Component/Timeline/LocationDelegate.qml index 29644b40e..f8ea6faba 100644 --- a/src/qml/Component/Timeline/LocationDelegate.qml +++ b/src/qml/Component/Timeline/LocationDelegate.qml @@ -1,14 +1,13 @@ // SPDX-FileCopyrightText: 2021 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtLocation 5.15 -import QtPositioning 5.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtLocation +import QtPositioning - -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for a location message. diff --git a/src/qml/Component/Timeline/MessageDelegate.qml b/src/qml/Component/Timeline/MessageDelegate.qml index 111c9c83b..9a2a7a32f 100644 --- a/src/qml/Component/Timeline/MessageDelegate.qml +++ b/src/qml/Component/Timeline/MessageDelegate.qml @@ -1,14 +1,15 @@ // SPDX-FileCopyrightText: 2020 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.qmlmodels -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief The base delegate for all messages in the timeline. diff --git a/src/qml/Component/Timeline/MessageEditComponent.qml b/src/qml/Component/Timeline/MessageEditComponent.qml index c7768a73f..3b219d35d 100644 --- a/src/qml/Component/Timeline/MessageEditComponent.qml +++ b/src/qml/Component/Timeline/MessageEditComponent.qml @@ -1,12 +1,13 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 + +import org.kde.neochat QQC2.TextArea { id: root diff --git a/src/qml/Component/Timeline/MimeComponent.qml b/src/qml/Component/Timeline/MimeComponent.qml index c569668f0..e8b64b74d 100644 --- a/src/qml/Component/Timeline/MimeComponent.qml +++ b/src/qml/Component/Timeline/MimeComponent.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami RowLayout { property alias mimeIconSource: icon.source diff --git a/src/qml/Component/Timeline/PollDelegate.qml b/src/qml/Component/Timeline/PollDelegate.qml index 144e32993..b2c848ad9 100644 --- a/src/qml/Component/Timeline/PollDelegate.qml +++ b/src/qml/Component/Timeline/PollDelegate.qml @@ -1,13 +1,12 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import Qt.labs.platform - -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for a poll message. diff --git a/src/qml/Component/Timeline/ReactionDelegate.qml b/src/qml/Component/Timeline/ReactionDelegate.qml index dbc7e89c6..844dee623 100644 --- a/src/qml/Component/Timeline/ReactionDelegate.qml +++ b/src/qml/Component/Timeline/ReactionDelegate.qml @@ -2,10 +2,10 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami Flow { id: root diff --git a/src/qml/Component/Timeline/ReadMarkerDelegate.qml b/src/qml/Component/Timeline/ReadMarkerDelegate.qml index a457d7dad..726d43fe7 100644 --- a/src/qml/Component/Timeline/ReadMarkerDelegate.qml +++ b/src/qml/Component/Timeline/ReadMarkerDelegate.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import Qt.labs.qmlmodels 1.0 -import org.kde.kirigami 2.15 as Kirigami +import Qt.labs.qmlmodels +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat TimelineDelegate { id: root diff --git a/src/qml/Component/Timeline/ReplyComponent.qml b/src/qml/Component/Timeline/ReplyComponent.qml index 2a68490d7..522443988 100644 --- a/src/qml/Component/Timeline/ReplyComponent.qml +++ b/src/qml/Component/Timeline/ReplyComponent.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A component to show a message that has been replied to. diff --git a/src/qml/Component/Timeline/RichLabel.qml b/src/qml/Component/Timeline/RichLabel.qml index a9de8c5d4..82902d039 100644 --- a/src/qml/Component/Timeline/RichLabel.qml +++ b/src/qml/Component/Timeline/RichLabel.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2020 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.neochat 1.0 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.neochat +import org.kde.kirigami as Kirigami /** * @brief A component to show the rich display text of text message. diff --git a/src/qml/Component/Timeline/SectionDelegate.qml b/src/qml/Component/Timeline/SectionDelegate.qml index bc1917b76..7ad37246f 100644 --- a/src/qml/Component/Timeline/SectionDelegate.qml +++ b/src/qml/Component/Timeline/SectionDelegate.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.ItemDelegate { id: root diff --git a/src/qml/Component/Timeline/StateComponent.qml b/src/qml/Component/Timeline/StateComponent.qml index 73ec70771..dfe78fe4c 100644 --- a/src/qml/Component/Timeline/StateComponent.qml +++ b/src/qml/Component/Timeline/StateComponent.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A component for visualising a single state event diff --git a/src/qml/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml index bb9ed4282..489aaa502 100644 --- a/src/qml/Component/Timeline/StateDelegate.qml +++ b/src/qml/Component/Timeline/StateDelegate.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2018-2020 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for visualising an aggregated list of consecutive state events. diff --git a/src/qml/Component/Timeline/TimelineContainer.qml b/src/qml/Component/Timeline/TimelineContainer.qml new file mode 100644 index 000000000..7ae8d57f0 --- /dev/null +++ b/src/qml/Component/Timeline/TimelineContainer.qml @@ -0,0 +1,662 @@ +// SPDX-FileCopyrightText: 2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts + +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents + +import org.kde.neochat + +/** + * @brief The base delegate for all messages in the timeline. + * + * This supports a message bubble plus sender avatar for each message as well as reactions + * and read markers. A date section can be show for when the message is on a different + * day to the previous one. + * + * The component is designed for all messages, positioning them in the timeline with + * variable padding depending on the window width. Local user messages are highlighted + * and can also be aligned to the right if configured. + * + * This component also supports a compact mode where the padding is adjusted, the + * background is hidden and the delegate spans the full width of the timeline. + */ +ColumnLayout { + id: root + + /** + * @brief The index of the delegate in the model. + */ + required property var index + + /** + * @brief The matrix ID of the message event. + */ + required property string eventId + + /** + * @brief The timestamp of the message. + */ + required property var time + + /** + * @brief The timestamp of the message as a string. + */ + required property string timeString + + /** + * @brief The message author. + * + * This should consist of the following: + * - id - The matrix ID of the author. + * - isLocalUser - Whether the author is the local user. + * - avatarSource - The mxc URL for the author's avatar in the current room. + * - avatarMediaId - The media ID of the author's avatar. + * - avatarUrl - The mxc URL for the author's avatar. + * - displayName - The display name of the author. + * - display - The name of the author. + * - color - The color for the author. + * - object - The Quotient::User object for the author. + * + * @sa Quotient::User + */ + required property var author + + /** + * @brief Whether the author should be shown. + */ + required property bool showAuthor + + /** + * @brief Whether the author should always be shown. + * + * This is primarily used when these delegates are used in a filtered list of + * events rather than a sequential timeline, e.g. the media model view. + * + * @note This setting still respects the avatar configuration settings. + */ + property bool alwaysShowAuthor: false + + /** + * @brief The delegate type of the message. + */ + required property int delegateType + + /** + * @brief The display text of the message. + */ + required property string display + + /** + * @brief The display text of the message as plain text. + */ + required property string plainText + + /** + * @brief The date of the event as a string. + */ + required property string section + + /** + * @brief Whether the section header should be shown. + */ + required property bool showSection + + /** + * @brief A model with the reactions to the message in. + */ + required property var reaction + + /** + * @brief Whether the reaction component should be shown. + */ + required property bool showReactions + + /** + * @brief A model with the first 5 other user read markers for this message. + */ + required property var readMarkers + + /** + * @brief String with the display name and matrix ID of the other user read markers. + */ + required property string readMarkersString + + /** + * @brief The number of other users at the event after the first 5. + */ + required property var excessReadMarkers + + /** + * @brief Whether the other user read marker component should be shown. + */ + required property bool showReadMarkers + + /** + * @brief The matrix ID of the reply event. + */ + required property var replyId + + /** + * @brief The reply author. + * + * This should consist of the following: + * - id - The matrix ID of the reply author. + * - isLocalUser - Whether the reply author is the local user. + * - avatarSource - The mxc URL for the reply author's avatar in the current room. + * - avatarMediaId - The media ID of the reply author's avatar. + * - avatarUrl - The mxc URL for the reply author's avatar. + * - displayName - The display name of the reply author. + * - display - The name of the reply author. + * - color - The color for the reply author. + * - object - The Quotient::User object for the reply author. + * + * @sa Quotient::User + */ + required property var replyAuthor + + /** + * @brief The delegate type of the message replied to. + */ + required property int replyDelegateType + + /** + * @brief The display text of the message replied to. + */ + required property string replyDisplay + + /** + * @brief The media info for the reply event. + * + * This could be an image, audio, video or file. + * + * This should consist of the following: + * - source - The mxc URL for the media. + * - mimeType - The MIME type of the media. + * - mimeIcon - The MIME icon name. + * - size - The file size in bytes. + * - duration - The length in seconds of the audio media (audio/video only). + * - width - The width in pixels of the audio media (image/video only). + * - height - The height in pixels of the audio media (image/video only). + * - tempInfo - mediaInfo (with the same properties as this except no tempInfo) for a temporary image while the file downloads (image/video only). + */ + required property var replyMediaInfo + + /** + * @brief Whether this message is replying to another. + */ + required property bool isReply + + /** + * @brief Whether this message has a local user mention. + */ + required property bool isHighlighted + + /** + * @brief Whether an event is waiting to be accepted by the server. + */ + required property bool isPending + + /** + * @brief Progress info when downloading files. + * + * @sa Quotient::FileTransferInfo + */ + required property var progressInfo + + /** + * @brief Whether an encrypted message is sent in a verified session. + */ + required property bool verified + + /** + * @brief The full message source JSON. + */ + required property var jsonSource + + /** + * @brief The x position of the message bubble. + * + * @note Used for positioning the hover actions. + */ + readonly property real bubbleX: bubble.x + bubble.anchors.leftMargin + + /** + * @brief The y position of the message bubble. + * + * @note Used for positioning the hover actions. + */ + readonly property alias bubbleY: mainContainer.y + + /** + * @brief The width of the message bubble. + * + * @note Used for sizing the hover actions. + */ + readonly property alias bubbleWidth: bubble.width + + /** + * @brief Whether this message is hovered. + */ + readonly property alias hovered: bubble.hovered + + required property NeoChatConnection connection + + /** + * @brief Open the context menu for the message. + */ + signal openContextMenu + + /** + * @brief Open the any message media externally. + */ + signal openExternally() + + /** + * @brief The reply has been clicked. + */ + signal replyClicked(string eventID) + + onReplyClicked: eventID => ListView.view.goToEvent(eventID) + + /** + * @brief The component to display the delegate type. + * + * This is used by the inherited delegates to assign a component to visualise + * the message content for that delegate type. + */ + default property alias innerObject : column.children + + /** + * @brief Whether the bubble background is enabled. + */ + property bool cardBackground: true + + /** + * @brief Whether the delegate should always stretch to the maximum availabel width. + */ + property bool alwaysMaxWidth: false + + /** + * @brief Whether local user messages should be aligned right. + * + * TODO: make private + */ + property bool showUserMessageOnRight: Config.showLocalMessagesOnRight && root.author.isLocalUser && !Config.compactLayout && !alwaysMaxWidth + + /** + * @brief Whether the message should be highlighted. + */ + property bool showHighlight: root.isHighlighted || isTemporaryHighlighted + + /** + * @brief Whether the message should temporarily be highlighted. + * + * Normally triggered when jumping to the event in the timeline, e.g. when a reply + * is clicked. + */ + property bool isTemporaryHighlighted: false + + onIsTemporaryHighlightedChanged: if (isTemporaryHighlighted) temporaryHighlightTimer.start() + + Timer { + id: temporaryHighlightTimer + + interval: 1500 + onTriggered: isTemporaryHighlighted = false + } + + readonly property int contentMaxWidth: bubbleSizeHelper.currentWidth + + width: parent ? timelineDelegateSizeHelper.currentWidth : 0 + spacing: Kirigami.Units.smallSpacing + + state: Config.compactLayout || root.alwaysMaxWidth ? "alignLeft" : "alignCenter" + // Align left when in compact mode and center when using bubbles + states: [ + State { + name: "alignLeft" + AnchorChanges { + target: root + anchors.horizontalCenter: undefined + anchors.left: parent ? parent.left : undefined + } + }, + State { + name: "alignCenter" + AnchorChanges { + target: root + anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined + anchors.left: undefined + } + } + ] + + transitions: [ + Transition { + AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic} + } + ] + + SectionDelegate { + id: sectionDelegate + Layout.fillWidth: true + visible: root.showSection + labelText: root.section + colorSet: Config.compactLayout || root.alwaysMaxWidth ? Kirigami.Theme.View : Kirigami.Theme.Window + } + + QQC2.ItemDelegate { + id: mainContainer + + Layout.fillWidth: true + Layout.topMargin: root.showAuthor || root.alwaysShowAuthor ? Kirigami.Units.largeSpacing : (Config.compactLayout ? 1 : Kirigami.Units.smallSpacing) + Layout.leftMargin: Kirigami.Units.smallSpacing + Layout.rightMargin: Kirigami.Units.smallSpacing + + implicitHeight: Math.max(root.showAuthor || root.alwaysShowAuthor ? avatar.implicitHeight : 0, bubble.height) + + Component.onCompleted: { + if (root.isReply && root.replyDelegateType === DelegateType.Other) { + currentRoom.loadReply(root.eventId, root.replyId) + } + } + + // show hover actions + onHoveredChanged: { + if (hovered && !Kirigami.Settings.isMobile) { + root.setHoverActionsToDelegate() + } + } + + KirigamiComponents.Avatar { + id: avatar + width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2: 0 + height: width + anchors { + left: parent.left + leftMargin: Kirigami.Units.smallSpacing + top: parent.top + topMargin: Kirigami.Units.smallSpacing + } + + visible: (root.showAuthor || root.alwaysShowAuthor) && + Config.showAvatarInTimeline && + (Config.compactLayout || !showUserMessageOnRight) + name: root.author.displayName + source: root.author.avatarSource + color: root.author.color + + MouseArea { + anchors.fill: parent + onClicked: { + RoomManager.visitUser(root.author.object, "mention") + } + cursorShape: Qt.PointingHandCursor + } + } + + QQC2.Control { + id: bubble + topPadding: Config.compactLayout ? Kirigami.Units.smallSpacing / 2 : Kirigami.Units.largeSpacing + bottomPadding: Config.compactLayout ? Kirigami.Units.mediumSpacing / 2 : Kirigami.Units.largeSpacing + leftPadding: Config.compactLayout ? 0 : Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing + rightPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing + hoverEnabled: true + + anchors { + left: avatar.right + leftMargin: Kirigami.Units.largeSpacing + rightMargin: Kirigami.Units.largeSpacing + } + // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably + width: Config.compactLayout || root.alwaysMaxWidth ? mainContainer.width - (Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 : 0) + Kirigami.Units.largeSpacing * 2 : implicitWidth + + state: showUserMessageOnRight ? "userMessageOnRight" : "userMessageOnLeft" + // states for anchor animations on window resize + // as setting anchors to undefined did not work reliably + states: [ + State { + name: "userMessageOnRight" + AnchorChanges { + target: bubble + anchors.left: undefined + anchors.right: parent.right + } + }, + State { + name: "userMessageOnLeft" + AnchorChanges { + target: bubble + anchors.left: avatar.right + anchors.right: undefined + } + } + ] + + transitions: [ + Transition { + AnchorAnimation{duration: Kirigami.Units.longDuration; easing.type: Easing.OutCubic} + } + ] + + contentItem: RowLayout { + Kirigami.Icon { + source: "content-loading-symbolic" + width: height + Layout.preferredWidth: Kirigami.Units.iconSizes.small + Layout.preferredHeight: Kirigami.Units.iconSizes.small + visible: root.isPending && Config.showLocalMessagesOnRight + } + ColumnLayout { + id: column + spacing: Kirigami.Units.smallSpacing + RowLayout { + id: rowLayout + + spacing: Kirigami.Units.smallSpacing + visible: root.showAuthor || root.alwaysShowAuthor + + QQC2.Label { + id: nameLabel + + Layout.maximumWidth: contentMaxWidth - timeLabel.implicitWidth - rowLayout.spacing + + text: visible ? root.author.displayName : "" + textFormat: Text.PlainText + font.weight: Font.Bold + color: root.author.color + elide: Text.ElideRight + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: { + RoomManager.visitUser(root.author.object, "mention") + } + } + } + QQC2.Label { + id: timeLabel + + text: root.timeString + color: Kirigami.Theme.disabledTextColor + QQC2.ToolTip.visible: hoverHandler.hovered + QQC2.ToolTip.text: root.time.toLocaleString(Qt.locale(), Locale.LongFormat) + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + + HoverHandler { + id: hoverHandler + } + } + } + Loader { + id: replyLoader + + Layout.maximumWidth: contentMaxWidth + + active: root.isReply && root.replyDelegateType !== DelegateType.Other + visible: active + + sourceComponent: ReplyComponent { + author: root.replyAuthor + type: root.replyDelegateType + display: root.replyDisplay + mediaInfo: root.replyMediaInfo + contentMaxWidth: bubbleSizeHelper.currentWidth + } + + Connections { + target: replyLoader.item + function onReplyClicked() { + replyClicked(root.replyId) + } + } + } + } + Kirigami.Icon { + source: "content-loading-symbolic" + width: height + Layout.preferredWidth: Kirigami.Units.iconSizes.small + Layout.preferredHeight: Kirigami.Units.iconSizes.small + visible: root.isPending && !Config.showLocalMessagesOnRight + } + } + + background: Item { + Kirigami.ShadowedRectangle { + id: bubbleBackground + visible: cardBackground && !Config.compactLayout + anchors.fill: parent + Kirigami.Theme.colorSet: Kirigami.Theme.View + Kirigami.Theme.inherit: false + color: if (root.author.isLocalUser) { + return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15) + } else if (root.showHighlight) { + return Kirigami.Theme.positiveBackgroundColor + } else { + return Kirigami.Theme.backgroundColor + } + radius: Kirigami.Units.smallSpacing + shadow { + size: Kirigami.Units.smallSpacing + color: root.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10) + } + + Behavior on color { + ColorAnimation { duration: Kirigami.Units.shortDuration } + } + } + } + } + + background: Rectangle { + visible: mainContainer.hovered && (Config.compactLayout || root.alwaysMaxWidth) + color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15) + radius: Kirigami.Units.smallSpacing + } + + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: root.openContextMenu() + } + + TapHandler { + acceptedButtons: Qt.LeftButton + onLongPressed: root.openContextMenu() + } + } + + ReactionDelegate { + Layout.maximumWidth: root.width - Kirigami.Units.largeSpacing * 2 + Layout.alignment: showUserMessageOnRight ? Qt.AlignRight : Qt.AlignLeft + Layout.leftMargin: showUserMessageOnRight ? 0 : bubble.x + bubble.anchors.leftMargin + Layout.rightMargin: showUserMessageOnRight ? Kirigami.Units.largeSpacing : 0 + + visible: root.showReactions + model: root.reaction + + onReactionClicked: (reaction) => currentRoom.toggleReaction(root.eventId, reaction) + } + AvatarFlow { + Layout.alignment: Qt.AlignRight + Layout.rightMargin: Kirigami.Units.largeSpacing + visible: root.showReadMarkers + model: root.readMarkers + toolTipText: root.readMarkersString + excessAvatars: root.excessReadMarkers + } + + function isVisibleInTimeline() { + let yoff = Math.round(y - ListView.view.contentY); + return (yoff + height > 0 && yoff < ListView.view.height) + } + + Component { + id: messageDelegateContextMenu + MessageDelegateContextMenu {} + } + + Component { + id: fileDelegateContextMenu + FileDelegateContextMenu {} + } + + /// Open message context dialog for file and videos + function openFileContext(file) { + const contextMenu = fileDelegateContextMenu.createObject(root, { + author: root.author, + eventId: root.eventId, + eventSource: root.jsonSource, + file: file, + progressInfo: root.progressInfo, + plainText: root.plainText, + htmlText: root.display, + connection: root.connection, + }); + contextMenu.open(); + } + + /// Open context menu for normal message + function openMessageContext(selectedText) { + const contextMenu = messageDelegateContextMenu.createObject(root, { + selectedText: selectedText, + author: root.author, + eventId: root.eventId, + eventSource: root.jsonSource, + eventType: root.delegateType, + plainText: root.plainText, + htmlText: root.display, + connection: root.connection, + }); + contextMenu.open(); + } + + function setHoverActionsToDelegate() { + if (ListView.view.setHoverActionsToDelegate) { + ListView.view.setHoverActionsToDelegate(root) + } + } + + DelegateSizeHelper { + id: timelineDelegateSizeHelper + startBreakpoint: Kirigami.Units.gridUnit * 46 + endBreakpoint: Kirigami.Units.gridUnit * 66 + startPercentWidth: 100 + endPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 85 + maxWidth: Config.compactLayout || root.alwaysMaxWidth ? -1 : Kirigami.Units.gridUnit * 60 + + parentWidth: root.parent ? root.parent.width - (Config.compactLayout && root.ListView.view.width >= Kirigami.Units.gridUnit * 20 ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.largeSpacing : 0) : 0 + } + DelegateSizeHelper { + id: bubbleSizeHelper + startBreakpoint: Kirigami.Units.gridUnit * 25 + endBreakpoint: Kirigami.Units.gridUnit * 40 + startPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 90 + endPercentWidth: Config.compactLayout || root.alwaysMaxWidth ? 100 : 60 + + parentWidth: mainContainer.availableWidth - (Config.showAvatarInTimeline ? avatar.width + bubble.anchors.leftMargin : 0) + } +} diff --git a/src/qml/Component/Timeline/VideoDelegate.qml b/src/qml/Component/Timeline/VideoDelegate.qml index 32d26f2f2..d1775ab9f 100644 --- a/src/qml/Component/Timeline/VideoDelegate.qml +++ b/src/qml/Component/Timeline/VideoDelegate.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2019 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts import QtMultimedia -import Qt.labs.platform 1.1 as Platform +import Qt.labs.platform as Platform -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief A timeline delegate for a video message. diff --git a/src/qml/Component/TimelineView.qml b/src/qml/Component/TimelineView.qml index 923660fc4..e2da4f00f 100644 --- a/src/qml/Component/TimelineView.qml +++ b/src/qml/Component/TimelineView.qml @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.qmlmodels 1.0 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.qmlmodels +import QtQuick.Window -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.ScrollView { id: root diff --git a/src/qml/Component/TypingPane.qml b/src/qml/Component/TypingPane.qml index 0205bc3ff..a1e85251a 100644 --- a/src/qml/Component/TypingPane.qml +++ b/src/qml/Component/TypingPane.qml @@ -4,11 +4,11 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 as QQC2 -import org.kde.kirigami 2.14 as Kirigami -import org.kde.neochat 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import org.kde.kirigami as Kirigami +import org.kde.neochat Loader { id: root diff --git a/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml b/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml index 89a655dba..08d19306f 100644 --- a/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml +++ b/src/qml/Dialog/ConfirmDeactivateAccountDialog.qml @@ -1,13 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 +import QtQuick +import QtQuick.Layouts -import QtQuick.Layouts 1.15 +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.kirigamiaddons.formcard 1.0 as FormCard - -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Dialog/ConfirmEncryptionDialog.qml b/src/qml/Dialog/ConfirmEncryptionDialog.qml index 0bfb52344..82b2146f1 100644 --- a/src/qml/Dialog/ConfirmEncryptionDialog.qml +++ b/src/qml/Dialog/ConfirmEncryptionDialog.qml @@ -2,12 +2,12 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Dialog { id: root diff --git a/src/qml/Dialog/ConfirmLogout.qml b/src/qml/Dialog/ConfirmLogout.qml index 952ebcd54..6c318bd50 100644 --- a/src/qml/Dialog/ConfirmLogout.qml +++ b/src/qml/Dialog/ConfirmLogout.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2022 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Dialog { id: root diff --git a/src/qml/Dialog/CreateRoomDialog.qml b/src/qml/Dialog/CreateRoomDialog.qml index 7eabc0a66..b213db6cd 100644 --- a/src/qml/Dialog/CreateRoomDialog.qml +++ b/src/qml/Dialog/CreateRoomDialog.qml @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 +import QtQuick -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Dialog/CreateSpaceDialog.qml b/src/qml/Dialog/CreateSpaceDialog.qml index 40199be5b..8b3d3bbb9 100644 --- a/src/qml/Dialog/CreateSpaceDialog.qml +++ b/src/qml/Dialog/CreateSpaceDialog.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami +import QtQuick +import QtQuick.Layouts +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.neochat +import org.kde.kirigamiaddons.formcard as FormCard FormCard.FormCardPage { id: root diff --git a/src/qml/Dialog/EmojiDialog.qml b/src/qml/Dialog/EmojiDialog.qml index 28a579dbe..72821b374 100644 --- a/src/qml/Dialog/EmojiDialog.qml +++ b/src/qml/Dialog/EmojiDialog.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: LGPL-2.1-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Popup { id: root diff --git a/src/qml/Dialog/KeyVerification/EmojiItem.qml b/src/qml/Dialog/KeyVerification/EmojiItem.qml index 07a394198..3da5ba119 100644 --- a/src/qml/Dialog/KeyVerification/EmojiItem.qml +++ b/src/qml/Dialog/KeyVerification/EmojiItem.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQml 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQml -import org.kde.kirigami 2.19 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat Column { id: root diff --git a/src/qml/Dialog/KeyVerification/EmojiRow.qml b/src/qml/Dialog/KeyVerification/EmojiRow.qml index 371ae602b..1db703da4 100644 --- a/src/qml/Dialog/KeyVerification/EmojiRow.qml +++ b/src/qml/Dialog/KeyVerification/EmojiRow.qml @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQml 2.15 +import QtQuick +import QtQml -import org.kde.neochat 1.0 +import org.kde.neochat Row { id: root diff --git a/src/qml/Dialog/KeyVerification/EmojiSas.qml b/src/qml/Dialog/KeyVerification/EmojiSas.qml index cce8f9a78..ed3b0fed8 100644 --- a/src/qml/Dialog/KeyVerification/EmojiSas.qml +++ b/src/qml/Dialog/KeyVerification/EmojiSas.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQml 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQml -import org.kde.kirigami 2.19 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat Column { id: root diff --git a/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml b/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml index 6dbdb1cce..31325f499 100644 --- a/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml +++ b/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQml 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQml -import org.kde.kirigami 2.19 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Dialog/KeyVerification/Message.qml b/src/qml/Dialog/KeyVerification/Message.qml index c654c07af..b7bb94447 100644 --- a/src/qml/Dialog/KeyVerification/Message.qml +++ b/src/qml/Dialog/KeyVerification/Message.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQml 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQml -import org.kde.kirigami 2.19 as Kirigami -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.neochat Column { id: root diff --git a/src/qml/Dialog/KeyVerification/VerificationCanceled.qml b/src/qml/Dialog/KeyVerification/VerificationCanceled.qml index 9bb3c3df8..32bbcae24 100644 --- a/src/qml/Dialog/KeyVerification/VerificationCanceled.qml +++ b/src/qml/Dialog/KeyVerification/VerificationCanceled.qml @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQml 2.15 +import QtQuick +import QtQml -import org.kde.neochat 1.0 +import org.kde.neochat Message { id: root diff --git a/src/qml/Dialog/OpenFileDialog.qml b/src/qml/Dialog/OpenFileDialog.qml index 6669503ec..971dcf6f3 100644 --- a/src/qml/Dialog/OpenFileDialog.qml +++ b/src/qml/Dialog/OpenFileDialog.qml @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: 2019 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import Qt.labs.platform 1.1 +import QtQuick +import Qt.labs.platform FileDialog { signal chosen(string path) diff --git a/src/qml/Dialog/PowerLevelDialog.qml b/src/qml/Dialog/PowerLevelDialog.qml index 0bc131160..3894b8e5a 100644 --- a/src/qml/Dialog/PowerLevelDialog.qml +++ b/src/qml/Dialog/PowerLevelDialog.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.OverlaySheet { id: root diff --git a/src/qml/Dialog/UserDetailDialog.qml b/src/qml/Dialog/UserDetailDialog.qml index d53ace6b5..5e6ab413f 100644 --- a/src/qml/Dialog/UserDetailDialog.qml +++ b/src/qml/Dialog/UserDetailDialog.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.Dialog { id: root diff --git a/src/qml/Menu/EditMenu.qml b/src/qml/Menu/EditMenu.qml index 167db7d87..df9cd61e8 100644 --- a/src/qml/Menu/EditMenu.qml +++ b/src/qml/Menu/EditMenu.qml @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2021 Carson Black // SPDX-License-Identifier: LGPL-2.0-or-later -import Qt.labs.platform 1.1 as Labs -import QtQuick 2.15 -import QtQuick.Layouts 1.10 +import Qt.labs.platform as Labs +import QtQuick +import QtQuick.Layouts Labs.Menu { id: root diff --git a/src/qml/Menu/GlobalMenu.qml b/src/qml/Menu/GlobalMenu.qml index 4f7a60968..bde9cd201 100644 --- a/src/qml/Menu/GlobalMenu.qml +++ b/src/qml/Menu/GlobalMenu.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2021 Carson Black // SPDX-License-Identifier: GPL-3.0-or-later -import Qt.labs.platform 1.1 as Labs +import Qt.labs.platform as Labs -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Layouts 1.10 +import QtQuick +import QtQuick.Window +import QtQuick.Layouts -import org.kde.neochat 1.0 +import org.kde.neochat Labs.MenuBar { id: root diff --git a/src/qml/Menu/ShareAction.qml b/src/qml/Menu/ShareAction.qml index f683c952b..b5bafe794 100644 --- a/src/qml/Menu/ShareAction.qml +++ b/src/qml/Menu/ShareAction.qml @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import org.kde.kirigami 2.14 as Kirigami +import QtQuick +import QtQuick.Layouts +import org.kde.kirigami as Kirigami /** * Action that allows an user to share data with other apps and service @@ -38,7 +38,7 @@ Kirigami.Action { property Instantiator _instantiator: Instantiator { Component.onCompleted: { - const purposeModel = Qt.createQmlObject('import org.kde.purpose 1.0 as Purpose; + const purposeModel = Qt.createQmlObject('import org.kde.purpose as Purpose; Purpose.PurposeAlternativesModel { pluginType: "Export" }', root._instantiator); diff --git a/src/qml/Menu/ShareActionAndroid.qml b/src/qml/Menu/ShareActionAndroid.qml index c2e310800..0adef963b 100644 --- a/src/qml/Menu/ShareActionAndroid.qml +++ b/src/qml/Menu/ShareActionAndroid.qml @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -import org.kde.kirigami 2.14 as Kirigami +import org.kde.kirigami as Kirigami Kirigami.Action { property var inputData: ({}) diff --git a/src/qml/Menu/ShareDialog.qml b/src/qml/Menu/ShareDialog.qml index 30dbdfb6e..b8991386e 100644 --- a/src/qml/Menu/ShareDialog.qml +++ b/src/qml/Menu/ShareDialog.qml @@ -5,12 +5,12 @@ * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -import QtQuick 2.7 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.15 as QQC2 -import org.kde.purpose 1.0 as Purpose -import org.kde.notification 1.0 -import org.kde.kirigami 2.14 as Kirigami +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls as QQC2 +import org.kde.purpose as Purpose +import org.kde.notification +import org.kde.kirigami as Kirigami Kirigami.Page { id: root diff --git a/src/qml/Menu/Timeline/BanSheet.qml b/src/qml/Menu/Timeline/BanSheet.qml index 2e908a2d3..14a0706be 100644 --- a/src/qml/Menu/Timeline/BanSheet.qml +++ b/src/qml/Menu/Timeline/BanSheet.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml index 8235f04ab..9385118e6 100644 --- a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2019 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import Qt.labs.platform 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import Qt.labs.platform -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief The menu for media messages. diff --git a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml index 0a1be1d93..c2c076e36 100644 --- a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief The base menu for most message types. diff --git a/src/qml/Menu/Timeline/MessageSourceSheet.qml b/src/qml/Menu/Timeline/MessageSourceSheet.qml index 35fae4200..b8c730ebe 100644 --- a/src/qml/Menu/Timeline/MessageSourceSheet.qml +++ b/src/qml/Menu/Timeline/MessageSourceSheet.qml @@ -2,12 +2,13 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 +import QtQuick +import QtQuick.Controls as QQC2 -import org.kde.syntaxhighlighting 1.0 import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.syntaxhighlighting + +import org.kde.neochat Kirigami.Page { property string sourceText diff --git a/src/qml/Menu/Timeline/RemoveSheet.qml b/src/qml/Menu/Timeline/RemoveSheet.qml index 28a65e981..18312c633 100644 --- a/src/qml/Menu/Timeline/RemoveSheet.qml +++ b/src/qml/Menu/Timeline/RemoveSheet.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Menu/Timeline/ReportSheet.qml b/src/qml/Menu/Timeline/ReportSheet.qml index 4566c0a2b..a38ba5cb3 100644 --- a/src/qml/Menu/Timeline/ReportSheet.qml +++ b/src/qml/Menu/Timeline/ReportSheet.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Page/ChooseRoomDialog.qml b/src/qml/Page/ChooseRoomDialog.qml index 2a1ab7b6a..9cd4b5f62 100644 --- a/src/qml/Page/ChooseRoomDialog.qml +++ b/src/qml/Page/ChooseRoomDialog.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 +import QtQuick +import QtQuick.Controls -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat import "./RoomList" diff --git a/src/qml/Page/DevtoolsPage.qml b/src/qml/Page/DevtoolsPage.qml index bc57636be..4f3908a95 100644 --- a/src/qml/Page/DevtoolsPage.qml +++ b/src/qml/Page/DevtoolsPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Page/ExplorerDelegate.qml b/src/qml/Page/ExplorerDelegate.qml index 34a31b179..b3cf96dd7 100644 --- a/src/qml/Page/ExplorerDelegate.qml +++ b/src/qml/Page/ExplorerDelegate.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as Components +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as Components -import org.kde.neochat 1.0 +import org.kde.neochat Delegates.RoundedItemDelegate { id: root diff --git a/src/qml/Page/ImageEditorPage.qml b/src/qml/Page/ImageEditorPage.qml index 355259fbd..8b5804c6f 100644 --- a/src/qml/Page/ImageEditorPage.qml +++ b/src/qml/Page/ImageEditorPage.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: BSD-2-Clause -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 as Platform +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.platform as Platform -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kquickimageeditor 1.0 as KQuickImageEditor +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kquickimageeditor as KQuickImageEditor Kirigami.Page { id: rootEditorView diff --git a/src/qml/Page/InviteUserPage.qml b/src/qml/Page/InviteUserPage.qml index 4c17ecd15..5fae26d9e 100644 --- a/src/qml/Page/InviteUserPage.qml +++ b/src/qml/Page/InviteUserPage.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2019 Black Hat // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.ScrollablePage { id: root diff --git a/src/qml/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml index 40d7b37e7..5415d5527 100644 --- a/src/qml/Page/JoinRoomPage.qml +++ b/src/qml/Page/JoinRoomPage.qml @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.qmlmodels -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.ScrollablePage { id: root diff --git a/src/qml/Page/LoadingPage.qml b/src/qml/Page/LoadingPage.qml index 00288152d..b54ab4c53 100644 --- a/src/qml/Page/LoadingPage.qml +++ b/src/qml/Page/LoadingPage.qml @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.19 as Kirigami +import QtQuick.Layouts +import org.kde.kirigami as Kirigami Kirigami.Page { title: i18n("Loading…") diff --git a/src/qml/Page/RoomList/AccountMenu.qml b/src/qml/Page/RoomList/AccountMenu.qml index 53f5bb4cd..a4f28bbc8 100644 --- a/src/qml/Page/RoomList/AccountMenu.qml +++ b/src/qml/Page/RoomList/AccountMenu.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat import '../Dialog' as Dialog QQC2.Menu { diff --git a/src/qml/Page/RoomList/CollapsedRoomDelegate.qml b/src/qml/Page/RoomList/CollapsedRoomDelegate.qml index df6e530d0..09469e7d2 100644 --- a/src/qml/Page/RoomList/CollapsedRoomDelegate.qml +++ b/src/qml/Page/RoomList/CollapsedRoomDelegate.qml @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2023 Carl Schwan // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQml.Models 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQml.Models -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat import './' as RoomList diff --git a/src/qml/Page/RoomList/ContextMenu.qml b/src/qml/Page/RoomList/ContextMenu.qml index 0092e0091..0b2a2c9bf 100644 --- a/src/qml/Page/RoomList/ContextMenu.qml +++ b/src/qml/Page/RoomList/ContextMenu.qml @@ -6,9 +6,9 @@ import QtQuick import QtQuick.Controls as QQC2 import QtQuick.Layouts -import org.kde.kirigami 2 as Kirigami -import org.kde.kirigamiaddons.components 1 as KirigamiComponents -import org.kde.kirigamiaddons.delegates 1 as Delegates +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.components as KirigamiComponents +import org.kde.kirigamiaddons.delegates as Delegates import org.kde.neochat diff --git a/src/qml/Page/RoomList/ExploreComponent.qml b/src/qml/Page/RoomList/ExploreComponent.qml index e4d3dc96b..81e382604 100644 --- a/src/qml/Page/RoomList/ExploreComponent.qml +++ b/src/qml/Page/RoomList/ExploreComponent.qml @@ -5,8 +5,8 @@ import QtQuick import QtQuick.Controls as QQC2 import QtQuick.Layouts -import org.kde.kirigami 2 as Kirigami -import org.kde.kirigamiaddons.delegates 1 as Delegates +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates import org.kde.neochat diff --git a/src/qml/Page/RoomList/Page.qml b/src/qml/Page/RoomList/Page.qml index 1f803d7a6..b9c1748a1 100644 --- a/src/qml/Page/RoomList/Page.qml +++ b/src/qml/Page/RoomList/Page.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQml.Models 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQml.Models -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat import './' as RoomList import '../' as NeoChat diff --git a/src/qml/Page/RoomList/RoomDelegate.qml b/src/qml/Page/RoomList/RoomDelegate.qml index 3ca0b7e14..50f1b4b79 100644 --- a/src/qml/Page/RoomList/RoomDelegate.qml +++ b/src/qml/Page/RoomList/RoomDelegate.qml @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: 2023 Carl Schwan // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQml.Models 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQml.Models -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as Components -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as Components +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat import './' as RoomList diff --git a/src/qml/Page/RoomList/SpaceDrawer.qml b/src/qml/Page/RoomList/SpaceDrawer.qml index e9b7c50a4..a73881cf3 100644 --- a/src/qml/Page/RoomList/SpaceDrawer.qml +++ b/src/qml/Page/RoomList/SpaceDrawer.qml @@ -2,14 +2,13 @@ // SPDX-FileCopyrightText: 2021-2022 Bart De Vries // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import '.' -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.Control { id: root diff --git a/src/qml/Page/RoomList/SpaceListContextMenu.qml b/src/qml/Page/RoomList/SpaceListContextMenu.qml index 8836529f9..f462d3d9f 100644 --- a/src/qml/Page/RoomList/SpaceListContextMenu.qml +++ b/src/qml/Page/RoomList/SpaceListContextMenu.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat /** * Context menu when clicking on a room in the room list diff --git a/src/qml/Page/RoomList/UserInfo.qml b/src/qml/Page/RoomList/UserInfo.qml index 1502c2d6e..2af6ee0a4 100644 --- a/src/qml/Page/RoomList/UserInfo.qml +++ b/src/qml/Page/RoomList/UserInfo.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kirigamiaddons.delegates 1.0 as Delegates +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kirigamiaddons.delegates as Delegates -import org.kde.neochat 1.0 +import org.kde.neochat QQC2.ToolBar { id: root diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml index b2622183e..c4cd4b04a 100644 --- a/src/qml/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQuick.Window -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kitemmodels 1.0 +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.Page { id: root diff --git a/src/qml/Page/RoomWindow.qml b/src/qml/Page/RoomWindow.qml index a4c9f9085..cb0bc3af7 100644 --- a/src/qml/Page/RoomWindow.qml +++ b/src/qml/Page/RoomWindow.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.ApplicationWindow { id: root diff --git a/src/qml/Page/SearchPage.qml b/src/qml/Page/SearchPage.qml index 614f5f545..2fb310496 100644 --- a/src/qml/Page/SearchPage.qml +++ b/src/qml/Page/SearchPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.ScrollablePage { id: root diff --git a/src/qml/Page/StartChatPage.qml b/src/qml/Page/StartChatPage.qml index 5493eb09e..3526374b5 100644 --- a/src/qml/Page/StartChatPage.qml +++ b/src/qml/Page/StartChatPage.qml @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.ScrollablePage { id: root diff --git a/src/qml/Page/WelcomePage.qml b/src/qml/Page/WelcomePage.qml index cd8579321..27aa3a1a9 100644 --- a/src/qml/Page/WelcomePage.qml +++ b/src/qml/Page/WelcomePage.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/RoomDrawer/DirectChatDrawerHeader.qml b/src/qml/RoomDrawer/DirectChatDrawerHeader.qml index 0a28b40f0..e773c4a1f 100644 --- a/src/qml/RoomDrawer/DirectChatDrawerHeader.qml +++ b/src/qml/RoomDrawer/DirectChatDrawerHeader.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { Layout.fillWidth: true diff --git a/src/qml/RoomDrawer/GroupChatDrawerHeader.qml b/src/qml/RoomDrawer/GroupChatDrawerHeader.qml index a944efab8..7f423dc49 100644 --- a/src/qml/RoomDrawer/GroupChatDrawerHeader.qml +++ b/src/qml/RoomDrawer/GroupChatDrawerHeader.qml @@ -2,12 +2,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import QtQuick +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/RoomDrawer/RoomDrawer.qml b/src/qml/RoomDrawer/RoomDrawer.qml index 0bc62d956..b188c8826 100644 --- a/src/qml/RoomDrawer/RoomDrawer.qml +++ b/src/qml/RoomDrawer/RoomDrawer.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat Kirigami.OverlayDrawer { id: root diff --git a/src/qml/RoomDrawer/RoomDrawerPage.qml b/src/qml/RoomDrawer/RoomDrawerPage.qml index d10bcbfd3..7a2ccd4f3 100644 --- a/src/qml/RoomDrawer/RoomDrawerPage.qml +++ b/src/qml/RoomDrawer/RoomDrawerPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief Page for holding a room drawer component. diff --git a/src/qml/RoomDrawer/RoomInformation.qml b/src/qml/RoomDrawer/RoomInformation.qml index 5b5e1e4af..b071d8dec 100644 --- a/src/qml/RoomDrawer/RoomInformation.qml +++ b/src/qml/RoomDrawer/RoomInformation.qml @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.20 as Kirigami -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief Component for visualising the room information. diff --git a/src/qml/RoomDrawer/RoomMedia.qml b/src/qml/RoomDrawer/RoomMedia.qml index f30066fa2..151f426f5 100644 --- a/src/qml/RoomDrawer/RoomMedia.qml +++ b/src/qml/RoomDrawer/RoomMedia.qml @@ -1,13 +1,12 @@ // SPDX-FileCopyrightText: 2023 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.qmlmodels 1.0 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.qmlmodels - -import org.kde.neochat 1.0 +import org.kde.neochat /** * @brief Component for visualising the loaded media items in the room. diff --git a/src/qml/RoomSettings/Categories.qml b/src/qml/RoomSettings/Categories.qml index 02b9bf838..b5abc6584 100644 --- a/src/qml/RoomSettings/Categories.qml +++ b/src/qml/RoomSettings/Categories.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick 2.15 -import org.kde.kirigami 2.18 as Kirigami -import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings -import QtQuick.Layouts 1.15 +import QtQuick +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.settings as KirigamiSettings +import QtQuick.Layouts -import org.kde.neochat 1.0 +import org.kde.neochat KirigamiSettings.CategorizedSettings { id: root diff --git a/src/qml/RoomSettings/General.qml b/src/qml/RoomSettings/General.qml index c25bc9e5b..41a4d1ad6 100644 --- a/src/qml/RoomSettings/General.qml +++ b/src/qml/RoomSettings/General.qml @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQuick.Window -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/RoomSettings/Permissions.qml b/src/qml/RoomSettings/Permissions.qml index 1df589acf..6e96e763f 100644 --- a/src/qml/RoomSettings/Permissions.qml +++ b/src/qml/RoomSettings/Permissions.qml @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kirigamiaddons.delegates 1.0 as Delegates -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.delegates as Delegates +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/RoomSettings/PushNotification.qml b/src/qml/RoomSettings/PushNotification.qml index 470437571..594cadfa8 100644 --- a/src/qml/RoomSettings/PushNotification.qml +++ b/src/qml/RoomSettings/PushNotification.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/RoomSettings/Security.qml b/src/qml/RoomSettings/Security.qml index 2263919e5..f8d49aebf 100644 --- a/src/qml/RoomSettings/Security.qml +++ b/src/qml/RoomSettings/Security.qml @@ -2,11 +2,11 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import QtQuick +import QtQuick.Layouts +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/About.qml b/src/qml/Settings/About.qml index cbad91345..e1e9fe133 100644 --- a/src/qml/Settings/About.qml +++ b/src/qml/Settings/About.qml @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick.Layouts 1.15 -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.neochat 1.0 +import QtQuick.Layouts +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.neochat FormCard.AboutPage { title: i18nc("@title:window", "About NeoChat") diff --git a/src/qml/Settings/AboutKDE.qml b/src/qml/Settings/AboutKDE.qml index 96ef23548..45f0448a5 100644 --- a/src/qml/Settings/AboutKDE.qml +++ b/src/qml/Settings/AboutKDE.qml @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: LGPL-2.0-or-later -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard FormCard.AboutKDE { title: i18nc("@title:window", "About KDE") diff --git a/src/qml/Settings/AccountEditorPage.qml b/src/qml/Settings/AccountEditorPage.qml index 221af3450..90f8b4b7c 100644 --- a/src/qml/Settings/AccountEditorPage.qml +++ b/src/qml/Settings/AccountEditorPage.qml @@ -2,16 +2,16 @@ // SPDX-FileCopyrightText: 2022 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.platform +import QtQuick.Window -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.components 1.0 as KirigamiComponents -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.neochat 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.labs.components as KirigamiComponents +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/AccountsPage.qml b/src/qml/Settings/AccountsPage.qml index 7aeb8c042..c023e1134 100644 --- a/src/qml/Settings/AccountsPage.qml +++ b/src/qml/Settings/AccountsPage.qml @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: 2020 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import QtQuick.Window 2.15 -import Qt.labs.platform 1.1 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import QtQuick.Window +import Qt.labs.platform -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat import 'Dialog' as Dialog FormCard.FormCardPage { diff --git a/src/qml/Settings/AppearanceSettingsPage.qml b/src/qml/Settings/AppearanceSettingsPage.qml index 6559804a8..407224ea5 100644 --- a/src/qml/Settings/AppearanceSettingsPage.qml +++ b/src/qml/Settings/AppearanceSettingsPage.qml @@ -2,15 +2,15 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kirigamiaddons.labs.components as KirigamiComponents -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/ColorScheme.qml b/src/qml/Settings/ColorScheme.qml index e3cb9b600..6601b0675 100644 --- a/src/qml/Settings/ColorScheme.qml +++ b/src/qml/Settings/ColorScheme.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormComboBoxDelegate { id: root diff --git a/src/qml/Settings/DeviceDelegate.qml b/src/qml/Settings/DeviceDelegate.qml index c2c11581f..bfc5cbab3 100644 --- a/src/qml/Settings/DeviceDelegate.qml +++ b/src/qml/Settings/DeviceDelegate.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.AbstractFormDelegate { id: root diff --git a/src/qml/Settings/DevicesCard.qml b/src/qml/Settings/DevicesCard.qml index 68cf5efd9..19ee1cf88 100644 --- a/src/qml/Settings/DevicesCard.qml +++ b/src/qml/Settings/DevicesCard.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat ColumnLayout { id: root diff --git a/src/qml/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml index 9d10264f9..3305d7856 100644 --- a/src/qml/Settings/DevicesPage.qml +++ b/src/qml/Settings/DevicesPage.qml @@ -2,14 +2,14 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/EmoticonEditorPage.qml b/src/qml/Settings/EmoticonEditorPage.qml index 1f003d24e..e03cb8049 100644 --- a/src/qml/Settings/EmoticonEditorPage.qml +++ b/src/qml/Settings/EmoticonEditorPage.qml @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import Qt.labs.platform 1.1 -import QtQuick.Window 2.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import Qt.labs.platform +import QtQuick.Window -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/EmoticonFormCard.qml b/src/qml/Settings/EmoticonFormCard.qml index 08d41fecd..248719268 100644 --- a/src/qml/Settings/EmoticonFormCard.qml +++ b/src/qml/Settings/EmoticonFormCard.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.19 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCard { id: root diff --git a/src/qml/Settings/EmoticonsPage.qml b/src/qml/Settings/EmoticonsPage.qml index a792c1172..caf7b59c9 100644 --- a/src/qml/Settings/EmoticonsPage.qml +++ b/src/qml/Settings/EmoticonsPage.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2023 Tobias Fella // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/GeneralSettingsPage.qml b/src/qml/Settings/GeneralSettingsPage.qml index 99fab3fb9..d9a448e1a 100644 --- a/src/qml/Settings/GeneralSettingsPage.qml +++ b/src/qml/Settings/GeneralSettingsPage.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { title: i18nc("@title:window", "General") diff --git a/src/qml/Settings/GlobalNotificationsPage.qml b/src/qml/Settings/GlobalNotificationsPage.qml index 3feddc358..a0260be95 100644 --- a/src/qml/Settings/GlobalNotificationsPage.qml +++ b/src/qml/Settings/GlobalNotificationsPage.qml @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard -import org.kde.kitemmodels 1.0 +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard +import org.kde.kitemmodels -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/NetworkProxyPage.qml b/src/qml/Settings/NetworkProxyPage.qml index 255d59fe7..28faf7a17 100644 --- a/src/qml/Settings/NetworkProxyPage.qml +++ b/src/qml/Settings/NetworkProxyPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2022 Gary Wang // SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDE-Accepted-LGPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.FormCardPage { id: root diff --git a/src/qml/Settings/NotificationRuleItem.qml b/src/qml/Settings/NotificationRuleItem.qml index fe82993fa..77e7c06d9 100644 --- a/src/qml/Settings/NotificationRuleItem.qml +++ b/src/qml/Settings/NotificationRuleItem.qml @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: 2022 James Graham // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat 1.0 +import org.kde.neochat FormCard.AbstractFormDelegate { id: root diff --git a/src/qml/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml index 7022c86f4..9ecfd9419 100644 --- a/src/qml/Settings/SettingsPage.qml +++ b/src/qml/Settings/SettingsPage.qml @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.0-or-later -import QtQuick 2.15 -import org.kde.kirigami 2.18 as Kirigami -import org.kde.kirigamiaddons.settings 1.0 as KirigamiSettings -import QtQuick.Layouts 1.15 +import QtQuick +import org.kde.kirigami as Kirigami +import org.kde.kirigamiaddons.settings as KirigamiSettings +import QtQuick.Layouts -import org.kde.neochat 1.0 +import org.kde.neochat KirigamiSettings.CategorizedSettings { id: root diff --git a/src/qml/Settings/SonnetConfigPage.qml b/src/qml/Settings/SonnetConfigPage.qml index 62d56711f..13302823f 100644 --- a/src/qml/Settings/SonnetConfigPage.qml +++ b/src/qml/Settings/SonnetConfigPage.qml @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: 2021 Carl Schwan // SPDX-License-Identifier: LGPL-2.1-or-later -import QtQml 2.15 -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami -import org.kde.sonnet 1.0 as Sonnet -import org.kde.kirigamiaddons.formcard 1.0 as FormCard +import QtQml +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami +import org.kde.sonnet as Sonnet +import org.kde.kirigamiaddons.formcard as FormCard Kirigami.ScrollablePage { id: root diff --git a/src/qml/Settings/ThemeRadioButton.qml b/src/qml/Settings/ThemeRadioButton.qml index 37e16be9c..9956b140c 100644 --- a/src/qml/Settings/ThemeRadioButton.qml +++ b/src/qml/Settings/ThemeRadioButton.qml @@ -3,10 +3,10 @@ // Copyright 2019 Nate Graham // SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.15 as Kirigami +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts +import org.kde.kirigami as Kirigami QQC2.RadioButton { id: root diff --git a/src/qml/main.qml b/src/qml/main.qml index dc16a1d01..c0b97fda8 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.15 -import QtQuick.Controls 2.15 as QQC2 -import QtQuick.Layouts 1.15 +import QtQuick +import QtQuick.Controls as QQC2 +import QtQuick.Layouts -import org.kde.kirigami 2.15 as Kirigami +import org.kde.kirigami as Kirigami -import org.kde.neochat 1.0 +import org.kde.neochat import './RoomList' as RoomList import './Dialog' as Dialog