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

Merge https://github.com/Forkk/MultiMC5

Browse Source 
Conflicts:
	gui/mainwindow.ui
This commit is contained in:
Petr Mrázek 2013-02-06 07:09:32 +01:00
commit 18b087e992
42 changed files with 2112 additions and 495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,9 @@
Thumbs.db Thumbs.db
.kdev4 .kdev4
MultiMC5.kdev4 MultiMC5.kdev4
MultiMC.pro.user
CMakeLists.txt.user
.user
build build
resources/CMakeFiles resources/CMakeFiles
resources/MultiMCLauncher.jar resources/MultiMCLauncher.jar

99
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.9) cmake_minimum_required(VERSION 2.8.9)
project(multimc5) project(MultiMC)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -17,6 +17,7 @@ include_directories(hacks)
#### Find the required Qt parts #### #### Find the required Qt parts ####
find_package(Qt5Widgets) find_package(Qt5Widgets)
find_package(Qt5Network)
#find_package(Qt5Declarative) #find_package(Qt5Declarative)
include_directories(${Qt5Widgets_INCLUDE_DIRS}) include_directories(${Qt5Widgets_INCLUDE_DIRS})
@ -24,16 +25,6 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS})
# find ZLIB for quazip # find ZLIB for quazip
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
# Find boost.
set(Boost_USE_STATIC_LIBS ON)
MESSAGE(STATUS "** Finding Boost...")
find_package(Boost 1.46.0 REQUIRED)
MESSAGE(STATUS "** Boost Include: ${Boost_INCLUDE_DIR}")
MESSAGE(STATUS "** Boost Libraries: ${Boost_LIBRARY_DIRS}")
# Include boost.
include_directories("${Boost_INCLUDE_DIRS}")
# Add quazip # Add quazip
add_subdirectory(quazip) add_subdirectory(quazip)
@ -104,34 +95,48 @@ data/appsettings.cpp
data/inifile.cpp data/inifile.cpp
data/instancebase.cpp data/instancebase.cpp
data/instancemodel.cpp data/instancemodel.cpp
data/settingsbase.cpp
data/stdinstance.cpp data/stdinstance.cpp
data/version.cpp
data/userinfo.cpp
data/loginresponse.cpp
gui/mainwindow.cpp gui/mainwindow.cpp
gui/modeditwindow.cpp gui/modeditwindow.cpp
gui/settingsdialog.cpp gui/settingsdialog.cpp
gui/newinstancedialog.cpp
gui/logindialog.cpp
gui/taskdialog.cpp
util/pathutils.cpp util/pathutils.cpp
util/osutils.cpp
java/javautils.cpp java/javautils.cpp
java/annotations.cpp java/annotations.cpp
tasks/task.cpp
tasks/logintask.cpp
) )
SET(MULTIMC_HEADERS SET(MULTIMC_HEADERS
gui/mainwindow.h gui/mainwindow.h
gui/modeditwindow.h gui/modeditwindow.h
gui/settingsdialog.h gui/settingsdialog.h
gui/newinstancedialog.h
gui/logindialog.h
gui/taskdialog.h
data/appsettings.h data/appsettings.h
data/inifile.h data/inifile.h
data/instancebase.h data/instancebase.h
data/instancemodel.h data/instancemodel.h
data/settingsbase.h
data/settingsmacros.h
data/settingsmacrosundef.h
data/stdinstance.h data/stdinstance.h
data/version.h
data/userinfo.h
data/loginresponse.h
util/apputils.h
util/pathutils.h util/pathutils.h
util/osutils.h
multimc_pragma.h multimc_pragma.h
@ -142,21 +147,75 @@ java/endian.h
java/errors.h java/errors.h
java/javautils.h java/javautils.h
java/membuffer.h java/membuffer.h
tasks/task.h
tasks/logintask.h
) )
SET(MULTIMC5_UIS SET(MULTIMC5_UIS
gui/mainwindow.ui gui/mainwindow.ui
gui/modeditwindow.ui gui/modeditwindow.ui
gui/settingsdialog.ui gui/settingsdialog.ui
gui/newinstancedialog.ui
gui/logindialog.ui
gui/taskdialog.ui
) )
IF(WIN32)
SET(MultiMC_LINK_ADDITIONAL_LIBS ${MultiMC_LINK_ADDITIONAL_LIBS}
Ws2_32)
ENDIF()
SET_SOURCE_FILES_PROPERTIES(resources/MultiMCLauncher.jar GENERATED) SET_SOURCE_FILES_PROPERTIES(resources/MultiMCLauncher.jar GENERATED)
QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS}) QT5_WRAP_UI(MULTIMC_UI ${MULTIMC5_UIS})
QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc) QT5_ADD_RESOURCES(MULTIMC_QRC multimc.qrc)
add_executable(multimc5 ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC}) add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MULTIMC_QRC})
qt5_use_modules(multimc5 Widgets) qt5_use_modules(MultiMC Widgets Network)
target_link_libraries(multimc5 quazip patchlib) target_link_libraries(MultiMC quazip patchlib ${MultiMC_LINK_ADDITIONAL_LIBS})
add_dependencies(multimc5 MultiMCLauncher) add_dependencies(MultiMC MultiMCLauncher)
install(TARGETS multimc5 RUNTIME DESTINATION bin) install(TARGETS MultiMC RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
IF(WIN32)
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
SET(D "d")
ELSE()
SET(D "")
ENDIF()
install(FILES "${Qt5_DIR}/plugins/platforms/qwindows${D}.dll" DESTINATION platforms)
install(FILES "${Qt5_DIR}/plugins/platforms/qminimal${D}.dll" DESTINATION platforms)
install(FILES "${Qt5_DIR}/bin/libEGL${D}.dll" DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES "${Qt5_DIR}/plugins/imageformats/qsvg${D}.dll" DESTINATION imageformats)
install(FILES "${Qt5_DIR}/plugins/imageformats/qico${D}.dll" DESTINATION imageformats)
install(FILES "${Qt5_DIR}/plugins/imageformats/qgif${D}.dll" DESTINATION imageformats)
install(FILES "${Qt5_DIR}/plugins/imageformats/qjpeg${D}.dll" DESTINATION imageformats)
ELSEIF(UNIX)
ENDIF()
GET_TARGET_PROPERTY(BINARY_LOCATION MultiMC LOCATION)
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/dependencies.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake"
@ONLY
)
INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/dependencies.cmake")
# Package with CPack
IF(UNIX)
if(APPLE)
SET(CPACK_GENERATOR "ZIP")
else()
SET(CPACK_GENERATOR "TGZ")
endif()
ELSEIF(WIN32)
SET(CPACK_GENERATOR "ZIP")
ENDIF()
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
set(CPACK_PACKAGE_FILE_NAME "MultiMC")
INCLUDE(CPack)

7
MultiMC.pro
View File

@ -20,7 +20,8 @@ SOURCES += main.cpp\
data/stdinstance.cpp \ data/stdinstance.cpp \
data/inifile.cpp \ data/inifile.cpp \
gui/settingsdialog.cpp \ gui/settingsdialog.cpp \
gui/modeditwindow.cpp gui/modeditwindow.cpp \
util/appsettings.cpp
HEADERS += gui/mainwindow.h \ HEADERS += gui/mainwindow.h \
data/instancebase.h \ data/instancebase.h \
@ -29,7 +30,9 @@ HEADERS += gui/mainwindow.h \
data/stdinstance.h \ data/stdinstance.h \
data/inifile.h \ data/inifile.h \
gui/settingsdialog.h \ gui/settingsdialog.h \
gui/modeditwindow.h gui/modeditwindow.h \
util/apputils.h \
util/appsettings.h
FORMS += gui/mainwindow.ui \ FORMS += gui/mainwindow.ui \
gui/settingsdialog.ui \ gui/settingsdialog.ui \

239
MultiMC.pro.user
View File

