Fixed restart settings
This commit is contained in:
parent
69a2c43ad9
commit
62fb670089
3 changed files with 9 additions and 9 deletions
|
|
@ -75,18 +75,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
argumentsList.push("-externalupdater");
|
argumentsList.push("-externalupdater");
|
||||||
}
|
}
|
||||||
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
||||||
if (cMainFont()) {
|
if (!cMainFont().isEmpty()) {
|
||||||
argumentsList.push(qsl("-mainfont"));
|
argumentsList.push(qsl("-mainfont"));
|
||||||
pushArgument(QFile::encodeName(cMainFont()));
|
pushArgument(QFile::encodeName(cMainFont()));
|
||||||
}
|
}
|
||||||
if (cSemiboldFont()) {
|
if (!cSemiboldFont().isEmpty()) {
|
||||||
argumentsList.push(qsl("-semiboldfont"));
|
argumentsList.push(qsl("-semiboldfont"));
|
||||||
pushArgument(QFile::encodeName(cSemiboldFont()));
|
pushArgument(QFile::encodeName(cSemiboldFont()));
|
||||||
}
|
}
|
||||||
if (cSemiboldFontIsBold()) {
|
if (cSemiboldFontIsBold()) {
|
||||||
argumentsList.push(qsl("-semiboldisbold"));
|
argumentsList.push(qsl("-semiboldisbold"));
|
||||||
}
|
}
|
||||||
if (cMonospaceFont()) {
|
if (!cMonospaceFont().isEmpty()) {
|
||||||
argumentsList.push(qsl("-monospacefont"));
|
argumentsList.push(qsl("-monospacefont"));
|
||||||
pushArgument(QFile::encodeName(cMonospaceFont()));
|
pushArgument(QFile::encodeName(cMonospaceFont()));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,18 +67,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
|
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
|
||||||
if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"];
|
if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"];
|
||||||
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
||||||
if (cMainFont()) {
|
if (!cMainFont().isEmpty()) {
|
||||||
[args addObject:@"-mainfont"];
|
[args addObject:@"-mainfont"];
|
||||||
[args addObject:Q2NSString(cMainFont())];
|
[args addObject:Q2NSString(cMainFont())];
|
||||||
}
|
}
|
||||||
if (cSemiboldFont()) {
|
if (!cSemiboldFont().isEmpty()) {
|
||||||
[args addObject:@"-semiboldfont"];
|
[args addObject:@"-semiboldfont"];
|
||||||
[args addObject:Q2NSString(cSemiboldFont())];
|
[args addObject:Q2NSString(cSemiboldFont())];
|
||||||
}
|
}
|
||||||
if (cSemiboldFontIsBold()) {
|
if (cSemiboldFontIsBold()) {
|
||||||
argumentsList.push(qsl("-semiboldisbold"));
|
argumentsList.push(qsl("-semiboldisbold"));
|
||||||
}
|
}
|
||||||
if (cMonospaceFont()) {
|
if (!cMonospaceFont().isEmpty()) {
|
||||||
[args addObject:@"-monospacefont"];
|
[args addObject:@"-monospacefont"];
|
||||||
[args addObject:Q2NSString(cMonospaceFont())];
|
[args addObject:Q2NSString(cMonospaceFont())];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,18 +80,18 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
pushArgument(qsl("-workdir"));
|
pushArgument(qsl("-workdir"));
|
||||||
pushArgument('"' + cWorkingDir() + '"');
|
pushArgument('"' + cWorkingDir() + '"');
|
||||||
}
|
}
|
||||||
if (cMainFont()) {
|
if (!cMainFont().isEmpty()) {
|
||||||
pushArgument(qsl("-mainfont"));
|
pushArgument(qsl("-mainfont"));
|
||||||
pushArgument('"' + cMainFont() + '"');
|
pushArgument('"' + cMainFont() + '"');
|
||||||
}
|
}
|
||||||
if (cSemiboldFont()) {
|
if (!cSemiboldFont().isEmpty()) {
|
||||||
pushArgument(qsl("-semiboldfont"));
|
pushArgument(qsl("-semiboldfont"));
|
||||||
pushArgument('"' + cSemiboldFont() + '"');
|
pushArgument('"' + cSemiboldFont() + '"');
|
||||||
}
|
}
|
||||||
if (cSemiboldFontIsBold()) {
|
if (cSemiboldFontIsBold()) {
|
||||||
pushArgument(qsl("-semiboldisbold"));
|
pushArgument(qsl("-semiboldisbold"));
|
||||||
}
|
}
|
||||||
if (cMonospaceFont()) {
|
if (!cMonospaceFont().isEmpty()) {
|
||||||
pushArgument(qsl("-monospacefont"));
|
pushArgument(qsl("-monospacefont"));
|
||||||
pushArgument('"' + cMonospaceFont() + '"');
|
pushArgument('"' + cMonospaceFont() + '"');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue