diff options
| author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2025-07-30 14:55:11 +0200 |
|---|---|---|
| committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2025-08-11 20:26:45 +0200 |
| commit | 3abb4313a2819c4a97baf08bddd25b09963ca7fc (patch) | |
| tree | ec9e8aed97dfd6eb4ca1f44c82a19431ac699d40 /src/quickdialogs/quickdialogsquickimpl/qml | |
| parent | 0880b3a4d1631010048a33a9f9ef162bbb61cd21 (diff) | |
FileDialog: Fix major sidebar issues
The SideBar were facing two major issues.
The first had to do with the buttonDelegate's `required icon` line,
which didn't work after 7322e051c9c3d8dc715c20a3d42d9be83ea2295c,
resulting in an error during component creation.
The other issue had to do with the icons qrc paths only working for the
Basic style. Since the paths were relative, they'd assume that no file
selectors were being used, and thus a simpler path resolution.
This caused all non-basic styles to resolve the url to an invalid
resource.
The first issue was fixed by removing `required icon`, and the latter
was fixed by using complete qrc paths.
In addition, we do a small drive-by fix, by putting a user facing string
into qsTr().
Pick-to: 6.10 6.9
Change-Id: If6cd7ab638ec349b39fe0e4bc763ead78a51a0f4
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickdialogs/quickdialogsquickimpl/qml')
4 files changed, 4 insertions, 8 deletions
diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/SideBar.qml index 21e55fe53e..237be7847c 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/SideBar.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Fusion/SideBar.qml @@ -47,7 +47,6 @@ DialogsQuickImpl.SideBar { required property int index required property string folderName - required icon } separatorDelegate: Item { @@ -65,7 +64,7 @@ DialogsQuickImpl.SideBar { addFavoriteDelegate: Button { id: addFavoriteDelegateRoot - text: "Add Favorite" + text: qsTr("Add Favorite") flat: true width: control.width contentItem: IconLabel { diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/SideBar.qml index ee9ad1e256..f0fd1b5610 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/SideBar.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Imagine/SideBar.qml @@ -41,7 +41,6 @@ DialogsQuickImpl.SideBar { required property int index required property string folderName - required icon } separatorDelegate: Item { @@ -59,7 +58,7 @@ DialogsQuickImpl.SideBar { addFavoriteDelegate: Button { id: addFavoriteDelegateRoot - text: "Add Favorite" + text: qsTr("Add Favorite") flat: true width: control.width contentItem: IconLabel { diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/SideBar.qml index 77952c8e31..8b25c975da 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Material/SideBar.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Material/SideBar.qml @@ -43,7 +43,6 @@ DialogsQuickImpl.SideBar { required property int index required property string folderName - required icon } separatorDelegate: Item { @@ -61,7 +60,7 @@ DialogsQuickImpl.SideBar { addFavoriteDelegate: Button { id: addFavoriteDelegateRoot - text: "Add Favorite" + text: qsTr("Add Favorite") flat: true width: control.width contentItem: IconLabel { diff --git a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/SideBar.qml b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/SideBar.qml index 0331c103da..e620ee994b 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/SideBar.qml +++ b/src/quickdialogs/quickdialogsquickimpl/qml/+Universal/SideBar.qml @@ -44,7 +44,6 @@ DialogsQuickImpl.SideBar { required property int index required property string folderName - required icon } separatorDelegate: Item { @@ -62,7 +61,7 @@ DialogsQuickImpl.SideBar { addFavoriteDelegate: Button { id: addFavoriteDelegateRoot - text: "Add Favorite" + text: qsTr("Add Favorite") flat: true width: control.width contentItem: IconLabel { |