mirror of
https://github.com/status-im/status-desktop.git
synced 2025-02-10 13:46:35 +00:00
ce7e6b8d51
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
149 lines
3.7 KiB
QML
149 lines
3.7 KiB
QML
import QtQuick 2.13
|
|
import "./components"
|
|
import "../../../imports"
|
|
import "../../../shared"
|
|
|
|
Item {
|
|
Component {
|
|
id: transactionListItemCmp
|
|
|
|
Rectangle {
|
|
id: transactionListItem
|
|
property bool isHovered: false
|
|
anchors.right: parent.right
|
|
anchors.left: parent.left
|
|
height: 64
|
|
color: isHovered ? "#f0f0f0" : "white"
|
|
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onClicked: transactionModal.open()
|
|
cursorShape: Qt.PointingHandCursor
|
|
hoverEnabled: true
|
|
onEntered: {
|
|
transactionListItem.isHovered = true
|
|
}
|
|
onExited: {
|
|
transactionListItem.isHovered = false
|
|
}
|
|
}
|
|
|
|
|
|
TransactionModal{
|
|
id: transactionModal
|
|
}
|
|
|
|
Item {
|
|
|
|
Rectangle {
|
|
id: assetIcon
|
|
color: "gray"
|
|
width: 40
|
|
height: 40
|
|
anchors.left: parent.left
|
|
anchors.top: parent.top
|
|
anchors.topMargin: 12
|
|
radius: 50
|
|
}
|
|
|
|
StyledText {
|
|
id: transferIcon
|
|
anchors.topMargin: 25
|
|
anchors.top: parent.top
|
|
anchors.left: assetIcon.right
|
|
anchors.leftMargin: 22
|
|
height: 15
|
|
width: 15
|
|
color: to != walletModel.currentAccount.address ? "#4360DF" : "green"
|
|
text: to != walletModel.currentAccount.address ? "↑" : "↓"
|
|
}
|
|
|
|
StyledText {
|
|
id: transactionValue
|
|
anchors.left: transferIcon.right
|
|
anchors.leftMargin: Theme.smallPadding
|
|
anchors.top: parent.top
|
|
anchors.topMargin: Theme.bigPadding
|
|
font.pixelSize: 15
|
|
text: value + " TOKEN"
|
|
}
|
|
}
|
|
|
|
Item {
|
|
anchors.right: timeInfo.left
|
|
anchors.top: parent.top
|
|
anchors.topMargin: Theme.bigPadding
|
|
width: children[0].width + children[1].width
|
|
|
|
StyledText {
|
|
text: to != walletModel.currentAccount.address ? "To " : "From "
|
|
anchors.right: addressValue.left
|
|
color: Theme.darkGrey
|
|
anchors.top: parent.top
|
|
font.pixelSize: 15
|
|
font.strikeout: false
|
|
}
|
|
|
|
StyledText {
|
|
id: addressValue
|
|
text: to
|
|
width: 100
|
|
elide: Text.ElideMiddle
|
|
anchors.right: parent.right
|
|
anchors.top: parent.top
|
|
font.pixelSize: 15
|
|
}
|
|
}
|
|
|
|
Item {
|
|
id: timeInfo
|
|
anchors.right: parent.right
|
|
anchors.top: parent.top
|
|
anchors.topMargin: Theme.bigPadding
|
|
width: children[0].width + children[1].width + children[2].width
|
|
|
|
StyledText {
|
|
text: "• "
|
|
font.weight: Font.Bold
|
|
anchors.right: timeIndicator.left
|
|
color: Theme.darkGrey
|
|
anchors.top: parent.top
|
|
font.pixelSize: 15
|
|
}
|
|
|
|
StyledText {
|
|
id: timeIndicator
|
|
text: "At "
|
|
anchors.right: timeValue.left
|
|
color: Theme.darkGrey
|
|
anchors.top: parent.top
|
|
font.pixelSize: 15
|
|
font.strikeout: false
|
|
}
|
|
|
|
StyledText {
|
|
id: timeValue
|
|
text: timestamp
|
|
anchors.right: parent.right
|
|
anchors.top: parent.top
|
|
font.pixelSize: 15
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ListView {
|
|
anchors.topMargin: 20
|
|
anchors.fill: parent
|
|
model: walletModel.transactions
|
|
delegate: transactionListItemCmp
|
|
}
|
|
|
|
}
|
|
|
|
/*##^##
|
|
Designer {
|
|
D{i:0;autoSize:true;height:480;width:640}
|
|
}
|
|
##^##*/
|