From 79c5ae121b4f4de24fe3edc57bf3f0e3a8fccfe4 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Wed, 13 Feb 2013 00:35:35 +0100 Subject: add first iteration of the integrated browser --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f67b8346..efa93f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ gui/settingsdialog.cpp gui/newinstancedialog.cpp gui/logindialog.cpp gui/taskdialog.cpp +gui/browserdialog.cpp util/pathutils.cpp util/osutils.cpp @@ -124,6 +125,7 @@ gui/settingsdialog.h gui/newinstancedialog.h gui/logindialog.h gui/taskdialog.h +gui/browserdialog.h data/appsettings.h data/inifile.h @@ -159,6 +161,7 @@ gui/settingsdialog.ui gui/newinstancedialog.ui gui/logindialog.ui gui/taskdialog.ui +gui/browserdialog.ui ) IF(WIN32) @@ -172,11 +175,13 @@ QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS}) QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc) add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC}) -qt5_use_modules(MultiMC Widgets Network) +qt5_use_modules(MultiMC Widgets Network WebKitWidgets) target_link_libraries(MultiMC quazip patchlib ${MultiMC_LINK_ADDITIONAL_LIBS}) add_dependencies(MultiMC MultiMCLauncher) install(TARGETS MultiMC RUNTIME DESTINATION .) +SET(Qt5_DIR $ENV{QTDIR}) + IF(WIN32) IF(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(D "d") -- cgit v1.2.3 From 369b1c55c99aa8bdcd2d57ab4aad3633343f1417 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Wed, 13 Feb 2013 04:03:15 +0100 Subject: implement desktop shortcut creation. windows code not tested. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bbac3bdb..95a16f60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,7 @@ gui/browserdialog.cpp util/pathutils.cpp util/osutils.cpp +util/userutil.cpp java/javautils.cpp java/annotations.cpp @@ -139,6 +140,7 @@ data/loginresponse.h util/apputils.h util/pathutils.h util/osutils.h +util/userutil.h multimc_pragma.h -- cgit v1.2.3 From c523a2c752bb7b071715f6c4eac18f36bcd2c162 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Wed, 20 Feb 2013 00:07:52 +0100 Subject: implement commandline parsing --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c8f7090..a1bd58ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,6 +117,7 @@ gui/browserdialog.cpp util/pathutils.cpp util/osutils.cpp util/userutil.cpp +util/cmdutils.cpp java/javautils.cpp java/annotations.cpp @@ -147,6 +148,7 @@ util/apputils.h util/pathutils.h util/osutils.h util/userutil.h +util/cmdutils.h multimc_pragma.h -- cgit v1.2.3 From 576e979df4a54df9bf5ffeae3559f488b3045268 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Thu, 21 Feb 2013 19:35:52 +0100 Subject: Implement About Dialog Prepared XDG icon theme in :/icons/multimc. will only be usefull as soon as Qt decides to support custom fallback themes. use the resources directly for now. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ab4ca97..1853a8f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,6 +113,7 @@ gui/newinstancedialog.cpp gui/logindialog.cpp gui/taskdialog.cpp gui/browserdialog.cpp +gui/aboutdialog.cpp util/pathutils.cpp util/osutils.cpp @@ -134,6 +135,7 @@ gui/newinstancedialog.h gui/logindialog.h gui/taskdialog.h gui/browserdialog.h +gui/aboutdialog.h data/appsettings.h data/inifile.h @@ -174,6 +176,7 @@ gui/newinstancedialog.ui gui/logindialog.ui gui/taskdialog.ui gui/browserdialog.ui +gui/aboutdialog.ui ) ################################ Install ################################ -- cgit v1.2.3 From d891032219c3faaa13a9d9a4d52659866e6773da Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Thu, 21 Feb 2013 21:55:35 +0100 Subject: use QtCreator's $QTPATH in CMake --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e7e4d4..86619f0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,6 +264,10 @@ ADD_DEPENDENCIES(MultiMC MultiMCLauncher libmmcutil libmmcsettings libmmcinst) ################################ INSTALLATION AND PACKAGING ################################ +# use QtCreator's QTDIR var +IF(DEFINED ENV{QTDIR}) + SET(Qt5_DIR $ENV{QTDIR}) +ENDIF() ######## Plugin and library folders ######## @@ -280,7 +284,7 @@ ENDIF() IF(APPLE) SET(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS) SET(QTCONF_DEST_DIR MultiMC.app/Contents/Resources) - SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") + SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") ENDIF() SET(QT_PLUGINS_DIR ${Qt5_DIR}/plugins) -- cgit v1.2.3 From 9f174ad4e7853b5864d7478ce97d7afa75d76636 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Fri, 22 Feb 2013 16:17:31 +0100 Subject: Implement Instance launching Use --launch to test --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 272250ad..dceb4615 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,7 @@ IF(DEFINED MultiMC_BUILD_TAG) MESSAGE(STATUS "Build tag: ${MultiMC_BUILD_TAG}") ELSE() MESSAGE(STATUS "No build tag specified.") + SET(MultiMC_BUILD_TAG custom) ENDIF() # Architecture detection @@ -168,6 +169,7 @@ gui/aboutdialog.h data/version.h data/userinfo.h data/loginresponse.h +data/minecraftprocess.h data/plugin/pluginmanager.h @@ -195,6 +197,7 @@ data/userinfo.cpp data/loginresponse.cpp data/plugin/pluginmanager.cpp +data/minecraftprocess.cpp gui/mainwindow.cpp gui/modeditwindow.cpp -- cgit v1.2.3 From 3a173648e789f30b2843241ee38e694d16e10358 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Fri, 22 Feb 2013 18:18:23 +0100 Subject: Implement ConsoleWindow --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 03f1f514..070dcc15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,7 @@ gui/logindialog.h gui/taskdialog.h gui/browserdialog.h gui/aboutdialog.h +gui/consolewindow.h data/version.h data/userinfo.h @@ -208,6 +209,7 @@ gui/logindialog.cpp gui/taskdialog.cpp gui/browserdialog.cpp gui/aboutdialog.cpp +gui/consolewindow.cpp java/javautils.cpp java/annotations.cpp @@ -228,6 +230,7 @@ gui/logindialog.ui gui/taskdialog.ui gui/browserdialog.ui gui/aboutdialog.ui +gui/consolewindow.ui ) -- cgit v1.2.3