From 240af0a5f2e87e844228c8754378ec0146d6678a Mon Sep 17 00:00:00 2001 From: reionwong Date: Tue, 15 Jun 2021 17:14:17 +0800 Subject: [PATCH] Remove libkf5coreaddons --- CMakeLists.txt | 2 -- README.md | 2 +- debian/control | 1 - src/about.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c89199f..f1c682d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,6 @@ find_package(Libcrypt REQUIRED) find_package(KF5NetworkManagerQt REQUIRED) find_package(KF5ModemManagerQt REQUIRED) -find_package(KF5CoreAddons REQUIRED) pkg_search_module(FontConfig REQUIRED fontconfig IMPORTED_TARGET) pkg_search_module(ICU REQUIRED icu-i18n) @@ -63,7 +62,6 @@ target_link_libraries(${PROJECT_NAME} KF5::NetworkManagerQt KF5::ModemManagerQt - KF5::CoreAddons PkgConfig::FontConfig ${FREETYPE_LIBRARIES} diff --git a/README.md b/README.md index f673782..0c204d9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ The System Settings application for Cutefish Desktop. ## Dependencies ```shell -sudo pacman -S extra-cmake-modules qt5-base qt5-quickcontrols2 freetype2 fontconfig networkmanager-qt modemmanager-qt kcoreaddons +sudo pacman -S extra-cmake-modules qt5-base qt5-quickcontrols2 freetype2 fontconfig networkmanager-qt modemmanager-qt ``` For Ubuntu, to meet the demand of module `icu-i18n`, you need to: diff --git a/debian/control b/debian/control index f89b2dc..155c3ae 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,6 @@ Build-Depends: cmake, libfreetype6-dev, libfontconfig1-dev, libkf5networkmanagerqt-dev, - libkf5coreaddons-dev, modemmanager-qt-dev, qtbase5-dev, qtdeclarative5-dev, diff --git a/src/about.cpp b/src/about.cpp index 6b2c414..7c26860 100644 --- a/src/about.cpp +++ b/src/about.cpp @@ -1,7 +1,6 @@ #include "about.h" #include -#include #include #include @@ -12,6 +11,48 @@ #include #endif +static QString formatByteSize(double size, int precision) +{ + int unit = 0; + double multiplier = 1024.0; + + while (qAbs(size) >= multiplier && unit < int(8)) { + size /= multiplier; + ++unit; + } + + if (unit == 0) { + precision = 0; + } + + QString numString = QString::number(size, 'f', precision); + + switch (unit) { + case 0: + return QObject::tr("%1 B").arg(numString); + case 1: + return QObject::tr("%1 KB").arg(numString); + case 2: + return QObject::tr("%1 MB").arg(numString); + case 3: + return QObject::tr("%1 GB").arg(numString); + case 4: + return QObject::tr("%1 TB").arg(numString); + case 5: + return QObject::tr("%1 PB").arg(numString); + case 6: + return QObject::tr("%1 EB").arg(numString); + case 7: + return QObject::tr("%1 ZB").arg(numString); + case 8: + return QObject::tr("%1 YB").arg(numString); + default: + return QString(); + } + + return QString(); +} + About::About(QObject *parent) : QObject(parent) { @@ -63,7 +104,7 @@ QString About::memorySize() const qlonglong totalRam = calculateTotalRam(); if (totalRam > 0) { - ram = KFormat().formatByteSize(totalRam, 0); + ram = formatByteSize(totalRam, 0); } return ram; } @@ -77,8 +118,8 @@ QString About::internalStorage() { QStorageInfo storage = QStorageInfo::root(); return QString("%1 / %2") - .arg(KFormat().formatByteSize(storage.bytesTotal() - storage.bytesAvailable())) - .arg(KFormat().formatByteSize(storage.bytesTotal(), 0)); + .arg(formatByteSize(storage.bytesTotal() - storage.bytesAvailable(), 0)) + .arg(formatByteSize(storage.bytesTotal(), 0)); } QString About::cpuInfo()