White theme

This commit is contained in:
dsc
2019-04-11 03:17:29 +02:00
parent 358e1d23fa
commit 42f7afaefd
151 changed files with 3425 additions and 1352 deletions

View File

@@ -1,4 +1,4 @@
import QtQuick 2.7
import QtQuick 2.9
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import QtGraphicalEffects 1.0
@@ -33,7 +33,6 @@ Item {
property var hiddenAmounts: []
function onPageCompleted() {
appWindow.titlebarToggleOrange();
appWindow.hideMenu();
// prepare tracking
@@ -53,8 +52,6 @@ Item {
}
function onPageClosed() {
appWindow.titlebarToggleOrange();
// reset component objects
timer.running = false
root.enableTracking = false
@@ -68,7 +65,7 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: 300 * scaleRatio
source: "../../images/merchant/bg.png"
source: "qrc:///images/merchant/bg.png"
smooth: false
}
@@ -129,11 +126,12 @@ Item {
Layout.preferredWidth: 10 * scaleRatio
}
Text {
MoneroComponents.TextPlain {
font.pixelSize: 16 * scaleRatio
font.bold: true
color: "#767676"
text: qsTr("Sales") + translationManager.emptyString
themeTransition: false
}
Item {
@@ -267,7 +265,7 @@ Item {
width: (parent.width - qrImg.width) - (50 * scaleRatio)
height: 32 * scaleRatio
Text {
MoneroComponents.TextPlain {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 12 * scaleRatio
@@ -275,6 +273,7 @@ Item {
color: "white"
text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 12px;}</style>Currently selected address: " + addressLabel + " <a href='#'>(Change)</a>"
textFormat: Text.RichText
themeTransition: false
MouseArea {
anchors.fill: parent
@@ -291,13 +290,14 @@ Item {
width: 220 * scaleRatio
height: 32 * scaleRatio
Text {
MoneroComponents.TextPlain {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
font.pixelSize: 12 * scaleRatio
font.bold: false
color: "white"
text: qsTr("(right-click, save as)") + translationManager.emptyString
themeTransition: false
}
}
}
@@ -336,11 +336,12 @@ Item {
Layout.preferredWidth: 10 * scaleRatio
}
Text {
MoneroComponents.TextPlain {
font.pixelSize: 14 * scaleRatio
font.bold: true
color: "#767676"
text: qsTr("Payment URL") + translationManager.emptyString
themeTransition: false
}
Item {
@@ -356,7 +357,7 @@ Item {
// Layout.fillHeight: true
// color: "transparent"
// Text {
// MoneroComponents.TextPlain {
// anchors.verticalCenter: parent.verticalCenter
// anchors.right: parent.right
// anchors.rightMargin: 20 * scaleRatio
@@ -390,7 +391,7 @@ Item {
color: "#d9d9d9"
}
Text {
MoneroComponents.TextPlain {
property string _color: "#767676"
Layout.fillWidth: true
Layout.margins: 20 * scaleRatio
@@ -403,6 +404,7 @@ Item {
font.bold: true
color: _color
text: TxUtils.makeQRCodeString(appWindow.current_address, amountToReceive.text)
themeTransition: false
MouseArea {
anchors.fill: parent
@@ -446,17 +448,18 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
Text {
MoneroComponents.TextPlain {
font.pixelSize: 14 * scaleRatio
font.bold: false
color: "white"
text: qsTr("Amount to receive") + " (XMR)"
themeTransition: false
}
Image {
height: 28 * scaleRatio
width: 220 * scaleRatio
source: "../../images/merchant/input_box.png"
source: "qrc:///images/merchant/input_box.png"
TextField {
id: amountToReceive
@@ -496,7 +499,7 @@ Item {
width: 220 * scaleRatio
}
Text {
MoneroComponents.TextPlain {
// @TODO: When we have XMR/USD rate avi. in the future.
visible: false
font.pixelSize: 14 * scaleRatio
@@ -504,13 +507,14 @@ Item {
color: "white"
text: qsTr("Amount to receive") + " (USD)"
opacity: 0.2
themeTransition: false
}
Image {
visible: false
height: 28 * scaleRatio
width: 220 * scaleRatio
source: "../../images/merchant/input_box.png"
source: "qrc:///images/merchant/input_box.png"
opacity: 0.2
}
}
@@ -536,12 +540,13 @@ Item {
}
}
Text {
MoneroComponents.TextPlain {
id: content
font.pixelSize: 14 * scaleRatio
font.bold: false
color: "white"
text: qsTr("Leave this page") + translationManager.emptyString
themeTransition: false
MouseArea {
anchors.fill: parent
@@ -564,13 +569,14 @@ Item {
width: 400 * scaleRatio
radius: 5
Text {
MoneroComponents.TextPlain {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 14 * scaleRatio
font.bold: true
color: MoneroComponents.Style.moneroGrey
text: qsTr("The merchant page requires a larger window") + translationManager.emptyString
themeTransition: false
}
}

View File

@@ -1,7 +1,8 @@
import QtQuick 2.7
import QtQuick 2.9
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import "../../components" as MoneroComponents
RowLayout {
id: root
@@ -22,16 +23,17 @@ RowLayout {
id: imageChecked
visible: root.checked
anchors.centerIn: parent
source: "../../images/uncheckedIcon.png"
source: "qrc:///images/uncheckedIcon.png"
}
}
Text {
MoneroComponents.TextPlain {
id: content
font.pixelSize: 14 * scaleRatio
font.bold: false
color: "white"
text: ""
themeTransition: false
}
MouseArea {

View File

@@ -0,0 +1,197 @@
// 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.9
import QtQuick.Window 2.0
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.2
import FontAwesome 1.0
import "../../components/" as MoneroComponents
import "../../components/effects/" as MoneroEffects
Rectangle {
id: root
property int mouseX: 0
property bool customDecorations: persistentSettings.customDecorations
property bool showMinimizeButton: true
property bool showMaximizeButton: true
property bool showCloseButton: true
height: {
if(!persistentSettings.customDecorations || isMobile) return 0;
return 50 * scaleRatio;
}
z: 1
color: "transparent"
signal closeClicked
signal maximizeClicked
signal minimizeClicked
Rectangle {
width: parent.width
height: parent.height
z: parent.z + 1
color: "#ff6600"
}
RowLayout {
z: parent.z + 2
spacing: 0
anchors.fill: parent
Item {
Layout.preferredHeight: parent.height
Layout.preferredWidth: parent.height * 3
}
// monero logo
Item {
Layout.fillWidth: true
Layout.preferredHeight: parent.height
Image {
id: imgLogo
width: 132
height: 22
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
source: "qrc:///images/moneroLogo_white.png"
}
}
// minimize
Rectangle {
color: "transparent"
visible: root.showMinimizeButton
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
anchors.bottom: parent.bottom
anchors.bottomMargin: 18
anchors.horizontalCenter: parent.horizontalCenter
height: 3
width: 15
image: MoneroComponents.Style.titleBarMinimizeSource
color: "white"
opacity: 0.75
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onClicked: root.minimizeClicked();
}
}
// maximize
Rectangle {
id: test
visible: root.showMaximizeButton
color: "transparent"
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
Image {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
source: MoneroComponents.Style._b_titleBarFullscreenSource
sourceSize.width: 16
sourceSize.height: 16
smooth: true
mipmap: true
opacity: 0.75
rotation: appWindow.visibility === Window.FullScreen ? 180 : 0
}
MouseArea {
id: buttonArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onClicked: root.maximizeClicked();
}
}
// close
Rectangle {
visible: root.showCloseButton
color: "transparent"
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
height: 16
width: 16
image: MoneroComponents.Style._b_titleBarCloseSource
color: "white"
opacity: 0.75
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onClicked: root.closeClicked();
}
}
}
MouseArea {
enabled: persistentSettings.customDecorations
property var previousPosition
anchors.fill: parent
propagateComposedEvents: true
onPressed: previousPosition = globalCursor.getPosition()
onPositionChanged: {
if (pressedButtons == Qt.LeftButton) {
var pos = globalCursor.getPosition()
var dx = pos.x - previousPosition.x
var dy = pos.y - previousPosition.y
appWindow.x += dx
appWindow.y += dy
previousPosition = pos
}
}
}
}

View File

@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.9
import QtQuick.Controls 2.0
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1
@@ -37,7 +37,7 @@ ListView {
color: "#767676"
textFormat: Text.RichText
text: parent.message
selectionColor: MoneroComponents.Style.dimmedFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectByMouse: true
readOnly: true
onFocusChanged: {if(focus === false) deselect() }
@@ -73,11 +73,11 @@ ListView {
TextEdit {
id: dateString
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 12 * scaleRatio
font.pixelSize: 13 * scaleRatio
font.bold: false
color: "#707070"
text: time_date + " (" + Utils.ago(time_epoch) + ") "
selectionColor: MoneroComponents.Style.dimmedFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectByMouse: true
readOnly: true
onFocusChanged: {if(focus === false) deselect() }
@@ -126,7 +126,7 @@ ListView {
font.bold: true
color: hide_amount ? "#707070" : "#009F1E"
text: hide_amount ? '-' : '+' + amount
selectionColor: MoneroComponents.Style.dimmedFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectByMouse: true
readOnly: true
onFocusChanged: {if(focus === false) deselect() }
@@ -173,7 +173,7 @@ ListView {
}
}
}
selectionColor: MoneroComponents.Style.dimmedFontColor
selectionColor: MoneroComponents.Style.textSelectionColor
selectByMouse: true
readOnly: true
onFocusChanged: {if(focus === false) deselect() }
@@ -199,7 +199,7 @@ ListView {
anchors.horizontalCenter: parent.horizontalCenter
Layout.preferredWidth: 12 * scaleRatio
Layout.preferredHeight: 21 * scaleRatio
source: "../../images/merchant/arrow_right.png"
source: "qrc:///images/merchant/arrow_right.png"
}
MouseArea {