new title bar + fixed payment id width on transfer page.
https://trello.com/c/U0nxQ9vy/32-payment-id-field-in-transfer-tab-needs-to-be-much-longer https://trello.com/c/r755XHXq/36-move-window-control-icons-to-left-hand-side-as-discussed-once-qml-is-all-done-we-will-see-how-everyone-reacts-to-it
@ -7,13 +7,6 @@ import "components"
|
|||||||
Rectangle {
|
Rectangle {
|
||||||
width: 330
|
width: 330
|
||||||
|
|
||||||
TitleBar {
|
|
||||||
anchors.top: parent.top
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.topMargin: 5
|
|
||||||
anchors.rightMargin: 5
|
|
||||||
}
|
|
||||||
|
|
||||||
TabView {
|
TabView {
|
||||||
id: tabView
|
id: tabView
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 3.1.2, 2014-07-13T17:44:06. -->
|
<!-- Written by QtCreator 3.1.2, 2014-07-15T16:02:00. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||||
|
@ -1,105 +1,79 @@
|
|||||||
import QtQuick 2.2
|
import QtQuick 2.2
|
||||||
import QtQuick.Window 2.0
|
import QtQuick.Window 2.0
|
||||||
|
|
||||||
Row {
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 25
|
id: titleBar
|
||||||
height: 25
|
height: 30
|
||||||
radius: 5
|
color: "#000000"
|
||||||
clip: true
|
y: -height
|
||||||
color: helpArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
|
property int mouseX: 0
|
||||||
|
property int mouseY: 0
|
||||||
|
|
||||||
|
Behavior on y {
|
||||||
|
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
id: row
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 25
|
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||||
height: 25
|
anchors.top: parent.top
|
||||||
radius: 5
|
anchors.bottom: parent.bottom
|
||||||
color: "#FFFFFF"
|
width: height
|
||||||
visible: helpArea.containsMouse
|
color: appWindow.whatIsEnable || containsMouse ? "#6B0072" : "#000000"
|
||||||
x: 1; y: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: {
|
source: "../images/helpIcon.png"
|
||||||
if(appWindow.whatIsEnable)
|
|
||||||
return "../images/whatIsIcon.png"
|
|
||||||
return helpArea.containsMouse ? "../images/helpIconHovered.png" :
|
|
||||||
"../images/helpIcon.png"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: helpArea
|
id: whatIsArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
|
||||||
onClicked: appWindow.whatIsEnable = !appWindow.whatIsEnable
|
onClicked: appWindow.whatIsEnable = !appWindow.whatIsEnable
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 25
|
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||||
height: 25
|
anchors.top: parent.top
|
||||||
radius: 5
|
anchors.bottom: parent.bottom
|
||||||
clip: true
|
width: height
|
||||||
color: minimizeArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
|
color: containsMouse ? "#3665B3" : "#000000"
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 25
|
|
||||||
height: 25
|
|
||||||
radius: 5
|
|
||||||
color: "#FFFFFF"
|
|
||||||
visible: minimizeArea.containsMouse
|
|
||||||
x: 1; y: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: minimizeArea.containsMouse ? "../images/minimizeIconHovered.png" :
|
source: "../images/minimizeIcon.png"
|
||||||
"../images/minimizeIcon.png"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: minimizeArea
|
id: minimizeArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
onClicked: appWindow.visibility = Window.Minimized
|
||||||
onClicked: {
|
|
||||||
appWindow.visible = false
|
|
||||||
appWindow.visibility = Window.Minimized
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
width: height
|
||||||
|
color: containsMouse ? "#FF6C3C" : "#000000"
|
||||||
property bool checked: false
|
property bool checked: false
|
||||||
width: 25
|
|
||||||
height: 25
|
|
||||||
radius: 5
|
|
||||||
clip: true
|
|
||||||
color: maximizeArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 25
|
|
||||||
height: 25
|
|
||||||
radius: 5
|
|
||||||
color: "#FFFFFF"
|
|
||||||
visible: maximizeArea.containsMouse
|
|
||||||
x: 1; y: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: {
|
source: parent.checked ? "../images/backToWindowIcon.png" :
|
||||||
if(parent.checked)
|
|
||||||
return maximizeArea.containsMouse ? "../images/backToWindowIconHovered.png" :
|
|
||||||
"../images/backToWindowIcon.png"
|
|
||||||
return maximizeArea.containsMouse ? "../images/maximizeIconHovered.png" :
|
|
||||||
"../images/maximizeIcon.png"
|
"../images/maximizeIcon.png"
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: maximizeArea
|
id: maximizeArea
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: true
|
hoverEnabled: true
|
||||||
onClicked: {
|
onClicked: {
|
||||||
parent.checked = !parent.checked
|
parent.checked = !parent.checked
|
||||||
@ -110,20 +84,11 @@ Row {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 25
|
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width
|
||||||
height: 25
|
anchors.top: parent.top
|
||||||
radius: 5
|
anchors.bottom: parent.bottom
|
||||||
clip: true
|
width: height
|
||||||
color: closeArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
|
color: containsMouse ? "#E04343" : "#000000"
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 25
|
|
||||||
height: 25
|
|
||||||
radius: 5
|
|
||||||
color: "#FFFFFF"
|
|
||||||
visible: closeArea.containsMouse
|
|
||||||
x: 1; y: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
@ -131,10 +96,9 @@ Row {
|
|||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: closeArea
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: true
|
|
||||||
onClicked: Qt.quit()
|
onClicked: Qt.quit()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 233 B After Width: | Height: | Size: 231 B |
Before Width: | Height: | Size: 239 B |
Before Width: | Height: | Size: 238 B After Width: | Height: | Size: 249 B |
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 208 B |
Before Width: | Height: | Size: 215 B |
Before Width: | Height: | Size: 198 B After Width: | Height: | Size: 198 B |
Before Width: | Height: | Size: 198 B |
25
main.qml
@ -140,5 +140,30 @@ ApplicationWindow {
|
|||||||
visible: false
|
visible: false
|
||||||
z: 100
|
z: 100
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: frameArea
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
height: 30
|
||||||
|
z: 1
|
||||||
|
hoverEnabled: true
|
||||||
|
onEntered: titleBar.y = 0
|
||||||
|
onExited: titleBar.y = -titleBar.height
|
||||||
|
propagateComposedEvents: true
|
||||||
|
onPressed: mouse.accepted = false
|
||||||
|
onReleased: mouse.accepted = false
|
||||||
|
onMouseXChanged: {
|
||||||
|
titleBar.mouseX = mouseX
|
||||||
|
titleBar.mouseY = mouseY
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
TitleBar {
|
||||||
|
id: titleBar
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -119,19 +119,25 @@ Rectangle {
|
|||||||
text: qsTr("Payment ID <font size='2'>( Optional )</font>")
|
text: qsTr("Payment ID <font size='2'>( Optional )</font>")
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
LineEdit {
|
||||||
|
id: paymentLine
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: paymentLabel.bottom
|
anchors.top: paymentLabel.bottom
|
||||||
anchors.leftMargin: 17
|
anchors.leftMargin: 17
|
||||||
anchors.rightMargin: 17
|
anchors.rightMargin: 17
|
||||||
anchors.topMargin: 5
|
anchors.topMargin: 5
|
||||||
spacing: 17
|
|
||||||
|
|
||||||
LineEdit {
|
|
||||||
width: parent.width - (checkBox.width + sendButton.width + 2 * parent.spacing)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.top: paymentLine.bottom
|
||||||
|
anchors.leftMargin: 17
|
||||||
|
anchors.rightMargin: 17
|
||||||
|
anchors.topMargin: 17
|
||||||
|
spacing: 17
|
||||||
|
|
||||||
StandardButton {
|
StandardButton {
|
||||||
id: sendButton
|
id: sendButton
|
||||||
width: 60
|
width: 60
|
||||||
|
6
qml.qrc
@ -8,9 +8,6 @@
|
|||||||
<file>images/helpIcon.png</file>
|
<file>images/helpIcon.png</file>
|
||||||
<file>images/maximizeIcon.png</file>
|
<file>images/maximizeIcon.png</file>
|
||||||
<file>images/minimizeIcon.png</file>
|
<file>images/minimizeIcon.png</file>
|
||||||
<file>images/helpIconHovered.png</file>
|
|
||||||
<file>images/maximizeIconHovered.png</file>
|
|
||||||
<file>images/minimizeIconHovered.png</file>
|
|
||||||
<file>images/moneroLogo.png</file>
|
<file>images/moneroLogo.png</file>
|
||||||
<file>components/Label.qml</file>
|
<file>components/Label.qml</file>
|
||||||
<file>images/whatIsIcon.png</file>
|
<file>images/whatIsIcon.png</file>
|
||||||
@ -41,7 +38,6 @@
|
|||||||
<file>images/descSortIndicatorActived.png</file>
|
<file>images/descSortIndicatorActived.png</file>
|
||||||
<file>images/descSortIndicatorPressed.png</file>
|
<file>images/descSortIndicatorPressed.png</file>
|
||||||
<file>images/backToWindowIcon.png</file>
|
<file>images/backToWindowIcon.png</file>
|
||||||
<file>images/backToWindowIconHovered.png</file>
|
|
||||||
<file>components/DashboardTable.qml</file>
|
<file>components/DashboardTable.qml</file>
|
||||||
<file>components/TableDropdown.qml</file>
|
<file>components/TableDropdown.qml</file>
|
||||||
<file>images/tableOptions.png</file>
|
<file>images/tableOptions.png</file>
|
||||||
@ -69,7 +65,7 @@
|
|||||||
<file>images/datePicker.png</file>
|
<file>images/datePicker.png</file>
|
||||||
<file>images/nextMonth.png</file>
|
<file>images/nextMonth.png</file>
|
||||||
<file>images/prevMonth.png</file>
|
<file>images/prevMonth.png</file>
|
||||||
<file>components/TitleBar.qml</file>
|
|
||||||
<file>components/TickDelegate.qml</file>
|
<file>components/TickDelegate.qml</file>
|
||||||
|
<file>components/TitleBar.qml</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|