diff options
| author | dsc <xmrdsc@protonmail.com> | 2018-12-08 16:55:29 +0100 |
|---|---|---|
| committer | skftn <sa.ferdinand@gmail.com> | 2018-12-29 18:08:21 +0100 |
| commit | 85cd428dcb46763e626c1c9bae1c27b44d617d4f (patch) | |
| tree | d420b15fd9e02f04c60a37b86dc688a421ad0cdf /MiddlePanel.qml | |
| parent | 48a267f631c18d3159cccfc551d72cc5aeb0df03 (diff) | |
| download | monzero-gui-85cd428dcb46763e626c1c9bae1c27b44d617d4f.tar.gz monzero-gui-85cd428dcb46763e626c1c9bae1c27b44d617d4f.tar.xz monzero-gui-85cd428dcb46763e626c1c9bae1c27b44d617d4f.zip | |
Merchant page
Diffstat (limited to 'MiddlePanel.qml')
| -rw-r--r-- | MiddlePanel.qml | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml index d47e3685..69d14d0f 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -38,6 +38,8 @@ import moneroComponents.Wallet 1.0 import "components" as MoneroComponents import "./pages" import "./pages/settings" +import "./pages/merchant" +import "components" as MoneroComponents Rectangle { id: root @@ -56,6 +58,7 @@ Rectangle { property Transfer transferView: Transfer { } property Receive receiveView: Receive { } + property Merchant merchantView: Merchant { } property TxKey txkeyView: TxKey { } property SharedRingDB sharedringdbView: SharedRingDB { } property History historyView: History { } @@ -72,11 +75,16 @@ Rectangle { signal getProofClicked(string txid, string address, string message); signal checkProofClicked(string txid, string address, string message, string signature); + Rectangle { + // grey background on merchantView + visible: currentView === merchantView + color: MoneroComponents.Style.moneroGrey + anchors.fill: parent + } + Image { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom + anchors.fill: parent + visible: currentView !== merchantView source: "../images/middlePanelBg.jpg" } @@ -124,6 +132,10 @@ Rectangle { PropertyChanges { target: root; currentView: receiveView } PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 100 } }, State { + name: "Merchant" + PropertyChanges { target: root; currentView: merchantView } + PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 100 } + }, State { name: "TxKey" PropertyChanges { target: root; currentView: txkeyView } PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio } @@ -172,8 +184,8 @@ Rectangle { ColumnLayout { anchors.fill: parent - anchors.margins: 18 - anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0 + anchors.margins: currentView !== merchantView ? 20 * scaleRatio : 0 + anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 * scaleRatio : 0 spacing: 0 Flickable { |