@ -1,239 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.6.1, 2013-01-15T19:01:37. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QString" key="CurrentPreferences">CppGlobal</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
<value type="QString" key="language">QmlJS</value>
<valuemap type="QVariantMap" key="value">
<value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
<value type="int" key="EditorConfiguration.TabKeyBehavior">1</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">false</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">false</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">true</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap"/>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.0.0 MSVC2010 32bit (SDK)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.0.0 MSVC2010 32bit (SDK)</value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">qt.500.win32_msvc2010.essentials_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Debug</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/Andrew/Projects/MultiMC5/MultiMC-build-Desktop_Qt_5_0_0_MSVC2010_32bit_SDK-Release</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.Project.UseGlobal">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">MultiMC</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Andrew/Projects/MultiMC5/MultiMC/MultiMC.pro</value>
<value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">MultiMC.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
<value type="QString">{d833f846-3a8b-4e2a-9d77-5f93cddd0a0f}</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">12</value>
</data>
</qtcreator>

22
data/appsettings.cpp
View File

@ -15,8 +15,26 @@
#include "appsettings.h" #include "appsettings.h"
AppSettings::AppSettings(QString fileName) : AppSettings* settings;
SettingsBase(fileName)
SettingsBase::SettingsBase(QObject *parent) :
QObject(parent)
{ {
} }
AppSettings::AppSettings(QObject *parent) :
SettingsBase(parent)
{
}
QVariant AppSettings::getValue(const QString& name, QVariant defVal) const
{
return config.value(name, defVal);
}
void AppSettings::setValue(const QString& name, QVariant val)
{
config.setValue(name, val);
}

96
data/appsettings.h
View File

@ -16,12 +16,104 @@
#ifndef APPSETTINGS_H #ifndef APPSETTINGS_H
#define APPSETTINGS_H #define APPSETTINGS_H
#include "settingsbase.h" #include <QObject>
#include <QSettings>
#include <QColor>
#include <QPoint>
#include "util/apputils.h"
#include "util/osutils.h"
#if WINDOWS
#define JPATHKEY "JavaPathWindows"
#elif OSX
#define JPATHKEY "JavaPathOSX"
#else
#define JPATHKEY "JavaPathLinux"
#endif
#define DEFINE_SETTING_ADVANCED(funcName, name, valType, defVal) \
virtual valType get ## funcName() const { return getValue(name, defVal).value<valType>(); } \
virtual void set ## funcName(valType value) { setValue(name, value); }
#define DEFINE_SETTING(name, valType, defVal) \
DEFINE_SETTING_ADVANCED(name, STR_VAL(name), valType, defVal)
#define DEFINE_OVERRIDE_SETTING(overrideName) \
class SettingsBase : public QObject
{
Q_OBJECT
public:
explicit SettingsBase(QObject *parent = 0);
// Updates
DEFINE_SETTING(UseDevBuilds, bool, false)
DEFINE_SETTING(AutoUpdate, bool, true)
// Folders
DEFINE_SETTING(InstanceDir, QString, "instances")
DEFINE_SETTING(CentralModsDir, QString, "mods")
DEFINE_SETTING(LWJGLDir, QString, "lwjgl")
// Console
DEFINE_SETTING(ShowConsole, bool, true)
DEFINE_SETTING(AutoCloseConsole, bool, true)
// Toolbar settings
DEFINE_SETTING(InstanceToolbarVisible, bool, true)
DEFINE_SETTING(InstanceToolbarPosition, QPoint, QPoint())
// Console Colors
DEFINE_SETTING(SysMessageColor, QColor, QColor(Qt::blue))
DEFINE_SETTING(StdOutColor, QColor, QColor(Qt::black))
DEFINE_SETTING(StdErrColor, QColor, QColor(Qt::red))
// Window Size
DEFINE_SETTING(LaunchCompatMode, bool, false)
DEFINE_SETTING(LaunchMaximized, bool, false)
DEFINE_SETTING(MinecraftWinWidth, int, 854)
DEFINE_SETTING(MinecraftWinHeight, int, 480)
// Auto login
DEFINE_SETTING(AutoLogin, bool, false)
// Memory
DEFINE_SETTING(MinMemAlloc, int, 512)
DEFINE_SETTING(MaxMemAlloc, int, 1024)
// Java Settings
DEFINE_SETTING_ADVANCED(JavaPath, JPATHKEY, QString, "java")
DEFINE_SETTING(JvmArgs, QString, "")
// Custom Commands
DEFINE_SETTING(PreLaunchCommand, QString, "")
DEFINE_SETTING(PostExitCommand, QString, "")
protected:
virtual QVariant getValue(const QString& name, QVariant defVal = QVariant()) const = 0;
virtual void setValue(const QString& name, QVariant val) = 0;
};
class AppSettings : public SettingsBase class AppSettings : public SettingsBase
{ {
Q_OBJECT
public: public:
AppSettings(QString fileName); explicit AppSettings(QObject *parent = 0);
QSettings& getConfig() { return config; }
protected:
virtual QVariant getValue(const QString &name, QVariant defVal = QVariant()) const;
virtual void setValue(const QString& name, QVariant val);
QSettings config;
}; };
#undef DEFINE_SETTING_ADVANCED
#undef DEFINE_SETTING
extern AppSettings* settings;
#endif // APPSETTINGS_H #endif // APPSETTINGS_H

134
data/instancemodel.cpp
View File

@ -16,15 +16,18 @@
#include "instancemodel.h" #include "instancemodel.h"
#include <QString> #include <QString>
#include <QDir> #include <QDir>
#include <QFile>
#include <QDirIterator> #include <QDirIterator>
#include "stdinstance.h" #include <QTextStream>
#include "../util/pathutils.h" #include <QJsonDocument>
#include <QJsonObject>
#include <boost/property_tree/json_parser.hpp> #include <QJsonArray>
#include <boost/foreach.hpp>
#include "data/stdinstance.h"
#include "util/pathutils.h"
#define GROUP_FILE_FORMAT_VERSION 1 #define GROUP_FILE_FORMAT_VERSION 1
@ -58,54 +61,105 @@ void InstanceGroup::addInstance ( InstanceBase* inst )
void InstanceModel::initialLoad(QString dir) void InstanceModel::initialLoad(QString dir)
{ {
groupFile = dir + "/instgroups.json"; groupFileName = dir + "/instgroups.json";
implicitGroup = new InstanceGroup("Ungrouped", this); implicitGroup = new InstanceGroup("Ungrouped", this);
groups.append(implicitGroup); groups.append(implicitGroup);
// temporary map from instance ID to group name // temporary map from instance ID to group name
QMap<QString, QString> groupMap; QMap<QString, QString> groupMap;
using namespace boost::property_tree; if (QFileInfo(groupFileName).exists())
ptree pt;
try
{ {
read_json(groupFile.toStdString(), pt); QFile groupFile(groupFileName);
if (pt.get_optional<int>("formatVersion") != GROUP_FILE_FORMAT_VERSION) if (!groupFile.open(QIODevice::ReadOnly))
{ {
// TODO: Discard old formats. // An error occurred. Ignore it.
qDebug("Failed to read instance group file.");
goto groupParseFail;
} }
BOOST_FOREACH(const ptree::value_type& vp, pt.get_child("groups")) QTextStream in(&groupFile);
QString jsonStr = in.readAll();
groupFile.close();
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);
if (error.error != QJsonParseError::NoError)
{ {
ptree gPt = vp.second; qWarning(QString("Failed to parse instance group file: %1 at offset %2").
QString groupName = QString::fromUtf8(vp.first.c_str()); arg(error.errorString(), QString::number(error.offset)).toUtf8());
goto groupParseFail;
InstanceGroup *group = new InstanceGroup(groupName, this); }
groups.push_back(group);
if (!jsonDoc.isObject())
if (gPt.get_child_optional("hidden")) {
group->setHidden(gPt.get<bool>("hidden")); qWarning("Invalid group file. Root entry should be an object.");
goto groupParseFail;
QVector<QString> groupInstances; }
BOOST_FOREACH(const ptree::value_type& v, gPt.get_child("instances"))
QJsonObject rootObj = jsonDoc.object();
// Make sure the format version matches.
if (rootObj.value("formatVersion").toVariant().toInt() == GROUP_FILE_FORMAT_VERSION)
{
// Get the group list.
if (!rootObj.value("groups").isObject())
{ {
QString key = QString::fromUtf8(v.second.data().c_str()); qWarning("Invalid group list JSON: 'groups' should be an object.");
groupMap[key] = groupName; goto groupParseFail;
}
// Iterate through the list.
QJsonObject groupList = rootObj.value("groups").toObject();
for (QJsonObject::iterator iter = groupList.begin();
iter != groupList.end(); iter++)
{
QString groupName = iter.key();
// If not an object, complain and skip to the next one.
if (!iter.value().isObject())
{
qWarning(QString("Group '%1' in the group list should "
"be an object.").arg(groupName).toUtf8());
continue;
}
QJsonObject groupObj = iter.value().toObject();
// Create the group object.
InstanceGroup *group = new InstanceGroup(groupName, this);
groups.push_back(group);
// If 'hidden' isn't a bool value, just assume it's false.
if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
{
group->setHidden(groupObj.value("hidden").toBool());
}
if (!groupObj.value("instances").isArray())
{
qWarning(QString("Group '%1' in the group list is invalid. "
"It should contain an array "
"called 'instances'.").arg(groupName).toUtf8());
continue;
}
// Iterate through the list of instances in the group.
QJsonArray instancesArray = groupObj.value("instances").toArray();
for (QJsonArray::iterator iter2 = instancesArray.begin();
iter2 != instancesArray.end(); iter2++)
{
groupMap[(*iter2).toString()] = groupName;
}
} }
} }
} }
catch (json_parser_error e)
{ groupParseFail:
qDebug("Failed to read group list. JSON parser error.");
// wxLogError(_(),
// e.line(), wxStr(e.message()).c_str());
}
catch (ptree_error e)
{
qDebug("Failed to read group list. Unknown ptree error.");
}
qDebug("Loading instances"); qDebug("Loading instances");
QDir instDir(dir); QDir instDir(dir);
@ -397,4 +451,4 @@ QVariant InstanceGroup::data ( int role ) const
default: default:
return QVariant(); return QVariant();
} }
} }

