From a3fb770d6c665be7caaf02cefd506c8ae5114f77 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Mon, 3 Jan 2022 22:12:16 +0100 Subject: [PATCH 1/6] GIT_SILENT Upgrade release service version to 21.12.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 330e9b555e..d4f39ad19b 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 "21") set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "0") +set (RELEASE_SERVICE_VERSION_MICRO "1") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) From 306e7e24938c52e1af09bcf3e88945828cbfcb34 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Mon, 3 Jan 2022 22:19:47 +0100 Subject: [PATCH 2/6] GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 3d9a08191e..59a2d59c92 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -413,9 +413,9 @@ dolphin + - From d04cc677861ee446c001e80cb13c1eb8a5e0ebe6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 24 Jan 2022 02:10:57 +0000 Subject: [PATCH 3/6] GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 59a2d59c92..2aac782531 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -393,6 +393,7 @@ Dolphin은 사용하고 싶은 대로 설정할 수 있습니다 လင်းပိုင်သည် ဖိုင်လ်မန်နေဂျာကို သင်ကြိုက်သလို ပြင်ဆင်ခွင့်ပေးထားသည် Dolphin laat u uw bestandsbeheerder exact configureren zoals u dat wilt + Dolphin lèt deg tilpassa filhandsamaren akkurat slik du vil ha han Dolphin umożliwia ustawienie zarządzania plikami dokładnie tak, jak tego chcesz O Dolphin permite-lhe configurar o seu gestor de ficheiros exactamente como pretende O Dolphin permite a você configurar seu gerenciador de arquivos exatamente como você quer From dd77fcb3a638ec3f318fdffd55a270c803edf6b4 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 28 Jan 2022 22:39:33 +0100 Subject: [PATCH 4/6] GIT_SILENT Upgrade release service version to 21.12.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4f39ad19b..7be5700fc3 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 "21") set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "1") +set (RELEASE_SERVICE_VERSION_MICRO "2") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) From 9d08bb5b97b02843e778d84bfc1ff793cded03bf Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 28 Jan 2022 23:29:39 +0100 Subject: [PATCH 5/6] GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 2aac782531..81d1df8610 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -414,9 +414,9 @@ dolphin + - From 43e915213e64f03d785c87cc5cf8db1c6b86a1a2 Mon Sep 17 00:00:00 2001 From: Eugene Popov Date: Sat, 29 Jan 2022 16:35:47 +0000 Subject: [PATCH 6/6] Revert "[DetailsView] Improve zooming" This reverts commit 7908aff3b5ebe4484d391c1fc4797e9dae2300b2. Reverting this commit will fix the issue of not being able to rename the last file in Details View and will also make the items in Details View and Compact View have the same height. BUG: 447215 FIXED-IN: 21.12.2 --- src/kitemviews/kstandarditemlistwidget.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 1751812710..9c527fa171 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -226,22 +226,8 @@ void KStandardItemListWidgetInformant::calculateCompactLayoutItemSizeHints(QVect void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const { const KItemListStyleOption& option = view->styleOption(); - - float zoomLevel = 1; - if (option.iconSize >= KIconLoader::SizeEnormous) { - zoomLevel = 2; - } else if (option.iconSize >= KIconLoader::SizeHuge) { - zoomLevel = 1.8; - } else if (option.iconSize >= KIconLoader::SizeLarge) { - zoomLevel = 1.6; - } else if (option.iconSize >= KIconLoader::SizeMedium) { - zoomLevel = 1.4; - } else if (option.iconSize >= KIconLoader::SizeSmallMedium) { - zoomLevel = 1.2; - } - - const qreal contentHeight = qMax(option.iconSize, zoomLevel * option.fontMetrics.height()); - logicalHeightHints.fill(contentHeight + 2 * option.padding); + const qreal height = option.padding * 2 + qMax(option.iconSize, option.fontMetrics.height()); + logicalHeightHints.fill(height); logicalWidthHint = -1.0; }