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

3
launcher/ui/dialogs/ResourceDownloadDialog.cpp
View File

@@ -187,7 +187,8 @@ void ResourceDownloadDialog::confirm()
auto extraInfo = dependencyExtraInfo.value(task->getPack()->addonId.toString());
confirm_dialog->appendResource({ task->getName(), task->getFilename(), task->getCustomPath(),
ModPlatform::ProviderCapabilities::name(task->getProvider()), extraInfo.required_by,
task->getVersion().version_type.toString(), !extraInfo.maybe_installed });
ModPlatform::indexedVersionTypeToString(task->getVersion().version_type),
!extraInfo.maybe_installed });
}
if (confirm_dialog->exec()) {

4
launcher/ui/dialogs/ResourceUpdateDialog.cpp
View File

@@ -453,8 +453,8 @@ void ResourceUpdateDialog::appendResource(CheckUpdateTask::Update const& info, Q
if (info.new_version_type.has_value()) {
auto new_version_type_item = new QTreeWidgetItem(item_top);
new_version_type_item->setText(0, tr("New Version Type: %1").arg(info.new_version_type.value().toString()));
new_version_type_item->setData(0, Qt::UserRole, info.new_version_type.value().toString());
new_version_type_item->setText(0, tr("New Version Type: %1").arg(indexedVersionTypeToString(info.new_version_type.value())));
new_version_type_item->setData(0, Qt::UserRole, indexedVersionTypeToString(info.new_version_type.value()));
}
if (!requiredBy.isEmpty()) {

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");

2
launcher/ui/themes/CustomTheme.cpp
View File

@@ -229,7 +229,7 @@ bool CustomTheme::read(const QString& path, bool& hasCustomLogColors)
hasCustomLogColors = true;
auto logColorsRoot = Json::requireObject(root, "logColors");
auto readAndSetLogColor = [this, readColor, logColorsRoot](MessageLevel::Enum level, bool fg, const QString& colorName) {
auto readAndSetLogColor = [this, readColor, logColorsRoot](MessageLevel level, bool fg, const QString& colorName) {
auto color = readColor(logColorsRoot, colorName);
if (color.isValid()) {
if (fg)

4
launcher/ui/themes/ITheme.h
View File

@@ -42,8 +42,8 @@
class QStyle;
struct LogColors {
QMap<MessageLevel::Enum, QColor> background;
QMap<MessageLevel::Enum, QColor> foreground;
QMap<MessageLevel, QColor> background;
QMap<MessageLevel, QColor> foreground;
};
// TODO: rename to Theme; this is not an interface as it contains method implementations

2
launcher/ui/widgets/AppearanceWidget.cpp
View File

@@ -232,7 +232,7 @@ void AppearanceWidget::updateConsolePreview()
m_ui->consolePreview->clear();
m_defaultFormat.setFont(QFont(fontFamily, fontSize));
auto print = [this, colors](const QString& message, MessageLevel::Enum level) {
auto print = [this, colors](const QString& message, MessageLevel level) {
QTextCharFormat format(m_defaultFormat);
QColor bg = colors.background.value(level);

8
launcher/ui/widgets/ModFilterWidget.cpp
View File

@@ -387,13 +387,13 @@ void ModFilterWidget::onReleaseFilterChanged()
{
std::list<ModPlatform::IndexedVersionType> releases;
if (ui->releaseCb->isChecked())
releases.push_back(ModPlatform::IndexedVersionType(ModPlatform::IndexedVersionType::VersionType::Release));
releases.push_back(ModPlatform::IndexedVersionType::Release);
if (ui->betaCb->isChecked())
releases.push_back(ModPlatform::IndexedVersionType(ModPlatform::IndexedVersionType::VersionType::Beta));
releases.push_back(ModPlatform::IndexedVersionType::Beta);
if (ui->alphaCb->isChecked())
releases.push_back(ModPlatform::IndexedVersionType(ModPlatform::IndexedVersionType::VersionType::Alpha));
releases.push_back(ModPlatform::IndexedVersionType::Alpha);
if (ui->unknownCb->isChecked())
releases.push_back(ModPlatform::IndexedVersionType(ModPlatform::IndexedVersionType::VersionType::Unknown));
releases.push_back(ModPlatform::IndexedVersionType::Unknown);
m_filter_changed = releases != m_filter->releases;
m_filter->releases = releases;
if (m_filter_changed)