r21030 by craig -

scribus-commit scribus-commit at lists.scribus.net
Tue Feb 23 21:43:32 UTC 2016


Author: craig
Date: Tue Feb 23 21:43:32 2016
New Revision: 21030

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21030
Log:
Make HelpBrowser try to use the new user help files directory first, then revert to the system dir, part 2

Modified:
    trunk/Scribus/scribus/ui/helpbrowser.cpp

Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21030&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp	(original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp	Tue Feb 23 21:43:32 2016
@@ -569,7 +569,7 @@
 			{
 				//Check if we can load, eg "de" when "de_CH" docs don't exist
 				QString baseHelpMenuFile3 = QDir::toNativeSeparators(baseHelpDir + language.left(2) + "/menu.xml");
-				QString altHelpMenuFile3 = QDir::toNativeSeparators(installHelpDir + "doc/" + language.left(2) + "/menu.xml");
+				QString altHelpMenuFile3 = QDir::toNativeSeparators(installHelpDir + language.left(2) + "/menu.xml");
 				QFileInfo fi3 = QFileInfo(baseHelpMenuFile3);
 				QFileInfo altfi3 = QFileInfo(altHelpMenuFile3);
 				if (fi3.exists())




More information about the scribus-commit mailing list