CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE continue debranding...

Browse Source
This commit is contained in:
Petr Mrázek
2021-10-18 00:47:02 +02:00
parent 297d4b4196
commit 5b3dffce62
50 changed files with 255 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/pages/global/ProxyPage.ui
View File

@ -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>

24
launcher/pages/instance/LogPage.cpp
View File

@ -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());
}