r22824 by jghali - #15562: Fonts installed by user are not found by scribus on Windows 10 1809

scribus-commit scribus-commit at lists.scribus.net
Fri Feb 1 23:23:02 UTC 2019


Author: jghali
Date: Fri Feb  1 23:23:02 2019
New Revision: 22824

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22824
Log:
#15562: Fonts installed by user are not found by scribus on Windows 10 1809

Modified:
    trunk/Scribus/scribus/scpaths.cpp

Modified: trunk/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22824&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp	(original)
+++ trunk/Scribus/scribus/scpaths.cpp	Fri Feb  1 23:23:02 2019
@@ -390,6 +390,15 @@
 	fontDirs.append("/Network/Library/Fonts/");
 	fontDirs.append("/System/Library/Fonts/");
 #elif defined(_WIN32)
+	QDir d;
+	QString localFontDir = windowsSpecialDir(CSIDL_LOCAL_APPDATA)+"Microsoft/Windows/Fonts"; // Added by Windows 10 1809
+	QString roamingFontDir = windowsSpecialDir(CSIDL_APPDATA)+"Microsoft/Windows/Fonts"; // Added by Windows 10 1809
+	d.setPath(localFontDir);
+	if (d.exists())
+		fontDirs.append(localFontDir);
+	d.setPath(roamingFontDir);
+	if (d.exists())
+		fontDirs.append(roamingFontDir);
 	fontDirs.append(windowsSpecialDir(CSIDL_FONTS));
 #endif
 	return fontDirs;




More information about the scribus-commit mailing list