From d40660cdefeea420b836c6102f97c6d999a99934 Mon Sep 17 00:00:00 2001 From: "cpolymeris@gmail.com" Date: Fri, 13 Jul 2012 18:30:14 +0000 Subject: [PATCH] Merge ParametersDialog & Ui_ParametersDialog. (Remnant from QT Designer?) git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@299 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d --- src/sextante/gui/ParametersDialog.py | 9 +++------ src/sextante/tests/test.py | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py index c149ce304e4..0a4e4d9aa08 100644 --- a/src/sextante/gui/ParametersDialog.py +++ b/src/sextante/gui/ParametersDialog.py @@ -37,17 +37,14 @@ except AttributeError: _fromUtf8 = lambda s: s class ParametersDialog(QtGui.QDialog): + + NOT_SELECTED = "[Not selected]" '''the default parameters dialog, to be used when an algorithm is called from the toolbox''' def __init__(self, alg): QtGui.QDialog.__init__(self, None, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint) - self.ui = Ui_ParametersDialog() - self.ui.setupUi(self, alg) + self.setupUi(self, alg) self.executed = False -class Ui_ParametersDialog(object): - - NOT_SELECTED = "[Not selected]" - def setupUi(self, dialog, alg): self.alg = alg self.dialog = dialog diff --git a/src/sextante/tests/test.py b/src/sextante/tests/test.py index 431b2fdf94a..7b65fb9137b 100755 --- a/src/sextante/tests/test.py +++ b/src/sextante/tests/test.py @@ -151,9 +151,9 @@ class SextanteProviderTestCase(unittest.TestCase): if not dlg: dlg = ParametersDialog(self.alg) # hack to handle that hacky code... - dlg.ui.setParamValues = lambda: True + dlg.setParamValues = lambda: True dlg.show() - dlg.ui.accept() + dlg.accept() while (not dlg.executed): time.sleep(.5)