fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-log-level-bleed

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2025-12-08 09:21:27 +00:00
committed by GitHub
parent 0853afe274 551382d0f6
commit 4f5e348b66
35 changed files with 135 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/ui/pages/instance/LogPage.cpp
View File

@@ -60,7 +60,7 @@ QVariant LogFormatProxyModel::data(const QModelIndex& index, int role) const
case Qt::FontRole:
return m_font;
case Qt::ForegroundRole: {
auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
auto level = static_cast<MessageLevel>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
QColor result = colors.foreground.value(level);
if (result.isValid())
@@ -69,7 +69,7 @@ QVariant LogFormatProxyModel::data(const QModelIndex& index, int role) const
break;
}
case Qt::BackgroundRole: {
auto level = static_cast<MessageLevel::Enum>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
auto level = static_cast<MessageLevel>(QIdentityProxyModel::data(index, LogModel::LevelRole).toInt());
QColor result = colors.background.value(level);
if (result.isValid())

6
launcher/ui/pages/instance/OtherLogsPage.cpp
View File

@@ -274,18 +274,18 @@ void OtherLogsPage::reload()
showTooBig();
return;
}
MessageLevel::Enum last = MessageLevel::Unknown;
MessageLevel last = MessageLevel::Unknown;
auto handleLine = [this, &last](QString line) {
if (line.isEmpty())
return false;
if (line.back() == '\n')
line = line.remove(line.size() - 1, 1);
MessageLevel::Enum level = MessageLevel::Unknown;
MessageLevel level = MessageLevel::Unknown;
QString lineTemp = line; // don't edit out the time and level for clarity
if (!m_instance) {
level = MessageLevel::fromLauncherLine(lineTemp);
level = messageLevelFromLauncherLine(lineTemp);
} else {
level = LogParser::guessLevel(line, last);
}

4
launcher/ui/pages/modplatform/ResourcePage.cpp
View File

@@ -297,8 +297,8 @@ void ResourcePage::versionListUpdated(const QModelIndex& index)
continue;
auto versionText = version.version;
if (version.version_type.isValid()) {
versionText += QString(" [%1]").arg(version.version_type.toString());
if (version.version_type != ModPlatform::IndexedVersionType::Unknown) {
versionText += QString(" [%1]").arg(ModPlatform::indexedVersionTypeToString(version.version_type));
}
if (version.fileId == installedVersion) {
versionText += tr(" [installed]", "Mod version select");