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, 70 insertions, 0 deletions

diff --git a/logic/screenshots/ScreenshotList.h b/logic/screenshots/ScreenshotList.h
new file mode 100644
index 00000000..ca6314e9
--- /dev/null
+++ b/logic/screenshots/ScreenshotList.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <QAbstractListModel>
+#include "logic/BaseInstance.h"
+#include "logic/tasks/Task.h"
+
+#include "Screenshot.h"
+
+class ScreenshotList : public QAbstractListModel
+{
+	Q_OBJECT
+public:
+	ScreenshotList(BaseInstance *instance, QObject *parent = 0);
+
+	QVariant data(const QModelIndex &index, int role) const;
+	QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+
+	int rowCount(const QModelIndex &parent) const;
+
+	Qt::ItemFlags flags(const QModelIndex &index) const;
+
+	Task *load();
+
+	void loadShots(QList<ScreenshotPtr> shots)
+	{
+		m_screenshots = shots;
+	}
+
+	QList<ScreenshotPtr> screenshots() const
+	{
+		return m_screenshots;
+	}
+
+	BaseInstance *instance() const
+	{
+		return m_instance;
+	}
+
+	void deleteSelected(class ScreenshotDialog *dialog);
+
+signals:
+
+public
+slots:
+
+private:
+	QList<ScreenshotPtr> m_screenshots;
+	BaseInstance *m_instance;
+};
+
+class ScreenshotLoadTask : public Task
+{
+	Q_OBJECT
+
+public:
+	explicit ScreenshotLoadTask(ScreenshotList *list);
+	~ScreenshotLoadTask();
+
+	QList<ScreenshotPtr> screenShots() const
+	{
+		return m_results;
+	}
+
+protected:
+	virtual void executeTask();
+
+private:
+	ScreenshotList *m_list;
+	QList<ScreenshotPtr> m_results;
+};