diff options
Diffstat (limited to 'launcher/pages')
| -rw-r--r-- | launcher/pages/global/ProxyPage.ui | 4 | ||||
| -rw-r--r-- | launcher/pages/instance/LogPage.cpp | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/launcher/pages/global/ProxyPage.ui b/launcher/pages/global/ProxyPage.ui index 69fcef1e..347fa86c 100644 --- a/launcher/pages/global/ProxyPage.ui +++ b/launcher/pages/global/ProxyPage.ui @@ -39,7 +39,7 @@ <item> <widget class="QLabel" name="proxyPlainTextWarningLabel_2"> <property name="text"> - <string>This only applies to MultiMC. Minecraft does not accept proxy settings.</string> + <string>This only applies to the launcher. Minecraft does not accept proxy settings.</string> </property> <property name="alignment"> <set>Qt::AlignCenter</set> @@ -166,7 +166,7 @@ <item row="2" column="0" colspan="2"> <widget class="QLabel" name="proxyPlainTextWarningLabel"> <property name="text"> - <string>Note: Proxy username and password are stored in plain text inside MultiMC's configuration file!</string> + <string>Note: Proxy username and password are stored in plain text inside the launcher's configuration file!</string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/launcher/pages/instance/LogPage.cpp b/launcher/pages/instance/LogPage.cpp index 2399b55d..2846dc51 100644 --- a/launcher/pages/instance/LogPage.cpp +++ b/launcher/pages/instance/LogPage.cpp @@ -11,6 +11,7 @@ #include <settings/Setting.h> #include "GuiUtil.h" #include <ColorCache.h> +#include <BuildConfig.h> class LogFormatProxyModel : public QIdentityProxyModel { @@ -236,15 +237,30 @@ void LogPage::on_btnPaste_clicked() return; //FIXME: turn this into a proper task and move the upload logic out of GuiUtil! - m_model->append(MessageLevel::MultiMC, QString("MultiMC: Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date))); + m_model->append( + MessageLevel::Launcher, + QString("%2: Log upload triggered at: %1").arg( + QDateTime::currentDateTime().toString(Qt::RFC2822Date), + BuildConfig.LAUNCHER_NAME + ) + ); auto url = GuiUtil::uploadPaste(m_model->toPlainText(), this); if(!url.isEmpty()) { - m_model->append(MessageLevel::MultiMC, QString("MultiMC: Log uploaded to: %1").arg(url)); + m_model->append( + MessageLevel::Launcher, + QString("%2: Log uploaded to: %1").arg( + url, + BuildConfig.LAUNCHER_NAME + ) + ); } else { - m_model->append(MessageLevel::Error, "MultiMC: Log upload failed!"); + m_model->append( + MessageLevel::Error, + QString("%1: Log upload failed!").arg(BuildConfig.LAUNCHER_NAME) + ); } } @@ -252,7 +268,7 @@ void LogPage::on_btnCopy_clicked() { if(!m_model) return; - m_model->append(MessageLevel::MultiMC, QString("Clipboard copy at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date))); + m_model->append(MessageLevel::Launcher, QString("Clipboard copy at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date))); GuiUtil::setClipboardText(m_model->toPlainText()); } |