Merge branch 'fix-control_timeline' into v4

UmSenhorQualquer · Mar 6, 2019 · cdd0160 · cdd0160
2 parents d1b0843 + 3fecc04
commit cdd0160
Show file tree

Hide file tree

Showing 28 changed files with 1,274 additions and 1,066 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/pyforms_gui/basewidget.py b/pyforms_gui/basewidget.py
@@ -76,14 +76,16 @@ def init_form(self):
         """
         if not self._formLoaded:
 
+            allparams = self.controls
+            for key, param in allparams.items():
+                param.parent = self
+                param.name = key
+
             if self._formset is not None:
                 control = self.generate_panel(self._formset)
                 self.layout().addWidget(control)
             else:
-                allparams = self.controls
                 for key, param in allparams.items():
-                    param.parent = self
-                    param.name = key
                     self.layout().addWidget(param.form)
             self._formLoaded = True
 

diff --git a/pyforms_gui/controls/control_dir.py b/pyforms_gui/controls/control_dir.py
@@ -25,12 +25,7 @@ def init_form(self):
 
 
     def click(self):
-        value = QFileDialog.getExistingDirectory(self.parent, self._label)
-
-        """if _api.USED_API == _api.QT_API_PYQT5:
-            value = value[0]
-        elif _api.USED_API == _api.QT_API_PYQT4:
-            value = str(value)"""
+        value = QFileDialog.getExistingDirectory(self.parent, self._label, options=conf.PYFORMS_DIALOGS_OPTIONS)
 
         if value and len(value)>0: 
             self.value = value