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.

1 files changed, 40 insertions, 0 deletions

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;
+};