From 5c4384235989b16d6931cc0cfa26dd192af68b96 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 12 Jul 2014 17:58:23 +0200 Subject: Add a new page that can show all sorts of logs --- gui/pages/LogPage.cpp | 47 +++++++++++------------------------------------ 1 file changed, 11 insertions(+), 36 deletions(-) (limited to 'gui/pages/LogPage.cpp') diff --git a/gui/pages/LogPage.cpp b/gui/pages/LogPage.cpp index 65b84b03..a7a0171f 100644 --- a/gui/pages/LogPage.cpp +++ b/gui/pages/LogPage.cpp @@ -1,25 +1,23 @@ #include "LogPage.h" -#include -#include -#include -#include #include "ui_LogPage.h" -#include "logic/net/PasteUpload.h" + +#include #include -#include -#include -QString LogPage::displayName() +#include "logic/MinecraftProcess.h" +#include "gui/GuiUtil.h" + +QString LogPage::displayName() const { return tr("Minecraft Log"); } -QIcon LogPage::icon() +QIcon LogPage::icon() const { return QIcon::fromTheme("refresh"); } -QString LogPage::id() +QString LogPage::id() const { return "console"; } @@ -42,42 +40,19 @@ bool LogPage::apply() return true; } -bool LogPage::shouldDisplay() +bool LogPage::shouldDisplay() const { return m_process->instance()->isRunning(); } void LogPage::on_btnPaste_clicked() { - auto text = ui->text->toPlainText(); - ProgressDialog dialog(this); - PasteUpload *paste = new PasteUpload(this, text); - dialog.exec(paste); - if (!paste->successful()) - { - CustomMessageBox::selectable(this, "Upload failed", paste->failReason(), - QMessageBox::Critical)->exec(); - } - else - { - QString link = paste->pasteLink(); - QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(link); - QDesktopServices::openUrl(link); - CustomMessageBox::selectable( - this, tr("Upload finished"), - tr("The link to the uploaded log has been opened in the default browser and placed in your clipboard.") - .arg(link), - QMessageBox::Information)->exec(); - } - delete paste; + GuiUtil::uploadPaste(ui->text->toPlainText(), this); } void LogPage::on_btnCopy_clicked() { - auto text = ui->text->toPlainText(); - QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(text); + GuiUtil::setClipboardText(ui->text->toPlainText()); } void LogPage::on_btnClear_clicked() -- cgit v1.2.3