2
data/instancemodel.h
View File

@ -129,7 +129,7 @@ signals:
public slots: public slots:
private: private:
QString groupFile; QString groupFileName;
QVector<InstanceGroup*> groups; QVector<InstanceGroup*> groups;
InstanceGroup * implicitGroup; InstanceGroup * implicitGroup;
}; };

69
data/loginresponse.cpp Normal file
View File

@ -0,0 +1,69 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "loginresponse.h"
LoginResponse::LoginResponse(const QString& username, const QString& sessionID,
qint64 latestVersion, QObject *parent) :
QObject(parent)
{
this->username = username;
this->sessionID = sessionID;
this->latestVersion = latestVersion;
}
LoginResponse::LoginResponse()
{
this->username = "";
this->sessionID = "";
this->latestVersion = 0;
}
LoginResponse::LoginResponse(const LoginResponse &other)
{
this->username = other.getUsername();
this->sessionID = other.getSessionID();
this->latestVersion = other.getLatestVersion();
}
QString LoginResponse::getUsername() const
{
return username;
}
void LoginResponse::setUsername(const QString& username)
{
this->username = username;
}
QString LoginResponse::getSessionID() const
{
return sessionID;
}
void LoginResponse::setSessionID(const QString& sessionID)
{
this->sessionID = sessionID;
}
qint64 LoginResponse::getLatestVersion() const
{
return latestVersion;
}
void LoginResponse::setLatestVersion(qint64 v)
{
this->latestVersion = v;
}

47
data/loginresponse.h Normal file
View File

@ -0,0 +1,47 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOGINRESPONSE_H
#define LOGINRESPONSE_H
#include <QObject>
class LoginResponse : public QObject
{
Q_OBJECT
public:
explicit LoginResponse(const QString &username, const QString &sessionID,
qint64 latestVersion, QObject *parent = 0);
LoginResponse();
LoginResponse(const LoginResponse& other);
QString getUsername() const;
void setUsername(const QString& username);
QString getSessionID() const;
void setSessionID(const QString& sessionID);
qint64 getLatestVersion() const;
void setLatestVersion(qint64 v);
private:
QString username;
QString sessionID;
qint64 latestVersion;
};
Q_DECLARE_METATYPE(LoginResponse)
#endif // LOGINRESPONSE_H

35
data/settingsmacros.h
View File

@ -1,35 +0,0 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef SETTINGSMACROS_H
#define SETTINGSMACROS_H
#define STR_VAL(val) # val
#define DEFINE_SETTING(funcName, name, defVal, typeName, toFunc) \
virtual typeName Get ## funcName() const { return value(name). ## toFunc(); } \
virtual void Set ## funcName(typeName value) { setValue(name, value); } \
virtual void Reset ## funcName() {
#define DEFINE_SETTING_STR(name, defVal) \
DEFINE_SETTING(name, STR_VAL(name), defVal, QString, toString)
#define DEFINE_SETTING_BOOL(name, defVal) \
DEFINE_SETTING(name, STR_VAL(name), defVal, bool, toBool)
#define DEFINE_SETTING_INT(name, defVal) \
DEFINE_SETTING(name, STR_VAL(name), defVal, int, toInt)
#endif // SETTINGSMACROS_H

4
data/stdinstance.cpp
View File

@ -15,8 +15,8 @@
#include "stdinstance.h" #include "stdinstance.h"
StdInstance::StdInstance(QString rootDir) : StdInstance::StdInstance(QString rootDir, QObject* parent) :
InstanceBase(rootDir) InstanceBase(rootDir, parent)
{ {
} }

2
data/stdinstance.h
View File

@ -22,7 +22,7 @@
class StdInstance : public InstanceBase class StdInstance : public InstanceBase
{ {
public: public:
explicit StdInstance(QString rootDir); explicit StdInstance(QString rootDir, QObject *parent = 0);
}; };
#endif // STDINSTANCE_H #endif // STDINSTANCE_H

49
data/userinfo.cpp Normal file
View File

@ -0,0 +1,49 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "userinfo.h"
UserInfo::UserInfo(const QString &username, const QString &password, QObject *parent) :
QObject(parent)
{
this->username = username;
this->password = password;
}
UserInfo::UserInfo(const UserInfo &other)
{
this->username = other.username;
this->password = other.password;
}
QString UserInfo::getUsername() const
{
return username;
}
void UserInfo::setUsername(const QString &username)
{
this->username = username;
}
QString UserInfo::getPassword() const
{
return password;
}
void UserInfo::setPassword(const QString &password)
{
this->password = password;
}

39
data/userinfo.h Normal file
View File

@ -0,0 +1,39 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef USERINFO_H
#define USERINFO_H
#include <QObject>
class UserInfo : public QObject
{
Q_OBJECT
public:
explicit UserInfo(const QString& username, const QString& password, QObject *parent = 0);
explicit UserInfo(const UserInfo& other);
QString getUsername() const;
void setUsername(const QString& username);
QString getPassword() const;
void setPassword(const QString& password);
protected:
QString username;
QString password;
};
#endif // USERINFO_H

46
data/version.cpp Normal file
View File

@ -0,0 +1,46 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "version.h"
#include "config.h"
Version Version::current(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD);
Version::Version(int major, int minor, int revision, int build, QObject *parent) :
QObject(parent)
{
this->major = major;
this->minor = minor;
this->revision = revision;
this->build = build;
}
Version::Version(const Version& ver)
{
this->major = ver.major;
this->minor = ver.minor;
this->revision = ver.revision;
this->build = ver.build;
}
QString Version::toString() const
{
return QString("%1.%2.%3.%4").arg(
QString::number(major),
QString::number(minor),
QString::number(revision),
QString::number(build));
}

40
data/version.h Normal file
View File

@ -0,0 +1,40 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef VERSION_H
#define VERSION_H
#include <QObject>
class Version : public QObject
{
Q_OBJECT
public:
explicit Version(int major = 0, int minor = 0, int revision = 0,
int build = 0, QObject *parent = 0);
Version(const Version& ver);
QString toString() const;
int major;
int minor;
int revision;
int build;
static Version current;
};
#endif // VERSION_H

25
dependencies.cmake.in Normal file
View File

