Merge branch 'develop' into v4

UmSenhorQualquer · Nov 16, 2018 · 7ec4114 · 7ec4114
2 parents b340e24 + 453d10f
commit 7ec4114
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/pyforms_gui/controls/control_label.py b/pyforms_gui/controls/control_label.py
@@ -6,7 +6,7 @@
 import pyforms_gui.utils.tools as tools
 from confapp import conf
 
-from AnyQt           import uic
+from AnyQt import uic, QtCore, QtGui
 
 from pyforms_gui.controls.control_base import ControlBase
 
@@ -26,12 +26,24 @@ 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
 
     def save_form(self, data, path=None): pass
 
+    @property
+    def selectable(self): return self._selectable
+
+    @selectable.setter
+    def selectable(self, value):
+        if value:
+            self._form.label.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
+            self._form.label.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
+        else:
+            self._form.label.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
+            self._form.label.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
 
     @property
     def form(self): return self._form

diff --git a/pyforms_gui/controls/control_text.py b/pyforms_gui/controls/control_text.py
@@ -64,3 +64,12 @@ def label(self): return self.form.label.text()
 	def label(self, value):
 		self.form.label.setText(value)
 		ControlBase.label.fset(self, value)
+
+	@property
+	def readonly(self):
+		return self._form.lineEdit.isReadOnly()
+
+	@readonly.setter
+	def readonly(self, value):
+		self._form.lineEdit.setReadOnly(value)
+		self._form.lineEdit.setEnabled(not value)