dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unit testing

Browse source
This commit is contained in:
Jan Dalheimer 2013-12-02 11:09:56 +01:00
parent 613699b362
commit 0a6399b52c
13 changed files with 271 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

34
MultiMC.cpp
View file

@ -7,7 +7,6 @@
#include <QLibraryInfo>
#include <QMessageBox>
#include "gui/MainWindow.h"
#include "gui/dialogs/VersionSelectDialog.h"
#include "logic/lists/InstanceList.h"
#include "logic/lists/MojangAccountList.h"
@ -31,7 +30,7 @@
#include "config.h"
using namespace Util::Commandline;
MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv),
MultiMC::MultiMC(int &argc, char **argv, const QString &root) : QApplication(argc, argv),
m_version{VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD, VERSION_BUILD_TYPE}
{
setOrganizationName("MultiMC");
@ -130,7 +129,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv),
}
// change directory
QDir::setCurrent(args["dir"].toString());
QDir::setCurrent(args["dir"].toString().isEmpty() ?
(root.isEmpty() ? QDir::currentPath() : QDir::current().absoluteFilePath(root))
: args["dir"].toString());
// init the logger
initLogger();
@ -404,31 +405,4 @@ std::shared_ptr<JavaVersionList> MultiMC::javalist()
return m_javalist;
}
int main_gui(MultiMC &app)
{
// show main window
MainWindow mainWin;
mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
mainWin.show();
mainWin.checkSetDefaultJava();
return app.exec();
}
int main(int argc, char *argv[])
{
// initialize Qt
MultiMC app(argc, argv);
switch (app.status())
{
case MultiMC::Initialized:
return main_gui(app);
case MultiMC::Failed:
return 1;
case MultiMC::Succeeded:
return 0;
}
}
#include "MultiMC.moc"