Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

StandardButton - removed unused properties and some layout changes to settings page

Browse Source
This commit is contained in:
Sander Ferdinand
2017-12-09 17:46:03 +01:00
committed by moneromooo-monero
parent 0477af1b0d
commit be9cb8931c
17 changed files with 33 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/DaemonConsole.qml
View File

@@ -110,10 +110,6 @@ Window {
id: okButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Close") + translationManager.emptyString
onClicked: {
root.close()
@@ -138,10 +134,6 @@ Window {
// id: sendCommandButton
// enabled: sendCommandText.text.length > 0
// fontSize: 14
// shadowReleasedColor: "#FF4304"
// shadowPressedColor: "#B32D00"
// releasedColor: "#FF6C3C"
// pressedColor: "#FF4304"
// text: qsTr("Send command")
// onClicked: {
// daemonManager.sendCommand(sendCommandText.text,currentWallet.testnet);

8
components/DaemonManagerDialog.qml
View File

@@ -108,10 +108,6 @@ Window {
id: okButton
visible:false
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Start daemon (%1)").arg(countDown)
KeyNavigation.tab: cancelButton
onClicked: {
@@ -125,10 +121,6 @@ Window {
MoneroComponents.StandardButton {
id: cancelButton
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Use custom settings")
onClicked: {

4
components/DatePicker.qml
View File

@@ -92,10 +92,6 @@ Item {
StandardButton {
id: button
anchors.fill: parent
shadowReleasedColor: "#DBDBDB"
shadowPressedColor: "#888888"
releasedColor: "#F0EEEE"
pressedColor: "#DBDBDB"
icon: "../images/datePicker.png"
visible: !datePicker.expanded
onClicked: datePicker.expanded = true

4
components/HistoryTable.qml
View File

@@ -96,10 +96,6 @@ ListView {
anchors.topMargin: parent.height/2 - this.height/2
width: 80
fontSize: 14
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Details")
onClicked: {
var tx_key = currentWallet.getTxKey(hash)

8
components/PasswordDialog.qml
View File

@@ -149,10 +149,6 @@ Item {
MoneroComponents.StandardButton {
id: cancelButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Cancel") + translationManager.emptyString
KeyNavigation.tab: passwordInput
onClicked: {
@@ -162,10 +158,6 @@ Item {
}
MoneroComponents.StandardButton {
id: okButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Continue")
KeyNavigation.tab: cancelButton
onClicked: {

4
components/RemoteNodeEdit.qml
View File

@@ -33,9 +33,12 @@ import QtQuick.Layouts 1.1
GridLayout {
columns: (isMobile) ? 1 : 2
columnSpacing: 32
id: root
property alias daemonAddrText: daemonAddr.text
property alias daemonPortText: daemonPort.text
property alias daemonAddrLabelText: daemonAddr.labelText
property alias daemonPortLabelText: daemonPort.labelText
signal editingFinished()
@@ -50,7 +53,6 @@ GridLayout {
onEditingFinished: root.editingFinished()
}
LineEdit {
id: daemonPort
Layout.fillWidth: true

32
components/StandardButton.qml
View File

@@ -33,10 +33,6 @@ import "." 1.0
Item {
id: button
height: 37 * scaleRatio
property string shadowPressedColor: Style.buttonBackgroundColor
property string shadowReleasedColor: Style.buttonBackgroundColor
property string pressedColor: Style.buttonBackgroundColor
property string releasedColor: Style.buttonBackgroundColor
property string icon: ""
property string textColor: button.enabled? Style.buttonTextColor: Style.buttonTextColorDisabled
property int fontSize: 16 * scaleRatio
@@ -57,8 +53,8 @@ Item {
anchors.right: parent.right
height: parent.height - 1
radius: 3
// color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled
color: parent.enabled ? Style.buttonBackgroundColor : Style.buttonBackgroundColorDisabled
border.color: Qt.darker(parent.releasedColor)
border.width: parent.focus ? 1 : 0
MouseArea{
@@ -68,32 +64,18 @@ Item {
propagateComposedEvents: true
// possibly do some hover effects here
onEntered: {
if(button.enabled) parent.color = Style.buttonBackgroundColorHover;
else parent.color = Style.buttonBackgroundColorDisabledHover;
// if(button.enabled) parent.color = Style.buttonBackgroundColorHover;
// else parent.color = Style.buttonBackgroundColorDisabledHover;
}
onExited: {
if(button.enabled) parent.color = Style.buttonBackgroundColor;
else parent.color = Style.buttonBackgroundColorDisabled;
// if(button.enabled) parent.color = Style.buttonBackgroundColor;
// else parent.color = Style.buttonBackgroundColorDisabled;
}
}
}
// Rectangle {
// anchors.left: parent.left
// anchors.right: parent.right
// height: parent.height - 1
// y: buttonArea.pressed ? 1 : 0
// color: {
// parent.enabled ? (buttonArea.pressed ? parent.pressedColor : parent.releasedColor)
// : Qt.lighter(parent.releasedColor)
// }
// //radius: 4
// }
Text {
id: label
anchors.verticalCenter: parent.verticalCenter
@@ -105,7 +87,6 @@ Item {
font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize
color: parent.textColor
visible: parent.icon === ""
// font.capitalization : Font.Capitalize
}
Image {
@@ -118,6 +99,7 @@ Item {
id: buttonArea
anchors.fill: parent
onClicked: doClick()
cursorShape: Qt.PointingHandCursor
}
Keys.onSpacePressed: doClick()

8
components/StandardDialog.qml
View File

@@ -140,10 +140,6 @@ Rectangle {
MoneroComponents.StandardButton {
id: cancelButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Cancel") + translationManager.emptyString
onClicked: {
root.close()
@@ -153,10 +149,6 @@ Rectangle {
MoneroComponents.StandardButton {
id: okButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("OK")
KeyNavigation.tab: cancelButton
onClicked: {