From 916f2d7d76260dafcae8afb8b1ec3eac57208f12 Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 5 Jul 2018 00:17:05 +0100 Subject: [PATCH] Fix yes-no panel transparency --- src/GUI/qml/AircraftDownloadPanel.qml | 55 ++++++++++----------------- src/GUI/qml/CatalogDelegate.qml | 5 +++ src/GUI/qml/PathListDelegate.qml | 5 +++ src/GUI/qml/YesNoPanel.qml | 2 +- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/GUI/qml/AircraftDownloadPanel.qml b/src/GUI/qml/AircraftDownloadPanel.qml index ccd91a063..306b579f1 100644 --- a/src/GUI/qml/AircraftDownloadPanel.qml +++ b/src/GUI/qml/AircraftDownloadPanel.qml @@ -43,15 +43,12 @@ Item { PropertyChanges { target: button - text: "Install" + text: qsTr("Install") hoverText: "" - } - - PropertyChanges { - target: sizeText visible: true } + PropertyChanges { target: sizeText; visible: true } PropertyChanges { target: confirmUninstallPanel; visible: false } }, @@ -60,15 +57,12 @@ Item { PropertyChanges { target: button - text: "Uninstall" + text: qsTr("Uninstall") hoverText: "" - } - - PropertyChanges { - target: sizeText visible: true } + PropertyChanges { target: sizeText; visible: true } PropertyChanges { target: confirmUninstallPanel; visible: false } }, @@ -77,15 +71,12 @@ Item { PropertyChanges { target: button - text: "Update" + text: qsTr("Update") hoverText: "" - } - - PropertyChanges { - target: sizeText visible: true } + PropertyChanges { target: sizeText; visible: true } PropertyChanges { target: confirmUninstallPanel; visible: false } }, @@ -99,8 +90,9 @@ Item { PropertyChanges { target: button - text: "Queued" - hoverText: "Cancel" + text: qsTr("Queued") + hoverText: qsTr("Cancel") + visible: true } PropertyChanges { target: confirmUninstallPanel; visible: false } @@ -108,32 +100,25 @@ Item { State { name: "downloading" - PropertyChanges { - target: progressFrame - visible: true - } - - PropertyChanges { - target: statusText - visible: true - } - - PropertyChanges { - target: sizeText - visible: false - } + PropertyChanges { target: progressFrame; visible: true } + PropertyChanges { target: statusText; visible: true } + PropertyChanges { target: sizeText; visible: false } + PropertyChanges { target: confirmUninstallPanel; visible: false } PropertyChanges { target: button - text: "Downloading" - hoverText: "Cancel" + text: qsTr("Downloading") + hoverText: qsTr("Cancel") + visible: true } - - PropertyChanges { target: confirmUninstallPanel; visible: false } }, State { name: "confirm-uninstall" + PropertyChanges { target: button; visible: false } + PropertyChanges { target: progressFrame; visible: false } + PropertyChanges { target: statusText; visible: false } + PropertyChanges { target: sizeText; visible: false } PropertyChanges { target: confirmUninstallPanel; visible: true } } ] diff --git a/src/GUI/qml/CatalogDelegate.qml b/src/GUI/qml/CatalogDelegate.qml index e5550d2c5..376b678ad 100644 --- a/src/GUI/qml/CatalogDelegate.qml +++ b/src/GUI/qml/CatalogDelegate.qml @@ -111,6 +111,11 @@ Item { onRejected: { confirmDeleteHangar.visible = false } + + Rectangle { + anchors.fill: parent + z: -1 + } } } diff --git a/src/GUI/qml/PathListDelegate.qml b/src/GUI/qml/PathListDelegate.qml index a116cb9a5..7e9c37a07 100644 --- a/src/GUI/qml/PathListDelegate.qml +++ b/src/GUI/qml/PathListDelegate.qml @@ -105,6 +105,11 @@ Item { onRejected: { confirmDeletePath.visible = false } + + Rectangle { + anchors.fill: parent + z: -1 + } } } } diff --git a/src/GUI/qml/YesNoPanel.qml b/src/GUI/qml/YesNoPanel.qml index 6c85e2ef8..5f5a4e28e 100644 --- a/src/GUI/qml/YesNoPanel.qml +++ b/src/GUI/qml/YesNoPanel.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import "." -Rectangle { +Item { property alias promptText:prompt.text property alias yesText: yesButton.text property alias noText: noButton.text