CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature_screenshots' into integration_json_and_tools

Browse Source 
Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.
This commit is contained in:
Petr Mrázek
2014-02-25 01:52:58 +01:00
parent 49dc9695f5 9d4e840a6e
commit acff155624
23 changed files with 969 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/MainWindow.h
View File

@ -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;