@ -0,0 +1,25 @@
cmake_minimum_required(VERSION 2.8.9)
message(STATUS "Running install script...")
SET(Qt5_DIR @Qt5_DIR@)
INCLUDE(GetPrerequisites)
GET_PREREQUISITES(@BINARY_LOCATION@ MULTIMC_PREREQS 1 1 "" "")
message(STATUS "Prerequisites: ${MULTIMC_PREREQS}")
FOREACH(PREREQ ${MULTIMC_PREREQS})
GET_FILENAME_COMPONENT(PREREQ_NAME "${PREREQ}" NAME)
GET_FILENAME_COMPONENT(_PREREQ_ACTUAL "${PREREQ}" REALPATH)
SET(PREREQ_ACTUAL "${Qt5_DIR}/bin/${PREREQ}")
message(STATUS "Adding install prerequisite: ${PREREQ_NAME}")
FILE(INSTALL
DESTINATION "${CMAKE_INSTALL_PREFIX}"
TYPE PROGRAM
RENAME "${PREREQ_NAME}"
FILES "${PREREQ_ACTUAL}"
)
ENDFOREACH()

51
gui/logindialog.cpp Normal file
View File

@ -0,0 +1,51 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "logindialog.h"
#include "ui_logindialog.h"
LoginDialog::LoginDialog(QWidget *parent, const QString& loginErrMsg) :
QDialog(parent),
ui(new Ui::LoginDialog)
{
ui->setupUi(this);
if (loginErrMsg.isEmpty())
ui->loginErrorLabel->setVisible(false);
else
{
ui->loginErrorLabel->setVisible(true);
ui->loginErrorLabel->setText(QString("<span style=\" color:#ff0000;\">%1</span>").
arg(loginErrMsg));
}
resize(minimumSizeHint());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}
LoginDialog::~LoginDialog()
{
delete ui;
}
QString LoginDialog::getUsername() const
{
return ui->usernameTextBox->text();
}
QString LoginDialog::getPassword() const
{
return ui->passwordTextBox->text();
}

40
gui/logindialog.h Normal file
View File

@ -0,0 +1,40 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOGINDIALOG_H
#define LOGINDIALOG_H
#include <QDialog>
namespace Ui {
class LoginDialog;
}
class LoginDialog : public QDialog
{
Q_OBJECT
public:
explicit LoginDialog(QWidget *parent = 0, const QString& loginErrMsg = "");
~LoginDialog();
QString getUsername() const;
QString getPassword() const;
private:
Ui::LoginDialog *ui;
};
#endif // LOGINDIALOG_H

146
gui/logindialog.ui Normal file
View File

@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LoginDialog</class>
<widget class="QDialog" name="LoginDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>365</width>
<height>145</height>
</rect>
</property>
<property name="windowTitle">
<string>Login</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="loginErrorLabel">
<property name="text">
<string>&lt;span style=&quot; color:#ff0000;&quot;&gt;Error&lt;/span&gt;</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="usernameLabel">
<property name="text">
<string>Username:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="usernameTextBox">
<property name="placeholderText">
<string>Username</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="text">
<string>Password:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="passwordTextBox">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
<property name="placeholderText">
<string>Password</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="checkboxLayout">
<item>
<widget class="QPushButton" name="forceUpdateButton">
<property name="text">
<string>&amp;Force Update</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="rememberUsernameCheckbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Remember Username?</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="rememberPasswordCheckbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>R&amp;emember Password?</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="loginButtonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>loginButtonBox</sender>
<signal>accepted()</signal>
<receiver>LoginDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>loginButtonBox</sender>
<signal>rejected()</signal>
<receiver>LoginDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

87
gui/mainwindow.cpp
View File

@ -16,16 +16,35 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include <QMenu>
#include <QMessageBox>
#include <QDesktopServices> #include <QDesktopServices>
#include <QUrl> #include <QUrl>
#include "../gui/settingsdialog.h" #include "util/osutils.h"
#include "gui/settingsdialog.h"
#include "gui/newinstancedialog.h"
#include "gui/logindialog.h"
#include "gui/taskdialog.h"
#include "data/appsettings.h"
#include "data/version.h"
#include "tasks/logintask.h"
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowTitle(QString("MultiMC %1").arg(Version::current.toString()));
restoreGeometry(settings->getConfig().value("MainWindowGeometry", saveGeometry()).toByteArray());
restoreState(settings->getConfig().value("MainWindowState", saveState()).toByteArray());
instList.initialLoad("instances"); instList.initialLoad("instances");
ui->instanceView->setModel(&instList); ui->instanceView->setModel(&instList);
} }
@ -37,12 +56,13 @@ MainWindow::~MainWindow()
void MainWindow::on_actionAddInstance_triggered() void MainWindow::on_actionAddInstance_triggered()
{ {
NewInstanceDialog *newInstDlg = new NewInstanceDialog(this);
newInstDlg->exec();
} }
void MainWindow::on_actionViewInstanceFolder_triggered() void MainWindow::on_actionViewInstanceFolder_triggered()
{ {
openInDefaultProgram(settings->getInstanceDir());
} }
void MainWindow::on_actionRefresh_triggered() void MainWindow::on_actionRefresh_triggered()
@ -52,7 +72,7 @@ void MainWindow::on_actionRefresh_triggered()
void MainWindow::on_actionViewCentralModsFolder_triggered() void MainWindow::on_actionViewCentralModsFolder_triggered()
{ {
openInDefaultProgram(settings->getCentralModsDir());
} }
void MainWindow::on_actionCheckUpdate_triggered() void MainWindow::on_actionCheckUpdate_triggered()
@ -68,15 +88,70 @@ void MainWindow::on_actionSettings_triggered()
void MainWindow::on_actionReportBug_triggered() void MainWindow::on_actionReportBug_triggered()
{ {
QDesktopServices::openUrl(QUrl("http://bugs.forkk.net/"));
} }
void MainWindow::on_actionNews_triggered() void MainWindow::on_actionNews_triggered()
{ {
QDesktopServices::openUrl(QUrl("http://news.forkk.net/"));
} }
void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionAbout_triggered()
{ {
} }
void MainWindow::on_mainToolBar_visibilityChanged(bool)
{
// Don't allow hiding the main toolbar.
// This is the only way I could find to prevent it... :/
ui->mainToolBar->setVisible(true);
}
void MainWindow::closeEvent(QCloseEvent *event)
{
// Save the window state and geometry.
settings->getConfig().setValue("MainWindowGeometry", saveGeometry());
settings->getConfig().setValue("MainWindowState", saveState());
QMainWindow::closeEvent(event);
}
void MainWindow::on_instanceView_customContextMenuRequested(const QPoint &pos)
{
QMenu *instContextMenu = new QMenu("Instance", this);
// Add the actions from the toolbar to the context menu.
instContextMenu->addActions(ui->instanceToolBar->actions());
instContextMenu->exec(ui->instanceView->mapToGlobal(pos));
}
void MainWindow::on_actionLaunchInstance_triggered()
{
doLogin();
}
void MainWindow::doLogin(const QString &errorMsg)
{
LoginDialog* loginDlg = new LoginDialog(this, errorMsg);
if (loginDlg->exec())
{
UserInfo uInfo(loginDlg->getUsername(), loginDlg->getPassword());
TaskDialog* tDialog = new TaskDialog(this);
LoginTask* loginTask = new LoginTask(uInfo, tDialog);
connect(loginTask, SIGNAL(loginComplete(LoginResponse)),
SLOT(onLoginComplete(LoginResponse)), Qt::QueuedConnection);
connect(loginTask, SIGNAL(loginFailed(QString)),
SLOT(doLogin(QString)), Qt::QueuedConnection);
tDialog->exec(loginTask);
}
}
void MainWindow::onLoginComplete(LoginResponse response)
{
QMessageBox::information(this, "Login Successful",
QString("Logged in as %1 with session ID %2.").
arg(response.getUsername(), response.getSessionID()));
}

17
gui/mainwindow.h
View File

