aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.qml18
-rw-r--r--pages/Settings.qml17
2 files changed, 22 insertions, 13 deletions
diff --git a/main.qml b/main.qml
index 19956c26..50621493 100644
--- a/main.qml
+++ b/main.qml
@@ -1804,7 +1804,25 @@ ApplicationWindow {
middlePanel.focus = true
middlePanel.focus = false
}
+ }
+ // Daemon console
+ DaemonConsole {
+ id: daemonConsolePopup
+ height:500
+ width:800
+ title: qsTr("Daemon log") + translationManager.emptyString
+ onAccepted: {
+ close();
+ }
+ }
+ // background gradient
+ Rectangle {
+ id: inactiveOverlay
+ visible: false
+ anchors.fill: parent
+ color: "black"
+ opacity: 0.8
}
}
diff --git a/pages/Settings.qml b/pages/Settings.qml
index bc9c689c..0b27c898 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -32,6 +32,8 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.2
import "../version.js" as Version
+import "../js/Windows.js" as Windows
+import "../js/Utils.js" as Utils
import "../components"
@@ -501,7 +503,7 @@ Rectangle {
visible: !isMobile
id: customDecorationsCheckBox
checked: persistentSettings.customDecorations
- onClicked: appWindow.setCustomWindowDecorations(checked)
+ onClicked: Windows.setCustomWindowDecorations(checked)
text: qsTr("Custom decorations") + translationManager.emptyString
}
}
@@ -719,17 +721,6 @@ Rectangle {
}
}
- // Daemon console
- DaemonConsole {
- id: daemonConsolePopup
- height:500
- width:800
- title: qsTr("Daemon log") + translationManager.emptyString
- onAccepted: {
- close();
- }
- }
-
// Choose blockchain folder
FileDialog {
id: blockchainFileDialog
@@ -794,7 +785,7 @@ Rectangle {
function onDaemonConsoleUpdated(message){
// Update daemon console
- daemonConsolePopup.textArea.append(message)
+ daemonConsolePopup.textArea.logMessage(message)
}