summaryrefslogtreecommitdiffstats
path: root/gui/pages/LogPage.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-07-12 17:58:23 +0200
committerPetr Mrázek <peterix@gmail.com>2014-07-12 23:31:05 +0200
commit5c4384235989b16d6931cc0cfa26dd192af68b96 (patch)
tree90e9fa1b758c97302726e01882e9c7c914426182 /gui/pages/LogPage.cpp
parentaba1f89e2abfd596eb01c674d1b2deee3bdc1047 (diff)
downloadMultiMC-5c4384235989b16d6931cc0cfa26dd192af68b96.tar
MultiMC-5c4384235989b16d6931cc0cfa26dd192af68b96.tar.gz
MultiMC-5c4384235989b16d6931cc0cfa26dd192af68b96.tar.lz
MultiMC-5c4384235989b16d6931cc0cfa26dd192af68b96.tar.xz
MultiMC-5c4384235989b16d6931cc0cfa26dd192af68b96.zip
Add a new page that can show all sorts of logs
Diffstat (limited to 'gui/pages/LogPage.cpp')
-rw-r--r--gui/pages/LogPage.cpp47
1 files changed, 11 insertions, 36 deletions
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 <gui/dialogs/CustomMessageBox.h>
-#include <gui/dialogs/ProgressDialog.h>
-#include <logic/MinecraftProcess.h>
-#include <QtGui/QIcon>
#include "ui_LogPage.h"
-#include "logic/net/PasteUpload.h"
+
+#include <QIcon>
#include <QScrollBar>
-#include <QtGui/QClipboard>
-#include <QtGui/QDesktopServices>
-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 <a href=\"%1\">link to the uploaded log</a> 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()