rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved default interface font

This commit is contained in:
RigoLigo 2022-05-28 21:19:29 +08:00
parent 07e74952ec
commit a7597930de
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
RedPandaIDE/settings.cpp
View File

@ -186,6 +186,7 @@ QString Settings::Dirs::appResourceDir() const
#elif defined(Q_OS_LINUX)
return includeTrailingPathDelimiter(PREFIX)+"share/"+APP_NAME;
#elif defined(Q_OS_MACOS)
// return QApplication::instance()->applicationDirPath();
return "";
#endif
}
@ -198,7 +199,7 @@ QString Settings::Dirs::appLibexecDir() const
#elif defined(Q_OS_LINUX)
return includeTrailingPathDelimiter(PREFIX)+"libexec/"+APP_NAME;
#elif defined(Q_OS_MACOS)
return "";
return QApplication::instance()->applicationDirPath();
#endif
}
@ -2835,7 +2836,13 @@ void Settings::Environment::doLoad()
QString defaultLocaleName = QLocale::system().name();
if (defaultLocaleName == "zh_CN") {
QString fontName;
#ifdef Q_OS_WINDOWS
fontName = "Microsoft Yahei";
#elif defined(Q_OS_MACOS)
fontName = "PingFang SC";
#elif defined(Q_OS_LINUX)
fontName = "Noto Sans CJK";
#endif
QFont font(fontName);
if (font.exactMatch()) {
defaultFontName = fontName;
@ -2864,6 +2871,10 @@ void Settings::Environment::doLoad()
if (mTerminalPath.isEmpty())
mTerminalPath = stringValue("terminal_path","/usr/bin/x-terminal-emulator");
mAStylePath = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle";
#elif defined(Q_OS_MACOS)
mTerminalPath = stringValue("terminal_path",
"/System/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal");
mAStylePath = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle";
#endif
mHideNonSupportFilesInFileView=boolValue("hide_non_support_files_file_view",true);
mOpenFilesInSingleInstance = boolValue("open_files_in_single_instance",false);