@ -18,7 +18,8 @@
#include <QMainWindow> #include <QMainWindow>
#include "../data/instancemodel.h" #include "data/instancemodel.h"
#include "data/loginresponse.h"
namespace Ui namespace Ui
{ {
@ -33,6 +34,8 @@ public:
explicit MainWindow(QWidget *parent = 0); explicit MainWindow(QWidget *parent = 0);
~MainWindow(); ~MainWindow();
void closeEvent(QCloseEvent *event);
private slots: private slots:
void on_actionAbout_triggered(); void on_actionAbout_triggered();
@ -52,6 +55,18 @@ private slots:
void on_actionNews_triggered(); void on_actionNews_triggered();
void on_mainToolBar_visibilityChanged(bool);
void on_instanceView_customContextMenuRequested(const QPoint &pos);
void on_actionLaunchInstance_triggered();
void doLogin(const QString& errorMsg = "");
void onLoginComplete(LoginResponse response);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;

223
gui/mainwindow.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>739</width> <width>600</width>
<height>657</height> <height>400</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -44,11 +44,17 @@
<attribute name="headerVisible"> <attribute name="headerVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QToolBar" name="mainToolBar"> <widget class="QToolBar" name="mainToolBar">
<property name="windowTitle">
<string>Main Toolbar</string>
</property>
<property name="movable"> <property name="movable">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -74,6 +80,38 @@
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="instanceToolBar">
<property name="windowTitle">
<string>Instance Toolbar</string>
</property>
<property name="floatable">
<bool>false</bool>
</property>
<attribute name="toolBarArea">
<enum>RightToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionLaunchInstance"/>
<addaction name="separator"/>
<addaction name="actionRenameInstance"/>
<addaction name="actionChangeInstGroup"/>
<addaction name="actionChangeInstIcon"/>
<addaction name="actionChangeInstMCVersion"/>
<addaction name="actionChangeInstLWJGLVersion"/>
<addaction name="actionEditInstNotes"/>
<addaction name="separator"/>
<addaction name="actionEditInstMods"/>
<addaction name="actionManageInstSaves"/>
<addaction name="actionRebuildInstJar"/>
<addaction name="separator"/>
<addaction name="actionInstanceSettings"/>
<addaction name="actionMakeDesktopShortcut"/>
<addaction name="actionViewSelectedInstFolder"/>
<addaction name="separator"/>
<addaction name="actionDeleteInstance"/>
</widget>
<action name="actionAddInstance"> <action name="actionAddInstance">
<property name="icon"> <property name="icon">
<iconset resource="../multimc.qrc"> <iconset resource="../multimc.qrc">
@ -85,6 +123,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Add a new instance.</string> <string>Add a new instance.</string>
</property> </property>
<property name="statusTip">
<string>Add a new instance.</string>
</property>
</action> </action>
<action name="actionViewInstanceFolder"> <action name="actionViewInstanceFolder">
<property name="icon"> <property name="icon">
@ -97,6 +138,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Open the instance folder in a file browser.</string> <string>Open the instance folder in a file browser.</string>
</property> </property>
<property name="statusTip">
<string>Open the instance folder in a file browser.</string>
</property>
</action> </action>
<action name="actionRefresh"> <action name="actionRefresh">
<property name="icon"> <property name="icon">
@ -109,6 +153,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Reload the instance list.</string> <string>Reload the instance list.</string>
</property> </property>
<property name="statusTip">
<string>Reload the instance list.</string>
</property>
</action> </action>
<action name="actionViewCentralModsFolder"> <action name="actionViewCentralModsFolder">
<property name="icon"> <property name="icon">
@ -121,6 +168,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Open the central mods folder in a file browser.</string> <string>Open the central mods folder in a file browser.</string>
</property> </property>
<property name="statusTip">
<string>Open the central mods folder in a file browser.</string>
</property>
</action> </action>
<action name="actionCheckUpdate"> <action name="actionCheckUpdate">
<property name="icon"> <property name="icon">
@ -133,6 +183,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Check for new updates for MultiMC</string> <string>Check for new updates for MultiMC</string>
</property> </property>
<property name="statusTip">
<string>Check for new updates for MultiMC</string>
</property>
</action> </action>
<action name="actionSettings"> <action name="actionSettings">
<property name="icon"> <property name="icon">
@ -145,6 +198,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Change settings.</string> <string>Change settings.</string>
</property> </property>
<property name="statusTip">
<string>Change settings.</string>
</property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::PreferencesRole</enum> <enum>QAction::PreferencesRole</enum>
</property> </property>
@ -160,6 +216,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Open the bug tracker to report a bug with MultiMC.</string> <string>Open the bug tracker to report a bug with MultiMC.</string>
</property> </property>
<property name="statusTip">
<string>Open the bug tracker to report a bug with MultiMC.</string>
</property>
</action> </action>
<action name="actionNews"> <action name="actionNews">
<property name="icon"> <property name="icon">
@ -172,6 +231,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Open the MultiMC dev blog to read news about MultiMC.</string> <string>Open the MultiMC dev blog to read news about MultiMC.</string>
</property> </property>
<property name="statusTip">
<string>Open the MultiMC dev blog to read news about MultiMC.</string>
</property>
</action> </action>
<action name="actionAbout"> <action name="actionAbout">
<property name="icon"> <property name="icon">
@ -184,10 +246,167 @@
<property name="toolTip"> <property name="toolTip">
<string>View information about MultiMC.</string> <string>View information about MultiMC.</string>
</property> </property>
<property name="statusTip">
<string>About MultiMC</string>
</property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::AboutRole</enum> <enum>QAction::AboutRole</enum>
</property> </property>
</action> </action>
<action name="actionLaunchInstance">
<property name="text">
<string>Play</string>
</property>
<property name="toolTip">
<string>Launch the selected instance.</string>
</property>
<property name="statusTip">
<string>Launch the selected instance.</string>
</property>
</action>
<action name="actionRenameInstance">
<property name="text">
<string>Rename</string>
</property>
<property name="toolTip">
<string>Rename the selected instance.</string>
</property>
<property name="statusTip">
<string>Rename the selected instance.</string>
</property>
</action>
<action name="actionChangeInstGroup">
<property name="text">
<string>Change Group</string>
</property>
<property name="toolTip">
<string>Change the selected instance's group.</string>
</property>
<property name="statusTip">
<string>Change the selected instance's group.</string>
</property>
</action>
<action name="actionChangeInstIcon">
<property name="text">
<string>Change Icon</string>
</property>
<property name="toolTip">
<string>Change the selected instance's icon.</string>
</property>
<property name="statusTip">
<string>Change the selected instance's icon.</string>
</property>
</action>
<action name="actionEditInstNotes">
<property name="text">
<string>Edit Notes</string>
</property>
<property name="toolTip">
<string>Edit the notes for the selected instance.</string>
</property>
<property name="statusTip">
<string>Edit the notes for the selected instance.</string>
</property>
</action>
<action name="actionInstanceSettings">
<property name="text">
<string>Settings</string>
</property>
<property name="toolTip">
<string>Change settings for the selected instance.</string>
</property>
<property name="statusTip">
<string>Change settings for the selected instance.</string>
</property>
</action>
<action name="actionMakeDesktopShortcut">
<property name="text">
<string>Make Shortcut</string>
</property>
<property name="toolTip">
<string>Make a shortcut on the desktop for the selected instance.</string>
</property>
<property name="statusTip">
<string>Make a shortcut on the desktop for the selected instance.</string>
</property>
</action>
<action name="actionManageInstSaves">
<property name="text">
<string>Manage Saves</string>
</property>
<property name="toolTip">
<string>Manage saves for the selected instance.</string>
</property>
<property name="statusTip">
<string>Manage saves for the selected instance.</string>
</property>
</action>
<action name="actionEditInstMods">
<property name="text">
<string>Edit Mods</string>
</property>
<property name="toolTip">
<string>Edit the mods for the selected instance.</string>
</property>
<property name="statusTip">
<string>Edit the mods for the selected instance.</string>
</property>
</action>
<action name="actionChangeInstMCVersion">
<property name="text">
<string>Change Version</string>
</property>
<property name="toolTip">
<string>Change the selected instance's Minecraft version.</string>
</property>
<property name="statusTip">
<string>Change the selected instance's Minecraft version.</string>
</property>
</action>
<action name="actionChangeInstLWJGLVersion">
<property name="text">
<string>Change LWJGL</string>
</property>
<property name="toolTip">
<string>Change the version of LWJGL for the selected instance to use.</string>
</property>
<property name="statusTip">
<string>Change the version of LWJGL for the selected instance to use.</string>
</property>
</action>
<action name="actionRebuildInstJar">
<property name="text">
<string>Rebuild Jar</string>
</property>
<property name="toolTip">
<string>Reinstall the mods for the selected instance.</string>
</property>
<property name="statusTip">
<string>Reinstall the mods for the selected instance.</string>
</property>
</action>
<action name="actionViewSelectedInstFolder">
<property name="text">
<string>View Folder</string>
</property>
<property name="toolTip">
<string>Open the selected instance's root folder in a file browser.</string>
</property>
<property name="statusTip">
<string>Open the selected instance's root folder in a file browser.</string>
</property>
</action>
<action name="actionDeleteInstance">
<property name="text">
<string>Delete</string>
</property>
<property name="toolTip">
<string>Delete the selected instance.</string>
</property>
<property name="statusTip">
<string>Delete the selected instance.</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<resources> <resources>

33
gui/newinstancedialog.cpp Normal file
View File

@ -0,0 +1,33 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "newinstancedialog.h"
#include "ui_newinstancedialog.h"
#include <QLayout>
NewInstanceDialog::NewInstanceDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::NewInstanceDialog)
{
ui->setupUi(this);
resize(minimumSizeHint());
layout()->setSizeConstraint(QLayout::SetFixedSize);
}
NewInstanceDialog::~NewInstanceDialog()
{
delete ui;
}

24
data/settingsbase.h → gui/newinstancedialog.h
View File

@ -13,21 +13,25 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef SETTINGSBASE_H #ifndef NEWINSTANCEDIALOG_H
#define SETTINGSBASE_H #define NEWINSTANCEDIALOG_H
#include <QSettings> #include <QDialog>
#include "settingsmacros.h" namespace Ui {
class NewInstanceDialog;
}
class SettingsBase : public QSettings class NewInstanceDialog : public QDialog
{ {
Q_OBJECT
public: public:
SettingsBase(QString fileName); explicit NewInstanceDialog(QWidget *parent = 0);
~NewInstanceDialog();
private:
Ui::NewInstanceDialog *ui;
}; };
#include "settingsmacrosundef.h" #endif // NEWINSTANCEDIALOG_H
#endif // SETTINGSBASE_H

