r16187 by craig - Fwd port broken doc Help Browser changes

[scribus-commit]

Author: craig
Date: Thu Dec 30 14:26:01 2010
New Revision: 16187

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16187
Log:
Fwd port broken doc Help Browser changes

Added:
    trunk/Scribus/doc/en/fileproblems.html
Modified:
    trunk/Scribus/doc/en/menu.xml
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/doc/en/menu.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16187&path=/trunk/Scribus/doc/en/menu.xml
==============================================================================
--- trunk/Scribus/doc/en/menu.xml (original)
+++ trunk/Scribus/doc/en/menu.xml Thu Dec 30 14:26:01 2010
@@ -95,6 +95,7 @@
 		<submenuitem text="Hints &amp; FAQs" file="topten.html">
 			<submenuitem text="Help" file="faq1.html"/>
 			<submenuitem text="Development" file="faq3.html"/>
+			<submenuitem text="Problems with Document Files" file="fileproblems.html"/>
 		</submenuitem>
 	</area>
 	<area text="My Tutorials" file="tutorials.html" section="tutorials">

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16187&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Dec 30 14:26:01 2010
@@ -3742,7 +3742,14 @@
 		{
 			delete fileLoader;
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-			QMessageBox::critical(this, tr("Fatal Error"), "<qt>"+ tr("File %1 is not in an acceptable format").arg(FName)+"</qt>", CommonStrings::tr_OK);
+			QString title = tr("Fatal Error") ;
+			QString msg = "<qt>"+ tr("File %1 is not in an acceptable format").arg(FName)+"</qt>";
+			QString infoMsg = "<qt>" + tr("The file may be damaged or may have been produced in a later version of Scribus.") + "</qt>";
+			QMessageBox msgBox(QMessageBox::Critical, title, msg, QMessageBox::Ok | QMessageBox::Help, this);
+			msgBox.setInformativeText(infoMsg);
+			int i=msgBox.exec();
+			if (i==QMessageBox::Help)
+					slotOnlineHelp("", "fileproblems.html");
 			return false;
 		}
 		bool is12doc=false;