Sort languages combobox by language code

* Avoid creating redundant file lists
* Sort languages combobox by language code

PR #20365.
This commit is contained in:
Chocobo1
2024-02-05 13:44:18 +08:00
committed by GitHub
parent 88a4990435
commit f87ea1b5d3
10 changed files with 41 additions and 49 deletions

View File

@@ -151,11 +151,11 @@ qint64 Utils::Fs::computePathSize(const Path &path)
// Compute folder size based on its content
qint64 size = 0;
QDirIterator iter {path.data(), QDir::Files | QDir::Hidden | QDir::NoSymLinks, QDirIterator::Subdirectories};
QDirIterator iter {path.data(), (QDir::Files | QDir::Hidden | QDir::NoSymLinks), QDirIterator::Subdirectories};
while (iter.hasNext())
{
iter.next();
size += iter.fileInfo().size();
const QFileInfo fileInfo = iter.nextFileInfo();
size += fileInfo.size();
}
return size;
}

View File

@@ -44,6 +44,7 @@
#include <QRegularExpression>
#include <QSet>
#include <QString>
#include <QStringView>
#include <QSysInfo>
#include "base/path.h"
@@ -252,7 +253,7 @@ QString Utils::Misc::userFriendlyDuration(const qlonglong seconds, const qlonglo
return QCoreApplication::translate("misc", "%1y %2d", "e.g: 2 years 10 days").arg(QString::number(years), QString::number(days));
}
QString Utils::Misc::languageToLocalizedString(const QString &localeStr)
QString Utils::Misc::languageToLocalizedString(const QStringView localeStr)
{
if (localeStr.startsWith(u"eo", Qt::CaseInsensitive))
{

View File

@@ -33,6 +33,7 @@
#include "base/pathfwd.h"
class QString;
class QStringView;
/* Miscellaneous functions that can be useful */
namespace Utils::Misc
@@ -82,5 +83,5 @@ namespace Utils::Misc
// time duration like "1d 2h 10m".
QString userFriendlyDuration(qlonglong seconds, qlonglong maxCap = -1, TimeResolution resolution = TimeResolution::Minutes);
QString languageToLocalizedString(const QString &localeStr);
QString languageToLocalizedString(QStringView localeStr);
}