166
gui/newinstancedialog.ui Normal file
View File

@ -0,0 +1,166 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>NewInstanceDialog</class>
<widget class="QDialog" name="NewInstanceDialog">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>220</width>
<height>230</height>
</rect>
</property>
<property name="windowTitle">
<string>New Instance</string>
</property>
<property name="windowIcon">
<iconset resource="../multimc.qrc">
<normaloff>:/icons/toolbar/new</normaloff>:/icons/toolbar/new</iconset>
</property>
<property name="modal">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="iconBtnLayout">
<item>
<spacer name="iconBtnLeftSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="iconButton">
<property name="icon">
<iconset resource="../multimc.qrc">
<normaloff>:/icons/instances/infinity</normaloff>:/icons/instances/infinity</iconset>
</property>
<property name="iconSize">
<size>
<width>80</width>
<height>80</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="iconBtnRightSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QLineEdit" name="instNameTextBox">
<property name="placeholderText">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="labelVersion">
<property name="text">
<string>Version:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="versionTextBox">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnChangeVersion">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="../multimc.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>NewInstanceDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>NewInstanceDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

112
gui/settingsdialog.cpp
View File

@ -16,13 +16,19 @@
#include "settingsdialog.h" #include "settingsdialog.h"
#include "ui_settingsdialog.h" #include "ui_settingsdialog.h"
#include "data/appsettings.h"
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox>
SettingsDialog::SettingsDialog(QWidget *parent) : SettingsDialog::SettingsDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::SettingsDialog) ui(new Ui::SettingsDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
loadSettings(settings);
updateCheckboxStuff();
} }
SettingsDialog::~SettingsDialog() SettingsDialog::~SettingsDialog()
@ -32,10 +38,10 @@ SettingsDialog::~SettingsDialog()
void SettingsDialog::updateCheckboxStuff() void SettingsDialog::updateCheckboxStuff()
{ {
ui->minMemSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || ui->windowWidthSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() ||
ui->maximizedCheckBox->isChecked())); ui->maximizedCheckBox->isChecked()));
ui->maxMemSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() || ui->windowHeightSpinBox->setEnabled(!(ui->compatModeCheckBox->isChecked() ||
ui->maximizedCheckBox->isChecked())); ui->maximizedCheckBox->isChecked()));
ui->maximizedCheckBox->setEnabled(!ui->compatModeCheckBox->isChecked()); ui->maximizedCheckBox->setEnabled(!ui->compatModeCheckBox->isChecked());
} }
@ -75,3 +81,101 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked)
Q_UNUSED(checked); Q_UNUSED(checked);
updateCheckboxStuff(); updateCheckboxStuff();
} }
void SettingsDialog::on_buttonBox_accepted()
{
applySettings(settings);
}
void SettingsDialog::applySettings(SettingsBase *s)
{
// Special cases
// Warn about dev builds.
if (!ui->devBuildsCheckBox->isChecked())
{
s->setUseDevBuilds(false);
}
else if (!s->getUseDevBuilds())
{
int response = QMessageBox::question(this, "Development builds",
"Development builds contain experimental features "
"and may be unstable. Are you sure you want to enable them?");
if (response == QMessageBox::Yes)
{
s->setUseDevBuilds(true);
}
}
// Updates
s->setAutoUpdate(ui->autoUpdateCheckBox->isChecked());
// Folders
// TODO: Offer to move instances to new instance folder.
s->setInstanceDir(ui->instDirTextBox->text());
s->setCentralModsDir(ui->modsDirTextBox->text());
s->setLWJGLDir(ui->lwjglDirTextBox->text());
// Console
s->setShowConsole(ui->showConsoleCheck->isChecked());
s->setAutoCloseConsole(ui->autoCloseConsoleCheck->isChecked());
// Window Size
s->setLaunchCompatMode(ui->compatModeCheckBox->isChecked());
s->setLaunchMaximized(ui->maximizedCheckBox->isChecked());
s->setMinecraftWinWidth(ui->windowWidthSpinBox->value());
s->setMinecraftWinHeight(ui->windowHeightSpinBox->value());
// Auto Login
s->setAutoLogin(ui->autoLoginCheckBox->isChecked());
// Memory
s->setMinMemAlloc(ui->minMemSpinBox->value());
s->setMaxMemAlloc(ui->maxMemSpinBox->value());
// Java Settings
s->setJavaPath(ui->javaPathTextBox->text());
s->setJvmArgs(ui->jvmArgsTextBox->text());
// Custom Commands
s->setPreLaunchCommand(ui->preLaunchCmdTextBox->text());
s->setPostExitCommand(ui->postExitCmdTextBox->text());
}
void SettingsDialog::loadSettings(SettingsBase *s)
{
// Updates
ui->autoUpdateCheckBox->setChecked(s->getAutoUpdate());
ui->devBuildsCheckBox->setChecked(s->getUseDevBuilds());
// Folders
ui->instDirTextBox->setText(s->getInstanceDir());
ui->modsDirTextBox->setText(s->getCentralModsDir());
ui->lwjglDirTextBox->setText(s->getLWJGLDir());
// Console
ui->showConsoleCheck->setChecked(s->getShowConsole());
ui->autoCloseConsoleCheck->setChecked(s->getAutoCloseConsole());
// Window Size
ui->compatModeCheckBox->setChecked(s->getLaunchCompatMode());
ui->maximizedCheckBox->setChecked(s->getLaunchMaximized());
ui->windowWidthSpinBox->setValue(s->getMinecraftWinWidth());
ui->windowHeightSpinBox->setValue(s->getMinecraftWinHeight());
// Auto Login
ui->autoLoginCheckBox->setChecked(s->getAutoLogin());
// Memory
ui->minMemSpinBox->setValue(s->getMinMemAlloc());
ui->maxMemSpinBox->setValue(s->getMaxMemAlloc());
// Java Settings
ui->javaPathTextBox->setText(s->getJavaPath());
ui->jvmArgsTextBox->setText(s->getJvmArgs());
// Custom Commands
ui->preLaunchCmdTextBox->setText(s->getPreLaunchCommand());
ui->postExitCmdTextBox->setText(s->getPostExitCommand());
}

