r24329 by jghali - #16385: Page import dialog defaults to cancel

[scribus-commit]

Author: jghali
Date: Tue Dec 15 10:42:53 2020
New Revision: 24329

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24329
Log:
#16385: Page import dialog defaults to cancel

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

Modified: trunk/Scribus/scribus/ui/mergedoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24329&path=/trunk/Scribus/scribus/ui/mergedoc.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/mergedoc.cpp	(original)
+++ trunk/Scribus/scribus/ui/mergedoc.cpp	Tue Dec 15 10:42:53 2020
@@ -106,7 +106,7 @@
 	importButton->setEnabled(false);
 	importCancelLayout->addWidget( importButton );
 	cancelButton = new QPushButton( CommonStrings::tr_Cancel, this );
-	cancelButton->setDefault( true );
+	cancelButton->setDefault(true);
 	importCancelLayout->addWidget( cancelButton );
 	dialogLayout->addLayout( importCancelLayout );
 	resize(minimumSizeHint());
@@ -160,6 +160,7 @@
 			{
 				fromDocData->setText( QDir::toNativeSeparators(fn) );
 				importButton->setEnabled(true);
+				importButton->setDefault(true);
 				if (masterPages)
 				{
 					masterPageNameData->clear();
@@ -182,6 +183,7 @@
 		fromDocData->setText("");
 		count = 0;
 		importButton->setEnabled(false);
+		cancelButton->setDefault(true);
 		if (masterPages)
 		{
 			masterPageNameData->clear();