diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/DaemonManagerDialog.qml | 120 | ||||
| -rw-r--r-- | components/DaemonProgress.qml | 3 | ||||
| -rw-r--r-- | components/HistoryTable.qml | 1 | ||||
| -rw-r--r-- | components/PasswordDialog.qml | 4 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 15 |
5 files changed, 135 insertions, 8 deletions
diff --git a/components/DaemonManagerDialog.qml b/components/DaemonManagerDialog.qml new file mode 100644 index 00000000..da3cf582 --- /dev/null +++ b/components/DaemonManagerDialog.qml @@ -0,0 +1,120 @@ +// 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() + signal started(); + + 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: { + root.close() + appWindow.startDaemon(); + root.started() + } + } + + MoneroComponents.StandardButton { + id: cancelButton + width: 120 + fontSize: 14 + shadowReleasedColor: "#FF4304" + shadowPressedColor: "#B32D00" + releasedColor: "#FF6C3C" + pressedColor: "#FF4304" + text: qsTr("Cancel") + + onClicked: { + root.close() + root.rejected() + } + } + } + } + +} + + + diff --git a/components/DaemonProgress.qml b/components/DaemonProgress.qml index 5fac2079..53a2f5c7 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 @@ -45,7 +46,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) } } 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 } diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 325bf2b3..19414987 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -152,8 +152,8 @@ Window { text: qsTr("Cancel") KeyNavigation.tab: passwordInput onClicked: { - root.rejected() root.close() + root.rejected() } } MoneroComponents.StandardButton { @@ -167,8 +167,8 @@ Window { text: qsTr("Ok") KeyNavigation.tab: cancelButton onClicked: { - root.accepted() root.close() + root.accepted() } } } diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 0e081ae5..03c64a64 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -40,9 +40,12 @@ 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 alias textArea: dialogContent + property var icon // same signals as Dialog has signal accepted() @@ -54,8 +57,8 @@ Window { } // TODO: implement without hardcoding sizes - width: 600 - height: 480 + width: 480 + height: 280 ColumnLayout { id: mainLayout @@ -81,6 +84,7 @@ Window { TextArea { id : dialogContent Layout.fillWidth: true + Layout.fillHeight: true font.family: "Arial" textFormat: TextEdit.AutoText readOnly: true @@ -105,8 +109,9 @@ Window { text: qsTr("Ok") KeyNavigation.tab: cancelButton onClicked: { - root.accepted() root.close() + root.accepted() + } } @@ -120,8 +125,8 @@ Window { pressedColor: "#FF4304" text: qsTr("Cancel") onClicked: { - root.rejected() root.close() + root.rejected() } } } |