7
gui/settingsdialog.h
View File

@ -18,6 +18,8 @@
#include <QDialog> #include <QDialog>
class SettingsBase;
namespace Ui { namespace Ui {
class SettingsDialog; class SettingsDialog;
} }
@ -32,6 +34,9 @@ public:
void updateCheckboxStuff(); void updateCheckboxStuff();
void applySettings(SettingsBase* s);
void loadSettings(SettingsBase* s);
private slots: private slots:
void on_instDirBrowseBtn_clicked(); void on_instDirBrowseBtn_clicked();
@ -43,6 +48,8 @@ private slots:
void on_maximizedCheckBox_clicked(bool checked); void on_maximizedCheckBox_clicked(bool checked);
void on_buttonBox_accepted();
private: private:
Ui::SettingsDialog *ui; Ui::SettingsDialog *ui;
}; };

107
gui/settingsdialog.ui
View File

@ -158,88 +158,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="consoleTab">
<attribute name="title">
<string>Console</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="consoleSettingsBox">
<property name="title">
<string>Console Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="showConsoleCheck">
<property name="text">
<string>Show console while the game is running?</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="autoCloseConsoleCheck">
<property name="text">
<string>Automatically close console when the game quits?</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="consoleColorsBox">
<property name="title">
<string>Instance Console Colors</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelSysMessageColor">
<property name="text">
<string>System message color:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="sysMsgColorTextBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelOutputMsgColor">
<property name="text">
<string>Output message color:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="outMsgColorTextBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelErrorMessageColor">
<property name="text">
<string>Error message color:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="errMsgColorTextBox"/>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="consoleVerticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="minecraftTab"> <widget class="QWidget" name="minecraftTab">
<attribute name="title"> <attribute name="title">
<string>Minecraft</string> <string>Minecraft</string>
@ -315,10 +233,33 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="consoleSettingsBox">
<property name="title">
<string>Console Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="showConsoleCheck">
<property name="text">
<string>Show console while the game is running?</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="autoCloseConsoleCheck">
<property name="text">
<string>Automatically close console when the game quits?</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="autoLoginCheckBox"> <widget class="QCheckBox" name="autoLoginCheckBox">
<property name="text"> <property name="text">
<string>Login automatically when an instance launches?</string> <string>Login automatically when an instance icon is double clicked?</string>
</property> </property>
</widget> </widget>
</item> </item>

109
gui/taskdialog.cpp Normal file
View File

@ -0,0 +1,109 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "taskdialog.h"
#include "ui_taskdialog.h"
#include <QKeyEvent>
#include "tasks/task.h"
TaskDialog::TaskDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::TaskDialog)
{
ui->setupUi(this);
updateSize();
changeProgress(0);
}
TaskDialog::~TaskDialog()
{
delete ui;
}
void TaskDialog::updateSize()
{
resize(QSize(480, minimumSizeHint().height()));
}
void TaskDialog::exec(Task *task)
{
this->task = task;
// Connect signals.
connect(task, SIGNAL(taskStarted(Task*)),
this, SLOT(onTaskStarted(Task*)));
connect(task, SIGNAL(taskEnded(Task*)),
this, SLOT(onTaskEnded(Task*)));
connect(task, SIGNAL(statusChanged(const QString&)),
this, SLOT(changeStatus(const QString&)));
connect(task, SIGNAL(progressChanged(int)),
this, SLOT(changeProgress(int)));
task->startTask();
QDialog::exec();
}
Task* TaskDialog::getTask()
{
return task;
}
void TaskDialog::onTaskStarted(Task*)
{
}
void TaskDialog::onTaskEnded(Task*)
{
close();
}
void TaskDialog::changeStatus(const QString &status)
{
ui->statusLabel->setText(status);
updateSize();
}
void TaskDialog::changeProgress(int progress)
{
if (progress < 0)
progress = 0;
else if (progress > 100)
progress = 100;
ui->taskProgressBar->setValue(progress);
}
void TaskDialog::keyPressEvent(QKeyEvent* e)
{
if (e->key() == Qt::Key_Escape)
return;
QDialog::keyPressEvent(e);
}
void TaskDialog::closeEvent(QCloseEvent* e)
{
if (task && task->isRunning())
{
e->ignore();
}
else
{
QDialog::closeEvent(e);
}
}

63
gui/taskdialog.h Normal file
View File

@ -0,0 +1,63 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef TASKDIALOG_H
#define TASKDIALOG_H
#include <QDialog>
class Task;
namespace Ui {
class TaskDialog;
}
class TaskDialog : public QDialog
{
Q_OBJECT
public:
explicit TaskDialog(QWidget *parent = 0);
~TaskDialog();
void updateSize();
void exec(Task* task);
Task* getTask();
public slots:
void onTaskStarted(Task*);
void onTaskEnded(Task*);
void changeStatus(const QString& status);
void changeProgress(int progress);
void test() { qDebug("Lol"); }
signals:
protected:
virtual void keyPressEvent(QKeyEvent* e);
virtual void closeEvent(QCloseEvent* e);
private:
Ui::TaskDialog *ui;
Task* task;
};
#endif // TASKDIALOG_H

53
gui/taskdialog.ui Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>TaskDialog</class>
<widget class="QDialog" name="TaskDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>58</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>600</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Please wait...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="statusLabel">
<property name="text">
<string>Task Status...</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="taskProgressBar">
<property name="value">
<number>24</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

11
main.cpp
View File

