From 98a30cc8b97ed2f16cc15742327ae8ea732fc9a6 Mon Sep 17 00:00:00 2001 From: craig Date: Wed, 25 Jan 2012 21:10:44 +0000 Subject: #10082: Backport new Query dialog code and adjust usage to new duplicate check method, and move to declared vars git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17234 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/scribus.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'scribus/scribus.cpp') diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp index 1505862..1ff9926 100644 --- a/scribus/scribus.cpp +++ b/scribus/scribus.cpp @@ -7075,14 +7075,13 @@ void ScribusMainWindow::setItemFSize(int id) else { bool ok = false; - Query* dia = new Query(this, "New", 1, 0, tr("&Size:"), tr("Size")); - if (dia->exec()) + Query dia(this, "New", 1, 0, tr("&Size:"), tr("Size")); + if (dia.exec()) { - c = qRound(dia->getEditText().toDouble(&ok)); + c = qRound(dia.getEditText().toDouble(&ok)); if ((ok) && (c < 1025) && (c > 0)) doc->itemSelection_SetFontSize(c*10); } - delete dia; } if (currItem->asTextFrame()) currItem->asTextFrame()->updateUndo(currItem->HasSel? PageItem::PARAMSEL : PageItem::PARAMFULL); @@ -9730,16 +9729,10 @@ void ScribusMainWindow::PutToPatterns() patternName = patternName.trimmed().simplified().replace(" ", "_"); Query dia(this, "tt", 1, 0, tr("&Name:"), tr("New Entry")); dia.setEditText(patternName, true); + dia.setTestList(doc->docPatterns.keys()); + dia.setCheckMode(true); if (dia.exec()) - { patternName = dia.getEditText(); - while (doc->docPatterns.contains(patternName)) - { - if (!dia.exec()) - return; - patternName = dia.getEditText(); - } - } else return; bool wasUndo = undoManager->undoEnabled(); -- cgit