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, 6 insertions, 4 deletions

diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 7a29977d..3a2843f8 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -139,7 +139,9 @@ slots:
 	// called when an icon is changed in the icon model.
 	void iconUpdated(QString);
 
-	void showInstanceContextMenu(const QPoint&);
+	void showInstanceContextMenu(const QPoint &);
+
+	void on_actionScreenshots_triggered();
 
 	void updateToolsMenu();
 
@@ -170,11 +172,11 @@ slots:
 	void updateStatusFailedUI();
 
 	void reloadStatus();
-	
+
 	/*!
 	 * Runs the DownloadUpdateTask and installs updates.
 	 */
-	void downloadUpdates(QString repo, int versionId, bool installOnExit=false);
+	void downloadUpdates(QString repo, int versionId, bool installOnExit = false);
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
@@ -191,7 +193,7 @@ private:
 	ConsoleWindow *console;
 	LabeledToolButton *renameButton;
 	QToolButton *changeIconButton;
-	QToolButton* newsLabel;
+	QToolButton *newsLabel;
 
 	BaseInstance *m_selectedInstance;
 	QString m_currentInstIcon;