0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature_better_launch' into develop

Browse Source
This commit is contained in:
Petr Mrázek 2014-01-12 23:56:19 +01:00
commit 85ff1657fd
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logic/BaseInstance.cpp
View File

@ -256,6 +256,11 @@ QString BaseInstance::name() const
return d->m_settings->get("name").toString(); return d->m_settings->get("name").toString();
} }
QString BaseInstance::windowTitle() const
{
return "MultiMC: " + name();
}
QStringList BaseInstance::extraArguments() const QStringList BaseInstance::extraArguments() const
{ {
return Util::Commandline::splitArgs(settings().get("JvmArgs").toString()); return Util::Commandline::splitArgs(settings().get("JvmArgs").toString());

3
logic/BaseInstance.h
View File

@ -71,6 +71,9 @@ public:
QString name() const; QString name() const;
void setName(QString val); void setName(QString val);
/// Value used for instance window titles
QString windowTitle() const;
QString iconKey() const; QString iconKey() const;
void setIconKey(QString val); void setIconKey(QString val);

2
logic/LegacyInstance.cpp
View File

@ -73,7 +73,7 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account)
.absolutePath(); .absolutePath();
launchScript += "userName " + account->currentProfile()->name + "\n"; launchScript += "userName " + account->currentProfile()->name + "\n";
launchScript += "sessionId " + account->sessionId() + "\n"; launchScript += "sessionId " + account->sessionId() + "\n";
launchScript += "windowTitle MultiMC: " + name() + "\n"; launchScript += "windowTitle " + windowTitle() + "\n";
launchScript += "windowParams " + windowParams + "\n"; launchScript += "windowParams " + windowParams + "\n";
launchScript += "lwjgl " + lwjgl + "\n"; launchScript += "lwjgl " + lwjgl + "\n";
launchScript += "launch legacy\n"; launchScript += "launch legacy\n";

2
logic/MinecraftProcess.cpp
View File

@ -203,7 +203,7 @@ void MinecraftProcess::launch()
// OSX dock icon and name // OSX dock icon and name
#ifdef OSX #ifdef OSX
args << "-Xdock:icon=icon.png"; args << "-Xdock:icon=icon.png";
args << QString("-Xdock:name=\"%1\"").arg(windowTitle); args << QString("-Xdock:name=\"%1\"").arg(m_instance->windowTitle());
#endif #endif
// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767 // HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767

2
logic/OneSixInstance.cpp
View File

@ -228,7 +228,7 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(MojangAccountPtr account)
"param --height\nparam " + settings().get("MinecraftWinHeight").toString() + "\n"; "param --height\nparam " + settings().get("MinecraftWinHeight").toString() + "\n";
} }
QDir natives_dir(PathCombine(instanceRoot(), "natives/")); QDir natives_dir(PathCombine(instanceRoot(), "natives/"));
launchScript += "windowTitle MultiMC: " + name() + "\n"; launchScript += "windowTitle " + windowTitle() + "\n";
launchScript += "natives " + natives_dir.absolutePath() + "\n"; launchScript += "natives " + natives_dir.absolutePath() + "\n";
launchScript += "launch onesix\n"; launchScript += "launch onesix\n";