r23253 by jghali - Slightly refactor ScribusMainWindow::PutToPatterns()

scribus-commit scribus-commit at lists.scribus.net
Thu Oct 10 06:55:55 UTC 2019


Author: jghali
Date: Thu Oct 10 06:55:55 2019
New Revision: 23253

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23253
Log:
Slightly refactor ScribusMainWindow::PutToPatterns()

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23253&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Thu Oct 10 06:55:55 2019
@@ -9129,14 +9129,13 @@
 		patternsDependingOnThis.prepend(temp);
 	}
 	allItems.clear();
+
 	Query dia(this, "tt", 1, tr("&Name:"), tr("New Entry"));
 	dia.setEditText(patternName, true);
 	dia.setForbiddenList(patternsDependingOnThis);
 	dia.setTestList(doc->docPatterns.keys());
 	dia.setCheckMode(true);
-	if (dia.exec())
-		patternName = dia.getEditText();
-	else
+	if (dia.exec() != QDialog::Accepted)
 	{
 		doc->m_Selection->clear();
 		doc->m_Selection->delaySignalsOff();
@@ -9149,6 +9148,8 @@
 		m_undoManager->setUndoEnabled(true);
 		return;
 	}
+	patternName = dia.getEditText();
+
 	ScPattern pat = ScPattern();
 	pat.setDoc(doc);
 	double minx =  std::numeric_limits<double>::max();




More information about the scribus-commit mailing list