diff options
Diffstat (limited to 'src/quickdialogs/quickdialogsquickimpl/qml/+Universal')
4 files changed, 33 insertions, 3 deletions
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml index d13b751652..384fa41e7e 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/ColorDialog.qml @@ -47,6 +47,7 @@ ColorDialogImpl { spacing: 12 Label { + objectName: "titleLabel" text: control.title elide: Label.ElideRight // TODO: QPlatformTheme::TitleBarFont @@ -63,10 +64,12 @@ ColorDialogImpl { Layout.leftMargin: 18 Layout.fillWidth: true Layout.preferredWidth: control.title.length > 0 ? implicitHeight : 0 + Layout.preferredHeight: control.title.length > 0 ? implicitHeight : 15 } Button { id: eyeDropperButton + objectName: "eyeDropperButton" icon.source: "qrc:/qt-project.org/imports/QtQuick/Dialogs/quickimpl/images/eye-dropper.png" flat: true topPadding: 24 @@ -83,10 +86,10 @@ ColorDialogImpl { SaturationLightnessPicker { id: colorPicker objectName: "colorPicker" - implicitHeight: width color: control.color Layout.fillWidth: true + Layout.fillHeight: true } Slider { diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml index c029b06293..0d2db8b426 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialog.qml @@ -30,12 +30,35 @@ FileDialogImpl { standardButtons: T.Dialog.Open | T.Dialog.Cancel + Dialog { + id: overwriteConfirmationDialog + objectName: "confirmationDialog" + anchors.centerIn: parent + closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent + dim: true + modal: true + title: qsTr("“%1” already exists. Do you want to replace it?").arg(control.fileName) + + Label { + text: qsTr("A file with the same name already exists in %1.\nReplacing it will overwrite its current contents.").arg(control.currentFolderName) + } + + footer: DialogButtonBox { + standardButtons: DialogButtonBox.Yes | DialogButtonBox.No + } + + Overlay.modal: Rectangle { + color: overwriteConfirmationDialog.Universal.baseMediumColor + } + } + FileDialogImpl.buttonBox: buttonBox FileDialogImpl.nameFiltersComboBox: nameFiltersComboBox FileDialogImpl.fileDialogListView: fileDialogListView FileDialogImpl.breadcrumbBar: breadcrumbBar FileDialogImpl.fileNameLabel: fileNameLabel FileDialogImpl.fileNameTextField: fileNameTextField + FileDialogImpl.overwriteConfirmationDialog: overwriteConfirmationDialog background: Rectangle { implicitWidth: 600 @@ -99,6 +122,9 @@ FileDialogImpl { highlighted: ListView.isCurrentItem dialog: control fileDetailRowWidth: nameFiltersComboBox.width + + KeyNavigation.backtab: breadcrumbBar + KeyNavigation.tab: fileNameTextField.visible ? fileNameTextField : nameFiltersComboBox } } @@ -117,7 +143,6 @@ FileDialogImpl { TextField { id: fileNameTextField objectName: "fileNameTextField" - text: control.fileName visible: false Layout.fillWidth: true diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml index 7650ec7a34..dd23f3d1e7 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/FileDialogDelegate.qml @@ -32,7 +32,7 @@ DialogsQuickImpl.FileDialogDelegate { required property int index required property string fileName required property url fileUrl - required property int fileSize + required property double fileSize required property date fileModified required property bool fileIsDir diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml index ac63d281d1..37284503d2 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/MessageDialog.qml @@ -115,6 +115,8 @@ MessageDialogImpl { Layout.bottomMargin: 20 background: Rectangle { + implicitWidth: 60 // TextControlThemeMinWidth - 4 (border) + implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) color: Qt.rgba(1,1,1,1) radius: 3 border.color: Qt.darker(control.palette.light) |