Merge branch 'feature_screenshots' into integration_json_and_tools

Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.

4 files changed, 229 insertions, 0 deletions

diff --git a/gui/dialogs/CustomMessageBox.cpp b/gui/dialogs/CustomMessageBox.cpp
index 1d2ab58a..4013db60 100644
--- a/gui/dialogs/CustomMessageBox.cpp
+++ b/gui/dialogs/CustomMessageBox.cpp
@@ -28,6 +28,7 @@ QMessageBox *selectable(QWidget *parent, const QString &title, const QString &te
 	messageBox->setDefaultButton(defaultButton);
 	messageBox->setTextInteractionFlags(Qt::TextSelectableByMouse);
 	messageBox->setIcon(icon);
+	messageBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
 	return messageBox;
 }
diff --git a/gui/dialogs/ScreenshotDialog.cpp b/gui/dialogs/ScreenshotDialog.cpp
new file mode 100644
index 00000000..a88c8dfd
--- /dev/null
+++ b/gui/dialogs/ScreenshotDialog.cpp
@@ -0,0 +1,78 @@
+#include "ScreenshotDialog.h"
+#include "ui_ScreenshotDialog.h"
+
+#include <QModelIndex>
+#include <QMutableListIterator>
+
+#include "ProgressDialog.h"
+#include "CustomMessageBox.h"
+#include "logic/net/NetJob.h"
+#include "logic/screenshots/ImgurUpload.h"
+#include "logic/screenshots/ImgurAlbumCreation.h"
+#include "logic/tasks/SequentialTask.h"
+
+ScreenshotDialog::ScreenshotDialog(ScreenshotList *list, QWidget *parent)
+	: QDialog(parent), ui(new Ui::ScreenshotDialog), m_list(list)
+{
+	ui->setupUi(this);
+	ui->listView->setModel(m_list);
+}
+
+ScreenshotDialog::~ScreenshotDialog()
+{
+	delete ui;
+}
+
+QString ScreenshotDialog::message() const
+{
+	return tr("<a href=\"https://imgur.com/a/%1\">Visit album</a><br/>Delete hash: %2 (save "
+			  "this if you want to be able to edit/delete the album)")
+		.arg(m_imgurAlbum->id(), m_imgurAlbum->deleteHash());
+}
+
+QList<ScreenshotPtr> ScreenshotDialog::selected() const
+{
+	QList<ScreenshotPtr> list;
+	QList<ScreenshotPtr> first = m_list->screenshots();
+	for (QModelIndex index : ui->listView->selectionModel()->selectedRows())
+	{
+		list.append(first.at(index.row()));
+	}
+	return list;
+}
+
+void ScreenshotDialog::on_uploadBtn_clicked()
+{
+	m_uploaded = selected();
+	if (m_uploaded.isEmpty())
+	{
+		done(NothingDone);
+		return;
+	}
+	SequentialTask *task = new SequentialTask(this);
+	NetJob *job = new NetJob("Screenshot Upload");
+	for (auto shot : m_uploaded)
+	{
+		job->addNetAction(ImgurUpload::make(shot));
+	}
+	NetJob *albumTask = new NetJob("Imgur Album Creation");
+	albumTask->addNetAction(m_imgurAlbum = ImgurAlbumCreation::make(m_uploaded));
+	task->addTask(NetJobPtr(job));
+	task->addTask(NetJobPtr(albumTask));
+	ProgressDialog prog(this);
+	if (prog.exec(task) == QDialog::Accepted)
+	{
+		accept();
+	}
+	else
+	{
+		CustomMessageBox::selectable(this, tr("Failed to upload screenshots!"),
+									 tr("Unknown error"), QMessageBox::Warning)->exec();
+		reject();
+	}
+}
+
+void ScreenshotDialog::on_deleteBtn_clicked()
+{
+	m_list->deleteSelected(this);
+}
diff --git a/gui/dialogs/ScreenshotDialog.h b/gui/dialogs/ScreenshotDialog.h
new file mode 100644
index 00000000..29dd6765
--- /dev/null
+++ b/gui/dialogs/ScreenshotDialog.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <QDialog>
+#include "logic/screenshots/ScreenshotList.h"
+
+class ImgurAlbumCreation;
+
+namespace Ui
+{
+class ScreenshotDialog;
+}
+
+class ScreenshotDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	explicit ScreenshotDialog(ScreenshotList *list, QWidget *parent = 0);
+	~ScreenshotDialog();
+
+	enum
+	{
+		NothingDone = 0x42
+	};
+
+	QString message() const;
+	QList<ScreenshotPtr> selected() const;
+
+private
+slots:
+	void on_uploadBtn_clicked();
+
+	void on_deleteBtn_clicked();
+
+private:
+	Ui::ScreenshotDialog *ui;
+	ScreenshotList *m_list;
+	QList<ScreenshotPtr> m_uploaded;
+	std::shared_ptr<ImgurAlbumCreation> m_imgurAlbum;
+};
diff --git a/gui/dialogs/ScreenshotDialog.ui b/gui/dialogs/ScreenshotDialog.ui
new file mode 100644
index 00000000..eb3dafba
--- /dev/null
+++ b/gui/dialogs/ScreenshotDialog.ui
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScreenshotDialog</class>
+ <widget class="QDialog" name="ScreenshotDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>470</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Screenshot Manager</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../resources/multimc/multimc.qrc">
+    <normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QListView" name="listView">
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectItems</enum>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>120</width>
+       <height>90</height>
+      </size>
+     </property>
+     <property name="flow">
+      <enum>QListView::LeftToRight</enum>
+     </property>
+     <property name="isWrapping" stdset="0">
+      <bool>true</bool>
+     </property>
+     <property name="resizeMode">
+      <enum>QListView::Adjust</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="uploadBtn">
+       <property name="text">
+        <string>Upload</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="deleteBtn">
+       <property name="text">
+        <string>Delete</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeBtn">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../resources/multimc/multimc.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>closeBtn</sender>
+   <signal>clicked()</signal>
+   <receiver>ScreenshotDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>315</x>
+     <y>272</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>271</x>
+     <y>258</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>