From 7fe9d71eb366dc0f9eef9258e212ca9ceb785f2c Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sat, 21 Apr 2018 22:21:35 +0200 Subject: Added daemonConsole component to main.qml --- pages/Settings.qml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'pages') 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) } -- cgit v1.2.3