From b069478f6ee7d63136b610af1b198da5bbd1b42b Mon Sep 17 00:00:00 2001 From: Davide Pierotti Date: Sat, 17 Sep 2022 15:42:02 +0200 Subject: [PATCH 1/2] NOISSUE Consistently express 'exit code' in logs --- launcher/LoggedProcess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp index 1f573800..49b411d5 100644 --- a/launcher/LoggedProcess.cpp +++ b/launcher/LoggedProcess.cpp @@ -67,7 +67,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status) if (status == QProcess::NormalExit) { //: Message displayed on instance exit - emit log({tr("Process exited with code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher); + emit log({tr("Process exited with exit code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher); changeState(LoggedProcess::Finished); } else @@ -76,7 +76,7 @@ void LoggedProcess::on_exit(int exit_code, QProcess::ExitStatus status) if(exit_code == -1) emit log({tr("Process crashed.")}, MessageLevel::Launcher); else - emit log({tr("Process crashed with exitcode %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher); + emit log({tr("Process crashed with exit code %1 (0x%2).").arg(exit_code).arg(exit_code, 0, 16)}, MessageLevel::Launcher); changeState(LoggedProcess::Crashed); } From a003b8e8675c84d17876170e367ceb58470fdaba Mon Sep 17 00:00:00 2001 From: Davide Pierotti Date: Tue, 16 May 2023 20:24:26 +0200 Subject: [PATCH 2/2] NOISSUE Use better wording for log upload popup --- launcher/ui/pages/instance/LogPage.cpp | 2 +- launcher/ui/pages/instance/OtherLogsPage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp index 9f287ef2..bd25c209 100644 --- a/launcher/ui/pages/instance/LogPage.cpp +++ b/launcher/ui/pages/instance/LogPage.cpp @@ -242,7 +242,7 @@ void LogPage::on_btnPaste_clicked() auto response = CustomMessageBox::selectable( this, tr("Log upload"), - tr("Are you sure you want to upload a log file?"), + tr("Are you sure you want to upload this log file?"), QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp index 2218d4ae..3a085f0f 100644 --- a/launcher/ui/pages/instance/OtherLogsPage.cpp +++ b/launcher/ui/pages/instance/OtherLogsPage.cpp @@ -183,7 +183,7 @@ void OtherLogsPage::on_btnPaste_clicked() auto response = CustomMessageBox::selectable( this, tr("Log upload"), - tr("Are you sure you want to upload a log file?"), + tr("Are you sure you want to upload this log file?"), QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No