Screenshot fixes, move some code around, fix some stuff

1 files changed, 40 insertions, 2 deletions

diff --git a/gui/dialogs/ScreenshotDialog.cpp b/gui/dialogs/ScreenshotDialog.cpp
index 8900f15b..02764fa3 100644
--- a/gui/dialogs/ScreenshotDialog.cpp
+++ b/gui/dialogs/ScreenshotDialog.cpp
@@ -1,6 +1,13 @@
 #include "ScreenshotDialog.h"
 #include "ui_ScreenshotDialog.h"
-#include "QModelIndex"
+
+#include <QModelIndex>
+#include <QDebug>
+
+#include "ProgressDialog.h"
+#include "CustomMessageBox.h"
+#include "logic/net/NetJob.h"
+#include "logic/net/ScreenshotUploader.h"
 
 ScreenshotDialog::ScreenshotDialog(ScreenshotList *list, QWidget *parent) :
 	QDialog(parent),
@@ -16,7 +23,12 @@ ScreenshotDialog::~ScreenshotDialog()
 	delete ui;
 }
 
-QList<ScreenShot*> ScreenshotDialog::selected()
+QList<ScreenShot *> ScreenshotDialog::uploaded() const
+{
+	return m_uploaded;
+}
+
+QList<ScreenShot*> ScreenshotDialog::selected() const
 {
 	QList<ScreenShot*> list;
 	QList<ScreenShot*> first = m_list->screenshots();
@@ -26,3 +38,29 @@ QList<ScreenShot*> ScreenshotDialog::selected()
 	}
 	return list;
 }
+
+void ScreenshotDialog::on_buttonBox_accepted()
+{
+	QList<ScreenShot *> screenshots = selected();
+	if (screenshots.isEmpty())
+	{
+		done(NothingDone);
+		return;
+	}
+	NetJob *job = new NetJob("Screenshot Upload");
+	for (ScreenShot *shot : screenshots)
+	{
+		qDebug() << shot->file;
+		job->addNetAction(ScreenShotUpload::make(shot));
+	}
+	ProgressDialog prog(this);
+	prog.exec(job);
+	connect(job, &NetJob::failed, [this]
+	{
+		CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
+									 tr("Unknown error"), QMessageBox::Warning)->exec();
+		reject();
+	});
+	m_uploaded = screenshots;
+	connect(job, &NetJob::succeeded, this, &ScreenshotDialog::accept);
+}