github
/
monero-gui
mirror of https://github.com/monero-project/monero-gui
1
Fork 0
Code Releases Activity

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
This commit is contained in:
marcin 2014-07-15 16:03:39 +02:00
parent c65a878d8c
commit ba65d921e8
15 changed files with 125 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RightPanel.qml
View File

@ -7,13 +7,6 @@ import "components"
Rectangle {
width: 330
TitleBar {
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 5
anchors.rightMargin: 5
}
TabView {
id: tabView
anchors.left: parent.left

2
bitmonero.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>

210
components/TitleBar.qml
View File

@ -1,140 +1,104 @@
import QtQuick 2.2
import QtQuick.Window 2.0
Row {
Rectangle {
width: 25
height: 25
radius: 5
clip: true
color: helpArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
Rectangle {
width: 25
height: 25
radius: 5
color: "#FFFFFF"
visible: helpArea.containsMouse
x: 1; y: 2
}
Image {
anchors.centerIn: parent
source: {
if(appWindow.whatIsEnable)
return "../images/whatIsIcon.png"
return helpArea.containsMouse ? "../images/helpIconHovered.png" :
"../images/helpIcon.png"
}
}
MouseArea {
id: helpArea
anchors.fill: parent
hoverEnabled: true
onClicked: appWindow.whatIsEnable = !appWindow.whatIsEnable
}
Rectangle {
id: titleBar
height: 30
color: "#000000"
y: -height
property int mouseX: 0
property int mouseY: 0
Behavior on y {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
}
Rectangle {
width: 25
height: 25
radius: 5
clip: true
color: minimizeArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
Row {
id: row
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
Rectangle {
width: 25
height: 25
radius: 5
color: "#FFFFFF"
visible: minimizeArea.containsMouse
x: 1; y: 2
}
Image {
anchors.centerIn: parent
source: minimizeArea.containsMouse ? "../images/minimizeIconHovered.png" :
"../images/minimizeIcon.png"
}
MouseArea {
id: minimizeArea
anchors.fill: parent
hoverEnabled: true
onClicked: {
appWindow.visible = false
appWindow.visibility = Window.Minimized
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: appWindow.whatIsEnable || containsMouse ? "#6B0072" : "#000000"
Image {
anchors.centerIn: parent
source: "../images/helpIcon.png"
}
MouseArea {
id: whatIsArea
anchors.fill: parent
onClicked: appWindow.whatIsEnable = !appWindow.whatIsEnable
}
}
}
Rectangle {
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 {
anchors.centerIn: parent
source: {
if(parent.checked)
return maximizeArea.containsMouse ? "../images/backToWindowIconHovered.png" :
"../images/backToWindowIcon.png"
return maximizeArea.containsMouse ? "../images/maximizeIconHovered.png" :
"../images/maximizeIcon.png"
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 ? "#3665B3" : "#000000"
Image {
anchors.centerIn: parent
source: "../images/minimizeIcon.png"
}
MouseArea {
id: minimizeArea
anchors.fill: parent
onClicked: appWindow.visibility = Window.Minimized
}
}
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
Image {
anchors.centerIn: parent
source: parent.checked ? "../images/backToWindowIcon.png" :
"../images/maximizeIcon.png"
MouseArea {
id: maximizeArea
anchors.fill: parent
hoverEnabled: true
onClicked: {
parent.checked = !parent.checked
appWindow.visibility = parent.checked ? Window.FullScreen :
Window.Windowed
}
MouseArea {
id: maximizeArea
hoverEnabled: true
onClicked: {
parent.checked = !parent.checked
appWindow.visibility = parent.checked ? Window.FullScreen :
Window.Windowed
}
}
}
}
Rectangle {
width: 25
height: 25
radius: 5
clip: true
color: closeArea.containsMouse ? "#DBDBDB" : "#FFFFFF"
Rectangle {
width: 25
height: 25
radius: 5
color: "#FFFFFF"
visible: closeArea.containsMouse
x: 1; y: 2
}
Image {
anchors.centerIn: parent
source: "../images/closeIcon.png"
}
MouseArea {
id: closeArea
anchors.fill: parent
hoverEnabled: true
onClicked: Qt.quit()
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 ? "#E04343" : "#000000"
Image {
anchors.centerIn: parent
source: "../images/closeIcon.png"
}
MouseArea {
anchors.fill: parent
onClicked: Qt.quit()
}
}
}
}

BIN
images/backToWindowIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 231 B

BIN
images/backToWindowIconHovered.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 239 B

BIN
images/closeIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 249 B

BIN
images/helpIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 319 B

BIN
images/helpIconHovered.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 220 B

BIN
images/maximizeIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 208 B

BIN
images/maximizeIconHovered.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 215 B

BIN
images/minimizeIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

BIN
images/minimizeIconHovered.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 198 B

25
main.qml
View File

@ -140,5 +140,30 @@ ApplicationWindow {
visible: false
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
}
}
}

16
pages/Transfer.qml
View File

@ -119,18 +119,24 @@ Rectangle {
text: qsTr("Payment ID <font size='2'>( Optional )</font>")
}
Row {
LineEdit {
id: paymentLine
anchors.left: parent.left
anchors.right: parent.right
anchors.top: paymentLabel.bottom
anchors.leftMargin: 17
anchors.rightMargin: 17
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 {
id: sendButton

6
qml.qrc
View File

@ -8,9 +8,6 @@
<file>images/helpIcon.png</file>
<file>images/maximizeIcon.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>components/Label.qml</file>
<file>images/whatIsIcon.png</file>
@ -41,7 +38,6 @@
<file>images/descSortIndicatorActived.png</file>
<file>images/descSortIndicatorPressed.png</file>
<file>images/backToWindowIcon.png</file>
<file>images/backToWindowIconHovered.png</file>
<file>components/DashboardTable.qml</file>
<file>components/TableDropdown.qml</file>
<file>images/tableOptions.png</file>
@ -69,7 +65,7 @@
<file>images/datePicker.png</file>
<file>images/nextMonth.png</file>
<file>images/prevMonth.png</file>
<file>components/TitleBar.qml</file>
<file>components/TickDelegate.qml</file>
<file>components/TitleBar.qml</file>
</qresource>
</RCC>