Set all internal qml versions to 1.0
They're useless and anything else just causes problem
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
*/
|
*/
|
||||||
import QtQuick 2.12
|
import QtQuick 2.12
|
||||||
|
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
signal primaryClicked()
|
signal primaryClicked()
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Component.Emoji 2.0
|
import NeoChat.Component.Emoji 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Control {
|
Control {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import QtQuick.Controls.Material 2.12
|
import QtQuick.Controls.Material 2.12
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
property string emojiCategory: "history"
|
property string emojiCategory: "history"
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
module NeoChat.Component.Emoji
|
module NeoChat.Component.Emoji
|
||||||
EmojiPicker 2.0 EmojiPicker.qml
|
EmojiPicker 1.0 EmojiPicker.qml
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ import Qt.labs.platform 1.0 as Platform
|
|||||||
import QtMultimedia 5.12
|
import QtMultimedia 5.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Menu.Timeline 2.0
|
import NeoChat.Menu.Timeline 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
readonly property bool avatarVisible: !sentByMe && showAuthor
|
readonly property bool avatarVisible: !sentByMe && showAuthor
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ import QtGraphicalEffects 1.0
|
|||||||
import Qt.labs.platform 1.0 as Platform
|
import Qt.labs.platform 1.0 as Platform
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Menu.Timeline 2.0
|
import NeoChat.Menu.Timeline 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
readonly property bool avatarVisible: !sentByMe && showAuthor
|
readonly property bool avatarVisible: !sentByMe && showAuthor
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ import QtQuick.Layouts 1.12
|
|||||||
import QtGraphicalEffects 1.0
|
import QtGraphicalEffects 1.0
|
||||||
import Qt.labs.platform 1.0 as Platform
|
import Qt.labs.platform 1.0 as Platform
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Menu.Timeline 2.0
|
import NeoChat.Menu.Timeline 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
readonly property bool isAnimated: contentType === "image/gif"
|
readonly property bool isAnimated: contentType === "image/gif"
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ import QtGraphicalEffects 1.12
|
|||||||
|
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
default property alias innerObject : column.children
|
default property alias innerObject : column.children
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import QtQuick.Layouts 1.12
|
|||||||
import QtQuick.Controls.Material 2.12
|
import QtQuick.Controls.Material 2.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
id: row
|
id: row
|
||||||
|
|||||||
@@ -12,14 +12,14 @@ import QtMultimedia 5.12
|
|||||||
import Qt.labs.platform 1.0 as Platform
|
import Qt.labs.platform 1.0 as Platform
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Menu.Timeline 2.0
|
import NeoChat.Menu.Timeline 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Font 0.1
|
import NeoChat.Font 1.0
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
readonly property bool avatarVisible: showAuthor && !sentByMe
|
readonly property bool avatarVisible: showAuthor && !sentByMe
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
module NeoChat.Component.Timeline
|
module NeoChat.Component.Timeline
|
||||||
TimelineContainer 2.0 TimelineContainer.qml
|
TimelineContainer 1.0 TimelineContainer.qml
|
||||||
MessageDelegate 2.0 MessageDelegate.qml
|
MessageDelegate 1.0 MessageDelegate.qml
|
||||||
TextDelegate 2.0 TextDelegate.qml
|
TextDelegate 1.0 TextDelegate.qml
|
||||||
StateDelegate 2.0 StateDelegate.qml
|
StateDelegate 1.0 StateDelegate.qml
|
||||||
SectionDelegate 2.0 SectionDelegate.qml
|
SectionDelegate 1.0 SectionDelegate.qml
|
||||||
ImageDelegate 2.0 ImageDelegate.qml
|
ImageDelegate 1.0 ImageDelegate.qml
|
||||||
FileDelegate 2.0 FileDelegate.qml
|
FileDelegate 1.0 FileDelegate.qml
|
||||||
VideoDelegate 2.0 VideoDelegate.qml
|
VideoDelegate 1.0 VideoDelegate.qml
|
||||||
ReactionDelegate 2.0 ReactionDelegate.qml
|
ReactionDelegate 1.0 ReactionDelegate.qml
|
||||||
AudioDelegate 2.0 AudioDelegate.qml
|
AudioDelegate 1.0 AudioDelegate.qml
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
module NeoChat.Component
|
module NeoChat.Component
|
||||||
AutoMouseArea 2.0 AutoMouseArea.qml
|
AutoMouseArea 1.0 AutoMouseArea.qml
|
||||||
MaterialIcon 2.0 MaterialIcon.qml
|
MaterialIcon 1.0 MaterialIcon.qml
|
||||||
SideNavButton 2.0 SideNavButton.qml
|
SideNavButton 1.0 SideNavButton.qml
|
||||||
ScrollHelper 2.0 ScrollHelper.qml
|
ScrollHelper 1.0 ScrollHelper.qml
|
||||||
AutoListView 2.0 AutoListView.qml
|
AutoListView 1.0 AutoListView.qml
|
||||||
AutoTextField 2.0 AutoTextField.qml
|
AutoTextField 1.0 AutoTextField.qml
|
||||||
FullScreenImage 2.0 FullScreenImage.qml
|
FullScreenImage 1.0 FullScreenImage.qml
|
||||||
AutoRectangle 2.0 AutoRectangle.qml
|
AutoRectangle 1.0 AutoRectangle.qml
|
||||||
ChatTextInput 2.0 ChatTextInput.qml
|
ChatTextInput 1.0 ChatTextInput.qml
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ import QtQuick 2.12
|
|||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
import QtQuick.Layouts 1.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 {
|
Dialog {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import QtQuick 2.12
|
|||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
Dialog {
|
Dialog {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Dialog {
|
Dialog {
|
||||||
property var room
|
property var room
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Dialog {
|
Dialog {
|
||||||
property var room
|
property var room
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ import QtQuick 2.12
|
|||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Dialog {
|
Dialog {
|
||||||
property var connection
|
property var connection
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import QtQuick.Controls 2.12 as QQC2
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
Kirigami.OverlaySheet {
|
Kirigami.OverlaySheet {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
module NeoChat.Dialog
|
module NeoChat.Dialog
|
||||||
RoomSettingsDialog 2.0 RoomSettingsDialog.qml
|
RoomSettingsDialog 1.0 RoomSettingsDialog.qml
|
||||||
UserDetailDialog 2.0 UserDetailDialog.qml
|
UserDetailDialog 1.0 UserDetailDialog.qml
|
||||||
MessageSourceDialog 2.0 MessageSourceDialog.qml
|
MessageSourceDialog 1.0 MessageSourceDialog.qml
|
||||||
LoginDialog 2.0 LoginDialog.qml
|
LoginDialog 1.0 LoginDialog.qml
|
||||||
CreateRoomDialog 2.0 CreateRoomDialog.qml
|
CreateRoomDialog 1.0 CreateRoomDialog.qml
|
||||||
InviteUserDialog 2.0 InviteUserDialog.qml
|
InviteUserDialog 1.0 InviteUserDialog.qml
|
||||||
AcceptInvitationDialog 2.0 AcceptInvitationDialog.qml
|
AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
|
||||||
FontFamilyDialog 2.0 FontFamilyDialog.qml
|
FontFamilyDialog 1.0 FontFamilyDialog.qml
|
||||||
OpenFileDialog 2.0 OpenFileDialog.qml
|
OpenFileDialog 1.0 OpenFileDialog.qml
|
||||||
OpenFolderDialog 2.0 OpenFolderDialog.qml
|
OpenFolderDialog 1.0 OpenFolderDialog.qml
|
||||||
ImageClipboardDialog 2.0 ImageClipboardDialog.qml
|
ImageClipboardDialog 1.0 ImageClipboardDialog.qml
|
||||||
StartChatDialog 2.0 StartChatDialog.qml
|
StartChatDialog 1.0 StartChatDialog.qml
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import QtQuick 2.12
|
|||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
import QtGraphicalEffects 1.0
|
import QtGraphicalEffects 1.0
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
AutoMouseArea {
|
AutoMouseArea {
|
||||||
id: ripple
|
id: ripple
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module NeoChat.Effect
|
module NeoChat.Effect
|
||||||
ElevationEffect 2.0 ElevationEffect.qml
|
ElevationEffect 1.0 ElevationEffect.qml
|
||||||
RippleEffect 2.0 RippleEffect.qml
|
RippleEffect 1.0 RippleEffect.qml
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import QtQuick 2.12
|
import QtQuick 2.12
|
||||||
import QtQuick.Controls 2.12
|
import QtQuick.Controls 2.12
|
||||||
|
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
|
|
||||||
Menu {
|
Menu {
|
||||||
signal viewSource()
|
signal viewSource()
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import QtQuick.Controls 2.12 as QQC2
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
|
|
||||||
Kirigami.OverlaySheet {
|
Kirigami.OverlaySheet {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module NeoChat.Menu.Timeline
|
module NeoChat.Menu.Timeline
|
||||||
MessageDelegateContextMenu 2.0 MessageDelegateContextMenu.qml
|
MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
|
||||||
FileDelegateContextMenu 2.0 FileDelegateContextMenu.qml
|
FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
module NeoChat.Menu
|
module NeoChat.Menu
|
||||||
RoomListContextMenu 2.0 RoomListContextMenu.qml
|
RoomListContextMenu 1.0 RoomListContextMenu.qml
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import QtQuick.Layouts 1.14
|
|||||||
|
|
||||||
import org.kde.kirigami 2.12 as Kirigami
|
import org.kde.kirigami 2.12 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Kirigami.ScrollablePage {
|
Kirigami.ScrollablePage {
|
||||||
title: i18n("Accounts")
|
title: i18n("Accounts")
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat 2.0
|
import NeoChat 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Kirigami.ScrollablePage {
|
Kirigami.ScrollablePage {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ import QtQuick 2.12
|
|||||||
import QtQuick.Controls 2.12 as QQC2
|
import QtQuick.Controls 2.12 as QQC2
|
||||||
import QtQuick.Layouts 1.12
|
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
|
import org.kde.kirigami 2.12 as Kirigami
|
||||||
|
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ import QtQuick.Layouts 1.12
|
|||||||
|
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
import org.kde.kitemmodels 1.0
|
import org.kde.kitemmodels 1.0
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
import NeoChat 2.0
|
import NeoChat 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Menu 2.0
|
import NeoChat.Menu 1.0
|
||||||
|
|
||||||
Kirigami.ScrollablePage {
|
Kirigami.ScrollablePage {
|
||||||
id: page
|
id: page
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ import QtQuick.Controls.Material 2.12
|
|||||||
|
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
import org.kde.kitemmodels 1.0
|
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 1.0
|
||||||
import NeoChat.Component.Timeline 2.0
|
import NeoChat.Component.Timeline 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Menu.Timeline 2.0
|
import NeoChat.Menu.Timeline 1.0
|
||||||
|
|
||||||
Kirigami.ScrollablePage {
|
Kirigami.ScrollablePage {
|
||||||
id: page
|
id: page
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module NeoChat.Page
|
module NeoChat.Page
|
||||||
LoadingPage 2.0 LoadingPage.qml
|
LoadingPage 1.0 LoadingPage.qml
|
||||||
LoginPage 2.0 LoginPage.qml
|
LoginPage 1.0 LoginPage.qml
|
||||||
RoomListPage 2.0 RoomListPage.qml
|
RoomListPage 1.0 RoomListPage.qml
|
||||||
RoomPage 2.0 RoomPage.qml
|
RoomPage 1.0 RoomPage.qml
|
||||||
JoinRoomPage 2.0 JoinRoomPage.qml
|
JoinRoomPage 1.0 JoinRoomPage.qml
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ import org.kde.kirigami 2.12 as Kirigami
|
|||||||
|
|
||||||
import SortFilterProxyModel 0.2
|
import SortFilterProxyModel 0.2
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Component.Timeline 2.0
|
import NeoChat.Component.Timeline 1.0
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Kirigami.GlobalDrawer {
|
Kirigami.GlobalDrawer {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ import QtQuick.Layouts 1.12
|
|||||||
|
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Kirigami.OverlayDrawer {
|
Kirigami.OverlayDrawer {
|
||||||
property var room
|
property var room
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ import QtQuick.Controls 2.12
|
|||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import QtQuick.Controls.Material 2.12
|
import QtQuick.Controls.Material 2.12
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat.Effect 2.0
|
import NeoChat.Effect 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Setting 0.1
|
import NeoChat.Setting 1.0
|
||||||
|
|
||||||
Control {
|
Control {
|
||||||
signal clicked()
|
signal clicked()
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ import QtQuick.Layouts 1.12
|
|||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
|
|
||||||
import org.kde.kitemmodels 1.0
|
import org.kde.kitemmodels 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
|
|
||||||
Kirigami.ScrollablePage {
|
Kirigami.ScrollablePage {
|
||||||
id: page
|
id: page
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
module NeoChat.Panel
|
module NeoChat.Panel
|
||||||
RoomPanel 2.0 RoomPanel.qml
|
RoomPanel 1.0 RoomPanel.qml
|
||||||
RoomListPanel 2.0 RoomListPanel.qml
|
RoomListPanel 1.0 RoomListPanel.qml
|
||||||
RoomDrawer 2.0 RoomDrawer.qml
|
RoomDrawer 1.0 RoomDrawer.qml
|
||||||
NeoChatSidebar 2.0 NeoChatSidebar.qml
|
NeoChatSidebar 1.0 NeoChatSidebar.qml
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
pragma Singleton
|
pragma Singleton
|
||||||
|
|
||||||
import QtQuick 2.14
|
import QtQuick 2.14
|
||||||
import NeoChat.Page 2.0
|
import NeoChat.Page 1.0
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manage opening and close rooms
|
* Manage opening and close rooms
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module NeoChat.Setting
|
module NeoChat.Setting
|
||||||
singleton MSettings 0.1 Setting.qml
|
singleton MSettings 1.0 Setting.qml
|
||||||
singleton MPalette 0.1 Palette.qml
|
singleton MPalette 1.0 Palette.qml
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
singleton RoomManager 2.0 RoomManager.qml
|
singleton RoomManager 1.0 RoomManager.qml
|
||||||
|
|||||||
14
qml/main.qml
14
qml/main.qml
@@ -10,13 +10,13 @@ import QtQuick.Layouts 1.14
|
|||||||
|
|
||||||
import org.kde.kirigami 2.12 as Kirigami
|
import org.kde.kirigami 2.12 as Kirigami
|
||||||
|
|
||||||
import org.kde.neochat 0.1
|
import org.kde.neochat 1.0
|
||||||
import NeoChat 2.0
|
import NeoChat 1.0
|
||||||
import NeoChat.Component 2.0
|
import NeoChat.Component 1.0
|
||||||
import NeoChat.Panel 2.0
|
import NeoChat.Panel 1.0
|
||||||
import NeoChat.Dialog 2.0
|
import NeoChat.Dialog 1.0
|
||||||
import NeoChat.Page 2.0
|
import NeoChat.Page 1.0
|
||||||
import NeoChat.Page 2.0
|
import NeoChat.Page 1.0
|
||||||
|
|
||||||
Kirigami.ApplicationWindow {
|
Kirigami.ApplicationWindow {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
28
src/main.cpp
28
src/main.cpp
@@ -60,21 +60,21 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
Clipboard clipboard;
|
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);
|
qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
|
||||||
qmlRegisterType<AccountListModel>("org.kde.neochat", 0, 1, "AccountListModel");
|
qmlRegisterType<AccountListModel>("org.kde.neochat", 1, 0, "AccountListModel");
|
||||||
qmlRegisterType<RoomListModel>("org.kde.neochat", 0, 1, "RoomListModel");
|
qmlRegisterType<RoomListModel>("org.kde.neochat", 1, 0, "RoomListModel");
|
||||||
qmlRegisterType<UserListModel>("org.kde.neochat", 0, 1, "UserListModel");
|
qmlRegisterType<UserListModel>("org.kde.neochat", 1, 0, "UserListModel");
|
||||||
qmlRegisterType<MessageEventModel>("org.kde.neochat", 0, 1, "MessageEventModel");
|
qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
|
||||||
qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 0, 1, "PublicRoomListModel");
|
qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
|
||||||
qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 0, 1, "UserDirectoryListModel");
|
qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
|
||||||
qmlRegisterType<EmojiModel>("org.kde.neochat", 0, 1, "EmojiModel");
|
qmlRegisterType<EmojiModel>("org.kde.neochat", 1, 0, "EmojiModel");
|
||||||
qmlRegisterType<NotificationsManager>("org.kde.neochat", 0, 1, "NotificationsManager");
|
qmlRegisterType<NotificationsManager>("org.kde.neochat", 1, 0, "NotificationsManager");
|
||||||
qmlRegisterType<TrayIcon>("org.kde.neochat", 0, 1, "TrayIcon");
|
qmlRegisterType<TrayIcon>("org.kde.neochat", 1, 0, "TrayIcon");
|
||||||
qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 0, 1, "SortFilterRoomListModel");
|
qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
|
||||||
qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 0, 1, "RoomMessageEvent", "ENUM");
|
qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
|
||||||
qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 0, 1, "RoomType", "ENUM");
|
qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 1, 0, "RoomType", "ENUM");
|
||||||
qmlRegisterUncreatableType<UserType>("org.kde.neochat", 0, 1, "UserType", "ENUM");
|
qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM");
|
||||||
|
|
||||||
qRegisterMetaType<User *>("User*");
|
qRegisterMetaType<User *>("User*");
|
||||||
qRegisterMetaType<User *>("const User*");
|
qRegisterMetaType<User *>("const User*");
|
||||||
|
|||||||
Reference in New Issue
Block a user