@ -1,3 +1,4 @@
/* Copyright 2013 MultiMC Contributors /* Copyright 2013 MultiMC Contributors
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -16,10 +17,20 @@
#include "gui/mainwindow.h" #include "gui/mainwindow.h"
#include <QApplication> #include <QApplication>
#include "data/appsettings.h"
#include "data/loginresponse.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
app.setOrganizationName("Forkk");
app.setApplicationName("MultiMC 5");
settings = new AppSettings(&app);
// Register meta types.
qRegisterMetaType<LoginResponse>("LoginResponse");
MainWindow mainWin; MainWindow mainWin;
mainWin.show(); mainWin.show();

61
multimc.qrc
View File

@ -1,32 +1,33 @@
<RCC> <RCC>
<qresource prefix="/icons/toolbar"> <qresource prefix="/icons/toolbar">
<file alias="about">resources/icons/toolbar/about.png</file> <file alias="about">resources/icons/toolbar/about.png</file>
<file alias="bug">resources/icons/toolbar/bug.svg</file> <file alias="bug">resources/icons/toolbar/bug.svg</file>
<file alias="centralmods">resources/icons/toolbar/centralmods.png</file> <file alias="centralmods">resources/icons/toolbar/centralmods.png</file>
<file alias="checkupdate">resources/icons/toolbar/checkupdate.png</file> <file alias="checkupdate">resources/icons/toolbar/checkupdate.png</file>
<file alias="help">resources/icons/toolbar/help.png</file> <file alias="help">resources/icons/toolbar/help.png</file>
<file alias="new">resources/icons/toolbar/new.png</file> <file alias="new">resources/icons/toolbar/new.png</file>
<file alias="news">resources/icons/toolbar/news.svg</file> <file alias="news">resources/icons/toolbar/news.svg</file>
<file alias="refresh">resources/icons/toolbar/refresh.png</file> <file alias="refresh">resources/icons/toolbar/refresh.png</file>
<file alias="settings">resources/icons/toolbar/settings.png</file> <file alias="settings">resources/icons/toolbar/settings.png</file>
<file alias="viewfolder">resources/icons/toolbar/viewfolder.png</file> <file alias="viewfolder">resources/icons/toolbar/viewfolder.png</file>
</qresource> </qresource>
<qresource prefix="/icons/instances"> <qresource prefix="/icons/instances">
<file alias="chicken">resources/icons/instances/clucker.svg</file> <file alias="chicken">resources/icons/instances/clucker.svg</file>
<file alias="creeper">resources/icons/instances/creeper.svg</file> <file alias="creeper">resources/icons/instances/creeper.svg</file>
<file alias="enderpearl">resources/icons/instances/enderpearl.svg</file> <file alias="enderpearl">resources/icons/instances/enderpearl.svg</file>
<file alias="ftb-glow">resources/icons/instances/ftb-glow.svg</file> <file alias="ftb-glow">resources/icons/instances/ftb-glow.svg</file>
<file alias="ftb-logo">resources/icons/instances/ftb-logo.svg</file> <file alias="ftb-logo">resources/icons/instances/ftb-logo.svg</file>
<file alias="gear">resources/icons/instances/gear.svg</file> <file alias="gear">resources/icons/instances/gear.svg</file>
<file alias="herobrine">resources/icons/instances/herobrine.svg</file> <file alias="herobrine">resources/icons/instances/herobrine.svg</file>
<file alias="magitech">resources/icons/instances/magitech.svg</file> <file alias="magitech">resources/icons/instances/magitech.svg</file>
<file alias="meat">resources/icons/instances/meat.svg</file> <file alias="meat">resources/icons/instances/meat.svg</file>
<file alias="netherstar">resources/icons/instances/netherstar.svg</file> <file alias="netherstar">resources/icons/instances/netherstar.svg</file>
<file alias="skeleton">resources/icons/instances/skeleton.svg</file> <file alias="skeleton">resources/icons/instances/skeleton.svg</file>
<file alias="squarecreeper">resources/icons/instances/squarecreeper.svg</file> <file alias="squarecreeper">resources/icons/instances/squarecreeper.svg</file>
<file alias="steve">resources/icons/instances/steve.svg</file> <file alias="steve">resources/icons/instances/steve.svg</file>
</qresource> <file alias="infinity">resources/icons/multimc.svg</file>
<qresource prefix="launcher"> </qresource>
<file alias="launcherjar">resources/MultiMCLauncher.jar</file> <qresource prefix="/launcher">
</qresource> <file alias="launcherjar">resources/MultiMCLauncher.jar</file>
</qresource>
</RCC> </RCC>

121
tasks/logintask.cpp Normal file
View File

@ -0,0 +1,121 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "logintask.h"
#include <QStringList>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkRequest>
#include <QUrl>
#include <QUrlQuery>
LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) :
Task(parent), uInfo(uInfo)
{
}
void LoginTask::executeTask()
{
setStatus("Logging in...");
QNetworkAccessManager netMgr;
connect(&netMgr, SIGNAL(finished(QNetworkReply*)),
SLOT(processNetReply(QNetworkReply*)));
QUrl loginURL("https://login.minecraft.net/");
QNetworkRequest netRequest(loginURL);
netRequest.setHeader(QNetworkRequest::ContentTypeHeader,
"application/x-www-form-urlencoded");
QUrlQuery params;
params.addQueryItem("user", uInfo.getUsername());
params.addQueryItem("password", uInfo.getPassword());
params.addQueryItem("version", "13");
netReply = netMgr.post(netRequest, params.query(QUrl::EncodeSpaces).toUtf8());
exec();
}
void LoginTask::processNetReply(QNetworkReply *reply)
{
// Check for errors.
switch (reply->error())
{
case QNetworkReply::NoError:
{
// Check the response code.
int responseCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (responseCode == 200)
{
QString responseStr(reply->readAll());
QStringList strings = responseStr.split(":");
if (strings.count() >= 4)
{
bool parseSuccess;
qint64 latestVersion = strings[0].toLongLong(&parseSuccess);
if (parseSuccess)
{
// strings[1] is the download ticket. It isn't used anymore.
QString username = strings[2];
QString sessionID = strings[3];
LoginResponse response(username, sessionID, latestVersion);
emit loginComplete(response);
}
else
{
emit loginFailed("Failed to parse Minecraft version string.");
}
}
else
{
if (responseStr.toLower() == "bad login")
emit loginFailed("Invalid username or password.");
else if (responseStr.toLower() == "old version")
emit loginFailed("Launcher outdated, please update.");
else
emit loginFailed("Login failed: " + responseStr);
}
}
else if (responseCode == 503)
{
emit loginFailed("The login servers are currently unavailable. "
"Check http://help.mojang.com/ for more info.");
}
else
{
emit loginFailed(QString("Login failed: Unknown HTTP error %1 occurred.").
arg(QString::number(responseCode)));
}
break;
}
case QNetworkReply::OperationCanceledError:
emit loginFailed("Login canceled.");
break;
default:
emit loginFailed("Login failed: " + reply->errorString());
break;
}
quit();
}

48
tasks/logintask.h Normal file
View File

@ -0,0 +1,48 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOGINTASK_H
#define LOGINTASK_H
#include "task.h"
#include "data/userinfo.h"
#include "data/loginresponse.h"
//class QNetworkAccessManager;
class QNetworkReply;
class LoginTask : public Task
{
Q_OBJECT
public:
explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
public slots:
void processNetReply(QNetworkReply* reply);
signals:
void loginComplete(LoginResponse loginResponse);
void loginFailed(const QString& errorMsg);
protected:
void executeTask();
QNetworkReply* netReply;
UserInfo uInfo;
};
#endif // LOGINTASK_H

56
tasks/task.cpp Normal file
View File

@ -0,0 +1,56 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "task.h"
Task::Task(QObject *parent) :
QThread(parent)
{
}
QString Task::getStatus() const
{
return status;
}
void Task::setStatus(const QString &status)
{
this->status = status;
emit statusChanged(status);
}
int Task::getProgress() const
{
return progress;
}
void Task::setProgress(int progress)
{
this->progress = progress;
emit progressChanged(progress);
}
void Task::startTask()
{
start();
}
void Task::run()
{
emit taskStarted(this);
executeTask();
emit taskEnded(this);
}

54
tasks/task.h Normal file
View File

@ -0,0 +1,54 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef TASK_H
#define TASK_H
#include <QObject>
#include <QThread>
#include <QString>
class Task : public QThread
{
Q_OBJECT
public:
explicit Task(QObject *parent = 0);
// Starts the task.
void startTask();
QString getStatus() const;
int getProgress() const;
public slots:
void setStatus(const QString& status);
void setProgress(int progress);
signals:
void taskStarted(Task* task);
void taskEnded(Task* task);
void statusChanged(const QString& status);
void progressChanged(int progress);
protected:
virtual void run();
virtual void executeTask() = 0;
QString status;
int progress;
};
#endif // TASK_H

11
data/settingsbase.cpp → util/apputils.h
View File

@ -13,10 +13,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "settingsbase.h" #ifndef APPUTILS_H
#define APPUTILS_H
SettingsBase::SettingsBase(QString fileName) : #define STR_VAL(val) # val
QSettings(fileName, QSettings::IniFormat)
{ #endif // APPUTILS_H
}

17
data/settingsmacrosundef.h → util/osutils.cpp
View File

@ -13,14 +13,13 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef SETTINGSMACROSUNDEF_H #include "osutils.h"
#define SETTINGSMACROSUNDEF_H
#undef DEFINE_SETTING #include <QDesktopServices>
#undef DEFINE_SETTING_STR #include <QUrl>
#undef DEFINE_SETTING_BOOL #include <QFileInfo>
#undef DEFINE_SETTING_INT
#undef STR_VAL void openInDefaultProgram(QString filename)
{
#endif // SETTINGSMACROSUNDEF_H QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath());
}

32
util/osutils.h Normal file
View File

@ -0,0 +1,32 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OSUTILS_H
#define OSUTILS_H
#include <QString>
#if defined _WIN32 | defined _WIN64
#define WINDOWS 1
#elif __APPLE__ & __MACH__
#define OSX 1
#elif __linux__
#define LINUX 1
#endif
// Opens the given file in the default application.
void openInDefaultProgram(QString filename);
#endif // OSUTILS_H