diff options
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/WorldList.cpp | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 503b34d9..3ba79178 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -213,12 +213,8 @@ QString MinecraftInstance::binRoot() const QString MinecraftInstance::getNativePath() const { -#ifdef Q_OS_FREEBSD - QDir natives_dir("/usr/local/lib/lwjgl/"); -#else QDir natives_dir(FS::PathCombine(instanceRoot(), "natives/")); return natives_dir.absolutePath(); -#endif } QString MinecraftInstance::getLocalLibraryPath() const diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp index 344bea63..955609bf 100644 --- a/launcher/minecraft/WorldList.cpp +++ b/launcher/minecraft/WorldList.cpp @@ -17,6 +17,7 @@ #include "Application.h" #include <FileSystem.h> +#include <Qt> #include <QMimeData> #include <QUrl> #include <QUuid> @@ -190,6 +191,16 @@ QVariant WorldList::data(const QModelIndex &index, int role) const return QVariant(); } + case Qt::UserRole: + switch (column) + { + case SizeColumn: + return qVariantFromValue<qlonglong>(world.bytes()); + + default: + return data(index, Qt::DisplayRole); + } + case Qt::ToolTipRole: { return world.folderName(); @@ -216,7 +227,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const } case SizeRole: { - return locale.formattedDataSize(world.bytes()); + return qVariantFromValue<qlonglong>(world.bytes()); } case IconFileRole: { |