From 5ad95134dc521d5eeb85cc37e6681b72b8d62c62 Mon Sep 17 00:00:00 2001
From: robotbrainify <robotbrainify@gmail.com>
Date: Fri, 6 Dec 2013 16:24:55 -0500
Subject: work on pasting instance logs

blame clang for formatting changes
---
 gui/ConsoleWindow.cpp | 19 +++++++++++++++++++
 gui/ConsoleWindow.h   |  2 ++
 gui/ConsoleWindow.ui  |  7 +++++++
 3 files changed, 28 insertions(+)

(limited to 'gui')

diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index d0210df6..f08f10de 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -22,6 +22,9 @@
 
 #include <gui/Platform.h>
 #include <gui/dialogs/CustomMessageBox.h>
+#include <gui/dialogs/ProgressDialog.h>
+
+#include "logic/net/PasteUpload.h"
 
 ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent)
 	: QMainWindow(parent), ui(new Ui::ConsoleWindow), proc(mcproc)
@@ -179,3 +182,19 @@ void ConsoleWindow::onLaunchFailed(BaseInstance *instance)
 	if(!isVisible())
 		show();
 }
+
+void ConsoleWindow::on_btnPaste_clicked()
+{
+	auto text = ui->text->toPlainText();
+	ProgressDialog dialog(this);
+	PasteUpload* paste=new PasteUpload(this, text);
+	dialog.exec(paste);
+	if(paste->successful())
+	{
+		paste->messageBox()->exec();
+	}
+	else
+	{
+		CustomMessageBox::selectable(this, "Upload failed", paste->failReason(), QMessageBox::Critical)->exec();
+	}
+}
diff --git a/gui/ConsoleWindow.h b/gui/ConsoleWindow.h
index 2d948484..731c616c 100644
--- a/gui/ConsoleWindow.h
+++ b/gui/ConsoleWindow.h
@@ -76,6 +76,8 @@ slots:
 	// FIXME: add handlers for the other MinecraftProcess signals (pre/post launch command
 	// failures)
 
+	void on_btnPaste_clicked();
+
 protected:
 	void closeEvent(QCloseEvent *);
 
diff --git a/gui/ConsoleWindow.ui b/gui/ConsoleWindow.ui
index ed1b627b..6cb5e93b 100644
--- a/gui/ConsoleWindow.ui
+++ b/gui/ConsoleWindow.ui
@@ -74,6 +74,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="btnPaste">
+        <property name="text">
+         <string>Upload Log</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </item>
    </layout>
-- 
cgit v1.2.3


From 4548930e34f5bc325c62ac5b6c5a1701ce914683 Mon Sep 17 00:00:00 2001
From: robotbrainify <robotbrainify@gmail.com>
Date: Fri, 6 Dec 2013 17:17:32 -0500
Subject: Open the url direectly.

---
 gui/ConsoleWindow.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'gui')

diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index f08f10de..5db4442e 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -189,11 +189,7 @@ void ConsoleWindow::on_btnPaste_clicked()
 	ProgressDialog dialog(this);
 	PasteUpload* paste=new PasteUpload(this, text);
 	dialog.exec(paste);
-	if(paste->successful())
-	{
-		paste->messageBox()->exec();
-	}
-	else
+	if(!paste->successful())
 	{
 		CustomMessageBox::selectable(this, "Upload failed", paste->failReason(), QMessageBox::Critical)->exec();
 	}
-- 
cgit v1.2.3