diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-25 01:52:58 +0100 |
| commit | acff15562431d5d9e9f091ed7cf912f5fe34a61a (patch) | |
| tree | e78502e7eda84696632be9b6539d386b829053b2 /gui/MainWindow.ui | |
| parent | 49dc9695f5204bb80a91214c411bcb1b868ee0db (diff) | |
| parent | 9d4e840a6e1a7169a2863fa1ff1812f8fe19e615 (diff) | |
| download | PrismLauncher-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.gz PrismLauncher-acff15562431d5d9e9f091ed7cf912f5fe34a61a.tar.bz2 PrismLauncher-acff15562431d5d9e9f091ed7cf912f5fe34a61a.zip | |
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.
Diffstat (limited to 'gui/MainWindow.ui')
| -rw-r--r-- | gui/MainWindow.ui | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 90c86075..2bd8ec22 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -112,6 +112,8 @@ <addaction name="actionEditInstNotes"/> <addaction name="actionChangeInstGroup"/> <addaction name="separator"/> + <addaction name="actionScreenshots"/> + <addaction name="separator"/> <addaction name="actionInstanceSettings"/> <addaction name="actionChangeInstMCVersion"/> <addaction name="actionChangeInstLWJGLVersion"/> @@ -528,6 +530,14 @@ <string>Launch the selected instance.</string> </property> </action> + <action name="actionScreenshots"> + <property name="text"> + <string>Manage Screenshots</string> + </property> + <property name="toolTip"> + <string><html><head/><body><p>View and upload screenshots for this instance</p></body></html></string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <resources> |