From 50c3be0ca0645d81dd10bde8441dc593b237c0d1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Apr 2022 02:58:27 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/org.kde.dolphin.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 2278ef172..a6ab14067 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -119,7 +119,7 @@ Keywords=files;file management;file browsing;samba;network shares;Explorer;Finde Keywords[ar]=ملف;ملفات;متصفح;سامبا;مشاركة;إدارة;إدارة ملفات;شبكة; Keywords[az]=fayllar;fayl idarəetməsi;fayl bələdçisi;smaba:şəbəkədə paylaşımlar;Araşdırmaq;Tapmaq; Keywords[ca]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;cercador; -Keywords[ca@valencia]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;cercador; +Keywords[ca@valencia]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;buscador; Keywords[de]=Dateien;Dateiverwaltung;Netzwerkfreigaben Keywords[en_GB]=files;file management;file browsing;samba;network shares;Explorer;Finder; Keywords[es]=archivos;gestión de archivos;administración de archivos;exploración de archivos;samba;recursos compartidos de red;gestor de archivos;administrador de archivos;explorador;buscador; -- cgit v1.3 From 2a3b731ca2b13c518c92951e2d1efa9a53dd70b3 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 5 Apr 2022 21:19:50 +0200 Subject: GIT_SILENT Upgrade release service version to 22.03.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1d136604..96b3f4264 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") set (RELEASE_SERVICE_VERSION_MINOR "03") -set (RELEASE_SERVICE_VERSION_MICRO "80") +set (RELEASE_SERVICE_VERSION_MICRO "90") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) -- cgit v1.3 From e50ff16e6871f6322cad23d8eb907b2f892c9289 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 7 Apr 2022 02:58:35 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/settings/kcm/kcmdolphingeneral.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index f1bb07f9a..b428367e8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -57,7 +57,7 @@ Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين ا Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. Comment[az]=Bu xidmət əsas Dolphin parametrlərini ayarlamağa imkan verir. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. -Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general de Dolphin. +Comment[ca@valencia]=Este servei permet la configuració de la configuració general de Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. Comment[da]=Denne tjeneste muliggør konfiguration af generelle Dolphin-indstillinger. Comment[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. -- cgit v1.3 From 3bf471e02a440bd008d69c5939b7c5bf2c03df54 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Fri, 8 Apr 2022 11:07:23 +0200 Subject: Add symmetric padding on right side of details view There have been some reports that users were unable to figure out that the padding on the left of the left-most "name" column can be used for deselecting or for dropping file items. All of these reports were by people using a Dolphin version in which that padding was way too narrow because of a regression (that has since been fixed). Nonetheless this highlights the potential problem that some users might be unable to notice/figure out the usefulness of the left padding. This commit adds a similar area on the right side of the view when the column widths are set automatically by Dolphin. The width of the right padding column mirrors the width of the left padding column when sized automatically. Both can manually be hidden or resized similarly to resizing other columns. There are various usability advantages to having this padding by default on both sides of the view and not only on the left: - The right margin is more discoverable since the item highlight ends right before the padding column - Less mouse travel time to reach either of the areas - More than double the likelihood of users figuring out the advantages of these padding areas for deselecting or dropping - More visual symmetry I had suggested also having this kind of right padding even before the initial implementation of the left padding. The contributor implementing it was in favour of it. It only wasn't implemented because the contributor said it was impossible without a lot of work. Turns out adding two characters at the right position seems to suffice in most ways. This commit does not contain the string change of renaming "Leading Column Padding" to "Column Padding" (since it changes two paddings now) to not infringe on the string freeze. BUG: 452273 --- src/kitemviews/kitemlistview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 239e399a4..77114735b 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -2405,7 +2405,9 @@ void KItemListView::applyAutomaticColumnWidths() qreal firstColumnWidth = m_headerWidget->columnWidth(firstRole); QSizeF dynamicItemSize = m_itemSize; - qreal requiredWidth = columnWidthsSum() + m_headerWidget->leadingPadding(); + qreal requiredWidth = columnWidthsSum() + m_headerWidget->leadingPadding() + + m_headerWidget->leadingPadding(); // Adding the padding a second time so we have the same padding symmetrically on both sides of the view. + // This improves UX, looks better and increases the chances of users figuring out that the padding area can be used for deselecting and dropping files. const qreal availableWidth = size().width(); if (requiredWidth < availableWidth) { // Stretch the first column to use the whole remaining width -- cgit v1.3