status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update qml imports

This commit is contained in:
Iuri Matias 2020-06-17 15:18:31 -04:00
parent eff29af548
commit 0ad64cc5de
79 changed files with 248 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/app/AppLayouts/Browser/BrowserLayout.qml
View File

@ -1,11 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Layouts 1.13
import QtWebView 1.14
import "../../../imports"
import "../../../shared"
Item {
id: browserView
@ -27,3 +22,9 @@ Item {
url: "https://dap.ps/"
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

8
ui/app/AppLayouts/Chat/ChatColumn.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../shared"
import "../../../imports"
import "./ChatColumn"

8
ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"

11
ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
View File

@ -1,10 +1,7 @@
import QtQuick 2.14
import QtQuick.Controls 2.3
import QtQuick.Controls 2.14 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQml.Models 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import QtQml.Models 2.13
import "../../../../shared"
import "../../../../imports"
import "../components"

15
ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"
@ -31,4 +29,9 @@ Item {
color: Theme.darkGrey
}
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

10
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"
import "../components"
@ -140,7 +138,6 @@ Item {
}
// Private group Messages
Text {
wrapMode: Text.Wrap
@ -287,4 +284,3 @@ Designer {
D{i:0;height:80;width:800}
}
##^##*/

18
ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"
import "../components"
@ -95,7 +93,7 @@ Rectangle {
PopupMenu {
id: chatContextMenu
QQC2.Action {
Action {
icon.source: "../../../img/leave_chat.svg"
text: qsTr("Leave Chat")
onTriggered: chatsModel.leaveActiveChat()
@ -104,25 +102,21 @@ Rectangle {
PopupMenu {
id: groupContextMenu
QQC2.Action {
Action {
icon.source: "../../../img/group_chat.svg"
text: qsTr("Group Information")
onTriggered: groupInfoPopup.open()
}
QQC2.Action {
Action {
icon.source: "../../../img/leave_chat.svg"
text: qsTr("Leave Group")
onTriggered: chatsModel.leaveActiveChat()
}
}
GroupInfoPopup {
id: groupInfoPopup
}
}
}
}

6
ui/app/AppLayouts/Chat/ChatColumn/samples/MessagesData.qml
View File

@ -1,8 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
ListModel {
ListElement {

6
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.3
import QtQuick 2.13
//TODO: update to import QtQuick.Controls 2.13
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick.Layouts 1.13
import "../../../imports"
import "."

16
ui/app/AppLayouts/Chat/ContactsColumn.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.12
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
import "./components"
@ -51,7 +49,7 @@ Item {
}
AddChat {
id: "addChat"
id: addChat
}
StackLayout {
@ -73,9 +71,3 @@ Item {
}
}
}
/*##^##
Designer {
D{i:0;formeditorColor:"#ffffff";height:770;width:300}
}
##^##*/

14
ui/app/AppLayouts/Chat/ContactsColumn/AddChat.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"
import "../components"
@ -80,19 +78,19 @@ Rectangle {
PopupMenu {
id: newChatMenu
QQC2.Action {
Action {
text: qsTr("Start new chat")
icon.source: "../../../img/new_chat.svg"
onTriggered: privateChatPopup.open()
}
QQC2.Action {
Action {
text: qsTr("Start group chat")
icon.source: "../../../img/group_chat.svg"
onTriggered: {
onTriggered: groupChatPopup.open()
}
}
QQC2.Action {
Action {
text: qsTr("Join public chat")
icon.source: "../../../img/public_chat.svg"
onTriggered: publicChatPopup.open()

14
ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../../../shared"
import "../../../../imports"
import "../components"
@ -112,3 +110,11 @@ Rectangle {
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

13
ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../shared"
import "../../../../imports"
import "../components"
@ -42,4 +42,9 @@ Item {
}
}
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

12
ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../components"
Item {
@ -72,3 +72,9 @@ Item {
}
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

8
ui/app/AppLayouts/Chat/components/ChannelIcon.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
@ -77,4 +76,3 @@ Rectangle {
}
}
}

15
ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "./"
@ -189,12 +188,12 @@ ModalPopup {
cursorShape: Qt.PointingHandCursor
PopupMenu {
id: contextMenu
QQC2.Action {
Action {
icon.source: "../../../img/make-admin.svg"
text: qsTr("Make Admin")
onTriggered: chatsModel.leaveActiveChat()
}
QQC2.Action {
Action {
icon.source: "../../../img/remove-from-group.svg"
icon.color: Theme.red
text: qsTr("Remove From Group")
@ -204,10 +203,6 @@ ModalPopup {
}
}
}
}
}
}

7
ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
View File

@ -1,13 +1,12 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "../../Profile/Sections/Contacts/"
import "./"
ModalPopup {
function doJoin(){
if (chatKey.text !== "") {
chatsModel.joinChat(chatKey.text, Constants.chatTypeOneToOne);

6
ui/app/AppLayouts/Chat/components/ProfilePopup.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "./"

9
ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
View File

@ -1,11 +1,10 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "./"
ModalPopup {
function doJoin() {
if(channelName.text === "") return;
@ -14,7 +13,6 @@ ModalPopup {
}
id: popup
title: qsTr("Join public chat")
@ -47,7 +45,6 @@ ModalPopup {
Keys.onReturnPressed: doJoin()
icon: "../../../img/hash.svg"
}
RowLayout {
id: row

6
ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
import "./"

2
ui/app/AppLayouts/Chat/components/SuggestedChannel.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.13
import "../../../../imports"
Rectangle {

8
ui/app/AppLayouts/Node/NodeLayout.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
SplitView {

8
ui/app/AppLayouts/Profile/LeftTab.qml
View File

@ -1,9 +1,5 @@
import QtGraphicalEffects 1.12
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
import "./LeftTab"

7
ui/app/AppLayouts/Profile/LeftTab/Menu.qml
View File

@ -1,7 +1,6 @@
import QtGraphicalEffects 1.12
import QtQuick 2.0
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Rectangle {

7
ui/app/AppLayouts/Profile/LeftTab/Profile.qml
View File

@ -1,7 +1,6 @@
import QtGraphicalEffects 1.12
import QtQuick 2.0
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Layouts 1.13
import QtGraphicalEffects 1.13
import "../../../../imports"
Rectangle {

12
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -1,13 +1,9 @@
import QtGraphicalEffects 1.12
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
import "./Sections"
import "."
SplitView {
id: profileView
@ -16,7 +12,7 @@ SplitView {
Layout.fillHeight: true
Layout.fillWidth: true
handleDelegate: Rectangle {
handle: Rectangle {
implicitWidth: 1
implicitHeight: 4
color: Theme.grey

6
ui/app/AppLayouts/Profile/Sections/AboutContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {

6
ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {

7
ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../../imports"
import "../../../../../shared"

7
ui/app/AppLayouts/Profile/Sections/Contacts/ContactList.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.14
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "./samples/"
import "../../../../../imports"
import "../../../../../shared"

5
ui/app/AppLayouts/Profile/Sections/Contacts/samples/ContactsData.qml
View File

@ -1,7 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
ListModel {
ListElement {

6
ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "./Contacts"

8
ui/app/AppLayouts/Profile/Sections/HelpContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {
@ -32,4 +32,4 @@ Item {
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
}
}
}
}

6
ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {

6
ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {

6
ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {

8
ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
import "../../../../shared"
@ -34,4 +34,4 @@ Item {
Qt.quit();
}
}
}
}

11
ui/app/AppLayouts/Profile/Sections/SyncContainer.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../../imports"
Item {
@ -21,13 +21,12 @@ Item {
font.pixelSize: 20
}
Component {
id: mailserversList
RadioButton {
text: name
checked: index == 0 ? true: false
text: name
checked: index == 0 ? true: false
}
}

6
ui/app/AppLayouts/Wallet/AccountSettingsModal.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import QtQuick.Dialogs 1.3
import "../../../imports"
import "../../../shared"

7
ui/app/AppLayouts/Wallet/AddCustomTokenModal.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick.Dialogs 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"

2
ui/app/AppLayouts/Wallet/AssetsTab.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.3
import QtQuick 2.13
import "../../../imports"
Item {

8
ui/app/AppLayouts/Wallet/CollectiblesTab.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.3
import QtQuick 2.13
Item {
Text {
@ -6,3 +6,9 @@ Item {
text: "Collectibles"
}
}
/*##^##
Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

15
ui/app/AppLayouts/Wallet/Components/AddAccount.qml
View File

@ -1,8 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../../../shared"
import "../../../../imports"
@ -93,28 +90,28 @@ Rectangle {
PopupMenu {
id: newAccountMenu
width: 280
QQC2.Action {
Action {
text: qsTr("Generate an account")
icon.source: "../../../img/generate_account.svg"
onTriggered: {
generateAccountModal.open()
}
}
QQC2.Action {
Action {
text: qsTr("Add a watch-only address")
icon.source: "../../../img/add_watch_only.svg"
onTriggered: {
addWatchOnlyAccountModal.open()
}
}
QQC2.Action {
Action {
text: qsTr("Enter a seed phrase")
icon.source: "../../../img/enter_seed_phrase.svg"
onTriggered: {
addAccountWithSeedModal.open()
}
}
QQC2.Action {
Action {
text: qsTr("Enter a private key")
icon.source: "../../../img/enter_private_key.svg"
onTriggered: {

4
ui/app/AppLayouts/Wallet/Components/AddAccountWithPrivateKey.qml
View File

@ -1,6 +1,4 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"

4
ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml
View File

@ -1,6 +1,4 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"

4
ui/app/AppLayouts/Wallet/Components/AddWatchOnlyAccount.qml
View File

@ -1,6 +1,4 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"

4
ui/app/AppLayouts/Wallet/Components/GenerateAccountModal.qml
View File

@ -1,6 +1,4 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"

5
ui/app/AppLayouts/Wallet/Components/SendModalContent.qml
View File

@ -1,7 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"

6
ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../../../imports"
import "../../../../shared"
import "../data/"

6
ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../../../imports"
import "../../../../shared"
import "../../Chat/ContactsColumn"

4
ui/app/AppLayouts/Wallet/Components/TransactionModal.qml
View File

@ -1,6 +1,4 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import "../../../../imports"
import "../../../../shared"
import "./"

2
ui/app/AppLayouts/Wallet/HistoryTab.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.3
import QtQuick 2.13
import "./Components"
import "../../../imports"

11
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -1,9 +1,7 @@
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtGraphicalEffects 1.0
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import QtGraphicalEffects 1.13
import "../../../imports"
import "../../../shared"
import "./Components"
@ -203,4 +201,3 @@ Designer {
D{i:0;formeditorColor:"#ffffff";formeditorZoom:0.75;height:770;width:340}
}
##^##*/

8
ui/app/AppLayouts/Wallet/SendModal.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
//import QtQuick.Layouts 1.13
//import Qt.labs.platform 1.1
import "../../../imports"
import "../../../shared"
import "./Components"

8
ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
//import QtQuick.Layouts 1.13
//import Qt.labs.platform 1.1
import "../../../imports"
import "../../../shared"
import "./Components"

6
ui/app/AppLayouts/Wallet/TokenSettingsModal.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../../imports"
import "../../../shared"
import "./Components"

13
ui/app/AppLayouts/Wallet/WalletHeader.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12 as QQC2
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
@ -182,21 +181,21 @@ Item {
PopupMenu {
id: newSettingsMenu
width: 280
QQC2.Action {
Action {
text: qsTr("Account Settings")
icon.source: "../../img/account_settings.svg"
onTriggered: {
accountSettingsModal.open()
}
}
QQC2.Action {
Action {
text: qsTr("Add/Remove Tokens")
icon.source: "../../img/add_remove_token.svg"
onTriggered: {
tokenSettingsModal.open()
}
}
QQC2.Action {
Action {
text: qsTr("Set Currency")
icon.source: "../../img/set_currency.svg"
onTriggered: {

8
ui/app/AppLayouts/Wallet/WalletLayout.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.3
import QtQuick 2.13
//TODO: update to import QtQuick.Controls 2.13
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick.Layouts 1.13
import "../../../imports"
import "../../../shared"
import "."
@ -14,6 +14,7 @@ SplitView {
Layout.fillHeight: true
Layout.fillWidth: true
// handle for QtQuick.Controls 2.13
handleDelegate: Rectangle {
implicitWidth: 1
implicitHeight: 4
@ -117,4 +118,3 @@ Designer {
D{i:0;autoSize:true;formeditorColor:"#ffffff";height:770;width:1152}
}
##^##*/

5
ui/app/AppLayouts/Wallet/data/Currencies.qml
View File

@ -1,7 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
ListModel {

5
ui/app/AppLayouts/Wallet/data/Tokens.qml
View File

@ -1,7 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
ListModel {

8
ui/app/AppMain.qml
View File

@ -1,8 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../imports"
import "./AppLayouts"

2
ui/imports/Constants.qml
View File

@ -1,6 +1,6 @@
pragma Singleton
import QtQuick 2.8
import QtQuick 2.13
QtObject {
readonly property int chatTypeOneToOne: 1

2
ui/imports/Theme.qml
View File

@ -1,6 +1,6 @@
pragma Singleton
import QtQuick 2.8
import QtQuick 2.13
QtObject {
readonly property color white: "#FFFFFF"

6
ui/main.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import Qt.labs.platform 1.1
import QtQml.StateMachine 1.14 as DSM
import "./onboarding"

5
ui/onboarding/CreatePasswordModal.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Dialogs 1.3
import "../imports"
import "../shared"

5
ui/onboarding/EnterSeedPhraseModal.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../imports"
import "../shared"

11
ui/onboarding/ExistingKey.qml
View File

@ -1,11 +1,5 @@
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Window 2.11
import QtQuick.Dialogs 1.3
import "../shared"
import "../imports"
import "."
import QtQuick 2.13
import QtQuick.Controls 2.13
Item {
property var onClosed: function () {}
@ -44,4 +38,3 @@ Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

9
ui/onboarding/GenKey.qml
View File

@ -1,10 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Window 2.11
import QtQuick.Dialogs 1.3
import "../imports"
import "../shared"
import QtQuick 2.13
Item {
property var onClosed: function () {}
@ -43,4 +37,3 @@ Designer {
D{i:0;autoSize:true;formeditorColor:"#ffffff";height:480;width:640}
}
##^##*/

6
ui/onboarding/GenKeyModal.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import "../imports"
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../shared"
import "./Login"

6
ui/onboarding/Intro.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import "../shared"
RowLayout {

8
ui/onboarding/KeysMain.qml
View File

@ -1,9 +1,6 @@
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../shared"
import "../imports"
Page {
id: page
@ -82,7 +79,6 @@ Page {
}
}
/*##^##
Designer {
D{i:0;autoSize:true;formeditorColor:"#ffffff";formeditorZoom:0.8999999761581421;height:760;width:1080}

10
ui/onboarding/Login.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Window 2.11
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13
import QtQuick.Dialogs 1.3
import QtGraphicalEffects 1.0
import QtGraphicalEffects 1.13
import "../shared"
import "../imports"
import "./Login"
@ -221,4 +220,3 @@ Designer {
D{i:0;autoSize:true;formeditorColor:"#ffffff";formeditorZoom:0.75;height:480;width:640}
}
##^##*/

7
ui/onboarding/Login/AccountList.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.14
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "./samples/"
import "../../imports"
@ -34,4 +32,3 @@ Designer {
D{i:0;autoSize:true;height:480;width:640}
}
##^##*/

6
ui/onboarding/Login/AddressView.qml
View File

@ -1,7 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../imports"
import "../../shared"

5
ui/onboarding/Login/ConfirmAddExistingKeyModal.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../imports"
import "../../shared"

5
ui/onboarding/Login/SelectAnotherAccountModal.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../../imports"
import "../../shared"

5
ui/onboarding/Login/samples/AccountsData.qml
View File

@ -1,7 +1,4 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import QtQuick 2.13
ListModel {
ListElement {

4
ui/onboarding/Slide.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.4
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../imports"
Item {

8
ui/shared/Input.qml
View File

@ -1,8 +1,5 @@
import QtQuick 2.12
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.12
import "../imports"
import QtQuick 2.13
import QtQuick.Controls 2.13
Item {
property alias textField: inputValue
@ -90,4 +87,3 @@ Designer {
D{i:0;formeditorColor:"#ffffff";formeditorZoom:1.25}
}
##^##*/