ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup QML imports and license headers

Browse Source 
- Group the imports into Qt, KDE, NeoChat
- Import the latest versions
- Remove unused imports
- Remove unused components
- Unify license header styling
This commit is contained in:
Tobias Fella
2021-04-06 14:29:15 +02:00
parent 9932823ad3
commit d170cc5161
57 changed files with 345 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
imports/NeoChat/Component/AutoMouseArea.qml
View File

@@ -1,18 +0,0 @@
/**
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
*
* 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()
}

12
imports/NeoChat/Component/ChatBox/AttachmentPane.qml
View File

@@ -1,15 +1,15 @@
/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
* SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com> // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
* SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.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 org.kde.neochat 1.0
import NeoChat.Page 1.0
Loader { Loader {
id: root id: root

12
imports/NeoChat/Component/ChatBox/ChatBar.qml
View File

@@ -1,13 +1,13 @@
/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
* SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com> // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
* SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import Qt.labs.platform 1.0 as Platform import Qt.labs.platform 1.1 as Platform
import org.kde.kirigami 2.14 as Kirigami
import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0

13
imports/NeoChat/Component/ChatBox/ChatBox.qml
View File

@@ -1,15 +1,14 @@
/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
* SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com> // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
* SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.15 import QtQuick 2.15
import Qt.labs.platform 1.0 as Platform import Qt.labs.platform 1.1 as Platform
import org.kde.kirigami 2.14 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0
import NeoChat.Component.ChatBox 1.0 import NeoChat.Component.ChatBox 1.0
import NeoChat.Component.Emoji 1.0 import NeoChat.Component.Emoji 1.0
import org.kde.neochat 1.0
Item { Item {
id: root id: root

3
imports/NeoChat/Component/ChatBox/CompletionMenu.qml
View File

@@ -5,7 +5,8 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.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 import org.kde.neochat 1.0

9
imports/NeoChat/Component/ChatBox/ReplyPane.qml
View File

@@ -1,12 +1,13 @@
/* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
* SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com> // SPDX-FileCopyrightText: 2020 Noah Davis <noahadvs@gmail.com>
* SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import org.kde.kirigami 2.14 as Kirigami import org.kde.kirigami 2.14 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
Loader { Loader {

17
imports/NeoChat/Component/Emoji/EmojiPicker.qml
View File

@@ -1,16 +1,13 @@
/** // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
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 org.kde.neochat 1.0 as NeoChat
import NeoChat.Component 1.0
ColumnLayout { ColumnLayout {
property string emojiCategory: "history" property string emojiCategory: "history"

18
imports/NeoChat/Component/FancyEffectsContainer.qml
View File

@@ -1,14 +1,12 @@
/** // SPDX-FileCopyrightText: 2021 Alexey Andreyev <aa13q@ya.ru>
* SPDX-FileCopyrightText: 2021 Alexey Andreyev <aa13q@ya.ru> // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*
* 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
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 { Rectangle {
id: item id: item

13
imports/NeoChat/Component/FullScreenImage.qml
View File

@@ -1,13 +1,10 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.12 import QtQuick 2.15
import QtQuick.Controls 2.12 import QtQuick.Controls 2.15
import org.kde.kirigami 2.12 as Kirigami import org.kde.kirigami 2.15 as Kirigami
ApplicationWindow { ApplicationWindow {
id: root id: root

15
imports/NeoChat/Component/Login/Homeserver.qml
View File

@@ -1,14 +1,11 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0

17
imports/NeoChat/Component/Login/Loading.qml
View File

@@ -1,18 +1,15 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import org.kde.kirigami 2.12 as Kirigami
QQC2.BusyIndicator { QQC2.BusyIndicator {
property var showContinueButton: false property var showContinueButton: false

15
imports/NeoChat/Component/Login/Login.qml
View File

@@ -1,15 +1,12 @@
/** // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 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 org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0

15
imports/NeoChat/Component/Login/LoginMethod.qml
View File

@@ -1,13 +1,10 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0
import NeoChat.Component.Login 1.0 import NeoChat.Component.Login 1.0

16
imports/NeoChat/Component/Login/LoginRegister.qml
View File

@@ -1,17 +1,13 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0
import NeoChat.Component.Login 1.0 import NeoChat.Component.Login 1.0
LoginStep { LoginStep {

3
imports/NeoChat/Component/Login/LoginStep.qml
View File

@@ -1,5 +1,4 @@
// SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.de>
//
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick 2.14 import QtQuick 2.14

14
imports/NeoChat/Component/Login/Password.qml
View File

@@ -1,19 +1,15 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 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 org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
LoginStep { LoginStep {
id: password id: password

18
imports/NeoChat/Component/Login/Sso.qml
View File

@@ -1,19 +1,15 @@
// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
// SPDX-License-Identifier: GPL-2.0-or-later
/**
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import org.kde.neochat 1.0
import NeoChat.Component 1.0
import org.kde.kirigami 2.12 as Kirigami import org.kde.kirigami 2.12 as Kirigami
import org.kde.neochat 1.0
import NeoChat.Component 1.0
LoginStep { LoginStep {
id: root id: root

27
imports/NeoChat/Component/Timeline/AudioDelegate.qml
View File

@@ -1,23 +1,20 @@
/** // SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 import QtGraphicalEffects 1.15
import QtQuick.Layouts 1.12 import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0 import QtMultimedia 5.15
import Qt.labs.platform 1.0 as Platform
import QtMultimedia 5.12 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.13 as Kirigami import org.kde.kcoreaddons 1.0 as KCA
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0 import NeoChat.Menu.Timeline 1.0
import org.kde.kcoreaddons 1.0 as KCA
Control { Control {
id: root id: root

24
imports/NeoChat/Component/Timeline/FileDelegate.qml
View File

@@ -1,20 +1,16 @@
/** // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 import QtGraphicalEffects 1.15
import QtQuick.Layouts 1.12 import Qt.labs.platform 1.1
import QtQuick.Controls.Material 2.12
import QtGraphicalEffects 1.0 import org.kde.kirigami 2.15 as Kirigami
import Qt.labs.platform 1.0
import org.kde.kirigami 2.13 as Kirigami
import org.kde.kcoreaddons 1.0 as KCA import org.kde.kcoreaddons 1.0 as KCA
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0 import NeoChat.Menu.Timeline 1.0

20
imports/NeoChat/Component/Timeline/ImageDelegate.qml
View File

@@ -1,17 +1,13 @@
/** // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 import QtGraphicalEffects 1.15
import QtQuick.Layouts 1.12 import Qt.labs.platform 1.1
import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0 import NeoChat.Menu.Timeline 1.0

19
imports/NeoChat/Component/Timeline/ReactionDelegate.qml
View File

@@ -1,13 +1,12 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.13 as Kirigami
Flow { Flow {
spacing: Kirigami.Units.largeSpacing spacing: Kirigami.Units.largeSpacing

22
imports/NeoChat/Component/Timeline/ReplyComponent.qml
View File

@@ -1,15 +1,15 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15 as QQC2
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.12 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component.Timeline 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component.Timeline 1.0
QQC2.AbstractButton { QQC2.AbstractButton {
visible: replyVisible visible: replyVisible

14
imports/NeoChat/Component/Timeline/SectionDelegate.qml
View File

@@ -1,12 +1,10 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.12
import org.kde.kirigami 2.13 as Kirigami import QtQuick 2.15
import org.kde.kirigami 2.15 as Kirigami
Kirigami.Heading { Kirigami.Heading {
level: 4 level: 4

19
imports/NeoChat/Component/Timeline/StateDelegate.qml
View File

@@ -1,17 +1,14 @@
/** // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12 import org.kde.kirigami 2.15 as Kirigami
import QtQuick.Controls.Material 2.12
import org.kde.kirigami 2.13 as Kirigami
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Setting 1.0
RowLayout { RowLayout {
id: row id: row

16
imports/NeoChat/Component/Timeline/TextDelegate.qml
View File

@@ -1,13 +1,11 @@
/** // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* 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.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 { TextEdit {
id: contentLabel id: contentLabel

13
imports/NeoChat/Component/Timeline/TimelineContainer.qml
View File

@@ -1,17 +1,14 @@
/** // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.12 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.kirigami 2.15 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Setting 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0

23
imports/NeoChat/Component/Timeline/VideoDelegate.qml
View File

@@ -1,19 +1,16 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 import QtGraphicalEffects 1.15
import QtQuick.Layouts 1.12 import QtMultimedia 5.15
import QtQuick.Controls.Material 2.12 import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0
import QtMultimedia 5.12
import Qt.labs.platform 1.0 as Platform
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Menu.Timeline 1.0 import NeoChat.Menu.Timeline 1.0

1
imports/NeoChat/Component/qmldir
View File

@@ -1,5 +1,4 @@
module NeoChat.Component module NeoChat.Component
AutoMouseArea 1.0 AutoMouseArea.qml
FullScreenImage 1.0 FullScreenImage.qml FullScreenImage 1.0 FullScreenImage.qml
ChatTextInput 1.0 ChatTextInput.qml ChatTextInput 1.0 ChatTextInput.qml
FancyEffectsContainer 1.0 FancyEffectsContainer.qml FancyEffectsContainer 1.0 FancyEffectsContainer.qml

17
imports/NeoChat/Dialog/CreateRoomDialog.qml
View File

@@ -1,16 +1,13 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
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 org.kde.neochat 1.0
import NeoChat.Component 1.0
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: root id: root

15
imports/NeoChat/Dialog/EmojiDialog.qml
View File

@@ -1,11 +1,10 @@
/** // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: LGPL-2.1-or-later
*
* SPDX-License-Identifier: LGPL-2.1-or-later import QtQuick 2.15
*/ import QtQuick.Controls 2.15 as QQC2
import QtQuick 2.14
import QtQuick.Controls 2.14 as QQC2 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component.Emoji 1.0 import NeoChat.Component.Emoji 1.0

