diff --git a/qml/Dialogs/DeleteDialog.qml b/qml/Dialogs/DeleteDialog.qml index 4207f47..51f9946 100644 --- a/qml/Dialogs/DeleteDialog.qml +++ b/qml/Dialogs/DeleteDialog.qml @@ -17,66 +17,14 @@ * along with this program. If not, see . */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 import FishUI 1.0 as FishUI -import Cutefish.FileManager 1.0 -FishUI.Window { - id: control +FishUI.ConfirmDialog { + title: qsTr("Delete") + text: qsTr("Do you want to delete it permanently?") + cancelText: qsTr("Cancel") + confirmText: qsTr("Delete") + destructive: true - flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint - minimizeButtonVisible: false - visible: true - - width: contentWidth - height: contentHeight - - minimumWidth: contentWidth - minimumHeight: contentHeight - maximumWidth: contentWidth - maximumHeight: contentHeight - - property var contentWidth: _mainLayout.implicitWidth + FishUI.Units.largeSpacing * 2 - property var contentHeight: _mainLayout.implicitHeight + control.header.height + FishUI.Units.largeSpacing * 2 - - background.color: FishUI.Theme.secondBackgroundColor - - ColumnLayout { - id: _mainLayout - anchors.fill: parent - anchors.leftMargin: FishUI.Units.largeSpacing - anchors.rightMargin: FishUI.Units.largeSpacing - anchors.bottomMargin: FishUI.Units.smallSpacing - spacing: FishUI.Units.largeSpacing - - Label { - text: qsTr("Do you want to delete it permanently?") - Layout.fillWidth: true - wrapMode: Text.Wrap - } - - RowLayout { - spacing: FishUI.Units.largeSpacing - - Button { - text: qsTr("Cancel") - Layout.fillWidth: true - onClicked: control.close() - } - - Button { - text: qsTr("Delete") - focus: true - Layout.fillWidth: true - onClicked: { - control.close() - model.deleteSelected() - } - flat: true - } - } - } + onAccepted: model.deleteSelected() } diff --git a/qml/Dialogs/EmptyTrashDialog.qml b/qml/Dialogs/EmptyTrashDialog.qml index a7025a2..c67b67a 100644 --- a/qml/Dialogs/EmptyTrashDialog.qml +++ b/qml/Dialogs/EmptyTrashDialog.qml @@ -17,87 +17,19 @@ * along with this program. If not, see . */ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 import FishUI 1.0 as FishUI import Cutefish.FileManager 1.0 -FishUI.Window { - id: control - - title: qsTr("File Manager") - flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint - minimizeButtonVisible: false - visible: true - - property int contentWidth: 300 + FishUI.Units.largeSpacing * 2 - property int contentHeight: _mainLayout.implicitHeight + control.header.height + FishUI.Units.largeSpacing - - width: contentWidth - height: contentHeight - -// x: Screen.virtualX + (Screen.width - contentWidth) / 2 -// y: Screen.virtualY + (Screen.height - contentHeight) / 2 - - minimumWidth: contentWidth - minimumHeight: contentHeight - maximumWidth: contentWidth - maximumHeight: contentHeight - - headerBackground.color: FishUI.Theme.secondBackgroundColor - - DragHandler { - target: null - acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad - grabPermissions: PointerHandler.CanTakeOverFromItems | PointerHandler.CanTakeOverFromHandlersOfDifferentType | PointerHandler.ApprovesTakeOverByAnything - onActiveChanged: if (active) { control.helper.startSystemMove(control) } - } +FishUI.ConfirmDialog { + title: qsTr("Empty Trash") + text: qsTr("Do you want to permanently delete all files from the Trash?") + cancelText: qsTr("Cancel") + confirmText: qsTr("Empty Trash") + destructive: true Fm { id: fm } - Rectangle { - anchors.fill: parent - color: FishUI.Theme.secondBackgroundColor - } - - ColumnLayout { - id: _mainLayout - anchors.fill: parent - anchors.topMargin: 0 - anchors.leftMargin: FishUI.Units.largeSpacing - anchors.rightMargin: FishUI.Units.largeSpacing - anchors.bottomMargin: FishUI.Units.largeSpacing - spacing: FishUI.Units.largeSpacing - - Label { - text: qsTr("Do you want to permanently delete all files from the Trash?") - Layout.fillWidth: true - wrapMode: Text.Wrap - } - - RowLayout { - spacing: FishUI.Units.largeSpacing - - Button { - text: qsTr("Cancel") - Layout.fillWidth: true - onClicked: control.close() - } - - Button { - text: qsTr("Empty Trash") - focus: true - Layout.fillWidth: true - onClicked: { - fm.emptyTrash() - control.close() - } - flat: true - } - } - } + onAccepted: fm.emptyTrash() }