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

diff --git a/logic/screenshots/Screenshot.cpp b/logic/screenshots/Screenshot.cpp
new file mode 100644
index 00000000..882e491f
--- /dev/null
+++ b/logic/screenshots/Screenshot.cpp
@@ -0,0 +1,14 @@
+#include "Screenshot.h"
+#include <QImage>
+#include <QIcon>
+QIcon ScreenShot::getImage()
+{
+	if(!imageloaded)
+	{
+		QImage image(file);
+		QImage thumbnail = image.scaledToWidth(256, Qt::SmoothTransformation);
+		m_image = QIcon(QPixmap::fromImage(thumbnail));
+		imageloaded = true;
+	}
+	return m_image;
+}