External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-04 14:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MultiMC:develop' into develop

Browse Source
This commit is contained in:
Sebastian
2021-10-25 14:44:45 -05:00
committed by GitHub
parent 18c7991d16 85ecbad467
commit d804081d48
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/InstanceProxyModel.cpp
View File

@@ -5,6 +5,10 @@
InstanceProxyModel::InstanceProxyModel(QObject *parent) : GroupedProxyModel(parent)
{
m_naturalSort.setNumericMode(true);
m_naturalSort.setCaseSensitivity(Qt::CaseSensitivity::CaseInsensitive);
// FIXME: use loaded translation as source of locale instead, hook this up to translation changes
m_naturalSort.setLocale(QLocale::system());
}
QVariant InstanceProxyModel::data(const QModelIndex & index, int role) const
@@ -29,6 +33,6 @@ bool InstanceProxyModel::subSortLessThan(const QModelIndex &left,
}
else
{
return QString::localeAwareCompare(pdataLeft->name(), pdataRight->name()) < 0;
return m_naturalSort.compare(pdataLeft->name(), pdataRight->name()) < 0;
}
}

3
launcher/InstanceProxyModel.h
View File

@@ -1,6 +1,7 @@
#pragma once
#include "groupview/GroupedProxyModel.h"
#include <QCollator>
/**
* A proxy model that is responsible for sorting instances into groups
@@ -13,4 +14,6 @@ public:
protected:
virtual bool subSortLessThan(const QModelIndex &left, const QModelIndex &right) const override;
private:
QCollator m_naturalSort;
};

6
launcher/java/JavaChecker.cpp
View File

@@ -142,8 +142,12 @@ void JavaChecker::error(QProcess::ProcessError err)
{
if(err == QProcess::FailedToStart)
{
killTimer.stop();
qDebug() << "Java checker has failed to start.";
qDebug() << "Process environment:";
qDebug() << process->environment();
qDebug() << "Native environment:";
qDebug() << QProcessEnvironment::systemEnvironment().toStringList();
killTimer.stop();
JavaCheckResult result;
{
result.path = m_path;

6
notsecrets/launcher.rc
View File

@@ -3,8 +3,8 @@
#endif
#include <windows.h>
IDI_ICON1 ICON DISCARDABLE "Laucher.ico"
1 RT_MANIFEST "Laucher.manifest"
IDI_ICON1 ICON DISCARDABLE "Launcher.ico"
1 RT_MANIFEST "Launcher.manifest"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,0
@@ -18,7 +18,7 @@ BEGIN
VALUE "CompanyName", "MultiMC Contributors"
VALUE "FileDescription", "A Minecraft Launcher"
VALUE "FileVersion", "1.0.0.0"
VALUE "ProductName", "Laucher"
VALUE "ProductName", "Launcher"
VALUE "ProductVersion", "5"
END
END