10
imports/NeoChat/Dialog/OpenFileDialog.qml
View File

@@ -1,9 +1,7 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/
import QtQuick 2.12
import Qt.labs.platform 1.1 import Qt.labs.platform 1.1
FileDialog { FileDialog {

17
imports/NeoChat/Dialog/OpenFolderDialog.qml
View File

@@ -1,17 +0,0 @@
/**
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
*
* 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)
}

18
imports/NeoChat/Dialog/RoomSettingsDialog.qml
View File

@@ -1,17 +1,13 @@
/** // SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019-2020 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
import NeoChat.Component 1.0 import QtQuick 2.15
import NeoChat.Setting 1.0 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 org.kde.neochat 1.0
import NeoChat.Component 1.0
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: root id: root

21
imports/NeoChat/Dialog/UserDetailDialog.qml
View File

@@ -1,18 +1,15 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15 as QQC2
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.12 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Setting 1.0
Kirigami.OverlaySheet { Kirigami.OverlaySheet {
id: root id: root

1
imports/NeoChat/Dialog/qmldir
View File

@@ -5,7 +5,6 @@ LoginDialog 1.0 LoginDialog.qml
CreateRoomDialog 1.0 CreateRoomDialog.qml CreateRoomDialog 1.0 CreateRoomDialog.qml
AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
OpenFileDialog 1.0 OpenFileDialog.qml OpenFileDialog 1.0 OpenFileDialog.qml
OpenFolderDialog 1.0 OpenFolderDialog.qml
ImageClipboardDialog 1.0 ImageClipboardDialog.qml ImageClipboardDialog 1.0 ImageClipboardDialog.qml
StartChatDialog 1.0 StartChatDialog.qml StartChatDialog 1.0 StartChatDialog.qml
EmojiDialog 1.0 EmojiDialog.qml EmojiDialog 1.0 EmojiDialog.qml

15
imports/NeoChat/Menu/RoomListContextMenu.qml
View File

@@ -1,11 +1,10 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12
import QtQuick.Controls 2.12
import NeoChat.Page 1.0 import NeoChat.Page 1.0
/** /**

22
imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
View File

@@ -1,17 +1,15 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import Qt.labs.platform 1.1
import QtQuick.Controls 2.12
import org.kde.kirigami 2.14 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import NeoChat.Dialog 1.0
import NeoChat.Menu 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Dialog 1.0
import Qt.labs.platform 1.1 import NeoChat.Menu 1.0
MessageDelegateContextMenu { MessageDelegateContextMenu {
id: root id: root

16
imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
View File

@@ -1,16 +1,14 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.14 as Kirigami import org.kde.kirigami 2.15 as Kirigami
import NeoChat.Dialog 1.0
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Dialog 1.0
Loader { Loader {
id: loadRoot id: loadRoot

16
imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
View File

@@ -1,13 +1,11 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.12
import QtQuick.Controls 2.12
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 { Kirigami.OverlaySheet {

15
imports/NeoChat/Page/AccountsPage.qml
View File

@@ -1,15 +1,12 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.14 import QtQuick.Layouts 1.15
import Qt.labs.platform 1.1 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 org.kde.neochat 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0

15
imports/NeoChat/Page/DevicesPage.qml
View File

@@ -1,14 +1,11 @@
/** // SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0

20
imports/NeoChat/Page/ImageEditorPage.qml
View File

@@ -1,16 +1,14 @@
/* // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: (C) 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: BSD-2-Clause
*
* SPDX-License-Identifier: BSD-2-Clause
*/
import QtQuick 2.10 import QtQuick 2.15
import QtQuick.Controls 2.1 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import org.kde.kirigami 2.12 as Kirigami 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 org.kde.kquickimageeditor 1.0 as KQuickImageEditor
import QtGraphicalEffects 1.12
import Qt.labs.platform 1.0 as Platform
Kirigami.Page { Kirigami.Page {
id: rootEditorView id: rootEditorView

17
imports/NeoChat/Page/InviteUserPage.qml
View File

@@ -1,12 +1,11 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12 import org.kde.kirigami 2.15 as Kirigami
import org.kde.kirigami 2.14 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0

21
imports/NeoChat/Page/JoinRoomPage.qml
View File

@@ -1,19 +1,14 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only import QtQuick 2.15
*/ import QtQuick.Controls 2.15
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 import org.kde.kirigami 2.15 as Kirigami
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.13 as Kirigami
import org.kde.neochat 1.0 import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root

10
imports/NeoChat/Page/LoadingPage.qml
View File

@@ -1,10 +1,8 @@
/** // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import org.kde.kirigami 2.12 as Kirigami
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.12 as QQC2
import org.kde.kirigami 2.12 as Kirigami
Kirigami.Page { Kirigami.Page {
title: i18n("Loading") title: i18n("Loading")

18
imports/NeoChat/Page/RoomListPage.qml
View File

@@ -1,18 +1,16 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import QtQml.Models 2.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.kitemmodels 1.0
import org.kde.neochat 1.0
import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Menu 1.0 import NeoChat.Menu 1.0

21
imports/NeoChat/Page/RoomPage.qml
View File

@@ -1,20 +1,17 @@
/** // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.15
import Qt.labs.platform 1.1 as Platform
import Qt.labs.qmlmodels 1.0 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.kitemmodels 1.0
import org.kde.neochat 1.0
import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Component.ChatBox 1.0 import NeoChat.Component.ChatBox 1.0
import NeoChat.Component.Timeline 1.0 import NeoChat.Component.Timeline 1.0

18
imports/NeoChat/Page/RoomWindow.qml
View File

@@ -1,13 +1,11 @@
/** // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-or-later
*
* SPDX-License-Identifier: GPL-3.0-or-later import QtQuick 2.15
*/ import QtQuick.Controls 2.15 as QQC2
import QtQuick 2.12 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Window 2.2 import org.kde.kirigami 2.15 as Kirigami
import QtQuick.Layouts 1.12
import org.kde.kirigami 2.14 as Kirigami
Kirigami.ApplicationWindow { Kirigami.ApplicationWindow {
id: window id: window

15
imports/NeoChat/Page/SettingsPage.qml
View File

@@ -1,14 +1,11 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as QQC2 import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0

21
imports/NeoChat/Page/StartChatPage.qml
View File

@@ -1,18 +1,15 @@
/** // SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
import NeoChat.Component 1.0 import QtQuick 2.15
import NeoChat.Setting 1.0 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 org.kde.neochat 1.0
import NeoChat.Component 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {
id: root id: root

16
imports/NeoChat/Page/WelcomePage.qml
View File

@@ -1,17 +1,13 @@
/** // SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de> // SPDX-License-Identifier: GPL-2.0-or-later
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Controls 2.14 as Controls import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.14 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 org.kde.neochat 1.0
import NeoChat.Component.Login 1.0 import NeoChat.Component.Login 1.0
Kirigami.ScrollablePage { Kirigami.ScrollablePage {

22
imports/NeoChat/Panel/RoomDrawer.qml
View File

@@ -1,22 +1,18 @@
/** // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
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.kitemmodels 1.0
import org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Setting 1.0
import org.kde.neochat 1.0
Kirigami.OverlayDrawer { Kirigami.OverlayDrawer {
id: roomDrawer id: roomDrawer

19
imports/NeoChat/Setting/Palette.qml
View File

@@ -1,19 +0,0 @@
/**
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
*
* 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"
}

18
imports/NeoChat/Setting/Setting.qml
View File

@@ -1,18 +0,0 @@
/**
* SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
*
* 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"
}

3
imports/NeoChat/Setting/qmldir
View File

@@ -1,3 +0,0 @@
module NeoChat.Setting
singleton MSettings 1.0 Setting.qml
singleton MPalette 1.0 Palette.qml

21
qml/main.qml
View File

@@ -1,21 +1,18 @@
/** // SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2018-2020 Black Hat <bhat@encom.eu.org> // SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu>
* SPDX-FileCopyrightText: 2020 Carl Schwan <carl@carlschwan.eu> // SPDX-License-Identifier: GPL-3.0-only
*
* 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
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 org.kde.neochat 1.0
import NeoChat.Component 1.0 import NeoChat.Component 1.0
import NeoChat.Panel 1.0
import NeoChat.Dialog 1.0 import NeoChat.Dialog 1.0
import NeoChat.Page 1.0 import NeoChat.Page 1.0
import NeoChat.Panel 1.0
Kirigami.ApplicationWindow { Kirigami.ApplicationWindow {
id: root id: root

5
res.qrc
View File

@@ -15,7 +15,6 @@
<file>imports/NeoChat/Page/DevicesPage.qml</file> <file>imports/NeoChat/Page/DevicesPage.qml</file>
<file>imports/NeoChat/Page/WelcomePage.qml</file> <file>imports/NeoChat/Page/WelcomePage.qml</file>
<file>imports/NeoChat/Component/qmldir</file> <file>imports/NeoChat/Component/qmldir</file>
<file>imports/NeoChat/Component/AutoMouseArea.qml</file>
<file>imports/NeoChat/Component/FullScreenImage.qml</file> <file>imports/NeoChat/Component/FullScreenImage.qml</file>
<file>imports/NeoChat/Component/FancyEffectsContainer.qml</file> <file>imports/NeoChat/Component/FancyEffectsContainer.qml</file>
<file>imports/NeoChat/Component/ChatBox</file> <file>imports/NeoChat/Component/ChatBox</file>
@@ -47,9 +46,6 @@
<file>imports/NeoChat/Component/Login/Homeserver.qml</file> <file>imports/NeoChat/Component/Login/Homeserver.qml</file>
<file>imports/NeoChat/Component/Login/LoginMethod.qml</file> <file>imports/NeoChat/Component/Login/LoginMethod.qml</file>
<file>imports/NeoChat/Component/Login/Sso.qml</file> <file>imports/NeoChat/Component/Login/Sso.qml</file>
<file>imports/NeoChat/Setting/Setting.qml</file>
<file>imports/NeoChat/Setting/qmldir</file>
<file>imports/NeoChat/Setting/Palette.qml</file>
<file>imports/NeoChat/Panel/qmldir</file> <file>imports/NeoChat/Panel/qmldir</file>
<file>imports/NeoChat/Panel/RoomDrawer.qml</file> <file>imports/NeoChat/Panel/RoomDrawer.qml</file>
<file>imports/NeoChat/Dialog/qmldir</file> <file>imports/NeoChat/Dialog/qmldir</file>
@@ -58,7 +54,6 @@
<file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file> <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
<file>imports/NeoChat/Dialog/EmojiDialog.qml</file> <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
<file>imports/NeoChat/Dialog/OpenFileDialog.qml</file> <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
<file>imports/NeoChat/Dialog/OpenFolderDialog.qml</file>
<file>imports/NeoChat/Menu/qmldir</file> <file>imports/NeoChat/Menu/qmldir</file>
<file>imports/NeoChat/Menu/Timeline/qmldir</file> <file>imports/NeoChat/Menu/Timeline/qmldir</file>
<file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file> <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>