r19475 by fschmid - Fixed Bug #12651: Complex AI file that can be opened/imported without issue in 1.4.x shows empty page in 1.5.0svn

[scribus-commit]

Author: fschmid
Date: Thu Sep  4 19:12:12 2014
New Revision: 19475

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19475
Log:
Fixed Bug #12651: Complex AI file that can be opened/imported without issue in 1.4.x shows empty page in 1.5.0svn
Restored old 1.4.x behaviour.

Modified:
    trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp

Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19475&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp Thu Sep  4 19:12:12 2014
@@ -162,16 +162,16 @@
 			if (tempBuf.startsWith("%PDF"))
 			{
 				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-			//	QMessageBox msgBox(ScCore->primaryMainWindow());
-			//	msgBox.setText( tr("This file contains 2 versions of the data."));
-			//	msgBox.setInformativeText( tr("Choose which one should be imported"));
-			//	msgBox.setIcon(QMessageBox::Question);
-			//	QPushButton *pdfButton = msgBox.addButton( tr("Use the pdf part"), QMessageBox::ActionRole);
-			//	msgBox.addButton( tr("Use the ai part"), QMessageBox::ActionRole);
-			//	msgBox.setDefaultButton(pdfButton);
-			//	msgBox.exec();
-			//	if ((QPushButton *)msgBox.clickedButton() == pdfButton)
-			//	{
+				QMessageBox msgBox(ScCore->primaryMainWindow());
+				msgBox.setText( tr("This file contains 2 versions of the data."));
+				msgBox.setInformativeText( tr("Choose which one should be imported"));
+				msgBox.setIcon(QMessageBox::Question);
+				QPushButton *pdfButton = msgBox.addButton( tr("Use the pdf part"), QMessageBox::ActionRole);
+				msgBox.addButton( tr("Use the ai part"), QMessageBox::ActionRole);
+				msgBox.setDefaultButton(pdfButton);
+				msgBox.exec();
+				if ((QPushButton *)msgBox.clickedButton() == pdfButton)
+				{
 					//Import PDF
 					const FileFormat *fmt = LoadSavePlugin::getFormatByExt("pdf");
 					if (!fmt)
@@ -188,7 +188,7 @@
 					if (!success)
 						QMessageBox::warning(ScCore->primaryMainWindow(), CommonStrings::trWarning, tr("The file could not be imported"), 1, 0, 0);
 					return success;
-			//	}
+				}
 				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
 			}
 			else if (tempBuf.startsWith("%!PS-Adobe-3.0 EPSF-3.0"))