Apply custom fonts after app restart

This commit is contained in:
Eric Kotato 2019-10-01 20:51:11 +03:00
parent 3be60a91c2
commit c748883bd3
3 changed files with 45 additions and 0 deletions

View file

@ -75,6 +75,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
argumentsList.push("-externalupdater");
}
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
if (cMainFont()) {
argumentsList.push(qsl("-mainfont"));
pushArgument(QFile::encodeName(cMainFont()));
}
if (cSemiboldFont()) {
argumentsList.push(qsl("-semiboldfont"));
pushArgument(QFile::encodeName(cSemiboldFont()));
}
if (cSemiboldFontIsBold()) {
argumentsList.push(qsl("-semiboldisbold"));
}
if (cMonospaceFont()) {
argumentsList.push(qsl("-monospacefont"));
pushArgument(QFile::encodeName(cMonospaceFont()));
}
if (cDataFile() != qsl("data")) {
argumentsList.push("-key");
argumentsList.push(QFile::encodeName(cDataFile()));

View file

@ -67,6 +67,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"];
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
if (cMainFont()) {
[args addObject:@"-mainfont"];
[args addObject:Q2NSString(cMainFont())];
}
if (cSemiboldFont()) {
[args addObject:@"-semiboldfont"];
[args addObject:Q2NSString(cSemiboldFont())];
}
if (cSemiboldFontIsBold()) {
argumentsList.push(qsl("-semiboldisbold"));
}
if (cMonospaceFont()) {
[args addObject:@"-monospacefont"];
[args addObject:Q2NSString(cMonospaceFont())];
}
if (cDataFile() != qsl("data")) {
[args addObject:@"-key"];
[args addObject:Q2NSString(cDataFile())];

View file

@ -80,6 +80,21 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
pushArgument(qsl("-workdir"));
pushArgument('"' + cWorkingDir() + '"');
}
if (cMainFont()) {
pushArgument(qsl("-mainfont"));
pushArgument('"' + cMainFont() + '"');
}
if (cSemiboldFont()) {
pushArgument(qsl("-semiboldfont"));
pushArgument('"' + cSemiboldFont() + '"');
}
if (cSemiboldFontIsBold()) {
pushArgument(qsl("-semiboldisbold"));
}
if (cMonospaceFont()) {
pushArgument(qsl("-monospacefont"));
pushArgument('"' + cMonospaceFont() + '"');
}
if (cDataFile() != qsl("data")) {
pushArgument(qsl("-key"));
pushArgument('"' + cDataFile() + '"');