4 files changed, 30 insertions, 3 deletions
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml
index 313e8645b4..dd1f887dd9 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/ColorDialog.qml
@@ -50,6 +50,7 @@ ColorDialogImpl {
 
     header: RowLayout {
         Label {
+            objectName: "titleLabel"
             text: control.title
             elide: Label.ElideRight
             font.bold: true
@@ -60,10 +61,12 @@ ColorDialogImpl {
             bottomPadding: 24
 
             Layout.preferredWidth: control.title.length > 0 ? implicitWidth : 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
@@ -80,10 +83,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/+Material/FileDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialog.qml
index cd2c513c2e..9700aeba79 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialog.qml
@@ -32,12 +32,32 @@ FileDialogImpl {
 
     Material.elevation: 24
 
+    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 {
+            alignment: Qt.AlignHCenter
+            standardButtons: DialogButtonBox.Yes | DialogButtonBox.No
+        }
+    }
+
     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
@@ -97,6 +117,9 @@ FileDialogImpl {
             highlighted: ListView.isCurrentItem
             dialog: control
             fileDetailRowWidth: nameFiltersComboBox.width
+
+            KeyNavigation.backtab: breadcrumbBar
+            KeyNavigation.tab: fileNameTextField.visible ? fileNameTextField : nameFiltersComboBox
         }
     }
 
@@ -116,7 +139,6 @@ FileDialogImpl {
         TextField {
             id: fileNameTextField
             objectName: "fileNameTextField"
-            text: control.fileName
             visible: false
 
             Layout.topMargin: 12
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml
index c96231345d..9ec992b7a6 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/FileDialogDelegate.qml
@@ -31,7 +31,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/+Material/MessageDialog.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
index a678503d6c..e336185430 100644
--- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
+++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/MessageDialog.qml
@@ -117,6 +117,8 @@ MessageDialogImpl {
             Layout.bottomMargin: 20
 
             background: Rectangle {
+                implicitWidth: 120
+                implicitHeight: control.Material.textFieldHeight
                 color: Qt.rgba(1,1,1,1)
                 radius: 3
                 border.color: Qt.darker(control.palette.light)