diff options
| author | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-25 13:31:37 -0600 |
| commit | 23474da17500b35bf4fb2a754021175361baab00 (patch) | |
| tree | db2dda426ec4a91982f5f5539b08cc7c3bb1fd35 /gui/mainwindow.h | |
| parent | 498225debdb22d83e591635dbd172cca12476279 (diff) | |
| parent | 4fd5bdb01b27c99f16c9acf3c7ac13c7ea719800 (diff) | |
| download | PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.tar.gz PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.tar.bz2 PrismLauncher-23474da17500b35bf4fb2a754021175361baab00.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
main.cpp
Diffstat (limited to 'gui/mainwindow.h')
| -rw-r--r-- | gui/mainwindow.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 591d0632..a57b8db4 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -35,6 +35,9 @@ public: ~MainWindow(); void closeEvent(QCloseEvent *event); + + // Browser Dialog + void openWebPage(QUrl url); private slots: void on_actionAbout_triggered(); @@ -61,6 +64,8 @@ private slots: void on_actionLaunchInstance_triggered(); + + void on_actionMakeDesktopShortcut_triggered(); void doLogin(const QString& errorMsg = ""); |