diff options
| author | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-01-25 21:10:44 +0000 |
|---|---|---|
| committer | craig <craig@11d20701-8431-0410-a711-e3c959e3b870> | 2012-01-25 21:10:44 +0000 |
| commit | 98a30cc8b97ed2f16cc15742327ae8ea732fc9a6 (patch) | |
| tree | 470e34491c4d1978df2d9700d6ce75a53d908acb /scribus/javadocs.cpp | |
| parent | 4f4d36f57f4b613364dfb18e262fb6c5e4e690e3 (diff) | |
| download | scribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.tar.gz scribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.tar.xz scribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.zip | |
#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
Diffstat (limited to 'scribus/javadocs.cpp')
| -rw-r--r-- | scribus/javadocs.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/scribus/javadocs.cpp b/scribus/javadocs.cpp index 4994add..b7e7bcc 100644 --- a/scribus/javadocs.cpp +++ b/scribus/javadocs.cpp @@ -74,21 +74,13 @@ JavaDocs::JavaDocs(QWidget* parent, ScribusDoc *doc, ScribusView* vie) : QDialog void JavaDocs::slotAdd() { QString nam; - Query *dia = new Query(this, "tt", 1, 0, tr("&New Script:"), tr("New Script")); - dia->setEditText( tr("New Script"), false ); - if (dia->exec()) + Query dia(this, "tt", 1, 0, tr("&New Script:"), tr("New Script")); + dia.setEditText( tr("New Script"), false ); + dia.setTestList(Doc->JavaScripts.keys()); + if (dia.exec()) { - nam = dia->getEditText(); + nam = dia.getEditText(); nam.replace( QRegExp("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]"), "_" ); - while (Doc->JavaScripts.contains(nam) || (nam.isEmpty())) - { - if (!dia->exec()) - { - delete dia; - return; - } - nam = dia->getEditText(); - } Editor* dia2 = new Editor(this, "", View); dia2->EditTex->setText("function "+nam+"()\n{\n}"); if (dia2->exec()) @@ -101,7 +93,6 @@ void JavaDocs::slotAdd() } delete dia2; } - delete dia; } void JavaDocs::slotEdit() |