diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-05-07 15:48:38 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-05-07 15:48:38 -0500 |
| commit | 6de8e70004768edd27e7f1a3733545b69b1fe2b8 (patch) | |
| tree | 4bba0b0aaacf8a3e8e0bc9908956db8997cdb89a /components | |
| parent | d69176e9367f425f23224eb3a58e634a5c5b0298 (diff) | |
| parent | bff27010f34459476effccbb9f03bf3e242bfaae (diff) | |
| download | monzero-gui-6de8e70004768edd27e7f1a3733545b69b1fe2b8.tar.gz monzero-gui-6de8e70004768edd27e7f1a3733545b69b1fe2b8.tar.xz monzero-gui-6de8e70004768edd27e7f1a3733545b69b1fe2b8.zip | |
Merge pull request #1359
5a1952f Reordered QR/Tracking sections on the receive page
44ad8a3 Redesigned the tracking section
cb94523 This doesnt belong here
6ff273f First iteration of the subaddress table restyle
0e49e4a Reimplemented create/edit/copy (sub)address icons and buttons
5487383 Variable address truncation (for mobile)
9018ae3 Dynamic page height for the receive page
dc1d5e9 Check the 'to receive amount' with the transaction tracker
229fba2 Introduced 'show advanced options' checkbox
d6427a1 Fixes undefined references to 'bg', was previously moved to main.inactiveOverlay
1541d87 Fixes undefined reference to 's'
178be38 Cursor pointer on link hover for richtexts
bfbe00e Removed obsolete SubaddressTable.qml component
3e5f5f3 Adding editIcon.png
bff2701 Fixes the background for 2 popups
Diffstat (limited to 'components')
| -rw-r--r-- | components/InputDialog.qml | 10 | ||||
| -rw-r--r-- | components/Label.qml | 3 | ||||
| -rw-r--r-- | components/LabelButton.qml | 1 | ||||
| -rw-r--r-- | components/LabelSubheader.qml | 6 | ||||
| -rw-r--r-- | components/NewPasswordDialog.qml | 4 | ||||
| -rw-r--r-- | components/PasswordDialog.qml | 2 | ||||
| -rw-r--r-- | components/Style.qml | 2 | ||||
| -rw-r--r-- | components/SubaddressTable.qml | 160 | ||||
| -rw-r--r-- | components/TitleBar.qml | 4 |
9 files changed, 17 insertions, 175 deletions
diff --git a/components/InputDialog.qml b/components/InputDialog.qml index 5119c9fc..fd1c3e3d 100644 --- a/components/InputDialog.qml +++ b/components/InputDialog.qml @@ -46,6 +46,7 @@ Item { signal rejected() function open() { + inactiveOverlay.visible = true leftPanel.enabled = false middlePanel.enabled = false titleBar.enabled = false @@ -56,6 +57,7 @@ Item { } function close() { + inactiveOverlay.visible = false leftPanel.enabled = true middlePanel.enabled = true titleBar.enabled = true @@ -153,12 +155,4 @@ Item { } } } - - Rectangle { - id: bg - z: parent.z + 1 - anchors.fill: parent - color: "black" - opacity: 0.8 - } } diff --git a/components/Label.qml b/components/Label.qml index 11d43fa3..5b0a25c9 100644 --- a/components/Label.qml +++ b/components/Label.qml @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import QtQuick 2.0 +import QtQuick 2.5 import QtQuick.Layouts 1.1 import "../components" as MoneroComponents @@ -43,6 +43,7 @@ Item { property string fontFamily: "" property alias wrapMode: label.wrapMode property alias horizontalAlignment: label.horizontalAlignment + property alias hoveredLink: label.hoveredLink signal linkActivated() height: label.height * scaleRatio width: label.width * scaleRatio diff --git a/components/LabelButton.qml b/components/LabelButton.qml index c2067117..532f4901 100644 --- a/components/LabelButton.qml +++ b/components/LabelButton.qml @@ -43,7 +43,6 @@ Rectangle { width: labelButtonText.width + 14 anchors.right: copyButton.left anchors.rightMargin: 6 - visible: isValidOpenAliasAddress(addressLine.text) Text { id: labelButtonText diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml index 96274f4d..50288ecf 100644 --- a/components/LabelSubheader.qml +++ b/components/LabelSubheader.qml @@ -43,4 +43,10 @@ Label { color: MoneroComponents.Style.dividerColor opacity: MoneroComponents.Style.dividerOpacity } + + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.NoButton + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + } } diff --git a/components/NewPasswordDialog.qml b/components/NewPasswordDialog.qml index d94b5407..f974965d 100644 --- a/components/NewPasswordDialog.qml +++ b/components/NewPasswordDialog.qml @@ -48,6 +48,7 @@ Item { signal closeCallback() function open() { + inactiveOverlay.visible = true leftPanel.enabled = false middlePanel.enabled = false titleBar.enabled = false @@ -59,6 +60,7 @@ Item { } function close() { + inactiveOverlay.visible = false leftPanel.enabled = true middlePanel.enabled = true titleBar.enabled = true @@ -80,7 +82,7 @@ Item { } ColumnLayout { - z: bg.z + 1 + z: inactiveOverlay.z + 1 id: mainLayout spacing: 10 anchors { fill: parent; margins: 35 * scaleRatio } diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 1534e1f3..e8e39e4c 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -70,7 +70,7 @@ Item { } ColumnLayout { - z: bg.z + 1 + z: inactiveOverlay.z + 1 id: mainLayout spacing: 10 anchors { fill: parent; margins: 35 * scaleRatio } diff --git a/components/Style.qml b/components/Style.qml index 3b917f97..a2c6f9b7 100644 --- a/components/Style.qml +++ b/components/Style.qml @@ -25,5 +25,5 @@ QtObject { property string buttonTextColor: "white" property string buttonTextColorDisabled: "black" property string dividerColor: "white" - property real dividerOpacity: 0.25 + property real dividerOpacity: 0.20 } diff --git a/components/SubaddressTable.qml b/components/SubaddressTable.qml deleted file mode 100644 index a024e519..00000000 --- a/components/SubaddressTable.qml +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright (c) 2014-2018, The Monero Project -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other -// materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be -// used to endorse or promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import QtQuick 2.0 -import moneroComponents.Clipboard 1.0 - -import "../components" as MoneroComponents - -ListView { - id: listView - clip: true - boundsBehavior: ListView.StopAtBounds - highlightMoveDuration: 0 - highlightFollowsCurrentItem: true - anchors.topMargin: 0 - spacing: 0 - - delegate: Rectangle { - id: delegate - height: 80 - color: 'transparent'; - anchors.topMargin: 0 - width: listView.width - clip: true - - MoneroComponents.LineEditMulti { - id: addressLine - - fontSize: 14 - readOnly: true - width: parent.width - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - anchors.leftMargin: 10 - anchors.topMargin: 12 - anchors.rightMargin: 54 - anchors.bottomMargin: 0 - text: address - - showingHeader: false - showBorder: false - addressValidation: false - } - - MoneroComponents.IconButton { - id: clipboardButton - imageSource: "../images/copyToClipboard.png" - - onClicked: { - console.log(addressLine.text + " copied to clipboard"); - clipboard.setText(addressLine.text); - appWindow.showStatusMessage(qsTr("Address copied to clipboard"),3); - } - - anchors.right: parent.right - anchors.rightMargin: 0 - anchors.verticalCenter: parent.verticalCenter - } - - Text { - id: indexText - anchors.top: addressLine.bottom - anchors.left: parent.left - anchors.leftMargin: 20 - font.family: "Arial" - font.bold: true - font.pixelSize: 12 - color: "#444444" - text: "#" + index - } - - Text { - id: labelText - anchors.top: addressLine.bottom - anchors.left: indexText.right - anchors.right: parent.right - anchors.leftMargin: 10 - font.family: "Arial" - font.bold: true - font.pixelSize: 12 - color: MoneroComponents.Style.greyFontColor - text: label - } - - MouseArea { - z: 5 - anchors.top: parent.top - anchors.left: parent.left - anchors.bottom: parent.bottom - anchors.right: parent.right - anchors.rightMargin: clipboardButton.width - cursorShape: Qt.PointingHandCursor - onClicked: { - listView.currentIndex = index; - } - } - - Rectangle { - anchors.left: parent.left - anchors.top: parent.top - anchors.bottom: parent.bottom - width: 1 - color: MoneroComponents.Style.grey - z: 6 - } - - Rectangle { - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - width: 1 - color: MoneroComponents.Style.grey - z: 6 - } - - Rectangle { - anchors.right: parent.right - anchors.left: parent.left - anchors.bottom: parent.bottom - color: MoneroComponents.Style.grey - height: 1 - z: 6 - } - - Rectangle { - width: 3 - color: 'white' - visible: listView.currentIndex == index - anchors.left: parent.left - anchors.top: parent.top - anchors.bottom: parent.bottom - } - } -} diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 166e2be9..fcbe53dc 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import QtQuick 2.2 +import QtQuick 2.5 import QtQuick.Window 2.0 import QtQuick.Layouts 1.1 @@ -64,7 +64,7 @@ Rectangle { Item { // Background gradient width: parent.width - height: s + height: parent.height z: parent.z + 1 Image { |
