diff --git a/imports/NeoChat/Component/AutoMouseArea.qml b/imports/NeoChat/Component/AutoMouseArea.qml index 3fe2e839b..c91b7e14c 100644 --- a/imports/NeoChat/Component/AutoMouseArea.qml +++ b/imports/NeoChat/Component/AutoMouseArea.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.12 -import NeoChat.Setting 0.1 +import NeoChat.Setting 1.0 MouseArea { signal primaryClicked() diff --git a/imports/NeoChat/Component/ChatTextInput.qml b/imports/NeoChat/Component/ChatTextInput.qml index 7afbd4965..415822a90 100644 --- a/imports/NeoChat/Component/ChatTextInput.qml +++ b/imports/NeoChat/Component/ChatTextInput.qml @@ -8,13 +8,13 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Component.Emoji 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Component.Emoji 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Control { id: root diff --git a/imports/NeoChat/Component/Emoji/EmojiPicker.qml b/imports/NeoChat/Component/Emoji/EmojiPicker.qml index bb52add6e..30a814d86 100644 --- a/imports/NeoChat/Component/Emoji/EmojiPicker.qml +++ b/imports/NeoChat/Component/Emoji/EmojiPicker.qml @@ -8,10 +8,10 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import QtQuick.Controls.Material 2.12 -import NeoChat.Component 2.0 +import NeoChat.Component 1.0 -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 ColumnLayout { property string emojiCategory: "history" diff --git a/imports/NeoChat/Component/Emoji/qmldir b/imports/NeoChat/Component/Emoji/qmldir index 7ae231ee9..d84e9a21f 100644 --- a/imports/NeoChat/Component/Emoji/qmldir +++ b/imports/NeoChat/Component/Emoji/qmldir @@ -1,2 +1,2 @@ module NeoChat.Component.Emoji -EmojiPicker 2.0 EmojiPicker.qml +EmojiPicker 1.0 EmojiPicker.qml diff --git a/imports/NeoChat/Component/Timeline/AudioDelegate.qml b/imports/NeoChat/Component/Timeline/AudioDelegate.qml index af86ccb7e..640fe792b 100644 --- a/imports/NeoChat/Component/Timeline/AudioDelegate.qml +++ b/imports/NeoChat/Component/Timeline/AudioDelegate.qml @@ -11,13 +11,13 @@ import Qt.labs.platform 1.0 as Platform import QtMultimedia 5.12 import org.kde.kirigami 2.13 as Kirigami -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Menu.Timeline 2.0 -import NeoChat.Effect 2.0 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Menu.Timeline 1.0 +import NeoChat.Effect 1.0 RowLayout { readonly property bool avatarVisible: !sentByMe && showAuthor diff --git a/imports/NeoChat/Component/Timeline/FileDelegate.qml b/imports/NeoChat/Component/Timeline/FileDelegate.qml index 5a46eb909..8535547c8 100644 --- a/imports/NeoChat/Component/Timeline/FileDelegate.qml +++ b/imports/NeoChat/Component/Timeline/FileDelegate.qml @@ -11,13 +11,13 @@ import QtGraphicalEffects 1.0 import Qt.labs.platform 1.0 as Platform import org.kde.kirigami 2.13 as Kirigami -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Menu.Timeline 2.0 -import NeoChat.Effect 2.0 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Menu.Timeline 1.0 +import NeoChat.Effect 1.0 RowLayout { readonly property bool avatarVisible: !sentByMe && showAuthor diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/imports/NeoChat/Component/Timeline/ImageDelegate.qml index da67a0ebe..80a5de100 100644 --- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml +++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml @@ -9,13 +9,13 @@ import QtQuick.Layouts 1.12 import QtGraphicalEffects 1.0 import Qt.labs.platform 1.0 as Platform -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Menu.Timeline 2.0 -import NeoChat.Effect 2.0 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Menu.Timeline 1.0 +import NeoChat.Effect 1.0 Image { readonly property bool isAnimated: contentType === "image/gif" diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml index ef1ee0cdb..f6fddf823 100644 --- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml +++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml @@ -11,10 +11,10 @@ import QtGraphicalEffects 1.12 import org.kde.kirigami 2.13 as Kirigami -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 RowLayout { default property alias innerObject : column.children diff --git a/imports/NeoChat/Component/Timeline/StateDelegate.qml b/imports/NeoChat/Component/Timeline/StateDelegate.qml index 76b2933fd..db5e6d94c 100644 --- a/imports/NeoChat/Component/Timeline/StateDelegate.qml +++ b/imports/NeoChat/Component/Timeline/StateDelegate.qml @@ -9,10 +9,10 @@ import QtQuick.Layouts 1.12 import QtQuick.Controls.Material 2.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 RowLayout { id: row diff --git a/imports/NeoChat/Component/Timeline/VideoDelegate.qml b/imports/NeoChat/Component/Timeline/VideoDelegate.qml index 1bbb361af..ee4594602 100644 --- a/imports/NeoChat/Component/Timeline/VideoDelegate.qml +++ b/imports/NeoChat/Component/Timeline/VideoDelegate.qml @@ -12,14 +12,14 @@ import QtMultimedia 5.12 import Qt.labs.platform 1.0 as Platform import org.kde.kirigami 2.13 as Kirigami -import org.kde.neochat 0.1 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Setting 1.0 -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Menu.Timeline 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Font 0.1 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Menu.Timeline 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Font 1.0 RowLayout { readonly property bool avatarVisible: showAuthor && !sentByMe diff --git a/imports/NeoChat/Component/Timeline/qmldir b/imports/NeoChat/Component/Timeline/qmldir index a7143fbf4..83469407d 100644 --- a/imports/NeoChat/Component/Timeline/qmldir +++ b/imports/NeoChat/Component/Timeline/qmldir @@ -1,11 +1,11 @@ module NeoChat.Component.Timeline -TimelineContainer 2.0 TimelineContainer.qml -MessageDelegate 2.0 MessageDelegate.qml -TextDelegate 2.0 TextDelegate.qml -StateDelegate 2.0 StateDelegate.qml -SectionDelegate 2.0 SectionDelegate.qml -ImageDelegate 2.0 ImageDelegate.qml -FileDelegate 2.0 FileDelegate.qml -VideoDelegate 2.0 VideoDelegate.qml -ReactionDelegate 2.0 ReactionDelegate.qml -AudioDelegate 2.0 AudioDelegate.qml +TimelineContainer 1.0 TimelineContainer.qml +MessageDelegate 1.0 MessageDelegate.qml +TextDelegate 1.0 TextDelegate.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 diff --git a/imports/NeoChat/Component/qmldir b/imports/NeoChat/Component/qmldir index 8234dc66b..d5f50d0a8 100644 --- a/imports/NeoChat/Component/qmldir +++ b/imports/NeoChat/Component/qmldir @@ -1,10 +1,10 @@ module NeoChat.Component -AutoMouseArea 2.0 AutoMouseArea.qml -MaterialIcon 2.0 MaterialIcon.qml -SideNavButton 2.0 SideNavButton.qml -ScrollHelper 2.0 ScrollHelper.qml -AutoListView 2.0 AutoListView.qml -AutoTextField 2.0 AutoTextField.qml -FullScreenImage 2.0 FullScreenImage.qml -AutoRectangle 2.0 AutoRectangle.qml -ChatTextInput 2.0 ChatTextInput.qml +AutoMouseArea 1.0 AutoMouseArea.qml +MaterialIcon 1.0 MaterialIcon.qml +SideNavButton 1.0 SideNavButton.qml +ScrollHelper 1.0 ScrollHelper.qml +AutoListView 1.0 AutoListView.qml +AutoTextField 1.0 AutoTextField.qml +FullScreenImage 1.0 FullScreenImage.qml +AutoRectangle 1.0 AutoRectangle.qml +ChatTextInput 1.0 ChatTextInput.qml diff --git a/imports/NeoChat/Dialog/CreateRoomDialog.qml b/imports/NeoChat/Dialog/CreateRoomDialog.qml index ac70d39b1..2f745c190 100644 --- a/imports/NeoChat/Dialog/CreateRoomDialog.qml +++ b/imports/NeoChat/Dialog/CreateRoomDialog.qml @@ -7,9 +7,9 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 -import NeoChat.Component 2.0 +import NeoChat.Component 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Dialog { anchors.centerIn: parent diff --git a/imports/NeoChat/Dialog/FontFamilyDialog.qml b/imports/NeoChat/Dialog/FontFamilyDialog.qml index 26d790941..5c237d880 100644 --- a/imports/NeoChat/Dialog/FontFamilyDialog.qml +++ b/imports/NeoChat/Dialog/FontFamilyDialog.qml @@ -7,8 +7,8 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 -import NeoChat.Component 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Setting 1.0 Dialog { anchors.centerIn: parent diff --git a/imports/NeoChat/Dialog/InviteUserDialog.qml b/imports/NeoChat/Dialog/InviteUserDialog.qml index fb0585cfe..c6d34e4e5 100644 --- a/imports/NeoChat/Dialog/InviteUserDialog.qml +++ b/imports/NeoChat/Dialog/InviteUserDialog.qml @@ -8,11 +8,11 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Dialog { property var room diff --git a/imports/NeoChat/Dialog/RoomSettingsDialog.qml b/imports/NeoChat/Dialog/RoomSettingsDialog.qml index 5477f9591..cd7ed8450 100644 --- a/imports/NeoChat/Dialog/RoomSettingsDialog.qml +++ b/imports/NeoChat/Dialog/RoomSettingsDialog.qml @@ -8,11 +8,11 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Dialog { property var room diff --git a/imports/NeoChat/Dialog/StartChatDialog.qml b/imports/NeoChat/Dialog/StartChatDialog.qml index 8e8f950b4..5f5c0933b 100644 --- a/imports/NeoChat/Dialog/StartChatDialog.qml +++ b/imports/NeoChat/Dialog/StartChatDialog.qml @@ -7,11 +7,11 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 -import NeoChat.Component 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Dialog { property var connection diff --git a/imports/NeoChat/Dialog/UserDetailDialog.qml b/imports/NeoChat/Dialog/UserDetailDialog.qml index 9c225dcfe..c3a3d7072 100644 --- a/imports/NeoChat/Dialog/UserDetailDialog.qml +++ b/imports/NeoChat/Dialog/UserDetailDialog.qml @@ -9,9 +9,9 @@ import QtQuick.Controls 2.12 as QQC2 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 Kirigami.OverlaySheet { id: root diff --git a/imports/NeoChat/Dialog/qmldir b/imports/NeoChat/Dialog/qmldir index 28e3b028f..7e575ff7d 100644 --- a/imports/NeoChat/Dialog/qmldir +++ b/imports/NeoChat/Dialog/qmldir @@ -1,13 +1,13 @@ module NeoChat.Dialog -RoomSettingsDialog 2.0 RoomSettingsDialog.qml -UserDetailDialog 2.0 UserDetailDialog.qml -MessageSourceDialog 2.0 MessageSourceDialog.qml -LoginDialog 2.0 LoginDialog.qml -CreateRoomDialog 2.0 CreateRoomDialog.qml -InviteUserDialog 2.0 InviteUserDialog.qml -AcceptInvitationDialog 2.0 AcceptInvitationDialog.qml -FontFamilyDialog 2.0 FontFamilyDialog.qml -OpenFileDialog 2.0 OpenFileDialog.qml -OpenFolderDialog 2.0 OpenFolderDialog.qml -ImageClipboardDialog 2.0 ImageClipboardDialog.qml -StartChatDialog 2.0 StartChatDialog.qml +RoomSettingsDialog 1.0 RoomSettingsDialog.qml +UserDetailDialog 1.0 UserDetailDialog.qml +MessageSourceDialog 1.0 MessageSourceDialog.qml +LoginDialog 1.0 LoginDialog.qml +CreateRoomDialog 1.0 CreateRoomDialog.qml +InviteUserDialog 1.0 InviteUserDialog.qml +AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml +FontFamilyDialog 1.0 FontFamilyDialog.qml +OpenFileDialog 1.0 OpenFileDialog.qml +OpenFolderDialog 1.0 OpenFolderDialog.qml +ImageClipboardDialog 1.0 ImageClipboardDialog.qml +StartChatDialog 1.0 StartChatDialog.qml diff --git a/imports/NeoChat/Effect/RippleEffect.qml b/imports/NeoChat/Effect/RippleEffect.qml index a9b9e7495..adf8bcce1 100644 --- a/imports/NeoChat/Effect/RippleEffect.qml +++ b/imports/NeoChat/Effect/RippleEffect.qml @@ -7,8 +7,8 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 import QtGraphicalEffects 1.0 -import NeoChat.Component 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Setting 1.0 AutoMouseArea { id: ripple diff --git a/imports/NeoChat/Effect/qmldir b/imports/NeoChat/Effect/qmldir index deab3499d..1d17b23e2 100644 --- a/imports/NeoChat/Effect/qmldir +++ b/imports/NeoChat/Effect/qmldir @@ -1,3 +1,3 @@ module NeoChat.Effect -ElevationEffect 2.0 ElevationEffect.qml -RippleEffect 2.0 RippleEffect.qml +ElevationEffect 1.0 ElevationEffect.qml +RippleEffect 1.0 RippleEffect.qml diff --git a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml index dbbb872d7..b751bb054 100644 --- a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml +++ b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml @@ -6,7 +6,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import NeoChat.Dialog 2.0 +import NeoChat.Dialog 1.0 Menu { signal viewSource() diff --git a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml index 28515b26f..88fcb21c3 100644 --- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml @@ -9,7 +9,7 @@ import QtQuick.Controls 2.12 as QQC2 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Dialog 2.0 +import NeoChat.Dialog 1.0 Kirigami.OverlaySheet { id: root diff --git a/imports/NeoChat/Menu/Timeline/qmldir b/imports/NeoChat/Menu/Timeline/qmldir index 0dd1e97bd..7f4285091 100644 --- a/imports/NeoChat/Menu/Timeline/qmldir +++ b/imports/NeoChat/Menu/Timeline/qmldir @@ -1,3 +1,3 @@ module NeoChat.Menu.Timeline -MessageDelegateContextMenu 2.0 MessageDelegateContextMenu.qml -FileDelegateContextMenu 2.0 FileDelegateContextMenu.qml +MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml +FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml diff --git a/imports/NeoChat/Menu/qmldir b/imports/NeoChat/Menu/qmldir index 5e9d0448a..e4aea3be7 100644 --- a/imports/NeoChat/Menu/qmldir +++ b/imports/NeoChat/Menu/qmldir @@ -1,2 +1,2 @@ module NeoChat.Menu -RoomListContextMenu 2.0 RoomListContextMenu.qml +RoomListContextMenu 1.0 RoomListContextMenu.qml diff --git a/imports/NeoChat/Page/AccountsPage.qml b/imports/NeoChat/Page/AccountsPage.qml index 5a0f0b74e..1db906924 100644 --- a/imports/NeoChat/Page/AccountsPage.qml +++ b/imports/NeoChat/Page/AccountsPage.qml @@ -10,7 +10,7 @@ import QtQuick.Layouts 1.14 import org.kde.kirigami 2.12 as Kirigami -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Kirigami.ScrollablePage { title: i18n("Accounts") diff --git a/imports/NeoChat/Page/JoinRoomPage.qml b/imports/NeoChat/Page/JoinRoomPage.qml index bf5efac18..0b887c35b 100644 --- a/imports/NeoChat/Page/JoinRoomPage.qml +++ b/imports/NeoChat/Page/JoinRoomPage.qml @@ -9,12 +9,12 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat 2.0 -import NeoChat.Component 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat 1.0 +import NeoChat.Component 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Kirigami.ScrollablePage { id: root diff --git a/imports/NeoChat/Page/LoginPage.qml b/imports/NeoChat/Page/LoginPage.qml index 1661d1629..b33f99820 100644 --- a/imports/NeoChat/Page/LoginPage.qml +++ b/imports/NeoChat/Page/LoginPage.qml @@ -8,9 +8,9 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 as QQC2 import QtQuick.Layouts 1.12 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 -import NeoChat.Component 2.0 +import NeoChat.Component 1.0 import org.kde.kirigami 2.12 as Kirigami diff --git a/imports/NeoChat/Page/RoomListPage.qml b/imports/NeoChat/Page/RoomListPage.qml index 06d3de296..78c0b1829 100644 --- a/imports/NeoChat/Page/RoomListPage.qml +++ b/imports/NeoChat/Page/RoomListPage.qml @@ -10,11 +10,11 @@ import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami import org.kde.kitemmodels 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 -import NeoChat 2.0 -import NeoChat.Component 2.0 -import NeoChat.Menu 2.0 +import NeoChat 1.0 +import NeoChat.Component 1.0 +import NeoChat.Menu 1.0 Kirigami.ScrollablePage { id: page diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index e092625c8..e05f8cec4 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -12,13 +12,13 @@ import QtQuick.Controls.Material 2.12 import org.kde.kirigami 2.13 as Kirigami import org.kde.kitemmodels 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 -import NeoChat.Component 2.0 -import NeoChat.Component.Timeline 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Menu.Timeline 2.0 +import NeoChat.Component 1.0 +import NeoChat.Component.Timeline 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Menu.Timeline 1.0 Kirigami.ScrollablePage { id: page diff --git a/imports/NeoChat/Page/qmldir b/imports/NeoChat/Page/qmldir index adf3156b6..903053ea7 100644 --- a/imports/NeoChat/Page/qmldir +++ b/imports/NeoChat/Page/qmldir @@ -1,6 +1,6 @@ module NeoChat.Page -LoadingPage 2.0 LoadingPage.qml -LoginPage 2.0 LoginPage.qml -RoomListPage 2.0 RoomListPage.qml -RoomPage 2.0 RoomPage.qml -JoinRoomPage 2.0 JoinRoomPage.qml +LoadingPage 1.0 LoadingPage.qml +LoginPage 1.0 LoginPage.qml +RoomListPage 1.0 RoomListPage.qml +RoomPage 1.0 RoomPage.qml +JoinRoomPage 1.0 JoinRoomPage.qml diff --git a/imports/NeoChat/Panel/NeoChatSidebar.qml b/imports/NeoChat/Panel/NeoChatSidebar.qml index 0e3f5cb24..4b78b1e7f 100644 --- a/imports/NeoChat/Panel/NeoChatSidebar.qml +++ b/imports/NeoChat/Panel/NeoChatSidebar.qml @@ -12,9 +12,9 @@ import org.kde.kirigami 2.12 as Kirigami import SortFilterProxyModel 0.2 -import NeoChat.Component 2.0 -import NeoChat.Component.Timeline 2.0 -import org.kde.neochat 0.1 +import NeoChat.Component 1.0 +import NeoChat.Component.Timeline 1.0 +import org.kde.neochat 1.0 Kirigami.GlobalDrawer { id: root diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml index 856e971db..eef0bdf91 100644 --- a/imports/NeoChat/Panel/RoomDrawer.qml +++ b/imports/NeoChat/Panel/RoomDrawer.qml @@ -11,12 +11,12 @@ import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami -import NeoChat.Component 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Effect 2.0 -import NeoChat.Setting 0.1 +import NeoChat.Component 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Setting 1.0 -import org.kde.neochat 0.1 +import org.kde.neochat 1.0 Kirigami.OverlayDrawer { property var room diff --git a/imports/NeoChat/Panel/RoomHeader.qml b/imports/NeoChat/Panel/RoomHeader.qml index 62ea5ceca..c7c4d6d9d 100644 --- a/imports/NeoChat/Panel/RoomHeader.qml +++ b/imports/NeoChat/Panel/RoomHeader.qml @@ -8,10 +8,10 @@ import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 import QtQuick.Controls.Material 2.12 -import org.kde.neochat 0.1 -import NeoChat.Effect 2.0 -import NeoChat.Component 2.0 -import NeoChat.Setting 0.1 +import org.kde.neochat 1.0 +import NeoChat.Effect 1.0 +import NeoChat.Component 1.0 +import NeoChat.Setting 1.0 Control { signal clicked() diff --git a/imports/NeoChat/Panel/RoomListPanel.qml b/imports/NeoChat/Panel/RoomListPanel.qml index 1f666e08c..0597a48bc 100644 --- a/imports/NeoChat/Panel/RoomListPanel.qml +++ b/imports/NeoChat/Panel/RoomListPanel.qml @@ -12,8 +12,8 @@ import QtQuick.Layouts 1.12 import org.kde.kirigami 2.13 as Kirigami import org.kde.kitemmodels 1.0 -import NeoChat.Component 2.0 -import org.kde.neochat 0.1 +import NeoChat.Component 1.0 +import org.kde.neochat 1.0 Kirigami.ScrollablePage { id: page diff --git a/imports/NeoChat/Panel/qmldir b/imports/NeoChat/Panel/qmldir index fbe7adac8..74be87f9b 100644 --- a/imports/NeoChat/Panel/qmldir +++ b/imports/NeoChat/Panel/qmldir @@ -1,5 +1,5 @@ module NeoChat.Panel -RoomPanel 2.0 RoomPanel.qml -RoomListPanel 2.0 RoomListPanel.qml -RoomDrawer 2.0 RoomDrawer.qml -NeoChatSidebar 2.0 NeoChatSidebar.qml +RoomPanel 1.0 RoomPanel.qml +RoomListPanel 1.0 RoomListPanel.qml +RoomDrawer 1.0 RoomDrawer.qml +NeoChatSidebar 1.0 NeoChatSidebar.qml diff --git a/imports/NeoChat/RoomManager.qml b/imports/NeoChat/RoomManager.qml index a3bc0acb5..b31389fd2 100644 --- a/imports/NeoChat/RoomManager.qml +++ b/imports/NeoChat/RoomManager.qml @@ -7,7 +7,7 @@ pragma Singleton import QtQuick 2.14 -import NeoChat.Page 2.0 +import NeoChat.Page 1.0 /** * Manage opening and close rooms diff --git a/imports/NeoChat/Setting/qmldir b/imports/NeoChat/Setting/qmldir index d20825b59..fdffe22f7 100644 --- a/imports/NeoChat/Setting/qmldir +++ b/imports/NeoChat/Setting/qmldir @@ -1,3 +1,3 @@ module NeoChat.Setting -singleton MSettings 0.1 Setting.qml -singleton MPalette 0.1 Palette.qml +singleton MSettings 1.0 Setting.qml +singleton MPalette 1.0 Palette.qml diff --git a/imports/NeoChat/qmldir b/imports/NeoChat/qmldir index 0f660f62e..e172b734a 100644 --- a/imports/NeoChat/qmldir +++ b/imports/NeoChat/qmldir @@ -1 +1 @@ -singleton RoomManager 2.0 RoomManager.qml +singleton RoomManager 1.0 RoomManager.qml diff --git a/qml/main.qml b/qml/main.qml index 146791b16..7a2d81f4f 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -10,13 +10,13 @@ import QtQuick.Layouts 1.14 import org.kde.kirigami 2.12 as Kirigami -import org.kde.neochat 0.1 -import NeoChat 2.0 -import NeoChat.Component 2.0 -import NeoChat.Panel 2.0 -import NeoChat.Dialog 2.0 -import NeoChat.Page 2.0 -import NeoChat.Page 2.0 +import org.kde.neochat 1.0 +import NeoChat 1.0 +import NeoChat.Component 1.0 +import NeoChat.Panel 1.0 +import NeoChat.Dialog 1.0 +import NeoChat.Page 1.0 +import NeoChat.Page 1.0 Kirigami.ApplicationWindow { id: root diff --git a/src/main.cpp b/src/main.cpp index e24f6b136..cb8158d18 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -60,21 +60,21 @@ int main(int argc, char *argv[]) Clipboard clipboard; - qmlRegisterSingletonInstance("org.kde.neochat", 0, 1, "Controller", &Controller::instance()); + qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance()); qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard); - qmlRegisterType("org.kde.neochat", 0, 1, "AccountListModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "RoomListModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "UserListModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "MessageEventModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "PublicRoomListModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "UserDirectoryListModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "EmojiModel"); - qmlRegisterType("org.kde.neochat", 0, 1, "NotificationsManager"); - qmlRegisterType("org.kde.neochat", 0, 1, "TrayIcon"); - qmlRegisterType("org.kde.neochat", 0, 1, "SortFilterRoomListModel"); - qmlRegisterUncreatableType("org.kde.neochat", 0, 1, "RoomMessageEvent", "ENUM"); - qmlRegisterUncreatableType("org.kde.neochat", 0, 1, "RoomType", "ENUM"); - qmlRegisterUncreatableType("org.kde.neochat", 0, 1, "UserType", "ENUM"); + qmlRegisterType("org.kde.neochat", 1, 0, "AccountListModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "RoomListModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "UserListModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "MessageEventModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "PublicRoomListModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "UserDirectoryListModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "EmojiModel"); + qmlRegisterType("org.kde.neochat", 1, 0, "NotificationsManager"); + qmlRegisterType("org.kde.neochat", 1, 0, "TrayIcon"); + qmlRegisterType("org.kde.neochat", 1, 0, "SortFilterRoomListModel"); + qmlRegisterUncreatableType("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM"); + qmlRegisterUncreatableType("org.kde.neochat", 1, 0, "RoomType", "ENUM"); + qmlRegisterUncreatableType("org.kde.neochat", 1, 0, "UserType", "ENUM"); qRegisterMetaType("User*"); qRegisterMetaType("const User*");