GH-1362 Put timestamps into the log when it is copied or uploaded

3 files changed, 17 insertions, 4 deletions

diff --git a/application/GuiUtil.cpp b/application/GuiUtil.cpp
index f10095c1..cab3721d 100644
--- a/application/GuiUtil.cpp
+++ b/application/GuiUtil.cpp
@@ -13,7 +13,7 @@
 #include <DesktopServices.h>
 #include <BuildConfig.h>
 
-void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
+QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 {
 	ProgressDialog dialog(parentWidget);
 	auto APIKeySetting = MMC->settings()->get("PasteEEAPIKey").toString();
@@ -29,7 +29,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 			parentWidget, QObject::tr("Upload failed"),
 			QObject::tr("The log file is too big. You'll have to upload it manually."),
 			QMessageBox::Warning)->exec();
-		return;
+		return QString();
 	}
 
 	dialog.execWithTask(paste.get());
@@ -37,6 +37,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 	{
 		CustomMessageBox::selectable(parentWidget, QObject::tr("Upload failed"),
 									 paste->failReason(), QMessageBox::Critical)->exec();
+		return QString();
 	}
 	else
 	{
@@ -49,6 +50,7 @@ void GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
 						"the default "
 						"browser and placed in your clipboard.").arg(link),
 			QMessageBox::Information)->exec();
+		return link;
 	}
 }
 
diff --git a/application/GuiUtil.h b/application/GuiUtil.h
index 381683e4..52520c56 100644
--- a/application/GuiUtil.h
+++ b/application/GuiUtil.h
@@ -4,7 +4,7 @@
 
 namespace GuiUtil
 {
-void uploadPaste(const QString &text, QWidget *parentWidget);
+QString uploadPaste(const QString &text, QWidget *parentWidget);
 void setClipboardText(const QString &text);
 QStringList BrowseForFiles(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget);
 }
diff --git a/application/pages/LogPage.cpp b/application/pages/LogPage.cpp
index 892ba324..597554db 100644
--- a/application/pages/LogPage.cpp
+++ b/application/pages/LogPage.cpp
@@ -74,11 +74,22 @@ bool LogPage::shouldDisplay() const
 
 void LogPage::on_btnPaste_clicked()
 {
-	GuiUtil::uploadPaste(ui->text->toPlainText(), this);
+	//FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
+	write(tr("MultiMC: Log upload triggered at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)), MessageLevel::MultiMC);
+	auto url = GuiUtil::uploadPaste(ui->text->toPlainText(), this);
+	if(!url.isEmpty())
+	{
+		write(tr("MultiMC: Log uploaded to: %1").arg(url), MessageLevel::MultiMC);
+	}
+	else
+	{
+		write(tr("MultiMC: Log upload failed!"), MessageLevel::Error);
+	}
 }
 
 void LogPage::on_btnCopy_clicked()
 {
+	write(QString("Clipboard copy at: %1").arg(QDateTime::currentDateTime().toString(Qt::RFC2822Date)), MessageLevel::MultiMC);
 	GuiUtil::setClipboardText(ui->text->toPlainText());
 }