From 6f17476b75185886f57e340bbfb1912b2b62c42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 22 Sep 2019 19:24:21 +0100 Subject: [PATCH 1/6] Run udevadm settle once more after udevadm trigger. CCBUG: 412204 --- src/plugins/sfdisk/sfdiskpartitiontable.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp index f740fe3..bf0ae6b 100644 --- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp +++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp @@ -63,6 +63,7 @@ bool SfdiskPartitionTable::commit(quint32 timeout) if (m_device->type() == Device::Type::SoftwareRAID_Device) ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("control"), QStringLiteral("--start-exec-queue") }).run(); + ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("settle"), QStringLiteral("--timeout=") + QString::number(timeout) }).run(); return true; } From a264a282372b0ed44122bcfcff75702512d2c57f Mon Sep 17 00:00:00 2001 From: Shubham Jangra Date: Sun, 1 Sep 2019 23:08:08 +0530 Subject: [PATCH 2/6] Reduce temperature's precision from six decimal places to two Summary: BUG: 411226 Test Plan: I couldn't test it since my device does not support SMART Reviewers: stikonas Reviewed By: stikonas Subscribers: #kde_partition_manager Tags: #kde_partition_manager Differential Revision: https://phabricator.kde.org/D23572 --- src/core/smartstatus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/smartstatus.cpp b/src/core/smartstatus.cpp index b9e8e37..85b3c81 100644 --- a/src/core/smartstatus.cpp +++ b/src/core/smartstatus.cpp @@ -82,7 +82,7 @@ QString SmartStatus::tempToString(quint64 mkelvin) const double celsius = (mkelvin - 273150.0) / 1000.0; const double fahrenheit = 9.0 * celsius / 5.0 + 32; return xi18nc("@item:intable degrees in Celsius and Fahrenheit", "%1° C / %2° F", - QLocale().toString(celsius, 1), QLocale().toString(fahrenheit, 1)); + QLocale().toString(celsius, 'g', 2), QLocale().toString(fahrenheit, 'g', 2)); } QString SmartStatus::selfTestStatusToString(SmartStatus::SelfTestStatus s) From df235a77517709d211d029234cf6c8893b4aa131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 7 Sep 2019 11:51:05 +0100 Subject: [PATCH 3/6] Make S.M.A.R.T. disk temperature label show only integers. BUG: 411226 --- src/core/smartstatus.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/smartstatus.cpp b/src/core/smartstatus.cpp index 85b3c81..d640fcc 100644 --- a/src/core/smartstatus.cpp +++ b/src/core/smartstatus.cpp @@ -82,7 +82,7 @@ QString SmartStatus::tempToString(quint64 mkelvin) const double celsius = (mkelvin - 273150.0) / 1000.0; const double fahrenheit = 9.0 * celsius / 5.0 + 32; return xi18nc("@item:intable degrees in Celsius and Fahrenheit", "%1° C / %2° F", - QLocale().toString(celsius, 'g', 2), QLocale().toString(fahrenheit, 'g', 2)); + QLocale().toString(celsius, 'f', 0), QLocale().toString(fahrenheit, 'f', 0)); } QString SmartStatus::selfTestStatusToString(SmartStatus::SelfTestStatus s) From d062cf50fb6b2461b3304684b219c361a846ab75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caio=20Jord=C3=A3o=20Carvalho?= Date: Tue, 17 Sep 2019 23:59:06 +0000 Subject: [PATCH 4/6] Including Caio's middle name in aboutData --- src/util/helpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/helpers.cpp b/src/util/helpers.cpp index 859d060..b3d377c 100644 --- a/src/util/helpers.cpp +++ b/src/util/helpers.cpp @@ -67,7 +67,7 @@ KAboutData aboutKPMcore() aboutData.addCredit(xi18nc("@info:credit", "Chantara Tith"), i18nc("@info:credit", "LVM support"), QStringLiteral("tith.chantara@gmail.com")); aboutData.addCredit(xi18nc("@info:credit", "Pali Rohár"), i18nc("@info:credit", "UDF support"), QStringLiteral("pali.rohar@gmail.com")); aboutData.addCredit(xi18nc("@info:credit", "Adriaan de Groot"), i18nc("@info:credit", "Calamares maintainer"), QStringLiteral("groot@kde.org")); - aboutData.addCredit(xi18nc("@info:credit", "Caio Carvalho"), i18nc("@info:credit", "Improved SMART support"), QStringLiteral("caiojcarvalho@gmail.com")); + aboutData.addCredit(xi18nc("@info:credit", "Caio Jordão Carvalho"), i18nc("@info:credit", "Improved SMART support"), QStringLiteral("caiojcarvalho@gmail.com")); return aboutData; } From 40b65438f0608a1913cd5b6232232fed78d50bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 5 Oct 2019 11:52:59 +0100 Subject: [PATCH 5/6] Do not align partitions if they are mounted. Moving data when partitions are mounted is almost guaranteed to cause data loss. BUG: 412575 --- src/gui/partresizerwidget.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/partresizerwidget.h b/src/gui/partresizerwidget.h index 929223b..dbbd57d 100644 --- a/src/gui/partresizerwidget.h +++ b/src/gui/partresizerwidget.h @@ -19,12 +19,12 @@ #define KPMCORE_PARTRESIZERWIDGET_H +#include "core/partition.h" #include "util/libpartitionmanagerexport.h" #include #include -class Partition; class PartWidget; class Device; @@ -97,6 +97,8 @@ public: } bool align() const { + if (partition().isMounted()) + return false; return m_Align; /**< @return true if the Partition is to be aligned */ } void setAlign(bool b) { From 8692697cd4e4df62fc57927d207d22e538679432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 5 Oct 2019 12:08:50 +0100 Subject: [PATCH 6/6] Bump kpmcore version to 4.0.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdb00be..6875430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(BLKID_MIN_VERSION "2.33.2") set(VERSION_MAJOR "4") set(VERSION_MINOR "0") -set(VERSION_RELEASE "0") +set(VERSION_RELEASE "1") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) set(SOVERSION "8") add_definitions(-D'VERSION="${VERSION}"') #"