Remove useless black bar buttons

Except the yellow layout change one, which is actually useful

In particular, the close button closed without saving the wallet
cache, contrary to what closing using the window manager close
button did. Which isn't nice if you want to keep your tx keys.

Also tweak the WM hints to make sure there's a close button
displayed on all platforms.
This commit is contained in:
moneromooo.monero 2016-11-19 14:22:56 +00:00
parent c83336cc47
commit 3b4543c716
3 changed files with 11 additions and 154 deletions

View file

@ -150,7 +150,7 @@ Rectangle {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: 2 anchors.margins: 2
anchors.topMargin: 30 anchors.topMargin: 0
spacing: 0 spacing: 0
@ -169,12 +169,13 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -5 anchors.verticalCenterOffset: -5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 20 anchors.leftMargin: 40
source: "images/moneroLogo2.png" source: "images/moneroLogo2.png"
} }
Grid { Grid {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
width: 256 width: 256
columns: 3 columns: 3

View file

@ -31,29 +31,12 @@ import QtQuick.Window 2.0
Rectangle { Rectangle {
id: titleBar id: titleBar
height: 30
color: "#000000" color: "#000000"
y: -height
property int mouseX: 0 property int mouseX: 0
property string title
property bool containsMouse: false property bool containsMouse: false
property alias maximizeButtonVisible: maximizeButton.visible
property alias basicButtonVisible: goToBasicVersionButton.visible property alias basicButtonVisible: goToBasicVersionButton.visible
signal goToBasicVersion(bool yes) signal goToBasicVersion(bool yes)
Text {
anchors.centerIn: parent
font.family: "Arial"
font.pixelSize: 15
font.letterSpacing: -1
color: "#FFFFFF"
text: titleBar.title
}
Behavior on y {
NumberAnimation { duration: 100; easing.type: Easing.InQuad }
}
Rectangle { Rectangle {
id: goToBasicVersionButton id: goToBasicVersionButton
property bool containsMouse: titleBar.mouseX >= x && titleBar.mouseX <= x + width property bool containsMouse: titleBar.mouseX >= x && titleBar.mouseX <= x + width
@ -61,8 +44,10 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
width: height anchors.right: parent.right
color: containsMouse || checked ? "#FFE00A" : "#000000" color: containsMouse || checked ? "#FFE00A" : "#000000"
width: parent.width
height: parent.height
Image { Image {
anchors.centerIn: parent anchors.centerIn: parent
@ -79,96 +64,4 @@ Rectangle {
} }
} }
} }
Row {
id: row
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
Rectangle {
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
color: containsMouse ? "#6B0072" : "#000000"
Image {
anchors.centerIn: parent
source: "../images/helpIcon.png"
}
MouseArea {
id: whatIsArea
anchors.fill: parent
onClicked: {
}
}
}
Rectangle {
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
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 {
id: maximizeButton
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
anchors.top: parent.top
anchors.bottom: parent.bottom
width: height
color: containsMouse ? "#FF6C3C" : "#000000"
Image {
anchors.centerIn: parent
source: appWindow.visibility === Window.FullScreen ? "../images/backToWindowIcon.png" :
"../images/maximizeIcon.png"
}
MouseArea {
id: maximizeArea
anchors.fill: parent
onClicked: {
appWindow.visibility = appWindow.visibility !== Window.FullScreen ? Window.FullScreen :
Window.Windowed
}
}
}
Rectangle {
property bool containsMouse: titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width && titleBar.containsMouse
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()
}
}
}
} }

View file

@ -615,7 +615,7 @@ ApplicationWindow {
width: rightPanelExpanded ? 1269 : 1269 - 300 width: rightPanelExpanded ? 1269 : 1269 - 300
height: 800 height: 800
color: "#FFFFFF" color: "#FFFFFF"
flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint flags: Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint | Qt.WindowMaximizeButtonHint
onWidthChanged: x -= 0 onWidthChanged: x -= 0
@ -743,10 +743,7 @@ ApplicationWindow {
PropertyChanges { target: appWindow; width: 930; } PropertyChanges { target: appWindow; width: 930; }
PropertyChanges { target: appWindow; height: 595; } PropertyChanges { target: appWindow; height: 595; }
PropertyChanges { target: resizeArea; visible: false } PropertyChanges { target: resizeArea; visible: false }
PropertyChanges { target: titleBar; maximizeButtonVisible: false }
PropertyChanges { target: frameArea; blocked: true } PropertyChanges { target: frameArea; blocked: true }
PropertyChanges { target: titleBar; y: 0 }
PropertyChanges { target: titleBar; title: qsTr("Program setup wizard") + translationManager.emptyString }
}, State { }, State {
name: "normal" name: "normal"
PropertyChanges { target: leftPanel; visible: true } PropertyChanges { target: leftPanel; visible: true }
@ -757,10 +754,7 @@ ApplicationWindow {
PropertyChanges { target: appWindow; width: rightPanelExpanded ? 1269 : 1269 - 300; } PropertyChanges { target: appWindow; width: rightPanelExpanded ? 1269 : 1269 - 300; }
PropertyChanges { target: appWindow; height: 800; } PropertyChanges { target: appWindow; height: 800; }
PropertyChanges { target: resizeArea; visible: true } PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: titleBar; maximizeButtonVisible: true }
PropertyChanges { target: frameArea; blocked: false } PropertyChanges { target: frameArea; blocked: false }
PropertyChanges { target: titleBar; y: 0 }
PropertyChanges { target: titleBar; title: qsTr("Monero") + translationManager.emptyString }
} }
] ]
@ -814,11 +808,6 @@ ApplicationWindow {
height: 30 height: 30
z: 1 z: 1
hoverEnabled: true hoverEnabled: true
// Uncomment to enable 'auto-hidden' titlebar
/*
onEntered: if(!blocked) titleBar.y = 0
onExited: if(!blocked) titleBar.y = -titleBar.height
*/
propagateComposedEvents: true propagateComposedEvents: true
onPressed: mouse.accepted = false onPressed: mouse.accepted = false
onReleased: mouse.accepted = false onReleased: mouse.accepted = false
@ -833,11 +822,6 @@ ApplicationWindow {
properties: "visibility" properties: "visibility"
value: Window.Windowed value: Window.Windowed
} }
PropertyAction {
target: titleBar
properties: "maximizeButtonVisible"
value: false
}
PropertyAction { PropertyAction {
target: frameArea target: frameArea
properties: "blocked" properties: "blocked"
@ -926,11 +910,6 @@ ApplicationWindow {
properties: "blocked" properties: "blocked"
value: false value: false
} }
PropertyAction {
target: titleBar
properties: "maximizeButtonVisible"
value: true
}
} }
WizardMain { WizardMain {
@ -993,8 +972,10 @@ ApplicationWindow {
TitleBar { TitleBar {
id: titleBar id: titleBar
anchors.left: parent.left x: 0
anchors.right: parent.right y: 0
width: 30
height: 30
onGoToBasicVersion: { onGoToBasicVersion: {
if (yes) { if (yes) {
// basicPanel.currentView = middlePanel.currentView // basicPanel.currentView = middlePanel.currentView
@ -1004,24 +985,6 @@ ApplicationWindow {
goToProAnimation.start() goToProAnimation.start()
} }
} }
MouseArea {
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
}
}
}
} }
} }
onClosing: { onClosing: {