status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
status-desktop/ui/app/AppLayouts/Wallet/components/SendModalContent.qml

128 lines
3.4 KiB
QML
Raw Normal View History

update qml imports
2020-06-17 19:18:31 +00:00
import QtQuick 2.13
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
import "../../../../imports"
import "../../../../shared"
Item {
feat: fix StyledButton and use it in Send modal
2020-05-29 18:02:06 +00:00
id: element
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
property alias valueInput: txtValue
property string defaultAccount: "0x1234"
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
fix: fix font loading issue and create a text component to use that font
2020-06-19 18:06:58 +00:00
StyledText {
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
id: modalDialogTitle
text: "Send"
anchors.top: parent.top
anchors.left: parent.left
font.bold: true
font.pixelSize: 17
anchors.leftMargin: 16
anchors.topMargin: 16
}
Image {
id: closeModalImg
anchors.top: parent.top
anchors.right: parent.right
anchors.rightMargin: 16
anchors.topMargin: 16
chore: refactor Linux and macOS build/packaging steps Replaces PR #105. Implement a `pkg-macos` target that ultimately results in `Status.dmg` being written to `pkg/`. Due to [limitations][limits] of the OpenSSL `.dylib`s in `/usr/lib/` on macOS, `libssl.a` and `libcrypto.a` are statically linked into `bin/nim_status_client` from a [Homebrew][brew] "bottle" that is compatible with macOS 10.13 (the oldest macOS version compatible with Qt v5.14). `pkg-macos` creates an `.app` bundle layout in `tmp/macos/dist` based partly on information in a very helpful [StackOverflow answer][so-answer]. Note the part of the answer (toward the end) that explains a problem with the working directory and how to fix it. That's the reason for the `nim_status_client.sh` script introduced in this commit (it gets copied into the bundle). It's also the reason for having `Info.plist` copied into the bundle before `macdeployqt` is run (see below) and then overwriting it with `Info.runner.plist` before creating the `.dmg` file. The app icons file `status-icon.icns` was taken from `deployment/macos/` in the [status-react][sr] repo. The [`macdeployqt`][macdeployqt] tool is used to copy the needed portions of Qt into the bundle; it automatically updates `rpath`, etc. so the `nim_status_client` executable in the bundle can locate the libs within the bundle. `macdeployqt` is run twice, for the "outer" and "inner" `.app` bundles, because of an apparent bug in `macdeployqt` that results in QtWebEngine related resources not being processed correctly on the first pass. This results in some bloat in the final bundle but it seems unavoidable at present. The [create-dmg][cdmg] tool is used to package the bundle into a `.dmg` file. There are two reasons for this: 1. It produces a nice looking icon for the `.dmg` that overlays the Status logo on an external disk icon. 2. `Info.plist` needs to be overwritten after running `macdeployqt` (see explanation above) but before creating the `.dmg` file. If we passed the `-dmg` cli option to `macdeployqt` to have it generate the `.dmg` file then it wouldn't be possible to overwrite `Info.plist`. So there is a cosmetic reason and a practical reason for using another tool. Probably the biggest downside is that `create-dmg` is implemented in Node.js so it needs to be installed with `npm`; that's the reason this commit introduces `package.json`, etc. Note that zero code from `node_modules` ends up in the `.app` bundle or the `.dmg` file. Code signing of the macOS `.app` bundle and `.dmg` is attempted if the environment variable `MACOS_CODESIGN_IDENT` is defined. In that case, the environment variable `MACOS_KEYCHAIN_OPT` may optionally be defined with the path to a preferred keychain database file. Refactor a number of sections in the Makefile for consistency's sake, e.g. the `appimage` target becomes `pkg-linux` and ultimately results in `NimStatusClient-x86_64.AppImage` being written to `pkg/`. Make a number of changes to bring the Linux packaging steps up-to-date and use the `-qmlimport` cli option of `linuxdeployqt` to simplify resolution of Qt plugins. Note that `make pkg` will correctly resolve to `make pkg-linux` or `make pkg-macos` depending on the OS in use. Consistently use lower-case "c" in the name of *components* directories and imports. [limits]: https://developer.apple.com/forums/thread/124782 [brew]: https://brew.sh/ [so-answer]: https://stackoverflow.com/a/3251285 [sr]: https://github.com/status-im/status-react/tree/develop/deployment/macos [macdeployqt]: https://doc.qt.io/qt-5/macos-deployment.html [cdmg]: https://github.com/sindresorhus/create-dmg
2020-06-04 20:56:44 +00:00
source: "../../../../shared/img/close.svg"
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
MouseArea {
id: closeModalMouseArea
cursorShape: Qt.PointingHandCursor
anchors.fill: parent
onClicked: {
popup.close()
}
}
}
Separator {
id: headerSeparator
anchors.top: modalDialogTitle.bottom
}
Item {
id: modalBody
anchors.right: parent.right
anchors.rightMargin: 32
anchors.top: headerSeparator.bottom
anchors.topMargin: Theme.padding
anchors.bottom: footerSeparator.top
anchors.bottomMargin: 16
anchors.left: parent.left
anchors.leftMargin: 32
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
Input {
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
id: txtValue
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
label: "Amount"
icon: "../../../img/token-icons/eth.svg"
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
anchors.top: parent.top
placeholderText: qsTr("Enter ETH")
}
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
Input {
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
id: txtFrom
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
label: "From account"
text: defaultAccount
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
placeholderText: qsTr("Send from (account)")
anchors.top: txtValue.bottom
anchors.topMargin: Theme.padding
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
}
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
Input {
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
id: txtTo
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
label: "Recipient"
text: defaultAccount
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
placeholderText: qsTr("Send to")
anchors.top: txtFrom.bottom
anchors.topMargin: Theme.padding
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
}
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
Input {
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
id: txtPassword
feat: use Input component for the send modal
2020-05-29 17:53:39 +00:00
label: "Password"
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
placeholderText: "Enter Password"
anchors.top: txtTo.bottom
anchors.topMargin: Theme.padding
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
}
}
Separator {
id: footerSeparator
anchors.bottom: parent.bottom
anchors.bottomMargin: 76
}
feat: fix StyledButton and use it in Send modal
2020-05-29 18:02:06 +00:00
StyledButton {
anchors.right: parent.right
anchors.rightMargin: Theme.padding
label: "Send"
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
anchors.bottom: parent.bottom
feat: fix StyledButton and use it in Send modal
2020-05-29 18:02:06 +00:00
anchors.bottomMargin: Theme.padding
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
onClicked: {
feat: show accounts in wallet and put assetList in Account
2020-06-02 20:10:48 +00:00
let result = walletModel.onSendTransaction(txtFrom.text,
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
txtTo.text,
txtValue.text,
txtPassword.text)
console.log(result)
}
}
}
/*##^##
Designer {
feat: fix StyledButton and use it in Send modal
2020-05-29 18:02:06 +00:00
D{i:0;autoSize:true;formeditorColor:"#ffffff";formeditorZoom:0.75;height:480;width:640}
feat: add very basic sendModal content
2020-05-29 15:43:37 +00:00
}
##^##*/