250809.2

Author: graham-trott

dist/easycoder-250809.1-py2.py3-none-any.whl renamed to dist/easycoder-250809.2-py2.py3-none-any.whl

@@ -11,4 +11,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250809.1"
+__version__ = "250809.2"

dist/easycoder-250809.1.tar.gz renamed to dist/easycoder-250809.2.tar.gz

@@ -70,7 +70,6 @@ def __init__(self, program, keyboardType, receiverLayout, receivers, caller = No
         self.program = program
         self.keyboardType = keyboardType
         self.receivers = receivers
-        self.selectedReceiver = receivers[0]
 
         dialog = QDialog(caller)
         self.dialog = dialog
@@ -80,7 +79,6 @@ def __init__(self, program, keyboardType, receiverLayout, receivers, caller = No
         dialog.setModal(True)
         dialog.setFixedWidth(500)
         dialog.setStyleSheet('background-color: white;border:1px solid black;')
-        self.originalText = self.selectedReceiver.getContent()
 
         # Add drop shadow
         shadow = QGraphicsDropShadowEffect(dialog)
@@ -96,7 +94,18 @@ def __init__(self, program, keyboardType, receiverLayout, receivers, caller = No
         border.iconClicked.connect(self.reject)
         layout.addWidget(border)
         layout.addLayout(receiverLayout)
-        layout.addWidget(VirtualKeyboard(keyboardType, 42, self.selectedReceiver, dialog.accept))
+        self.vk = VirtualKeyboard(keyboardType, 42, receivers[0], dialog.accept)
+        layout.addWidget(self.vk)
+
+        restore = []
+        index = 0
+        for receiver in receivers:
+            receiver.field.setContainer(self)
+            receiver.index = index
+            restore.append(receiver.getContent())
+            index += 1
+        self.restore = restore
+        self.selectedReceiver = receivers[0]
 
         # Position at bottom of parent window
         dialog.show()  # Ensure geometry is calculated
@@ -108,8 +117,24 @@ def __init__(self, program, keyboardType, receiverLayout, receivers, caller = No
 
         dialog.exec()
 
+    def setClickSource(self, field):
+        receivers = self.receivers
+        index = 0
+        for receiver in receivers:
+            if receiver.field == field:
+                self.selectedReceiver = receiver
+                break
+            index += 1
+
     def reject(self):
-        self.selectedReceiver.setContent(self.originalText)
+        selectedReceiver = self.selectedReceiver
+        receivers = self.receivers
+        index = 0
+        for receiver in receivers:
+            if receiver == selectedReceiver:
+                break
+            index += 1
+        receiver.setContent(self.restore[index])
         self.dialog.reject()
 
 class TextReceiver():
@@ -185,11 +210,11 @@ def __init__(self, rows):
             self.addLayout(row)
 
 class VirtualKeyboard(QStackedWidget):
-    def __init__(self, keyboardType, buttonHeight, textField, onFinished):
+    def __init__(self, keyboardType, buttonHeight, receiver, onFinished):
         super().__init__()
         self.keyboardType = keyboardType
         self.buttonHeight = buttonHeight
-        self.textField = textField
+        self.receiver = receiver
         self.onFinished = onFinished
         self.setStyleSheet('background-color: #ccc;border:none;')
 
@@ -410,11 +435,14 @@ def addKeyboardLayout3(self):
         container = QWidget()
         container.setLayout(keyboardView)
         self.addWidget(container)
+    
+    def setClickSource(self, receiver):
+        self.receiver = receiver
 
     # Callback functions
     def onClickChar(self,keycode):
         # print(f"Key pressed: {keycode}")
-        self.textField.addCharacter(keycode)
+        self.receiver.addCharacter(keycode)
 
     def onClickShift(self,keycode):
         # print("Shift pressed")
@@ -437,13 +465,13 @@ def onClickSymbols(self,keycode):
 
     def onClickBack(self,keycode):
         # print("Backspace pressed")
-        self.textField.backspace()
+        self.receiver.backspace()
 
     def onClickSpace(self,keycode):
         # print("Space pressed")
-        self.textField.addCharacter(' ')
+        self.receiver.addCharacter(' ')
 
     def onClickEnter(self,keycode):
         # print("Enter pressed")
-        if self.keyboardType == 'multiline': self.textField.addCharacter('\n')
+        if self.keyboardType == 'multiline': self.receiver.addCharacter('\n')
         else: self.onFinished()

easycoder/__init__.py

@@ -84,32 +84,28 @@ class ClickableLineEdit(QLineEdit):
 
         def __init__(self):
             super().__init__()
-            self.program = None
 
-        def setCallback(self, program, pc):
-            self.program = program
-            self.pc = pc
+        def setContainer(self, container):
+            self.container = container
 
         def mousePressEvent(self, event):
             self.clicked.emit()
             super().mousePressEvent(event)
-            if self.program != None: self.program.run(self.pc)
+            if self.container != None: self.container.setClickSource(self)
 
     class ClickablePlainTextEdit(QPlainTextEdit):
         clicked = Signal()
 
         def __init__(self):
             super().__init__()
-            self.program = None
 
-        def setCallback(self, program, pc):
-            self.program = program
-            self.pc = pc
+        def setContainer(self, container):
+            self.container = container
 
         def mousePressEvent(self, event):
             self.clicked.emit()
             super().mousePressEvent(event)
-            if self.program != None: self.program.run(self.pc)
+            if self.container != None: self.container.setClickSource(self)
 
     #############################################################################
     # Keyword handlers
@@ -816,8 +812,6 @@ def r_on(self, command):
             keyword = record['keyword']
             if keyword == 'pushbutton':
                 widget.clicked.connect(lambda: self.run(command['goto']))
-            if keyword in ['lineinput', 'multiline']:
-                widget.setCallback(self.program, command['goto'])
             elif keyword == 'combobox':
                 widget.currentIndexChanged.connect(lambda: self.run(command['goto']))
             elif keyword == 'listbox':