From 1c6884e886f5f548428a1ce33798c66ac8f0675e Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 5 Nov 2016 10:54:11 +0100 Subject: Show daemon manager dialog if daemon isnt started --- components/DaemonManagerDialog.qml | 119 +++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 components/DaemonManagerDialog.qml (limited to 'components') diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml new file mode 100644 index 00000000..a0787fb5 --- /dev/null +++ b/components/DaemonManagerDialog.qml @@ -0,0 +1,119 @@ +// Copyright (c) 2014-2015, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import QtQuick 2.0 +import QtQuick.Controls 1.4 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.1 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Window 2.0 + +import "../components" as MoneroComponents + +Window { + id: root + modality: Qt.ApplicationModal + flags: Qt.Window | Qt.FramelessWindowHint + + signal rejected() + + function open() { + show() + } + + // TODO: implement without hardcoding sizes + width: 480 + height: 200 + + ColumnLayout { + id: mainLayout + spacing: 10 + anchors { fill: parent; margins: 35 } + + ColumnLayout { + id: column + //anchors {fill: parent; margins: 16 } + Layout.alignment: Qt.AlignHCenter + + Label { + text: qsTr("Daemon doesn't appear to be running") + Layout.alignment: Qt.AlignHCenter + Layout.columnSpan: 2 + Layout.fillWidth: true + horizontalAlignment: Text.AlignHCenter + font.pixelSize: 24 + font.family: "Arial" + color: "#555555" + } + + } + + RowLayout { + id: buttons + spacing: 60 + Layout.alignment: Qt.AlignHCenter + + MoneroComponents.StandardButton { + id: okButton + width: 120 + fontSize: 14 + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + text: qsTr("Start daemon") + KeyNavigation.tab: cancelButton + onClicked: { + daemonManager.start(); + root.accepted() + root.close() + } + } + + MoneroComponents.StandardButton { + id: cancelButton + width: 120 + fontSize: 14 + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + text: qsTr("Cancel") + + onClicked: { + root.rejected() + root.close() + } + } + } + } + +} + + + -- cgit v1.2.3 From 277512475715a353e81a217a751655ec6fd4c943 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 5 Nov 2016 11:00:29 +0100 Subject: small error in daemon manager dialog --- components/DaemonManagerDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components') diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml index a0787fb5..23f2e9e5 100644 --- a/components/DaemonManagerDialog.qml +++ b/components/DaemonManagerDialog.qml @@ -90,8 +90,8 @@ Window { KeyNavigation.tab: cancelButton onClicked: { daemonManager.start(); - root.accepted() root.close() + // root.accepted() } } -- cgit v1.2.3 From 86772bee5221d68862a5471dca6b2ee4227599e2 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 19 Nov 2016 15:05:53 +0100 Subject: added standardDialog component --- components/StandardDialog.qml | 1 + qml.qrc | 1 + 2 files changed, 2 insertions(+) (limited to 'components') diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 0e081ae5..8c7a05d3 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -119,6 +119,7 @@ Window { releasedColor: "#FF6C3C" pressedColor: "#FF4304" text: qsTr("Cancel") + KeyNavigation.tab: passwordInput onClicked: { root.rejected() root.close() diff --git a/qml.qrc b/qml.qrc index 93938e96..c1aa0ece 100644 --- a/qml.qrc +++ b/qml.qrc @@ -121,5 +121,6 @@ components/StandardDialog.qml pages/Sign.qml components/DaemonManagerDialog.qml + components/StandardDialog.qml -- cgit v1.2.3 From de635cb24f8943192dab2fab9e8541277e65df2c Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sat, 19 Nov 2016 15:07:49 +0100 Subject: pw dialog: close popup before continue --- components/PasswordDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components') diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 7d1a5bd6..7b19c517 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -143,8 +143,8 @@ Window { text: qsTr("Cancel") KeyNavigation.tab: passwordInput onClicked: { - root.rejected() root.close() + root.rejected() } } MoneroComponents.StandardButton { @@ -158,8 +158,8 @@ Window { text: qsTr("Ok") KeyNavigation.tab: cancelButton onClicked: { - root.accepted() root.close() + root.accepted() } } } -- cgit v1.2.3 From d4657804cd35b7d25dca67aa16c3eeb35140eb44 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Sun, 6 Nov 2016 23:35:16 +0100 Subject: resized standard dialog --- components/StandardDialog.qml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'components') diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 8c7a05d3..8f7e0e8d 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -40,9 +40,11 @@ Window { modality: Qt.ApplicationModal flags: Qt.Window | Qt.FramelessWindowHint property alias title: dialogTitle.text - property alias content: dialogContent.text + property alias text: dialogContent.text + property alias content: root.text property alias cancelVisible: cancelButton.visible property alias okVisible: okButton.visible + property var icon // same signals as Dialog has signal accepted() @@ -54,8 +56,8 @@ Window { } // TODO: implement without hardcoding sizes - width: 600 - height: 480 + width: 800 + height: 580 ColumnLayout { id: mainLayout @@ -80,6 +82,8 @@ Window { RowLayout { TextArea { id : dialogContent + width: 750 + height: 480 Layout.fillWidth: true font.family: "Arial" textFormat: TextEdit.AutoText -- cgit v1.2.3 From 5da9f8fbe4f2221bb6ec7ce08140c17ef0754b18 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 7 Nov 2016 11:09:31 +0100 Subject: standardDialog: close window before continue --- components/StandardDialog.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'components') diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 8f7e0e8d..f93a22ea 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -109,8 +109,9 @@ Window { text: qsTr("Ok") KeyNavigation.tab: cancelButton onClicked: { - root.accepted() root.close() + root.accepted() + } } @@ -125,8 +126,8 @@ Window { text: qsTr("Cancel") KeyNavigation.tab: passwordInput onClicked: { - root.rejected() root.close() + root.rejected() } } } -- cgit v1.2.3 From 5855700007a1675916440944dbf8d03d4ac886f2 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 7 Nov 2016 14:54:49 +0100 Subject: daemonManagerDialog: added starting signal --- components/DaemonManagerDialog.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'components') diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml index 23f2e9e5..f93cbb9a 100644 --- a/components/DaemonManagerDialog.qml +++ b/components/DaemonManagerDialog.qml @@ -41,6 +41,7 @@ Window { flags: Qt.Window | Qt.FramelessWindowHint signal rejected() + signal started(); function open() { show() @@ -91,7 +92,7 @@ Window { onClicked: { daemonManager.start(); root.close() - // root.accepted() + root.started() } } @@ -106,8 +107,8 @@ Window { text: qsTr("Cancel") onClicked: { - root.rejected() root.close() + root.rejected() } } } -- cgit v1.2.3 From b4f29b291c96378115bf3a3883858246dc2e73d5 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 7 Nov 2016 14:56:05 +0100 Subject: StandardDialog: changed default sizes --- components/StandardDialog.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'components') diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index f93a22ea..39ef1660 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -44,6 +44,7 @@ Window { property alias content: root.text property alias cancelVisible: cancelButton.visible property alias okVisible: okButton.visible + property alias textArea: dialogContent property var icon // same signals as Dialog has @@ -56,8 +57,8 @@ Window { } // TODO: implement without hardcoding sizes - width: 800 - height: 580 + width: 480 + height: 280 ColumnLayout { id: mainLayout @@ -82,9 +83,8 @@ Window { RowLayout { TextArea { id : dialogContent - width: 750 - height: 480 Layout.fillWidth: true + Layout.fillHeight: true font.family: "Arial" textFormat: TextEdit.AutoText readOnly: true -- cgit v1.2.3 From b53ef00b3611998148a91c0ffc97460ff0a0b54e Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Mon, 7 Nov 2016 14:58:06 +0100 Subject: history tx details: resized popup --- components/HistoryTable.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'components') diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index 5f4584c7..0c9e9b60 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -69,6 +69,7 @@ ListView { StandardDialog { id: detailsPopup + width:600 cancelVisible: false okVisible: true } -- cgit v1.2.3 From 760e01b50c38cfeff4b80bf8129cc51559a2a6e5 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 26 Nov 2016 11:41:27 +0100 Subject: daemonManagerDialog: show processdialog when starting --- components/DaemonManagerDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components') diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml index f93cbb9a..da3cf582 100644 --- a/components/DaemonManagerDialog.qml +++ b/components/DaemonManagerDialog.qml @@ -90,8 +90,8 @@ Window { text: qsTr("Start daemon") KeyNavigation.tab: cancelButton onClicked: { - daemonManager.start(); root.close() + appWindow.startDaemon(); root.started() } } -- cgit v1.2.3 From dd01f59a9c99a5aeea988218c57ca3f97f0fe785 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 26 Nov 2016 13:15:25 +0100 Subject: hide daemon sync progress after disconnecting wallet --- components/DaemonProgress.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components') diff --git a/components/DaemonProgress.qml b/components/DaemonProgress.qml index 1ed533e3..846c03d3 100644 --- a/components/DaemonProgress.qml +++ b/components/DaemonProgress.qml @@ -27,6 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 +import moneroComponents.Wallet 1.0 Item { id: item @@ -46,7 +47,7 @@ Item { // TODO: lower daemon block height cache, ttl and refresh interval? - item.visible = (currentBlock < targetBlock) + item.visible = (currentWallet.connected !== Wallet.ConnectionStatus_Disconnected) && (currentBlock < targetBlock) } } -- cgit v1.2.3 From 76e6ae8b6f8392871011639be214fe03346e23e4 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sat, 26 Nov 2016 15:35:45 +0100 Subject: remove reference to old pw-dialog --- components/StandardDialog.qml | 1 - 1 file changed, 1 deletion(-) (limited to 'components') diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 39ef1660..03c64a64 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -124,7 +124,6 @@ Window { releasedColor: "#FF6C3C" pressedColor: "#FF4304" text: qsTr("Cancel") - KeyNavigation.tab: passwordInput onClicked: { root.close() root.rejected() -- cgit v1.2.3