4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes some javascript errors

Browse Source
This commit is contained in:
Sander Ferdinand 2018-07-18 18:26:34 +02:00
parent 6be5e5731e
commit 9872689abe
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/InputDialog.qml
View File

@ -65,7 +65,7 @@ Item {
} }
ColumnLayout { ColumnLayout {
z: bg.z + 1 z: parent.z + 1
id: mainLayout id: mainLayout
spacing: 10 spacing: 10
anchors { fill: parent; margins: 35 } anchors { fill: parent; margins: 35 }

5
js/Windows.js
View File

@ -11,12 +11,11 @@ function setCustomWindowDecorations(custom) {
var y = appWindow.y var y = appWindow.y
if (x < 0) x = 0 if (x < 0) x = 0
if (y < 0) y = 0 if (y < 0) y = 0
// Update persistentSettings // Update persistentSettings
persistentSettings.customDecorations = custom; persistentSettings.customDecorations = custom;
titleBar.visible = custom; titleBar.visible = custom;
daemonConsolePopup.titleBar.visible = custom;
if (custom) { if (custom) {
appWindow.flags = flagsCustomDecorations; appWindow.flags = flagsCustomDecorations;
@ -25,7 +24,7 @@ function setCustomWindowDecorations(custom) {
appWindow.flags = flags; appWindow.flags = flags;
daemonConsolePopup.flags = flags; daemonConsolePopup.flags = flags;
} }
// Reset window // Reset window
appWindow.hide() appWindow.hide()
appWindow.x = x appWindow.x = x

7
pages/settings/SettingsLog.qml
View File

@ -11,7 +11,7 @@ Rectangle {
color: "transparent" color: "transparent"
height: 1400 height: 1400
Layout.fillWidth: true Layout.fillWidth: true
ColumnLayout { ColumnLayout {
id: settingsLog id: settingsLog
property int itemHeight: 60 * scaleRatio property int itemHeight: 60 * scaleRatio
@ -31,7 +31,7 @@ Rectangle {
// color: MoneroComponents.Style.dividerColor // color: MoneroComponents.Style.dividerColor
// opacity: MoneroComponents.Style.dividerOpacity // opacity: MoneroComponents.Style.dividerOpacity
// } // }
Text { Text {
Layout.bottomMargin: 2 * scaleRatio Layout.bottomMargin: 2 * scaleRatio
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
@ -191,7 +191,6 @@ Rectangle {
id: sendCommandText id: sendCommandText
Layout.fillWidth: true Layout.fillWidth: true
fontBold: false fontBold: false
fontFamily: MoneroComponents.Style.fontRegular.name
placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString
placeholderFontSize: 16 * scaleRatio placeholderFontSize: 16 * scaleRatio
onAccepted: { onAccepted: {
@ -207,7 +206,7 @@ Rectangle {
Component.onCompleted: { Component.onCompleted: {
logLevelDropdown.currentIndex = persistentSettings.logLevel; logLevelDropdown.currentIndex = persistentSettings.logLevel;
logLevelDropdown.update(); logLevelDropdown.update();
if(typeof daemonManager != "undefined") if(typeof daemonManager != "undefined")
daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated) daemonManager.daemonConsoleUpdated.connect(onDaemonConsoleUpdated)
} }