r22825 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:24:20 UTC 2019


Author: jghali
Date: Fri Feb  1 23:24:20 2019
New Revision: 22825

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

Modified:
    branches/Version14x/Scribus/scribus/scpaths.cpp

Modified: branches/Version14x/Scribus/scribus/scpaths.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22825&path=/branches/Version14x/Scribus/scribus/scpaths.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scpaths.cpp	(original)
+++ branches/Version14x/Scribus/scribus/scpaths.cpp	Fri Feb  1 23:24:20 2019
@@ -333,6 +333,15 @@
 	fontDirs.append("/Network/Library/Fonts/");
 	fontDirs.append("/System/Library/Fonts/");
 #elif defined(_WIN32)
+	QDir d;
+	QString localFontDir = getSpecialDir(CSIDL_LOCAL_APPDATA)+"Microsoft/Windows/Fonts"; // Added by Windows 10 1809
+	QString roamingFontDir = getSpecialDir(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( getSpecialDir(CSIDL_FONTS) );
 #endif
 	return fontDirs;




More information about the scribus-commit mailing list