diff --git a/imports/NeoChat/Component/AutoMouseArea.qml b/imports/NeoChat/Component/AutoMouseArea.qml deleted file mode 100644 index c91b7e14c..000000000 --- a/imports/NeoChat/Component/AutoMouseArea.qml +++ /dev/null @@ -1,18 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 - -import NeoChat.Setting 1.0 - -MouseArea { - signal primaryClicked() - signal secondaryClicked() - - acceptedButtons: Qt.LeftButton | Qt.RightButton - - onClicked: mouse.button == Qt.RightButton ? secondaryClicked() : primaryClicked() - onPressAndHold: secondaryClicked() -} diff --git a/imports/NeoChat/Component/ChatBox/AttachmentPane.qml b/imports/NeoChat/Component/ChatBox/AttachmentPane.qml index 372cd598a..2de62ff21 100644 --- a/imports/NeoChat/Component/ChatBox/AttachmentPane.qml +++ b/imports/NeoChat/Component/ChatBox/AttachmentPane.qml @@ -1,15 +1,15 @@ -/* SPDX-FileCopyrightText: 2020 Carl Schwan - * SPDX-FileCopyrightText: 2020 Noah Davis - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// 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 -import org.kde.kirigami 2.14 as Kirigami -import NeoChat.Page 1.0 +import org.kde.kirigami 2.15 as Kirigami + import org.kde.neochat 1.0 +import NeoChat.Page 1.0 Loader { id: root diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml index db8654b26..52a08de3a 100644 --- a/imports/NeoChat/Component/ChatBox/ChatBar.qml +++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml @@ -1,13 +1,13 @@ -/* SPDX-FileCopyrightText: 2020 Carl Schwan - * SPDX-FileCopyrightText: 2020 Noah Davis - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// 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 -import Qt.labs.platform 1.0 as Platform -import org.kde.kirigami 2.14 as Kirigami +import Qt.labs.platform 1.1 as Platform + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Component/ChatBox/ChatBox.qml b/imports/NeoChat/Component/ChatBox/ChatBox.qml index 9e9bea492..465280e5d 100644 --- a/imports/NeoChat/Component/ChatBox/ChatBox.qml +++ b/imports/NeoChat/Component/ChatBox/ChatBox.qml @@ -1,15 +1,14 @@ -/* SPDX-FileCopyrightText: 2020 Carl Schwan - * SPDX-FileCopyrightText: 2020 Noah Davis - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-FileCopyrightText: 2020 Noah Davis +// SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import Qt.labs.platform 1.0 as Platform -import org.kde.kirigami 2.14 as Kirigami +import Qt.labs.platform 1.1 as Platform +import org.kde.kirigami 2.15 as Kirigami +import org.kde.neochat 1.0 import NeoChat.Component.ChatBox 1.0 import NeoChat.Component.Emoji 1.0 -import org.kde.neochat 1.0 Item { id: root diff --git a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml index cd5c58d76..39367d363 100644 --- a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml +++ b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml @@ -5,7 +5,8 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -import org.kde.kirigami 2.14 as Kirigami + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Component/ChatBox/ReplyPane.qml b/imports/NeoChat/Component/ChatBox/ReplyPane.qml index 3696db418..ede35a3c5 100644 --- a/imports/NeoChat/Component/ChatBox/ReplyPane.qml +++ b/imports/NeoChat/Component/ChatBox/ReplyPane.qml @@ -1,12 +1,13 @@ -/* SPDX-FileCopyrightText: 2020 Carl Schwan - * SPDX-FileCopyrightText: 2020 Noah Davis - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// 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 + import org.kde.kirigami 2.14 as Kirigami + import org.kde.neochat 1.0 Loader { diff --git a/imports/NeoChat/Component/Emoji/EmojiPicker.qml b/imports/NeoChat/Component/Emoji/EmojiPicker.qml index de6ab72ec..dbd185df8 100644 --- a/imports/NeoChat/Component/Emoji/EmojiPicker.qml +++ b/imports/NeoChat/Component/Emoji/EmojiPicker.qml @@ -1,16 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2018-2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only -import NeoChat.Component 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 as NeoChat +import NeoChat.Component 1.0 ColumnLayout { property string emojiCategory: "history" diff --git a/imports/NeoChat/Component/FancyEffectsContainer.qml b/imports/NeoChat/Component/FancyEffectsContainer.qml index 2844a4d0b..f31bf5802 100644 --- a/imports/NeoChat/Component/FancyEffectsContainer.qml +++ b/imports/NeoChat/Component/FancyEffectsContainer.qml @@ -1,14 +1,12 @@ -/** - * 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.12 -import QtQuick.Controls 2.12 as Controls -import QtQuick.Layouts 1.12 -import QtQuick.Particles 2.12 +// SPDX-FileCopyrightText: 2021 Alexey Andreyev +// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -import org.kde.kirigami 2.4 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 +import QtQuick.Particles 2.15 + +import org.kde.kirigami 2.15 as Kirigami Rectangle { id: item diff --git a/imports/NeoChat/Component/FullScreenImage.qml b/imports/NeoChat/Component/FullScreenImage.qml index e9627818d..e7f999d91 100644 --- a/imports/NeoChat/Component/FullScreenImage.qml +++ b/imports/NeoChat/Component/FullScreenImage.qml @@ -1,13 +1,10 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only -import QtQuick 2.12 -import QtQuick.Controls 2.12 +import QtQuick 2.15 +import QtQuick.Controls 2.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami ApplicationWindow { id: root diff --git a/imports/NeoChat/Component/Login/Homeserver.qml b/imports/NeoChat/Component/Login/Homeserver.qml index 6cf7edfb9..1780c742a 100644 --- a/imports/NeoChat/Component/Login/Homeserver.qml +++ b/imports/NeoChat/Component/Login/Homeserver.qml @@ -1,14 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// 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 2.15 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Component/Login/Loading.qml b/imports/NeoChat/Component/Login/Loading.qml index 432fee63a..5bd2fd482 100644 --- a/imports/NeoChat/Component/Login/Loading.qml +++ b/imports/NeoChat/Component/Login/Loading.qml @@ -1,18 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-3.0-only + import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 - import NeoChat.Component 1.0 -import org.kde.kirigami 2.12 as Kirigami - QQC2.BusyIndicator { property var showContinueButton: false diff --git a/imports/NeoChat/Component/Login/Login.qml b/imports/NeoChat/Component/Login/Login.qml index 9a9e2fd2c..fbe589155 100644 --- a/imports/NeoChat/Component/Login/Login.qml +++ b/imports/NeoChat/Component/Login/Login.qml @@ -1,15 +1,12 @@ -/** - * SPDX-FileCopyrightText: 2020 Carl Schwan - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Component 1.0 diff --git a/imports/NeoChat/Component/Login/LoginMethod.qml b/imports/NeoChat/Component/Login/LoginMethod.qml index 2d47c7d12..21a5f3ec7 100644 --- a/imports/NeoChat/Component/Login/LoginMethod.qml +++ b/imports/NeoChat/Component/Login/LoginMethod.qml @@ -1,13 +1,10 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls -import QtQuick.Layouts 1.14 -import org.kde.kirigami 2.12 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Component.Login 1.0 diff --git a/imports/NeoChat/Component/Login/LoginRegister.qml b/imports/NeoChat/Component/Login/LoginRegister.qml index 8a7e0ff9c..9f2c2d77f 100644 --- a/imports/NeoChat/Component/Login/LoginRegister.qml +++ b/imports/NeoChat/Component/Login/LoginRegister.qml @@ -1,17 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls -import QtQuick.Layouts 1.14 +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 - import NeoChat.Component.Login 1.0 LoginStep { diff --git a/imports/NeoChat/Component/Login/LoginStep.qml b/imports/NeoChat/Component/Login/LoginStep.qml index 3958e17c1..52fb9a5e9 100644 --- a/imports/NeoChat/Component/Login/LoginStep.qml +++ b/imports/NeoChat/Component/Login/LoginStep.qml @@ -1,5 +1,4 @@ -// SPDX-FileCopyrightText: 2020 Carl Schwan -// +// SPDX-FileCopyrightText: 2020 Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.14 diff --git a/imports/NeoChat/Component/Login/Password.qml b/imports/NeoChat/Component/Login/Password.qml index c52d8fef2..50b7466ee 100644 --- a/imports/NeoChat/Component/Login/Password.qml +++ b/imports/NeoChat/Component/Login/Password.qml @@ -1,19 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Component 1.0 - LoginStep { id: password diff --git a/imports/NeoChat/Component/Login/Sso.qml b/imports/NeoChat/Component/Login/Sso.qml index b105fcc28..b4b005749 100644 --- a/imports/NeoChat/Component/Login/Sso.qml +++ b/imports/NeoChat/Component/Login/Sso.qml @@ -1,19 +1,15 @@ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-3.0-only - */ import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 - -import org.kde.neochat 1.0 - -import NeoChat.Component 1.0 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.12 as Kirigami +import org.kde.neochat 1.0 +import NeoChat.Component 1.0 + LoginStep { id: root diff --git a/imports/NeoChat/Component/Timeline/AudioDelegate.qml b/imports/NeoChat/Component/Timeline/AudioDelegate.qml index 596988147..55901f24e 100644 --- a/imports/NeoChat/Component/Timeline/AudioDelegate.qml +++ b/imports/NeoChat/Component/Timeline/AudioDelegate.qml @@ -1,23 +1,20 @@ -/** - * SPDX-FileCopyrightText: 2019-2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.0 -import Qt.labs.platform 1.0 as Platform -import QtMultimedia 5.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019-2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import Qt.labs.platform 1.1 as Platform +import QtMultimedia 5.15 + +import org.kde.kirigami 2.15 as Kirigami +import org.kde.kcoreaddons 1.0 as KCA import org.kde.neochat 1.0 -import NeoChat.Setting 1.0 - import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 import NeoChat.Menu.Timeline 1.0 -import org.kde.kcoreaddons 1.0 as KCA Control { id: root diff --git a/imports/NeoChat/Component/Timeline/FileDelegate.qml b/imports/NeoChat/Component/Timeline/FileDelegate.qml index c2d09651c..b944d7ca2 100644 --- a/imports/NeoChat/Component/Timeline/FileDelegate.qml +++ b/imports/NeoChat/Component/Timeline/FileDelegate.qml @@ -1,20 +1,16 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls.Material 2.12 -import QtGraphicalEffects 1.0 -import Qt.labs.platform 1.0 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2018-2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import Qt.labs.platform 1.1 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.kcoreaddons 1.0 as KCA import org.kde.neochat 1.0 -import NeoChat.Setting 1.0 - import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 import NeoChat.Menu.Timeline 1.0 diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/imports/NeoChat/Component/Timeline/ImageDelegate.qml index eed65595d..905ceb665 100644 --- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml +++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml @@ -1,17 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2018-2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.0 -import Qt.labs.platform 1.0 +// SPDX-FileCopyrightText: 2018-2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import Qt.labs.platform 1.1 import org.kde.neochat 1.0 -import NeoChat.Setting 1.0 - import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 import NeoChat.Menu.Timeline 1.0 diff --git a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml index 677f08d06..7ac7a8fca 100644 --- a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml +++ b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml @@ -1,13 +1,12 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami Flow { spacing: Kirigami.Units.largeSpacing diff --git a/imports/NeoChat/Component/Timeline/ReplyComponent.qml b/imports/NeoChat/Component/Timeline/ReplyComponent.qml index 143a9c776..4d63e3afb 100644 --- a/imports/NeoChat/Component/Timeline/ReplyComponent.qml +++ b/imports/NeoChat/Component/Timeline/ReplyComponent.qml @@ -1,15 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component.Timeline 1.0 +// SPDX-FileCopyrightText: 2019 Black Hat +// 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.neochat 1.0 +import NeoChat.Component.Timeline 1.0 QQC2.AbstractButton { visible: replyVisible diff --git a/imports/NeoChat/Component/Timeline/SectionDelegate.qml b/imports/NeoChat/Component/Timeline/SectionDelegate.qml index 380733a0a..8f8258bac 100644 --- a/imports/NeoChat/Component/Timeline/SectionDelegate.qml +++ b/imports/NeoChat/Component/Timeline/SectionDelegate.qml @@ -1,12 +1,10 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only -import org.kde.kirigami 2.13 as Kirigami +import QtQuick 2.15 + +import org.kde.kirigami 2.15 as Kirigami Kirigami.Heading { level: 4 diff --git a/imports/NeoChat/Component/Timeline/StateDelegate.qml b/imports/NeoChat/Component/Timeline/StateDelegate.qml index 238d4f206..635d7cee9 100644 --- a/imports/NeoChat/Component/Timeline/StateDelegate.qml +++ b/imports/NeoChat/Component/Timeline/StateDelegate.qml @@ -1,17 +1,14 @@ -/** - * SPDX-FileCopyrightText: 2018-2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls.Material 2.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2018-2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 -import NeoChat.Setting 1.0 RowLayout { id: row diff --git a/imports/NeoChat/Component/Timeline/TextDelegate.qml b/imports/NeoChat/Component/Timeline/TextDelegate.qml index 3983b135a..2f47608f9 100644 --- a/imports/NeoChat/Component/Timeline/TextDelegate.qml +++ b/imports/NeoChat/Component/Timeline/TextDelegate.qml @@ -1,13 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +// SPDX-FileCopyrightText: 2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only -import org.kde.kirigami 2.4 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami TextEdit { id: contentLabel diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml index 1828d577f..e3340b4f1 100644 --- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml +++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml @@ -1,17 +1,14 @@ -/** - * SPDX-FileCopyrightText: 2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + import QtQuick 2.15 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 as QQC2 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 import QtGraphicalEffects 1.12 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Setting 1.0 import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 diff --git a/imports/NeoChat/Component/Timeline/VideoDelegate.qml b/imports/NeoChat/Component/Timeline/VideoDelegate.qml index 6cac32cca..3ac74c3bd 100644 --- a/imports/NeoChat/Component/Timeline/VideoDelegate.qml +++ b/imports/NeoChat/Component/Timeline/VideoDelegate.qml @@ -1,19 +1,16 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls.Material 2.12 -import QtGraphicalEffects 1.0 -import QtMultimedia 5.12 -import Qt.labs.platform 1.0 as Platform +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import QtMultimedia 5.15 +import Qt.labs.platform 1.1 as Platform + import org.kde.kirigami 2.13 as Kirigami import org.kde.neochat 1.0 - import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 import NeoChat.Menu.Timeline 1.0 diff --git a/imports/NeoChat/Component/qmldir b/imports/NeoChat/Component/qmldir index 3b788a24c..96abab2d1 100644 --- a/imports/NeoChat/Component/qmldir +++ b/imports/NeoChat/Component/qmldir @@ -1,5 +1,4 @@ module NeoChat.Component -AutoMouseArea 1.0 AutoMouseArea.qml FullScreenImage 1.0 FullScreenImage.qml ChatTextInput 1.0 ChatTextInput.qml FancyEffectsContainer 1.0 FancyEffectsContainer.qml diff --git a/imports/NeoChat/Dialog/CreateRoomDialog.qml b/imports/NeoChat/Dialog/CreateRoomDialog.qml index 3af2c50b9..396a031d3 100644 --- a/imports/NeoChat/Dialog/CreateRoomDialog.qml +++ b/imports/NeoChat/Dialog/CreateRoomDialog.qml @@ -1,16 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only -import NeoChat.Component 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 +import NeoChat.Component 1.0 Kirigami.OverlaySheet { id: root diff --git a/imports/NeoChat/Dialog/EmojiDialog.qml b/imports/NeoChat/Dialog/EmojiDialog.qml index 845d13f71..640f0d217 100644 --- a/imports/NeoChat/Dialog/EmojiDialog.qml +++ b/imports/NeoChat/Dialog/EmojiDialog.qml @@ -1,11 +1,10 @@ -/** - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: LGPL-2.1-or-later - */ -import QtQuick 2.14 -import QtQuick.Controls 2.14 as QQC2 -import org.kde.kirigami 2.13 as Kirigami +// 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 org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Component.Emoji 1.0 diff --git a/imports/NeoChat/Dialog/OpenFileDialog.qml b/imports/NeoChat/Dialog/OpenFileDialog.qml index 00096d215..6669503ec 100644 --- a/imports/NeoChat/Dialog/OpenFileDialog.qml +++ b/imports/NeoChat/Dialog/OpenFileDialog.qml @@ -1,9 +1,7 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 import Qt.labs.platform 1.1 FileDialog { diff --git a/imports/NeoChat/Dialog/OpenFolderDialog.qml b/imports/NeoChat/Dialog/OpenFolderDialog.qml deleted file mode 100644 index 6af42de4b..000000000 --- a/imports/NeoChat/Dialog/OpenFolderDialog.qml +++ /dev/null @@ -1,17 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import Qt.labs.platform 1.1 - -FolderDialog { - signal chosen(string path) - - id: root - - title: i18n("Please choose a folder") - - onAccepted: chosen(folder) -} diff --git a/imports/NeoChat/Dialog/RoomSettingsDialog.qml b/imports/NeoChat/Dialog/RoomSettingsDialog.qml index 0ea859934..27876598a 100644 --- a/imports/NeoChat/Dialog/RoomSettingsDialog.qml +++ b/imports/NeoChat/Dialog/RoomSettingsDialog.qml @@ -1,17 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2019-2020 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019-2020 Black Hat +// SPDX-License-Identifier: GPL-3.0-only -import NeoChat.Component 1.0 -import NeoChat.Setting 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 +import NeoChat.Component 1.0 Kirigami.OverlaySheet { id: root diff --git a/imports/NeoChat/Dialog/UserDetailDialog.qml b/imports/NeoChat/Dialog/UserDetailDialog.qml index 362f07f20..54ad55819 100644 --- a/imports/NeoChat/Dialog/UserDetailDialog.qml +++ b/imports/NeoChat/Dialog/UserDetailDialog.qml @@ -1,18 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// 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.neochat 1.0 - import NeoChat.Component 1.0 -import NeoChat.Setting 1.0 Kirigami.OverlaySheet { id: root diff --git a/imports/NeoChat/Dialog/qmldir b/imports/NeoChat/Dialog/qmldir index f6d467ce6..36a58402e 100644 --- a/imports/NeoChat/Dialog/qmldir +++ b/imports/NeoChat/Dialog/qmldir @@ -5,7 +5,6 @@ LoginDialog 1.0 LoginDialog.qml CreateRoomDialog 1.0 CreateRoomDialog.qml AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml OpenFileDialog 1.0 OpenFileDialog.qml -OpenFolderDialog 1.0 OpenFolderDialog.qml ImageClipboardDialog 1.0 ImageClipboardDialog.qml StartChatDialog 1.0 StartChatDialog.qml EmojiDialog 1.0 EmojiDialog.qml diff --git a/imports/NeoChat/Menu/RoomListContextMenu.qml b/imports/NeoChat/Menu/RoomListContextMenu.qml index 60e0ab765..4e58dc046 100644 --- a/imports/NeoChat/Menu/RoomListContextMenu.qml +++ b/imports/NeoChat/Menu/RoomListContextMenu.qml @@ -1,11 +1,10 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 + import NeoChat.Page 1.0 /** diff --git a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml index 2306868d4..ea25a17ae 100644 --- a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml +++ b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml @@ -1,17 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import org.kde.kirigami 2.14 as Kirigami -import NeoChat.Dialog 1.0 -import NeoChat.Menu 1.0 +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import Qt.labs.platform 1.1 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 - -import Qt.labs.platform 1.1 +import NeoChat.Dialog 1.0 +import NeoChat.Menu 1.0 MessageDelegateContextMenu { id: root diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml index f0e233d11..409a36f8b 100644 --- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml @@ -1,16 +1,14 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2019 Black Hat +// 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.12 -import org.kde.kirigami 2.14 as Kirigami +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami -import NeoChat.Dialog 1.0 import org.kde.neochat 1.0 +import NeoChat.Dialog 1.0 Loader { id: loadRoot diff --git a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml index ebe75f1ed..e73816e25 100644 --- a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml +++ b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml @@ -1,13 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-3.0-only -import org.kde.kirigami 2.12 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 + +import org.kde.kirigami 2.15 as Kirigami Kirigami.OverlaySheet { diff --git a/imports/NeoChat/Page/AccountsPage.qml b/imports/NeoChat/Page/AccountsPage.qml index 97fe51b53..db03f7172 100644 --- a/imports/NeoChat/Page/AccountsPage.qml +++ b/imports/NeoChat/Page/AccountsPage.qml @@ -1,15 +1,12 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls -import QtQuick.Layouts 1.14 +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 import Qt.labs.platform 1.1 -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Dialog 1.0 diff --git a/imports/NeoChat/Page/DevicesPage.qml b/imports/NeoChat/Page/DevicesPage.qml index a11b10c3c..dd5149b20 100644 --- a/imports/NeoChat/Page/DevicesPage.qml +++ b/imports/NeoChat/Page/DevicesPage.qml @@ -1,14 +1,11 @@ -/** - * SPDX-FileCopyrightText: Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls -import QtQuick.Layouts 1.14 +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Page/ImageEditorPage.qml b/imports/NeoChat/Page/ImageEditorPage.qml index 49d2e5e58..d0ad45e45 100644 --- a/imports/NeoChat/Page/ImageEditorPage.qml +++ b/imports/NeoChat/Page/ImageEditorPage.qml @@ -1,16 +1,14 @@ -/* - * SPDX-FileCopyrightText: (C) 2020 Carl Schwan - * - * SPDX-License-Identifier: BSD-2-Clause - */ +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: BSD-2-Clause -import QtQuick 2.10 -import QtQuick.Controls 2.1 as QQC2 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.12 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 +import QtGraphicalEffects 1.15 +import Qt.labs.platform 1.1 as Platform + +import org.kde.kirigami 2.15 as Kirigami import org.kde.kquickimageeditor 1.0 as KQuickImageEditor -import QtGraphicalEffects 1.12 -import Qt.labs.platform 1.0 as Platform Kirigami.Page { id: rootEditorView diff --git a/imports/NeoChat/Page/InviteUserPage.qml b/imports/NeoChat/Page/InviteUserPage.qml index 5c9d0a964..b65f4720f 100644 --- a/imports/NeoChat/Page/InviteUserPage.qml +++ b/imports/NeoChat/Page/InviteUserPage.qml @@ -1,12 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.14 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Page/JoinRoomPage.qml b/imports/NeoChat/Page/JoinRoomPage.qml index 546ab5287..385919a7b 100644 --- a/imports/NeoChat/Page/JoinRoomPage.qml +++ b/imports/NeoChat/Page/JoinRoomPage.qml @@ -1,19 +1,14 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.13 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only + +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 import NeoChat.Component 1.0 -import NeoChat.Setting 1.0 - -import org.kde.neochat 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/Page/LoadingPage.qml b/imports/NeoChat/Page/LoadingPage.qml index 320d946ff..044debed4 100644 --- a/imports/NeoChat/Page/LoadingPage.qml +++ b/imports/NeoChat/Page/LoadingPage.qml @@ -1,10 +1,8 @@ -/** - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ -import org.kde.kirigami 2.12 as Kirigami +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-2.0-or-later + import QtQuick.Controls 2.12 as QQC2 +import org.kde.kirigami 2.12 as Kirigami Kirigami.Page { title: i18n("Loading") diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml index 243d703c2..208e9aa9a 100644 --- a/imports/NeoChat/Page/RoomListPage.qml +++ b/imports/NeoChat/Page/RoomListPage.qml @@ -1,18 +1,16 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only + import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 import QtQml.Models 2.15 -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.kitemmodels 1.0 -import org.kde.neochat 1.0 +import org.kde.neochat 1.0 import NeoChat.Component 1.0 import NeoChat.Menu 1.0 diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index 9deee828c..2953310ab 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -1,20 +1,17 @@ -/** - * SPDX-FileCopyrightText: 2018-2020 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ +// SPDX-FileCopyrightText: 2018-2020 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only + import QtQuick 2.15 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 +import Qt.labs.platform 1.1 as Platform import Qt.labs.qmlmodels 1.0 -import Qt.labs.platform 1.0 as Platform -import QtQuick.Controls.Material 2.12 -import org.kde.kirigami 2.13 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.kitemmodels 1.0 -import org.kde.neochat 1.0 +import org.kde.neochat 1.0 import NeoChat.Component 1.0 import NeoChat.Component.ChatBox 1.0 import NeoChat.Component.Timeline 1.0 diff --git a/imports/NeoChat/Page/RoomWindow.qml b/imports/NeoChat/Page/RoomWindow.qml index b78809571..112f06feb 100644 --- a/imports/NeoChat/Page/RoomWindow.qml +++ b/imports/NeoChat/Page/RoomWindow.qml @@ -1,13 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 as QQC2 -import QtQuick.Window 2.2 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.14 as Kirigami +// 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 org.kde.kirigami 2.15 as Kirigami Kirigami.ApplicationWindow { id: window diff --git a/imports/NeoChat/Page/SettingsPage.qml b/imports/NeoChat/Page/SettingsPage.qml index 4b89dbfd4..580be4caa 100644 --- a/imports/NeoChat/Page/SettingsPage.qml +++ b/imports/NeoChat/Page/SettingsPage.qml @@ -1,14 +1,11 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// 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 2.15 +import QtQuick.Controls 2.15 as QQC2 +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 diff --git a/imports/NeoChat/Page/StartChatPage.qml b/imports/NeoChat/Page/StartChatPage.qml index 35a597fcc..a02029919 100644 --- a/imports/NeoChat/Page/StartChatPage.qml +++ b/imports/NeoChat/Page/StartChatPage.qml @@ -1,18 +1,15 @@ -/** - * SPDX-FileCopyrightText: 2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 -import org.kde.kirigami 2.14 as Kirigami +// SPDX-FileCopyrightText: 2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only -import NeoChat.Component 1.0 -import NeoChat.Setting 1.0 +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 +import NeoChat.Component 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/Page/WelcomePage.qml b/imports/NeoChat/Page/WelcomePage.qml index dc106f0df..0802fa5f7 100644 --- a/imports/NeoChat/Page/WelcomePage.qml +++ b/imports/NeoChat/Page/WelcomePage.qml @@ -1,17 +1,13 @@ -/** - * SPDX-FileCopyrightText: 2020 Tobias Fella - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ +// SPDX-FileCopyrightText: 2020 Tobias Fella +// SPDX-License-Identifier: GPL-2.0-or-later -import QtQuick 2.14 -import QtQuick.Controls 2.14 as Controls -import QtQuick.Layouts 1.14 +import QtQuick 2.15 +import QtQuick.Controls 2.15 as Controls +import QtQuick.Layouts 1.15 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 - import NeoChat.Component.Login 1.0 Kirigami.ScrollablePage { diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml index 9ac9abfb6..dcd95b651 100644 --- a/imports/NeoChat/Panel/RoomDrawer.qml +++ b/imports/NeoChat/Panel/RoomDrawer.qml @@ -1,22 +1,18 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Layouts 1.12 +// SPDX-FileCopyrightText: 2018-2019 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only -import org.kde.kirigami 2.13 as Kirigami +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +import org.kde.kirigami 2.15 as Kirigami import org.kde.kitemmodels 1.0 +import org.kde.neochat 1.0 import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 -import NeoChat.Setting 1.0 -import org.kde.neochat 1.0 Kirigami.OverlayDrawer { id: roomDrawer diff --git a/imports/NeoChat/Setting/Palette.qml b/imports/NeoChat/Setting/Palette.qml deleted file mode 100644 index 58f47113b..000000000 --- a/imports/NeoChat/Setting/Palette.qml +++ /dev/null @@ -1,19 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -pragma Singleton -import QtQuick 2.12 -import QtQuick.Controls.Material 2.12 - -QtObject { - readonly property int theme: MSettings.darkTheme ? Material.Dark : Material.Light - - readonly property color primary: "#344955" - readonly property color accent: "#4286F5" - readonly property color foreground: MSettings.darkTheme ? "#FFFFFF" : "#1D333E" - readonly property color background: MSettings.darkTheme ? "#303030" : "#FFFFFF" - readonly property color lighter: MSettings.darkTheme ? "#FFFFFF" : "#5B7480" - readonly property color banner: MSettings.darkTheme ? "#404040" : "#F2F3F4" -} diff --git a/imports/NeoChat/Setting/Setting.qml b/imports/NeoChat/Setting/Setting.qml deleted file mode 100644 index 90a1afd28..000000000 --- a/imports/NeoChat/Setting/Setting.qml +++ /dev/null @@ -1,18 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2018-2019 Black Hat - * - * SPDX-License-Identifier: GPL-3.0-only - */ -pragma Singleton -import QtQuick 2.12 -import Qt.labs.settings 1.0 - -Settings { - property bool showNotification: true - - property bool showTray: true - - property bool darkTheme - - property string fontFamily: "Roboto,Noto Sans,Noto Color Emoji" -} diff --git a/imports/NeoChat/Setting/qmldir b/imports/NeoChat/Setting/qmldir deleted file mode 100644 index fdffe22f7..000000000 --- a/imports/NeoChat/Setting/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module NeoChat.Setting -singleton MSettings 1.0 Setting.qml -singleton MPalette 1.0 Palette.qml diff --git a/qml/main.qml b/qml/main.qml index 71294a996..d2604ab2f 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -1,21 +1,18 @@ -/** - * SPDX-FileCopyrightText: 2018-2020 Black Hat - * SPDX-FileCopyrightText: 2020 Carl Schwan - * - * SPDX-License-Identifier: GPL-3.0-only - */ -import QtQuick 2.14 -import QtQuick.Controls 2.14 as QQC2 -import QtQuick.Window 2.2 -import QtQuick.Layouts 1.14 +// SPDX-FileCopyrightText: 2018-2020 Black Hat +// SPDX-FileCopyrightText: 2020 Carl Schwan +// SPDX-License-Identifier: GPL-3.0-only -import org.kde.kirigami 2.12 as Kirigami +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.neochat 1.0 import NeoChat.Component 1.0 -import NeoChat.Panel 1.0 import NeoChat.Dialog 1.0 import NeoChat.Page 1.0 +import NeoChat.Panel 1.0 Kirigami.ApplicationWindow { id: root diff --git a/res.qrc b/res.qrc index 9562578a4..b48b5ad08 100644 --- a/res.qrc +++ b/res.qrc @@ -15,7 +15,6 @@ imports/NeoChat/Page/DevicesPage.qml imports/NeoChat/Page/WelcomePage.qml imports/NeoChat/Component/qmldir - imports/NeoChat/Component/AutoMouseArea.qml imports/NeoChat/Component/FullScreenImage.qml imports/NeoChat/Component/FancyEffectsContainer.qml imports/NeoChat/Component/ChatBox @@ -47,9 +46,6 @@ imports/NeoChat/Component/Login/Homeserver.qml imports/NeoChat/Component/Login/LoginMethod.qml imports/NeoChat/Component/Login/Sso.qml - imports/NeoChat/Setting/Setting.qml - imports/NeoChat/Setting/qmldir - imports/NeoChat/Setting/Palette.qml imports/NeoChat/Panel/qmldir imports/NeoChat/Panel/RoomDrawer.qml imports/NeoChat/Dialog/qmldir @@ -58,7 +54,6 @@ imports/NeoChat/Dialog/CreateRoomDialog.qml imports/NeoChat/Dialog/EmojiDialog.qml imports/NeoChat/Dialog/OpenFileDialog.qml - imports/NeoChat/Dialog/OpenFolderDialog.qml imports/NeoChat/Menu/qmldir imports/NeoChat/Menu/Timeline/qmldir imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml