Update tutorial app and merge Luis updates

UmSenhorQualquer · Nov 26, 2018 · c48b745 · c48b745
1 parent 557467d
commit c48b745
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/pyforms_gui/controls/control_label.py b/pyforms_gui/controls/control_label.py
@@ -22,14 +22,11 @@
 
 class ControlLabel(ControlBase):
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.selectable = kwargs.get('selectable', False)
-
     def init_form(self):
         control_path = tools.getFileInSameDirectory(__file__, "label.ui")
         self._form = uic.loadUi(control_path)
         self._form.label.setText(self._label)
+        self._selectable = False
         super(ControlLabel, self).init_form()
 
     def load_form(self, data, path=None): pass
@@ -41,8 +38,7 @@ def selectable(self): return self._selectable
 
     @selectable.setter
     def selectable(self, value):
-        self._selectable = value
-        if self._selectable:
+        if value:
             self._form.label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
             self._form.label.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
         else:
@@ -52,6 +48,7 @@ def selectable(self, value):
     @property
     def form(self): return self._form
 
+
     @property
     def value(self): return ControlBase.value.fget(self)
 

diff --git a/pyforms_gui/controls/control_text.py b/pyforms_gui/controls/control_text.py
@@ -15,13 +15,8 @@
 from AnyQt.QtWidgets import QLineEdit
 from AnyQt 			 import uic
 
-
 class ControlText(ControlBase):
 
-	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
-		self.readonly = kwargs.get('readonly', False)
-
 	def init_form(self):
 		control_path = tools.getFileInSameDirectory(__file__, "textInput.ui")
 		self._form = uic.loadUi(control_path)

diff --git a/tutorials/Controls4Docs/ControlList.py b/tutorials/Controls4Docs/ControlList.py
@@ -20,16 +20,16 @@ def __init__(self):
 		super(SimpleExample,self).__init__('Simple example')
 
 		#Definition of the forms fields
-		self._control 	= ControlList('List')
+		self._control 	= ControlList('List',horizontal_headers=[] )
 
 		self.formset = [' ',(' ', '_control', ' '),' ']
 
 		self._control.value = [('Elem1', 'Elem2'), ('Elem3', 'Elem4')]
 
 		self._control += ('Elem5', 'Elem6')
 
-		self._control.horizontalHeaders = ['col1','col2','col3']
-		self._control.horizontalHeaders = ['col4',]
+		self._control.horizontal_headers = ['col1','col2','col3']
+		self._control.horizontal_headers = ['col4',]