From 2817ce9d16522d1970bdd0274ea3f94c87a61d41 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Wed, 19 Oct 2022 14:47:17 +0200 Subject: [PATCH] Move QML files to src/qml and don't use internal qml modules --- .reuse/dep5 | 10 +- imports/NeoChat/Component/ChatBox/qmldir | 7 -- imports/NeoChat/Component/Emoji/qmldir | 2 - imports/NeoChat/Component/Login/qmldir | 7 -- imports/NeoChat/Component/Timeline/qmldir | 16 --- imports/NeoChat/Component/qmldir | 7 -- imports/NeoChat/Dialog/KeyVerification/qmldir | 7 -- imports/NeoChat/Dialog/qmldir | 10 -- imports/NeoChat/Menu/Timeline/qmldir | 5 - imports/NeoChat/Menu/qmldir | 6 -- imports/NeoChat/Page/qmldir | 9 -- imports/NeoChat/Panel/qmldir | 2 - imports/NeoChat/Settings/qmldir | 4 - qtquickcontrols2.conf | 4 - res.qrc | 100 ------------------ res_android.qrc | 5 - res_desktop.qrc | 6 -- src/CMakeLists.txt | 6 +- src/main.cpp | 3 +- .../qml}/Component/ChatBox/AttachmentPane.qml | 1 - .../qml}/Component/ChatBox/ChatBar.qml | 0 .../qml}/Component/ChatBox/ChatBox.qml | 2 - .../qml}/Component/ChatBox/CompletionMenu.qml | 0 .../qml}/Component/ChatBox/ReplyPane.qml | 0 .../qml}/Component/Emoji/EmojiPicker.qml | 1 - .../qml}/Component/FancyEffectsContainer.qml | 8 +- .../qml}/Component/FullScreenImage.qml | 0 .../qml}/Component/Login/Homeserver.qml | 0 .../qml}/Component/Login/Loading.qml | 1 - .../qml}/Component/Login/Login.qml | 7 +- .../qml}/Component/Login/LoginMethod.qml | 5 +- .../qml}/Component/Login/LoginRegister.qml | 5 +- .../qml}/Component/Login/LoginStep.qml | 0 .../qml}/Component/Login/Password.qml | 5 +- .../qml}/Component/Login/Sso.qml | 5 +- .../qml}/Component/QuickSwitcher.qml | 0 .../qml}/Component/ShimmerGradient.qml | 0 .../qml}/Component/Timeline/AudioDelegate.qml | 0 .../Component/Timeline/EncryptedDelegate.qml | 0 .../qml}/Component/Timeline/EventDelegate.qml | 0 .../qml}/Component/Timeline/FileDelegate.qml | 3 - .../qml}/Component/Timeline/ImageDelegate.qml | 4 - .../Timeline/LinkPreviewDelegate.qml | 0 .../Component/Timeline/MessageDelegate.qml | 0 .../qml}/Component/Timeline/MimeComponent.qml | 0 .../Component/Timeline/ReactionDelegate.qml | 0 .../Component/Timeline/ReadMarkerDelegate.qml | 0 .../Component/Timeline/ReplyComponent.qml | 1 - .../qml}/Component/Timeline/RichLabel.qml | 0 .../Component/Timeline/SectionDelegate.qml | 0 .../qml}/Component/Timeline/StateDelegate.qml | 2 - .../Component/Timeline/TimelineContainer.qml | 2 - .../qml}/Component/Timeline/VideoDelegate.qml | 3 - .../qml}/Component/TypingPane.qml | 0 .../qml}/Component/confetti.png | Bin .../NeoChat => src/qml}/Component/glowdot.png | Bin .../qml}/Dialog/CreateRoomDialog.qml | 1 - .../qml}/Dialog/EmojiDialog.qml | 1 - .../qml}/Dialog/KeyVerification/EmojiItem.qml | 0 .../qml}/Dialog/KeyVerification/EmojiRow.qml | 0 .../qml}/Dialog/KeyVerification/EmojiSas.qml | 0 .../KeyVerification/KeyVerificationDialog.qml | 0 .../qml}/Dialog/KeyVerification/Message.qml | 0 .../KeyVerification/VerificationCanceled.qml | 0 .../qml}/Dialog/OpenFileDialog.qml | 0 .../qml}/Dialog/UserDetailDialog.qml | 1 - .../NeoChat => src/qml}/Menu/EditMenu.qml | 0 .../NeoChat => src/qml}/Menu/GlobalMenu.qml | 10 +- .../qml}/Menu/RoomListContextMenu.qml | 5 +- .../NeoChat => src/qml}/Menu/ShareAction.qml | 2 +- .../qml}/Menu/ShareActionAndroid.qml | 0 .../NeoChat => src/qml}/Menu/ShareDialog.qml | 0 .../Menu/Timeline/FileDelegateContextMenu.qml | 6 +- .../Timeline/MessageDelegateContextMenu.qml | 5 +- .../qml}/Menu/Timeline/MessageSourceSheet.qml | 0 .../qml}/Menu/Timeline/ReportSheet.qml | 0 .../qml}/Page/ImageEditorPage.qml | 0 .../qml}/Page/InviteUserPage.qml | 0 .../NeoChat => src/qml}/Page/JoinRoomPage.qml | 1 - .../NeoChat => src/qml}/Page/LoadingPage.qml | 0 .../NeoChat => src/qml}/Page/RoomListPage.qml | 4 +- .../NeoChat => src/qml}/Page/RoomPage.qml | 5 - .../NeoChat => src/qml}/Page/RoomWindow.qml | 0 .../qml}/Page/StartChatPage.qml | 1 - .../NeoChat => src/qml}/Page/WelcomePage.qml | 3 +- .../NeoChat => src/qml}/Panel/RoomDrawer.qml | 7 +- .../qml}/RoomSettings/Categories.qml | 0 .../qml}/RoomSettings/General.qml | 2 - .../qml}/RoomSettings/PushNotification.qml | 0 .../qml}/RoomSettings/Security.qml | 2 - .../NeoChat => src/qml}/Settings/About.qml | 0 .../qml}/Settings/AccountEditorPage.qml | 1 - .../qml}/Settings/AccountsPage.qml | 5 +- .../qml}/Settings/AppearanceSettingsPage.qml | 3 +- .../qml}/Settings/ColorScheme.qml | 1 - .../qml}/Settings/DevicesPage.qml | 0 .../qml}/Settings/Emoticons.qml | 6 +- .../qml}/Settings/GeneralSettingsPage.qml | 0 .../qml}/Settings/SettingsPage.qml | 0 .../qml}/Settings/SonnetConfigPage.qml | 0 .../qml}/Settings/ThemeRadioButton.qml | 0 {qml => src/qml}/main.qml | 19 ++-- src/res.qrc | 86 +++++++++++++++ src/res_android.qrc | 5 + src/res_desktop.qrc | 6 ++ 105 files changed, 144 insertions(+), 315 deletions(-) delete mode 100644 imports/NeoChat/Component/ChatBox/qmldir delete mode 100644 imports/NeoChat/Component/Emoji/qmldir delete mode 100644 imports/NeoChat/Component/Login/qmldir delete mode 100644 imports/NeoChat/Component/Timeline/qmldir delete mode 100644 imports/NeoChat/Component/qmldir delete mode 100644 imports/NeoChat/Dialog/KeyVerification/qmldir delete mode 100644 imports/NeoChat/Dialog/qmldir delete mode 100644 imports/NeoChat/Menu/Timeline/qmldir delete mode 100644 imports/NeoChat/Menu/qmldir delete mode 100644 imports/NeoChat/Page/qmldir delete mode 100644 imports/NeoChat/Panel/qmldir delete mode 100644 imports/NeoChat/Settings/qmldir delete mode 100644 qtquickcontrols2.conf delete mode 100644 res.qrc delete mode 100644 res_android.qrc delete mode 100644 res_desktop.qrc rename {imports/NeoChat => src/qml}/Component/ChatBox/AttachmentPane.qml (99%) rename {imports/NeoChat => src/qml}/Component/ChatBox/ChatBar.qml (100%) rename {imports/NeoChat => src/qml}/Component/ChatBox/ChatBox.qml (98%) rename {imports/NeoChat => src/qml}/Component/ChatBox/CompletionMenu.qml (100%) rename {imports/NeoChat => src/qml}/Component/ChatBox/ReplyPane.qml (100%) rename {imports/NeoChat => src/qml}/Component/Emoji/EmojiPicker.qml (99%) rename {imports/NeoChat => src/qml}/Component/FancyEffectsContainer.qml (96%) rename {imports/NeoChat => src/qml}/Component/FullScreenImage.qml (100%) rename {imports/NeoChat => src/qml}/Component/Login/Homeserver.qml (100%) rename {imports/NeoChat => src/qml}/Component/Login/Loading.qml (95%) rename {imports/NeoChat => src/qml}/Component/Login/Login.qml (86%) rename {imports/NeoChat => src/qml}/Component/Login/LoginMethod.qml (78%) rename {imports/NeoChat => src/qml}/Component/Login/LoginRegister.qml (77%) rename {imports/NeoChat => src/qml}/Component/Login/LoginStep.qml (100%) rename {imports/NeoChat => src/qml}/Component/Login/Password.qml (84%) rename {imports/NeoChat => src/qml}/Component/Login/Sso.qml (85%) rename {imports/NeoChat => src/qml}/Component/QuickSwitcher.qml (100%) rename {imports/NeoChat => src/qml}/Component/ShimmerGradient.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/AudioDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/EncryptedDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/EventDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/FileDelegate.qml (97%) rename {imports/NeoChat => src/qml}/Component/Timeline/ImageDelegate.qml (97%) rename {imports/NeoChat => src/qml}/Component/Timeline/LinkPreviewDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/MessageDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/MimeComponent.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/ReactionDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/ReadMarkerDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/ReplyComponent.qml (98%) rename {imports/NeoChat => src/qml}/Component/Timeline/RichLabel.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/SectionDelegate.qml (100%) rename {imports/NeoChat => src/qml}/Component/Timeline/StateDelegate.qml (98%) rename {imports/NeoChat => src/qml}/Component/Timeline/TimelineContainer.qml (99%) rename {imports/NeoChat => src/qml}/Component/Timeline/VideoDelegate.qml (97%) rename {imports/NeoChat => src/qml}/Component/TypingPane.qml (100%) rename {imports/NeoChat => src/qml}/Component/confetti.png (100%) rename {imports/NeoChat => src/qml}/Component/glowdot.png (100%) rename {imports/NeoChat => src/qml}/Dialog/CreateRoomDialog.qml (97%) rename {imports/NeoChat => src/qml}/Dialog/EmojiDialog.qml (96%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/EmojiItem.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/EmojiRow.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/EmojiSas.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/KeyVerificationDialog.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/Message.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/KeyVerification/VerificationCanceled.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/OpenFileDialog.qml (100%) rename {imports/NeoChat => src/qml}/Dialog/UserDetailDialog.qml (99%) rename {imports/NeoChat => src/qml}/Menu/EditMenu.qml (100%) rename {imports/NeoChat => src/qml}/Menu/GlobalMenu.qml (87%) rename {imports/NeoChat => src/qml}/Menu/RoomListContextMenu.qml (97%) rename {imports/NeoChat => src/qml}/Menu/ShareAction.qml (98%) rename {imports/NeoChat => src/qml}/Menu/ShareActionAndroid.qml (100%) rename {imports/NeoChat => src/qml}/Menu/ShareDialog.qml (100%) rename {imports/NeoChat => src/qml}/Menu/Timeline/FileDelegateContextMenu.qml (95%) rename {imports/NeoChat => src/qml}/Menu/Timeline/MessageDelegateContextMenu.qml (98%) rename {imports/NeoChat => src/qml}/Menu/Timeline/MessageSourceSheet.qml (100%) rename {imports/NeoChat => src/qml}/Menu/Timeline/ReportSheet.qml (100%) rename {imports/NeoChat => src/qml}/Page/ImageEditorPage.qml (100%) rename {imports/NeoChat => src/qml}/Page/InviteUserPage.qml (100%) rename {imports/NeoChat => src/qml}/Page/JoinRoomPage.qml (99%) rename {imports/NeoChat => src/qml}/Page/LoadingPage.qml (100%) rename {imports/NeoChat => src/qml}/Page/RoomListPage.qml (98%) rename {imports/NeoChat => src/qml}/Page/RoomPage.qml (99%) rename {imports/NeoChat => src/qml}/Page/RoomWindow.qml (100%) rename {imports/NeoChat => src/qml}/Page/StartChatPage.qml (99%) rename {imports/NeoChat => src/qml}/Page/WelcomePage.qml (96%) rename {imports/NeoChat => src/qml}/Panel/RoomDrawer.qml (98%) rename {imports/NeoChat => src/qml}/RoomSettings/Categories.qml (100%) rename {imports/NeoChat => src/qml}/RoomSettings/General.qml (99%) rename {imports/NeoChat => src/qml}/RoomSettings/PushNotification.qml (100%) rename {imports/NeoChat => src/qml}/RoomSettings/Security.qml (97%) rename {imports/NeoChat => src/qml}/Settings/About.qml (100%) rename {imports/NeoChat => src/qml}/Settings/AccountEditorPage.qml (99%) rename {imports/NeoChat => src/qml}/Settings/AccountsPage.qml (94%) rename {imports/NeoChat => src/qml}/Settings/AppearanceSettingsPage.qml (99%) rename {imports/NeoChat => src/qml}/Settings/ColorScheme.qml (95%) rename {imports/NeoChat => src/qml}/Settings/DevicesPage.qml (100%) rename {imports/NeoChat => src/qml}/Settings/Emoticons.qml (95%) rename {imports/NeoChat => src/qml}/Settings/GeneralSettingsPage.qml (100%) rename {imports/NeoChat => src/qml}/Settings/SettingsPage.qml (100%) rename {imports/NeoChat => src/qml}/Settings/SonnetConfigPage.qml (100%) rename {imports/NeoChat => src/qml}/Settings/ThemeRadioButton.qml (100%) rename {qml => src/qml}/main.qml (94%) create mode 100644 src/res.qrc create mode 100644 src/res_android.qrc create mode 100644 src/res_desktop.qrc diff --git a/.reuse/dep5 b/.reuse/dep5 index cbbc155d5..fd3705cee 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -6,15 +6,11 @@ Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.sv Copyright: 2020 Carson Black License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL -Files: qtquickcontrols2.conf -Copyright: 2020 Tobias Fella -License: CC0-1.0 - Files: android/res/drawable/splash.xml Copyright: 2020 Tobias Fella License: BSD-2-Clause -Files: */qmldir .gitignore +Files: .gitignore Copyright: None License: CC0-1.0 @@ -22,7 +18,7 @@ Files: .gitlab/issue_templates/bug.md Copyright: 2021 Carl Schwan License: CC0-1.0 -Files: res.qrc res_android.qrc res_desktop.qrc +Files: src/res.qrc src/res_android.qrc src/res_desktop.qrc Copyright: None License: CC0-1.0 @@ -38,7 +34,7 @@ Files: src/neochat.notifyrc Copyright: 2020 Tobias Fella License: BSD-2-Clause -Files: imports/NeoChat/Component/confetti.png imports/NeoChat/Component/glowdot.png +Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png Copyright: 2021 Alexey Andreyev License: CC0-1.0 diff --git a/imports/NeoChat/Component/ChatBox/qmldir b/imports/NeoChat/Component/ChatBox/qmldir deleted file mode 100644 index 28b7a8a94..000000000 --- a/imports/NeoChat/Component/ChatBox/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -module NeoChat.Component.ChatBox -ChatBox 1.0 ChatBox.qml -ChatBar 1.0 ChatBar.qml -ReplyPane 1.0 ReplyPane.qml -AttachmentPane 1.0 AttachmentPane.qml -CompletionMenu 1.0 CompletionMenu.qml -EmojiPickerPane 1.0 EmojiPickerPane.qml diff --git a/imports/NeoChat/Component/Emoji/qmldir b/imports/NeoChat/Component/Emoji/qmldir deleted file mode 100644 index d84e9a21f..000000000 --- a/imports/NeoChat/Component/Emoji/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module NeoChat.Component.Emoji -EmojiPicker 1.0 EmojiPicker.qml diff --git a/imports/NeoChat/Component/Login/qmldir b/imports/NeoChat/Component/Login/qmldir deleted file mode 100644 index 8769eb0c4..000000000 --- a/imports/NeoChat/Component/Login/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -module NeoChat.Component.Login -Login 1.0 Login.qml -Password 1.0 Password.qml -LoginRegister 1.0 LoginRegister.qml -Loading 1.0 Loading.qml -LoginMethod 1.0 LoginMethod.qml -LoginStep 1.0 LoginStep.qml diff --git a/imports/NeoChat/Component/Timeline/qmldir b/imports/NeoChat/Component/Timeline/qmldir deleted file mode 100644 index fe30e440b..000000000 --- a/imports/NeoChat/Component/Timeline/qmldir +++ /dev/null @@ -1,16 +0,0 @@ -module NeoChat.Component.Timeline -RichLabel 1.0 RichLabel.qml -TimelineContainer 1.0 TimelineContainer.qml -StateDelegate 1.0 StateDelegate.qml -SectionDelegate 1.0 SectionDelegate.qml -ImageDelegate 1.0 ImageDelegate.qml -FileDelegate 1.0 FileDelegate.qml -VideoDelegate 1.0 VideoDelegate.qml -ReactionDelegate 1.0 ReactionDelegate.qml -AudioDelegate 1.0 AudioDelegate.qml -EncryptedDelegate 1.0 EncryptedDelegate.qml -EventDelegate 1.0 EventDelegate.qml -MessageDelegate 1.0 MessageDelegate.qml -ReadMarkerDelegate 1.0 ReadMarkerDelegate.qml -LinkPreviewDelegate 1.0 LinkPreviewDelegate.qml -MimeComponent 1.0 MimeComponent.qml diff --git a/imports/NeoChat/Component/qmldir b/imports/NeoChat/Component/qmldir deleted file mode 100644 index 038c8b9b3..000000000 --- a/imports/NeoChat/Component/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -module NeoChat.Component -FullScreenImage 1.0 FullScreenImage.qml -ChatTextInput 1.0 ChatTextInput.qml -FancyEffectsContainer 1.0 FancyEffectsContainer.qml -TypingPane 1.0 TypingPane.qml -QuickSwitcher 1.0 QuickSwitcher.qml -ShimmerGradient 1.0 ShimmerGradient.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/qmldir b/imports/NeoChat/Dialog/KeyVerification/qmldir deleted file mode 100644 index 5a583bb09..000000000 --- a/imports/NeoChat/Dialog/KeyVerification/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -module NeoChat.Dialog.KeyVerification -KeyVerificationDialog 1.0 KeyVerificationDialog.qml -Message 1.0 Message.qml -VerificationCanceled 1.0 VerificationCanceled.qml -EmojiItem 1.0 EmojiItem.qml -EmojiRow 1.0 EmojiRow.qml -EmojiSas 1.0 EmojiSas.qml diff --git a/imports/NeoChat/Dialog/qmldir b/imports/NeoChat/Dialog/qmldir deleted file mode 100644 index bf858091e..000000000 --- a/imports/NeoChat/Dialog/qmldir +++ /dev/null @@ -1,10 +0,0 @@ -module NeoChat.Dialog -UserDetailDialog 1.0 UserDetailDialog.qml -LoginDialog 1.0 LoginDialog.qml -CreateRoomDialog 1.0 CreateRoomDialog.qml -AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml -OpenFileDialog 1.0 OpenFileDialog.qml -ImageClipboardDialog 1.0 ImageClipboardDialog.qml -StartChatDialog 1.0 StartChatDialog.qml -EmojiDialog 1.0 EmojiDialog.qml -KeyVerificationDialog 1.0 KeyVerificationDialog.qml diff --git a/imports/NeoChat/Menu/Timeline/qmldir b/imports/NeoChat/Menu/Timeline/qmldir deleted file mode 100644 index 2a9245e4e..000000000 --- a/imports/NeoChat/Menu/Timeline/qmldir +++ /dev/null @@ -1,5 +0,0 @@ -module NeoChat.Menu.Timeline -MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml -FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml -MessageSourceSheet 1.0 MessageSourceSheet.qml -ReportSheet 1.0 ReportSheet.qml diff --git a/imports/NeoChat/Menu/qmldir b/imports/NeoChat/Menu/qmldir deleted file mode 100644 index 83cfb25aa..000000000 --- a/imports/NeoChat/Menu/qmldir +++ /dev/null @@ -1,6 +0,0 @@ -module NeoChat.Menu -RoomListContextMenu 1.0 RoomListContextMenu.qml -GlobalMenu 1.0 GlobalMenu.qml -EditMenu 1.0 EditMenu.qml -ShareAction 1.0 ShareAction.qml -ShareDialog 1.0 ShareDialog.qml diff --git a/imports/NeoChat/Page/qmldir b/imports/NeoChat/Page/qmldir deleted file mode 100644 index 888331262..000000000 --- a/imports/NeoChat/Page/qmldir +++ /dev/null @@ -1,9 +0,0 @@ -module NeoChat.Page -LoadingPage 1.0 LoadingPage.qml -RoomListPage 1.0 RoomListPage.qml -RoomPage 1.0 RoomPage.qml -RoomWindow 1.0 RoomWindow.qml -JoinRoomPage 1.0 JoinRoomPage.qml -InviteUserPage 1.0 InviteUserPage.qml -ImageEditorPage 1.0 ImageEditorPage.qml - diff --git a/imports/NeoChat/Panel/qmldir b/imports/NeoChat/Panel/qmldir deleted file mode 100644 index 0b98bcc8c..000000000 --- a/imports/NeoChat/Panel/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module NeoChat.Panel -RoomDrawer 1.0 RoomDrawer.qml diff --git a/imports/NeoChat/Settings/qmldir b/imports/NeoChat/Settings/qmldir deleted file mode 100644 index 6e25565d7..000000000 --- a/imports/NeoChat/Settings/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module NeoChat.Settings -ThemeRadioButton 1.0 ThemeRadioButton.qml -SettingsPage 1.0 SettingsPage.qml -SonnetConfigPage 1.0 SonnetConfigPage.qml diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf deleted file mode 100644 index fb79f068e..000000000 --- a/qtquickcontrols2.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Material] -Primary=Blue -Accent=Blue -Theme=System diff --git a/res.qrc b/res.qrc deleted file mode 100644 index f98b0ea1d..000000000 --- a/res.qrc +++ /dev/null @@ -1,100 +0,0 @@ - - - org.kde.neochat.svg - org.kde.neochat.tray.svg - qml/main.qml - imports/NeoChat/Page/qmldir - imports/NeoChat/Page/LoadingPage.qml - imports/NeoChat/Page/RoomListPage.qml - imports/NeoChat/Page/RoomPage.qml - imports/NeoChat/Page/RoomWindow.qml - imports/NeoChat/Page/JoinRoomPage.qml - imports/NeoChat/Page/InviteUserPage.qml - imports/NeoChat/Page/StartChatPage.qml - imports/NeoChat/Page/ImageEditorPage.qml - imports/NeoChat/Page/WelcomePage.qml - imports/NeoChat/RoomSettings/General.qml - imports/NeoChat/RoomSettings/Security.qml - imports/NeoChat/RoomSettings/PushNotification.qml - imports/NeoChat/RoomSettings/Categories.qml - imports/NeoChat/Component/qmldir - imports/NeoChat/Component/FullScreenImage.qml - imports/NeoChat/Component/FancyEffectsContainer.qml - imports/NeoChat/Component/TypingPane.qml - imports/NeoChat/Component/ShimmerGradient.qml - imports/NeoChat/Component/QuickSwitcher.qml - imports/NeoChat/Component/ChatBox - imports/NeoChat/Component/ChatBox/ChatBox.qml - imports/NeoChat/Component/ChatBox/ChatBar.qml - imports/NeoChat/Component/ChatBox/AttachmentPane.qml - imports/NeoChat/Component/ChatBox/ReplyPane.qml - imports/NeoChat/Component/ChatBox/CompletionMenu.qml - imports/NeoChat/Component/ChatBox/qmldir - imports/NeoChat/Component/Emoji/EmojiPicker.qml - imports/NeoChat/Component/Emoji/qmldir - imports/NeoChat/Component/Timeline/qmldir - imports/NeoChat/Component/Timeline/ReplyComponent.qml - imports/NeoChat/Component/Timeline/StateDelegate.qml - imports/NeoChat/Component/Timeline/RichLabel.qml - imports/NeoChat/Component/Timeline/TimelineContainer.qml - imports/NeoChat/Component/Timeline/SectionDelegate.qml - imports/NeoChat/Component/Timeline/VideoDelegate.qml - imports/NeoChat/Component/Timeline/ReactionDelegate.qml - imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml - imports/NeoChat/Component/Timeline/AudioDelegate.qml - imports/NeoChat/Component/Timeline/FileDelegate.qml - imports/NeoChat/Component/Timeline/ImageDelegate.qml - imports/NeoChat/Component/Timeline/EncryptedDelegate.qml - imports/NeoChat/Component/Timeline/EventDelegate.qml - imports/NeoChat/Component/Timeline/MessageDelegate.qml - imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml - imports/NeoChat/Component/Timeline/MimeComponent.qml - imports/NeoChat/Component/Login/qmldir - imports/NeoChat/Component/Login/LoginStep.qml - imports/NeoChat/Component/Login/Login.qml - imports/NeoChat/Component/Login/Password.qml - imports/NeoChat/Component/Login/LoginRegister.qml - imports/NeoChat/Component/Login/Loading.qml - imports/NeoChat/Component/Login/Homeserver.qml - imports/NeoChat/Component/Login/LoginMethod.qml - imports/NeoChat/Component/Login/Sso.qml - imports/NeoChat/Panel/qmldir - imports/NeoChat/Panel/RoomDrawer.qml - imports/NeoChat/Dialog/qmldir - imports/NeoChat/Dialog/UserDetailDialog.qml - imports/NeoChat/Dialog/CreateRoomDialog.qml - imports/NeoChat/Dialog/EmojiDialog.qml - imports/NeoChat/Dialog/OpenFileDialog.qml - imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml - imports/NeoChat/Dialog/KeyVerification/Message.qml - imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml - imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml - imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml - imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml - imports/NeoChat/Dialog/KeyVerification/qmldir - imports/NeoChat/Menu/qmldir - imports/NeoChat/Menu/GlobalMenu.qml - imports/NeoChat/Menu/EditMenu.qml - imports/NeoChat/Menu/Timeline/qmldir - imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml - imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml - imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml - imports/NeoChat/Menu/Timeline/ReportSheet.qml - imports/NeoChat/Menu/RoomListContextMenu.qml - qtquickcontrols2.conf - imports/NeoChat/Component/glowdot.png - imports/NeoChat/Component/confetti.png - imports/NeoChat/Settings/SettingsPage.qml - imports/NeoChat/Settings/ThemeRadioButton.qml - imports/NeoChat/Settings/ColorScheme.qml - imports/NeoChat/Settings/GeneralSettingsPage.qml - imports/NeoChat/Settings/Emoticons.qml - imports/NeoChat/Settings/AppearanceSettingsPage.qml - imports/NeoChat/Settings/AccountsPage.qml - imports/NeoChat/Settings/AccountEditorPage.qml - imports/NeoChat/Settings/DevicesPage.qml - imports/NeoChat/Settings/About.qml - imports/NeoChat/Settings/SonnetConfigPage.qml - imports/NeoChat/Settings/qmldir - - diff --git a/res_android.qrc b/res_android.qrc deleted file mode 100644 index 699ff54dd..000000000 --- a/res_android.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - imports/NeoChat/Menu/ShareActionAndroid.qml - - diff --git a/res_desktop.qrc b/res_desktop.qrc deleted file mode 100644 index 9d9e77da8..000000000 --- a/res_desktop.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - imports/NeoChat/Menu/ShareAction.qml - imports/NeoChat/Menu/ShareDialog.qml - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a6191c2b9..4c8588a6b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ add_library(neochat STATIC add_executable(neochat-app main.cpp - ../res.qrc + res.qrc ) target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR}) @@ -76,11 +76,11 @@ if(NOT ANDROID) endif() if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) - target_sources(neochat-app PRIVATE ../res_desktop.qrc) + target_sources(neochat-app PRIVATE res_desktop.qrc) target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER) target_sources(neochat PRIVATE runner.cpp) else() - target_sources(neochat-app PRIVATE ../res_android.qrc) + target_sources(neochat-app PRIVATE res_android.qrc) endif() target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR}) diff --git a/src/main.cpp b/src/main.cpp index b9781301f..cf1b5e68c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -251,11 +251,10 @@ int main(int argc, char *argv[]) Controller::instance().setAboutData(about); - engine.addImportPath("qrc:/imports"); engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider); engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider); - engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); if (engine.rootObjects().isEmpty()) { return -1; } diff --git a/imports/NeoChat/Component/ChatBox/AttachmentPane.qml b/src/qml/Component/ChatBox/AttachmentPane.qml similarity index 99% rename from imports/NeoChat/Component/ChatBox/AttachmentPane.qml rename to src/qml/Component/ChatBox/AttachmentPane.qml index 4c9940ba8..e51797778 100644 --- a/imports/NeoChat/Component/ChatBox/AttachmentPane.qml +++ b/src/qml/Component/ChatBox/AttachmentPane.qml @@ -9,7 +9,6 @@ import QtQuick.Controls 2.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Page 1.0 Loader { id: attachmentPaneLoader diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/src/qml/Component/ChatBox/ChatBar.qml similarity index 100% rename from imports/NeoChat/Component/ChatBox/ChatBar.qml rename to src/qml/Component/ChatBox/ChatBar.qml diff --git a/imports/NeoChat/Component/ChatBox/ChatBox.qml b/src/qml/Component/ChatBox/ChatBox.qml similarity index 98% rename from imports/NeoChat/Component/ChatBox/ChatBox.qml rename to src/qml/Component/ChatBox/ChatBox.qml index 876903cab..5e7ab5b39 100644 --- a/imports/NeoChat/Component/ChatBox/ChatBox.qml +++ b/src/qml/Component/ChatBox/ChatBox.qml @@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15 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 ColumnLayout { id: chatBox diff --git a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml b/src/qml/Component/ChatBox/CompletionMenu.qml similarity index 100% rename from imports/NeoChat/Component/ChatBox/CompletionMenu.qml rename to src/qml/Component/ChatBox/CompletionMenu.qml diff --git a/imports/NeoChat/Component/ChatBox/ReplyPane.qml b/src/qml/Component/ChatBox/ReplyPane.qml similarity index 100% rename from imports/NeoChat/Component/ChatBox/ReplyPane.qml rename to src/qml/Component/ChatBox/ReplyPane.qml diff --git a/imports/NeoChat/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml similarity index 99% rename from imports/NeoChat/Component/Emoji/EmojiPicker.qml rename to src/qml/Component/Emoji/EmojiPicker.qml index f725d3883..f05c1b798 100644 --- a/imports/NeoChat/Component/Emoji/EmojiPicker.qml +++ b/src/qml/Component/Emoji/EmojiPicker.qml @@ -7,7 +7,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 ColumnLayout { id: _picker diff --git a/imports/NeoChat/Component/FancyEffectsContainer.qml b/src/qml/Component/FancyEffectsContainer.qml similarity index 96% rename from imports/NeoChat/Component/FancyEffectsContainer.qml rename to src/qml/Component/FancyEffectsContainer.qml index 4707e0254..a05d42fc8 100644 --- a/imports/NeoChat/Component/FancyEffectsContainer.qml +++ b/src/qml/Component/FancyEffectsContainer.qml @@ -62,7 +62,7 @@ Item { } ImageParticle { - source: "qrc:/imports/NeoChat/Component/confetti.png" + source: "qrc:/confetti.png" entryEffect: ImageParticle.Scale rotationVariation: 360 rotationVelocity: 90 @@ -206,7 +206,7 @@ Item { ImageParticle { id: fireworksParticleA system: fireworksSystem - source: "qrc:/imports/NeoChat/Component/glowdot.png" + source: "qrc:/glowdot.png" alphaVariation: item.isThemeDark ? 0.1 : 0.1 alpha: item.isThemeDark ? 0.5 : 1 groups: ["a"] @@ -217,7 +217,7 @@ Item { ImageParticle { system: fireworksSystem - source: "qrc:/imports/NeoChat/Component/glowdot.png" + source: "qrc:/glowdot.png" color: item.isThemeDark ? "white" : "gold" alphaVariation: item.isThemeDark ? 0.1 : 0.1 alpha: item.isThemeDark ? 0.5 : 1 @@ -230,7 +230,7 @@ Item { ImageParticle { id: fireworksParticleB system: fireworksSystem - source: "qrc:/imports/NeoChat/Component/glowdot.png" + source: "qrc:/glowdot.png" alphaVariation: item.isThemeDark ? 0.1 : 0.1 alpha: item.isThemeDark ? 0.5 : 1 groups: ["b"] diff --git a/imports/NeoChat/Component/FullScreenImage.qml b/src/qml/Component/FullScreenImage.qml similarity index 100% rename from imports/NeoChat/Component/FullScreenImage.qml rename to src/qml/Component/FullScreenImage.qml diff --git a/imports/NeoChat/Component/Login/Homeserver.qml b/src/qml/Component/Login/Homeserver.qml similarity index 100% rename from imports/NeoChat/Component/Login/Homeserver.qml rename to src/qml/Component/Login/Homeserver.qml diff --git a/imports/NeoChat/Component/Login/Loading.qml b/src/qml/Component/Login/Loading.qml similarity index 95% rename from imports/NeoChat/Component/Login/Loading.qml rename to src/qml/Component/Login/Loading.qml index 8a752f71f..504750816 100644 --- a/imports/NeoChat/Component/Login/Loading.qml +++ b/src/qml/Component/Login/Loading.qml @@ -8,7 +8,6 @@ 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.PlaceholderMessage { property var showContinueButton: false diff --git a/imports/NeoChat/Component/Login/Login.qml b/src/qml/Component/Login/Login.qml similarity index 86% rename from imports/NeoChat/Component/Login/Login.qml rename to src/qml/Component/Login/Login.qml index 8194f72da..7549a5cf8 100644 --- a/imports/NeoChat/Component/Login/Login.qml +++ b/src/qml/Component/Login/Login.qml @@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 LoginStep { id: login @@ -53,11 +52,11 @@ LoginStep { text: LoginHelper.testing && matrixIdField.acceptableInput ? i18n("Loading…") : i18nc("@action:button", "Continue") onTriggered: { if (LoginHelper.supportsSso && LoginHelper.supportsPassword) { - processed("qrc:/imports/NeoChat/Component/Login/LoginMethod.qml"); + processed("qrc:/LoginMethod.qml"); } else if (LoginHelper.supportsPassword) { - processed("qrc:/imports/NeoChat/Component/Login/Password.qml"); + processed("qrc:/Password.qml"); } else { - processed("qrc:/imports/NeoChat/Component/Login/Sso.qml"); + processed("qrc:/Sso.qml"); } } enabled: LoginHelper.homeserverReachable diff --git a/imports/NeoChat/Component/Login/LoginMethod.qml b/src/qml/Component/Login/LoginMethod.qml similarity index 78% rename from imports/NeoChat/Component/Login/LoginMethod.qml rename to src/qml/Component/Login/LoginMethod.qml index 21a5f3ec7..5d2d3134c 100644 --- a/imports/NeoChat/Component/Login/LoginMethod.qml +++ b/src/qml/Component/Login/LoginMethod.qml @@ -7,7 +7,6 @@ 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 LoginStep { id: loginMethod @@ -20,13 +19,13 @@ LoginStep { Layout.alignment: Qt.AlignHCenter text: i18n("Login with password") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 - onClicked: processed("qrc:/imports/NeoChat/Component/Login/Password.qml") + onClicked: processed("qrc:/Password.qml") } Controls.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Login with single sign-on") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 - onClicked: processed("qrc:/imports/NeoChat/Component/Login/Sso.qml") + onClicked: processed("qrc:/Sso.qml") } } diff --git a/imports/NeoChat/Component/Login/LoginRegister.qml b/src/qml/Component/Login/LoginRegister.qml similarity index 77% rename from imports/NeoChat/Component/Login/LoginRegister.qml rename to src/qml/Component/Login/LoginRegister.qml index 9f2c2d77f..fb42de4a1 100644 --- a/imports/NeoChat/Component/Login/LoginRegister.qml +++ b/src/qml/Component/Login/LoginRegister.qml @@ -8,7 +8,6 @@ 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 LoginStep { id: loginRegister @@ -19,13 +18,13 @@ LoginStep { Layout.alignment: Qt.AlignHCenter text: i18n("Login") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 - onClicked: processed("qrc:/imports/NeoChat/Component/Login/Login.qml") + onClicked: processed("qrc:/Login.qml") } Controls.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Register") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 - onClicked: processed("qrc:/imports/NeoChat/Component/Login/Homeserver.qml") + onClicked: processed("qrc:/Homeserver.qml") } } diff --git a/imports/NeoChat/Component/Login/LoginStep.qml b/src/qml/Component/Login/LoginStep.qml similarity index 100% rename from imports/NeoChat/Component/Login/LoginStep.qml rename to src/qml/Component/Login/LoginStep.qml diff --git a/imports/NeoChat/Component/Login/Password.qml b/src/qml/Component/Login/Password.qml similarity index 84% rename from imports/NeoChat/Component/Login/Password.qml rename to src/qml/Component/Login/Password.qml index 50b7466ee..148213a40 100644 --- a/imports/NeoChat/Component/Login/Password.qml +++ b/src/qml/Component/Login/Password.qml @@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 LoginStep { id: password @@ -17,7 +16,7 @@ LoginStep { message: i18n("Enter your password") showContinueButton: true showBackButton: true - previousUrl: LoginHelper.isLoggingIn ? "" : LoginHelper.supportsSso ? "qrc:/imports/NeoChat/Component/Login/LoginMethod.qml" : "qrc:/imports/NeoChat/Component/Login/Login.qml" + previousUrl: LoginHelper.isLoggingIn ? "" : LoginHelper.supportsSso ? "qrc:/LoginMethod.qml" : "qrc:/Login.qml" action: Kirigami.Action { text: i18nc("@action:button", "Login") @@ -30,7 +29,7 @@ LoginStep { Connections { target: LoginHelper function onConnected() { - processed("qrc:/imports/NeoChat/Component/Login/Loading.qml") + processed("qrc:/Loading.qml") } } diff --git a/imports/NeoChat/Component/Login/Sso.qml b/src/qml/Component/Login/Sso.qml similarity index 85% rename from imports/NeoChat/Component/Login/Sso.qml rename to src/qml/Component/Login/Sso.qml index 46a0128b2..8eb9f8f26 100644 --- a/imports/NeoChat/Component/Login/Sso.qml +++ b/src/qml/Component/Login/Sso.qml @@ -8,7 +8,6 @@ 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 @@ -23,7 +22,7 @@ LoginStep { UrlHelper.openUrl(LoginHelper.ssoUrl) } function onConnected() { - processed("qrc:/imports/NeoChat/Component/Login/Loading.qml") + processed("qrc:/Loading.qml") } } RowLayout { @@ -31,7 +30,7 @@ LoginStep { text: i18nc("@action:button", "Back") onClicked: { - module.source = "qrc:/imports/NeoChat/Component/Login/Login.qml" + module.source = "qrc:/Login.qml" } } QQC2.Button { diff --git a/imports/NeoChat/Component/QuickSwitcher.qml b/src/qml/Component/QuickSwitcher.qml similarity index 100% rename from imports/NeoChat/Component/QuickSwitcher.qml rename to src/qml/Component/QuickSwitcher.qml diff --git a/imports/NeoChat/Component/ShimmerGradient.qml b/src/qml/Component/ShimmerGradient.qml similarity index 100% rename from imports/NeoChat/Component/ShimmerGradient.qml rename to src/qml/Component/ShimmerGradient.qml diff --git a/imports/NeoChat/Component/Timeline/AudioDelegate.qml b/src/qml/Component/Timeline/AudioDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/AudioDelegate.qml rename to src/qml/Component/Timeline/AudioDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml b/src/qml/Component/Timeline/EncryptedDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/EncryptedDelegate.qml rename to src/qml/Component/Timeline/EncryptedDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/EventDelegate.qml b/src/qml/Component/Timeline/EventDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/EventDelegate.qml rename to src/qml/Component/Timeline/EventDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/FileDelegate.qml b/src/qml/Component/Timeline/FileDelegate.qml similarity index 97% rename from imports/NeoChat/Component/Timeline/FileDelegate.qml rename to src/qml/Component/Timeline/FileDelegate.qml index fef165ba9..76452103c 100644 --- a/imports/NeoChat/Component/Timeline/FileDelegate.qml +++ b/src/qml/Component/Timeline/FileDelegate.qml @@ -9,9 +9,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 -import NeoChat.Dialog 1.0 -import NeoChat.Menu.Timeline 1.0 TimelineContainer { id: fileDelegate diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/src/qml/Component/Timeline/ImageDelegate.qml similarity index 97% rename from imports/NeoChat/Component/Timeline/ImageDelegate.qml rename to src/qml/Component/Timeline/ImageDelegate.qml index 26b38b996..9fbca5951 100644 --- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml +++ b/src/qml/Component/Timeline/ImageDelegate.qml @@ -9,10 +9,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 -import NeoChat.Dialog 1.0 -import NeoChat.Menu.Timeline 1.0 - TimelineContainer { id: imageDelegate diff --git a/imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml b/src/qml/Component/Timeline/LinkPreviewDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml rename to src/qml/Component/Timeline/LinkPreviewDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/src/qml/Component/Timeline/MessageDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/MessageDelegate.qml rename to src/qml/Component/Timeline/MessageDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/MimeComponent.qml b/src/qml/Component/Timeline/MimeComponent.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/MimeComponent.qml rename to src/qml/Component/Timeline/MimeComponent.qml diff --git a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml b/src/qml/Component/Timeline/ReactionDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/ReactionDelegate.qml rename to src/qml/Component/Timeline/ReactionDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml b/src/qml/Component/Timeline/ReadMarkerDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml rename to src/qml/Component/Timeline/ReadMarkerDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/ReplyComponent.qml b/src/qml/Component/Timeline/ReplyComponent.qml similarity index 98% rename from imports/NeoChat/Component/Timeline/ReplyComponent.qml rename to src/qml/Component/Timeline/ReplyComponent.qml index ccf9c6505..8dd772ca1 100644 --- a/imports/NeoChat/Component/Timeline/ReplyComponent.qml +++ b/src/qml/Component/Timeline/ReplyComponent.qml @@ -9,7 +9,6 @@ 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 Item { id: replyComponent diff --git a/imports/NeoChat/Component/Timeline/RichLabel.qml b/src/qml/Component/Timeline/RichLabel.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/RichLabel.qml rename to src/qml/Component/Timeline/RichLabel.qml diff --git a/imports/NeoChat/Component/Timeline/SectionDelegate.qml b/src/qml/Component/Timeline/SectionDelegate.qml similarity index 100% rename from imports/NeoChat/Component/Timeline/SectionDelegate.qml rename to src/qml/Component/Timeline/SectionDelegate.qml diff --git a/imports/NeoChat/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml similarity index 98% rename from imports/NeoChat/Component/Timeline/StateDelegate.qml rename to src/qml/Component/Timeline/StateDelegate.qml index be845b353..2e9a035b4 100644 --- a/imports/NeoChat/Component/Timeline/StateDelegate.qml +++ b/src/qml/Component/Timeline/StateDelegate.qml @@ -8,8 +8,6 @@ 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.Dialog 1.0 Control { id: stateDelegate diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/src/qml/Component/Timeline/TimelineContainer.qml similarity index 99% rename from imports/NeoChat/Component/Timeline/TimelineContainer.qml rename to src/qml/Component/Timeline/TimelineContainer.qml index 5f3e38b1d..2fc9213d2 100644 --- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml +++ b/src/qml/Component/Timeline/TimelineContainer.qml @@ -8,8 +8,6 @@ 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.Dialog 1.0 QQC2.ItemDelegate { id: timelineContainer diff --git a/imports/NeoChat/Component/Timeline/VideoDelegate.qml b/src/qml/Component/Timeline/VideoDelegate.qml similarity index 97% rename from imports/NeoChat/Component/Timeline/VideoDelegate.qml rename to src/qml/Component/Timeline/VideoDelegate.qml index c540bd619..2e14965e3 100644 --- a/imports/NeoChat/Component/Timeline/VideoDelegate.qml +++ b/src/qml/Component/Timeline/VideoDelegate.qml @@ -10,9 +10,6 @@ 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 TimelineContainer { id: videoDelegate diff --git a/imports/NeoChat/Component/TypingPane.qml b/src/qml/Component/TypingPane.qml similarity index 100% rename from imports/NeoChat/Component/TypingPane.qml rename to src/qml/Component/TypingPane.qml diff --git a/imports/NeoChat/Component/confetti.png b/src/qml/Component/confetti.png similarity index 100% rename from imports/NeoChat/Component/confetti.png rename to src/qml/Component/confetti.png diff --git a/imports/NeoChat/Component/glowdot.png b/src/qml/Component/glowdot.png similarity index 100% rename from imports/NeoChat/Component/glowdot.png rename to src/qml/Component/glowdot.png diff --git a/imports/NeoChat/Dialog/CreateRoomDialog.qml b/src/qml/Dialog/CreateRoomDialog.qml similarity index 97% rename from imports/NeoChat/Dialog/CreateRoomDialog.qml rename to src/qml/Dialog/CreateRoomDialog.qml index b51b9d7cd..29a3ce36a 100644 --- a/imports/NeoChat/Dialog/CreateRoomDialog.qml +++ b/src/qml/Dialog/CreateRoomDialog.qml @@ -7,7 +7,6 @@ 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/src/qml/Dialog/EmojiDialog.qml similarity index 96% rename from imports/NeoChat/Dialog/EmojiDialog.qml rename to src/qml/Dialog/EmojiDialog.qml index da2ec7422..a06485d89 100644 --- a/imports/NeoChat/Dialog/EmojiDialog.qml +++ b/src/qml/Dialog/EmojiDialog.qml @@ -7,7 +7,6 @@ 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 QQC2.Popup { id: root diff --git a/imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml b/src/qml/Dialog/KeyVerification/EmojiItem.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml rename to src/qml/Dialog/KeyVerification/EmojiItem.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml b/src/qml/Dialog/KeyVerification/EmojiRow.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml rename to src/qml/Dialog/KeyVerification/EmojiRow.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml b/src/qml/Dialog/KeyVerification/EmojiSas.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml rename to src/qml/Dialog/KeyVerification/EmojiSas.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml b/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml rename to src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/Message.qml b/src/qml/Dialog/KeyVerification/Message.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/Message.qml rename to src/qml/Dialog/KeyVerification/Message.qml diff --git a/imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml b/src/qml/Dialog/KeyVerification/VerificationCanceled.qml similarity index 100% rename from imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml rename to src/qml/Dialog/KeyVerification/VerificationCanceled.qml diff --git a/imports/NeoChat/Dialog/OpenFileDialog.qml b/src/qml/Dialog/OpenFileDialog.qml similarity index 100% rename from imports/NeoChat/Dialog/OpenFileDialog.qml rename to src/qml/Dialog/OpenFileDialog.qml diff --git a/imports/NeoChat/Dialog/UserDetailDialog.qml b/src/qml/Dialog/UserDetailDialog.qml similarity index 99% rename from imports/NeoChat/Dialog/UserDetailDialog.qml rename to src/qml/Dialog/UserDetailDialog.qml index c1210719c..4066f3f90 100644 --- a/imports/NeoChat/Dialog/UserDetailDialog.qml +++ b/src/qml/Dialog/UserDetailDialog.qml @@ -9,7 +9,6 @@ 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/Menu/EditMenu.qml b/src/qml/Menu/EditMenu.qml similarity index 100% rename from imports/NeoChat/Menu/EditMenu.qml rename to src/qml/Menu/EditMenu.qml diff --git a/imports/NeoChat/Menu/GlobalMenu.qml b/src/qml/Menu/GlobalMenu.qml similarity index 87% rename from imports/NeoChat/Menu/GlobalMenu.qml rename to src/qml/Menu/GlobalMenu.qml index cb9e48f9d..7114463ed 100644 --- a/imports/NeoChat/Menu/GlobalMenu.qml +++ b/src/qml/Menu/GlobalMenu.qml @@ -10,10 +10,6 @@ import QtQuick.Layouts 1.10 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Component 1.0 -import NeoChat.Dialog 1.0 -import NeoChat.Page 1.0 -import NeoChat.Panel 1.0 Labs.MenuBar { Labs.Menu { @@ -28,7 +24,7 @@ Labs.MenuBar { text: i18nc("menu", "Configure NeoChat...") shortcut: StandardKey.Preferences - onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml", {}, { + onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, { title: i18n("Configure") }) } @@ -45,7 +41,7 @@ Labs.MenuBar { Labs.MenuItem { text: i18nc("menu", "New Private Chat…") enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0 - onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {connection: Controller.activeConnection}) + onTriggered: pushReplaceLayer("qrc:/StartChatPage.qml", {connection: Controller.activeConnection}) } Labs.MenuItem { text: i18nc("menu", "New Group…") @@ -58,7 +54,7 @@ Labs.MenuBar { } Labs.MenuItem { text: i18nc("menu", "Browse Chats…") - onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {connection: Controller.activeConnection}) + onTriggered: pushReplaceLayer("qrc:/JoinRoomPage.qml", {connection: Controller.activeConnection}) } } EditMenu { diff --git a/imports/NeoChat/Menu/RoomListContextMenu.qml b/src/qml/Menu/RoomListContextMenu.qml similarity index 97% rename from imports/NeoChat/Menu/RoomListContextMenu.qml rename to src/qml/Menu/RoomListContextMenu.qml index 195ba715b..059fa4493 100644 --- a/imports/NeoChat/Menu/RoomListContextMenu.qml +++ b/src/qml/Menu/RoomListContextMenu.qml @@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Page 1.0 /** * Context menu when clicking on a room in the room list @@ -104,7 +103,7 @@ Loader { MenuItem { text: i18n("Room Settings") - onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room}) + onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } MenuSeparator {} @@ -168,7 +167,7 @@ Loader { ToolButton { icon.name: 'settings-configure' - onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room}) + onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } } diff --git a/imports/NeoChat/Menu/ShareAction.qml b/src/qml/Menu/ShareAction.qml similarity index 98% rename from imports/NeoChat/Menu/ShareAction.qml rename to src/qml/Menu/ShareAction.qml index e835502a9..b7f6e5baa 100644 --- a/imports/NeoChat/Menu/ShareAction.qml +++ b/src/qml/Menu/ShareAction.qml @@ -55,7 +55,7 @@ Purpose.PurposeAlternativesModel { icon.name: model.iconName onTriggered: { doBeforeSharing(); - applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/ShareDialog.qml', { + applicationWindow().pageStack.pushDialogLayer('qrc:/ShareDialog.qml', { title: shareAction.tooltip, index: index, model: shareAction._instantiator.model diff --git a/imports/NeoChat/Menu/ShareActionAndroid.qml b/src/qml/Menu/ShareActionAndroid.qml similarity index 100% rename from imports/NeoChat/Menu/ShareActionAndroid.qml rename to src/qml/Menu/ShareActionAndroid.qml diff --git a/imports/NeoChat/Menu/ShareDialog.qml b/src/qml/Menu/ShareDialog.qml similarity index 100% rename from imports/NeoChat/Menu/ShareDialog.qml rename to src/qml/Menu/ShareDialog.qml diff --git a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml similarity index 95% rename from imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml rename to src/qml/Menu/Timeline/FileDelegateContextMenu.qml index 362d3fc48..6c4faad64 100644 --- a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml @@ -8,8 +8,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Dialog 1.0 -import NeoChat.Menu 1.0 MessageDelegateContextMenu { id: root @@ -71,7 +69,7 @@ MessageDelegateContextMenu { text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report") icon.name: "dialog-warning-symbolic" visible: author.id !== currentRoom.localUser.id - onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, { + onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, { title: i18nc("@title", "Report Message"), width: Kirigami.Units.gridUnit * 25 }) @@ -80,7 +78,7 @@ MessageDelegateContextMenu { text: i18n("View Source") icon.name: "code-context" onTriggered: { - applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', { + applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', { sourceText: root.source }, { title: i18n("Message Source"), diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml similarity index 98% rename from imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml rename to src/qml/Menu/Timeline/MessageDelegateContextMenu.qml index 10a646e55..03847354c 100644 --- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml @@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Dialog 1.0 Loader { id: loadRoot @@ -58,7 +57,7 @@ Loader { text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report") icon.name: "dialog-warning-symbolic" visible: author.id !== currentRoom.localUser.id - onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, { + onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, { title: i18nc("@title", "Report Message"), width: Kirigami.Units.gridUnit * 25 }) @@ -67,7 +66,7 @@ Loader { text: i18n("View Source") icon.name: "code-context" onTriggered: { - applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', { + applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', { sourceText: loadRoot.source }, { title: i18n("Message Source"), diff --git a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml b/src/qml/Menu/Timeline/MessageSourceSheet.qml similarity index 100% rename from imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml rename to src/qml/Menu/Timeline/MessageSourceSheet.qml diff --git a/imports/NeoChat/Menu/Timeline/ReportSheet.qml b/src/qml/Menu/Timeline/ReportSheet.qml similarity index 100% rename from imports/NeoChat/Menu/Timeline/ReportSheet.qml rename to src/qml/Menu/Timeline/ReportSheet.qml diff --git a/imports/NeoChat/Page/ImageEditorPage.qml b/src/qml/Page/ImageEditorPage.qml similarity index 100% rename from imports/NeoChat/Page/ImageEditorPage.qml rename to src/qml/Page/ImageEditorPage.qml diff --git a/imports/NeoChat/Page/InviteUserPage.qml b/src/qml/Page/InviteUserPage.qml similarity index 100% rename from imports/NeoChat/Page/InviteUserPage.qml rename to src/qml/Page/InviteUserPage.qml diff --git a/imports/NeoChat/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml similarity index 99% rename from imports/NeoChat/Page/JoinRoomPage.qml rename to src/qml/Page/JoinRoomPage.qml index b07754600..6143cbd5a 100644 --- a/imports/NeoChat/Page/JoinRoomPage.qml +++ b/src/qml/Page/JoinRoomPage.qml @@ -8,7 +8,6 @@ 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/LoadingPage.qml b/src/qml/Page/LoadingPage.qml similarity index 100% rename from imports/NeoChat/Page/LoadingPage.qml rename to src/qml/Page/LoadingPage.qml diff --git a/imports/NeoChat/Page/RoomListPage.qml b/src/qml/Page/RoomListPage.qml similarity index 98% rename from imports/NeoChat/Page/RoomListPage.qml rename to src/qml/Page/RoomListPage.qml index e40fd60b8..445f76830 100644 --- a/imports/NeoChat/Page/RoomListPage.qml +++ b/src/qml/Page/RoomListPage.qml @@ -11,8 +11,6 @@ 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.Menu 1.0 Kirigami.ScrollablePage { @@ -187,7 +185,7 @@ Kirigami.ScrollablePage { helpfulAction: Kirigami.Action { icon.name: sortFilterRoomListModel.filterText.length > 0 ? "search" : "list-add" text: sortFilterRoomListModel.filterText.length > 0 ? i18n("Search in room directory") : i18n("Explore rooms") - onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", { + onTriggered: pageStack.layers.push("qrc:/JoinRoomPage.qml", { connection: Controller.activeConnection, keyword: sortFilterRoomListModel.filterText }) diff --git a/imports/NeoChat/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml similarity index 99% rename from imports/NeoChat/Page/RoomPage.qml rename to src/qml/Page/RoomPage.qml index 00441444e..0331651d3 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/src/qml/Page/RoomPage.qml @@ -12,11 +12,6 @@ import org.kde.kirigami 2.19 as Kirigami import org.kde.kitemmodels 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 -import NeoChat.Dialog 1.0 -import NeoChat.Menu.Timeline 1.0 Kirigami.ScrollablePage { id: page diff --git a/imports/NeoChat/Page/RoomWindow.qml b/src/qml/Page/RoomWindow.qml similarity index 100% rename from imports/NeoChat/Page/RoomWindow.qml rename to src/qml/Page/RoomWindow.qml diff --git a/imports/NeoChat/Page/StartChatPage.qml b/src/qml/Page/StartChatPage.qml similarity index 99% rename from imports/NeoChat/Page/StartChatPage.qml rename to src/qml/Page/StartChatPage.qml index a02029919..15e4eac5d 100644 --- a/imports/NeoChat/Page/StartChatPage.qml +++ b/src/qml/Page/StartChatPage.qml @@ -9,7 +9,6 @@ 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/src/qml/Page/WelcomePage.qml similarity index 96% rename from imports/NeoChat/Page/WelcomePage.qml rename to src/qml/Page/WelcomePage.qml index f9a64d078..de9ff377d 100644 --- a/imports/NeoChat/Page/WelcomePage.qml +++ b/src/qml/Page/WelcomePage.qml @@ -8,7 +8,6 @@ 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 Kirigami.ScrollablePage { id: welcomePage @@ -60,7 +59,7 @@ Kirigami.ScrollablePage { Loader { id: module Layout.alignment: Qt.AlignHCenter - source: "qrc:/imports/NeoChat/Component/Login/Login.qml" + source: "qrc:/Login.qml" onSourceChanged: { headerMessage.visible = false headerMessage.text = "" diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/src/qml/Panel/RoomDrawer.qml similarity index 98% rename from imports/NeoChat/Panel/RoomDrawer.qml rename to src/qml/Panel/RoomDrawer.qml index 8b1229d92..ad38d3359 100644 --- a/imports/NeoChat/Panel/RoomDrawer.qml +++ b/src/qml/Panel/RoomDrawer.qml @@ -10,9 +10,6 @@ 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 - Kirigami.OverlayDrawer { id: roomDrawer @@ -105,7 +102,7 @@ Kirigami.OverlayDrawer { display: AbstractButton.IconOnly onClicked: { - applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {room: room}) + applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: room}) roomDrawer.close(); } @@ -137,7 +134,7 @@ Kirigami.OverlayDrawer { text: i18n("Room settings") display: AbstractButton.IconOnly - onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room}) + onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) ToolTip { text: settingsButton.text diff --git a/imports/NeoChat/RoomSettings/Categories.qml b/src/qml/RoomSettings/Categories.qml similarity index 100% rename from imports/NeoChat/RoomSettings/Categories.qml rename to src/qml/RoomSettings/Categories.qml diff --git a/imports/NeoChat/RoomSettings/General.qml b/src/qml/RoomSettings/General.qml similarity index 99% rename from imports/NeoChat/RoomSettings/General.qml rename to src/qml/RoomSettings/General.qml index b63a77839..74708d6b6 100644 --- a/imports/NeoChat/RoomSettings/General.qml +++ b/src/qml/RoomSettings/General.qml @@ -8,8 +8,6 @@ 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.Dialog 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/RoomSettings/PushNotification.qml b/src/qml/RoomSettings/PushNotification.qml similarity index 100% rename from imports/NeoChat/RoomSettings/PushNotification.qml rename to src/qml/RoomSettings/PushNotification.qml diff --git a/imports/NeoChat/RoomSettings/Security.qml b/src/qml/RoomSettings/Security.qml similarity index 97% rename from imports/NeoChat/RoomSettings/Security.qml rename to src/qml/RoomSettings/Security.qml index cbe2d8013..9e995359b 100644 --- a/imports/NeoChat/RoomSettings/Security.qml +++ b/src/qml/RoomSettings/Security.qml @@ -8,8 +8,6 @@ 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.Dialog 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/Settings/About.qml b/src/qml/Settings/About.qml similarity index 100% rename from imports/NeoChat/Settings/About.qml rename to src/qml/Settings/About.qml diff --git a/imports/NeoChat/Settings/AccountEditorPage.qml b/src/qml/Settings/AccountEditorPage.qml similarity index 99% rename from imports/NeoChat/Settings/AccountEditorPage.qml rename to src/qml/Settings/AccountEditorPage.qml index d8317502e..beebef282 100644 --- a/imports/NeoChat/Settings/AccountEditorPage.qml +++ b/src/qml/Settings/AccountEditorPage.qml @@ -10,7 +10,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Dialog 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/Settings/AccountsPage.qml b/src/qml/Settings/AccountsPage.qml similarity index 94% rename from imports/NeoChat/Settings/AccountsPage.qml rename to src/qml/Settings/AccountsPage.qml index 98285ac2c..e826bc5a9 100644 --- a/imports/NeoChat/Settings/AccountsPage.qml +++ b/src/qml/Settings/AccountsPage.qml @@ -9,7 +9,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Dialog 1.0 Kirigami.ScrollablePage { title: i18n("Accounts") @@ -17,7 +16,7 @@ Kirigami.ScrollablePage { actions.main: Kirigami.Action { text: i18n("Add an account") icon.name: "list-add-user" - onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml") + onTriggered: pageStack.layers.push("qrc:/WelcomePage.qml") visible: !pageSettingStack.wideMode } @@ -81,7 +80,7 @@ Kirigami.ScrollablePage { actions: Kirigami.Action { text: i18n("Add an account") icon.name: "list-add-user" - onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml") + onTriggered: pageStack.layers.push("qrc:/WelcomePage.qml") } } } diff --git a/imports/NeoChat/Settings/AppearanceSettingsPage.qml b/src/qml/Settings/AppearanceSettingsPage.qml similarity index 99% rename from imports/NeoChat/Settings/AppearanceSettingsPage.qml rename to src/qml/Settings/AppearanceSettingsPage.qml index ef9a62abf..7c5b87944 100644 --- a/imports/NeoChat/Settings/AppearanceSettingsPage.qml +++ b/src/qml/Settings/AppearanceSettingsPage.qml @@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Settings 1.0 Kirigami.ScrollablePage { title: i18nc("@title:window", "Appearance") @@ -207,7 +206,7 @@ Kirigami.ScrollablePage { Loader { visible: item !== null Kirigami.FormData.label: item ? i18n("Theme:") : "" - source: "qrc:/imports/NeoChat/Settings/ColorScheme.qml" + source: "qrc:/ColorScheme.qml" } QQC2.CheckBox { visible: Controller.hasWindowSystem diff --git a/imports/NeoChat/Settings/ColorScheme.qml b/src/qml/Settings/ColorScheme.qml similarity index 95% rename from imports/NeoChat/Settings/ColorScheme.qml rename to src/qml/Settings/ColorScheme.qml index e71e84dee..6f61b9455 100644 --- a/imports/NeoChat/Settings/ColorScheme.qml +++ b/src/qml/Settings/ColorScheme.qml @@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Settings 1.0 QQC2.ComboBox { textRole: "display" diff --git a/imports/NeoChat/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml similarity index 100% rename from imports/NeoChat/Settings/DevicesPage.qml rename to src/qml/Settings/DevicesPage.qml diff --git a/imports/NeoChat/Settings/Emoticons.qml b/src/qml/Settings/Emoticons.qml similarity index 95% rename from imports/NeoChat/Settings/Emoticons.qml rename to src/qml/Settings/Emoticons.qml index 9db37a174..1a84796bb 100644 --- a/imports/NeoChat/Settings/Emoticons.qml +++ b/src/qml/Settings/Emoticons.qml @@ -10,10 +10,6 @@ import Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -import NeoChat.Settings 1.0 - -import NeoChat.Component 1.0 as Components -import NeoChat.Dialog 1.0 Kirigami.ScrollablePage { title: i18nc("@title:window", "Custom Emojis") @@ -48,7 +44,7 @@ Kirigami.ScrollablePage { anchors.fill: parent visible: parent.status === Image.Loading radius: height/2 - gradient: Components.ShimmerGradient { } + gradient: ShimmerGradient { } } } diff --git a/imports/NeoChat/Settings/GeneralSettingsPage.qml b/src/qml/Settings/GeneralSettingsPage.qml similarity index 100% rename from imports/NeoChat/Settings/GeneralSettingsPage.qml rename to src/qml/Settings/GeneralSettingsPage.qml diff --git a/imports/NeoChat/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml similarity index 100% rename from imports/NeoChat/Settings/SettingsPage.qml rename to src/qml/Settings/SettingsPage.qml diff --git a/imports/NeoChat/Settings/SonnetConfigPage.qml b/src/qml/Settings/SonnetConfigPage.qml similarity index 100% rename from imports/NeoChat/Settings/SonnetConfigPage.qml rename to src/qml/Settings/SonnetConfigPage.qml diff --git a/imports/NeoChat/Settings/ThemeRadioButton.qml b/src/qml/Settings/ThemeRadioButton.qml similarity index 100% rename from imports/NeoChat/Settings/ThemeRadioButton.qml rename to src/qml/Settings/ThemeRadioButton.qml diff --git a/qml/main.qml b/src/qml/main.qml similarity index 94% rename from qml/main.qml rename to src/qml/main.qml index 3f34e31e7..9c7941cec 100644 --- a/qml/main.qml +++ b/src/qml/main.qml @@ -9,11 +9,6 @@ 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.Dialog 1.0 -import NeoChat.Page 1.0 -import NeoChat.Panel 1.0 -import NeoChat.Dialog.KeyVerification 1.0 Kirigami.ApplicationWindow { id: root @@ -42,7 +37,7 @@ Kirigami.ApplicationWindow { Loader { active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile - source: Qt.resolvedUrl("qrc:/imports/NeoChat/Menu/GlobalMenu.qml") + source: Qt.resolvedUrl("qrc:/GlobalMenu.qml") } // This timer allows to batch update the window size change to reduce @@ -78,7 +73,7 @@ Kirigami.ApplicationWindow { target: RoomManager function onPushRoom(room, event) { - root.roomPage = pageStack.push("qrc:/imports/NeoChat/Page/RoomPage.qml"); + root.roomPage = pageStack.push("qrc:/RoomPage.qml"); root.roomPage.forceActiveFocus(); if (event.length > 0) { roomPage.goToEvent(event); @@ -242,13 +237,13 @@ Kirigami.ApplicationWindow { Kirigami.Action { text: i18n("Explore rooms") icon.name: "compass" - onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {connection: Controller.activeConnection}) + onTriggered: pushReplaceLayer("qrc:/JoinRoomPage.qml", {connection: Controller.activeConnection}) enabled: pageStack.layers.currentItem.title !== i18n("Explore Rooms") && Controller.accountCount > 0 }, Kirigami.Action { text: i18n("Start a Chat") icon.name: "irc-join-channel" - onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {connection: Controller.activeConnection}) + onTriggered: pushReplaceLayer("qrc:/StartChatPage.qml", {connection: Controller.activeConnection}) enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0 }, Kirigami.Action { @@ -264,7 +259,7 @@ Kirigami.ApplicationWindow { Kirigami.Action { text: i18n("Configure NeoChat...") icon.name: "settings-configure" - onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml", {}, { + onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, { title: i18n("Configure") }) enabled: pageStack.layers.currentItem.title !== i18n("Configure NeoChat...") @@ -336,7 +331,7 @@ Kirigami.ApplicationWindow { RoomManager.reset(); pageStack.clear(); roomListLoaded = false; - pageStack.push("qrc:/imports/NeoChat/Page/WelcomePage.qml"); + pageStack.push("qrc:/WelcomePage.qml"); } } } @@ -346,7 +341,7 @@ Kirigami.ApplicationWindow { function onInitiated() { if (Controller.accountCount === 0) { - pageStack.replace("qrc:/imports/NeoChat/Page/WelcomePage.qml", {}); + pageStack.replace("qrc:/WelcomePage.qml", {}); } else if (!roomListLoaded) { pageStack.replace(roomListComponent, { activeConnection: Controller.activeConnection diff --git a/src/res.qrc b/src/res.qrc new file mode 100644 index 000000000..034e649b6 --- /dev/null +++ b/src/res.qrc @@ -0,0 +1,86 @@ + + + ../org.kde.neochat.svg + ../org.kde.neochat.tray.svg + qml/main.qml + qml/Page/LoadingPage.qml + qml/Page/RoomListPage.qml + qml/Page/RoomPage.qml + qml/Page/RoomWindow.qml + qml/Page/JoinRoomPage.qml + qml/Page/InviteUserPage.qml + qml/Page/StartChatPage.qml + qml/Page/ImageEditorPage.qml + qml/Page/WelcomePage.qml + qml/RoomSettings/General.qml + qml/RoomSettings/Security.qml + qml/RoomSettings/PushNotification.qml + qml/RoomSettings/Categories.qml + qml/Component/FullScreenImage.qml + qml/Component/FancyEffectsContainer.qml + qml/Component/TypingPane.qml + qml/Component/ShimmerGradient.qml + qml/Component/QuickSwitcher.qml + qml/Component/ChatBox/ChatBox.qml + qml/Component/ChatBox/ChatBar.qml + qml/Component/ChatBox/AttachmentPane.qml + qml/Component/ChatBox/ReplyPane.qml + qml/Component/ChatBox/CompletionMenu.qml + qml/Component/Emoji/EmojiPicker.qml + qml/Component/Timeline/ReplyComponent.qml + qml/Component/Timeline/StateDelegate.qml + qml/Component/Timeline/RichLabel.qml + qml/Component/Timeline/TimelineContainer.qml + qml/Component/Timeline/SectionDelegate.qml + qml/Component/Timeline/VideoDelegate.qml + qml/Component/Timeline/ReactionDelegate.qml + qml/Component/Timeline/LinkPreviewDelegate.qml + qml/Component/Timeline/AudioDelegate.qml + qml/Component/Timeline/FileDelegate.qml + qml/Component/Timeline/ImageDelegate.qml + qml/Component/Timeline/EncryptedDelegate.qml + qml/Component/Timeline/EventDelegate.qml + qml/Component/Timeline/MessageDelegate.qml + qml/Component/Timeline/ReadMarkerDelegate.qml + qml/Component/Timeline/MimeComponent.qml + qml/Component/Login/LoginStep.qml + qml/Component/Login/Login.qml + qml/Component/Login/Password.qml + qml/Component/Login/LoginRegister.qml + qml/Component/Login/Loading.qml + qml/Component/Login/Homeserver.qml + qml/Component/Login/LoginMethod.qml + qml/Component/Login/Sso.qml + qml/Panel/RoomDrawer.qml + qml/Dialog/UserDetailDialog.qml + qml/Dialog/CreateRoomDialog.qml + qml/Dialog/EmojiDialog.qml + qml/Dialog/OpenFileDialog.qml + qml/Dialog/KeyVerification/KeyVerificationDialog.qml + qml/Dialog/KeyVerification/Message.qml + qml/Dialog/KeyVerification/EmojiItem.qml + qml/Dialog/KeyVerification/EmojiRow.qml + qml/Dialog/KeyVerification/EmojiSas.qml + qml/Dialog/KeyVerification/VerificationCanceled.qml + qml/Menu/GlobalMenu.qml + qml/Menu/EditMenu.qml + qml/Menu/Timeline/MessageDelegateContextMenu.qml + qml/Menu/Timeline/FileDelegateContextMenu.qml + qml/Menu/Timeline/MessageSourceSheet.qml + qml/Menu/Timeline/ReportSheet.qml + qml/Menu/RoomListContextMenu.qml + qml/Component/glowdot.png + qml/Component/confetti.png + qml/Settings/SettingsPage.qml + qml/Settings/ThemeRadioButton.qml + qml/Settings/ColorScheme.qml + qml/Settings/GeneralSettingsPage.qml + qml/Settings/Emoticons.qml + qml/Settings/AppearanceSettingsPage.qml + qml/Settings/AccountsPage.qml + qml/Settings/AccountEditorPage.qml + qml/Settings/DevicesPage.qml + qml/Settings/About.qml + qml/Settings/SonnetConfigPage.qml + + diff --git a/src/res_android.qrc b/src/res_android.qrc new file mode 100644 index 000000000..385c34bb9 --- /dev/null +++ b/src/res_android.qrc @@ -0,0 +1,5 @@ + + + qml/Menu/ShareActionAndroid.qml + + diff --git a/src/res_desktop.qrc b/src/res_desktop.qrc new file mode 100644 index 000000000..27f468a8e --- /dev/null +++ b/src/res_desktop.qrc @@ -0,0 +1,6 @@ + + + qml/Menu/ShareAction.qml + qml/Menu/ShareDialog.qml + +