easycoder 250807.2__py2.py3-none-any.whl → 250809.2__py2.py3-none-any.whl

easycoder/__init__.py

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

easycoder/ec_keyboard.py

@@ -1,4 +1,3 @@
-
 import os
 from .ec_handler import Handler
 from PySide6.QtWidgets import (
@@ -14,7 +13,7 @@ from PySide6.QtWidgets import (
     QSizePolicy,
     QGraphicsDropShadowEffect
 )
-from PySide6.QtGui import QFont, QIcon, QPixmap, QPainter, QColor
+from PySide6.QtGui import QFont, QIcon, QPixmap, QPainter
 from PySide6.QtCore import Qt, QTimer, Signal, QRect
 
 class Keyboard(Handler):
@@ -65,12 +64,12 @@ class Keyboard(Handler):
             self._drag_active = False
             super().mouseReleaseEvent(event)
     
-    def __init__(self, program, keyboardType, receiver, caller = None, parent=None):
+    def __init__(self, program, keyboardType, receiverLayout, receivers, caller = None, parent=None):
         super().__init__(program.compiler)
 
         self.program = program
         self.keyboardType = keyboardType
-        self.receiver = receiver
+        self.receivers = receivers
 
         dialog = QDialog(caller)
         self.dialog = dialog
@@ -78,9 +77,8 @@ class Keyboard(Handler):
 #        dialog.setWindowTitle('')
         dialog.setWindowFlags(Qt.FramelessWindowHint)
         dialog.setModal(True)
-        dialog.setFixedSize(500, 250)
+        dialog.setFixedWidth(500)
         dialog.setStyleSheet('background-color: white;border:1px solid black;')
-        self.originalText = receiver.getContent()
 
         # Add drop shadow
         shadow = QGraphicsDropShadowEffect(dialog)
@@ -95,7 +93,19 @@ class Keyboard(Handler):
         border = self.Border()
         border.iconClicked.connect(self.reject)
         layout.addWidget(border)
-        layout.addWidget(VirtualKeyboard(keyboardType, 42, receiver, dialog.accept))
+        layout.addLayout(receiverLayout)
+        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
@@ -107,8 +117,24 @@ class Keyboard(Handler):
 
         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.receiver.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():
@@ -184,11 +210,11 @@ class KeyboardView(QVBoxLayout):
             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;')
 
@@ -409,11 +435,14 @@ class VirtualKeyboard(QStackedWidget):
         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")
@@ -436,13 +465,13 @@ class VirtualKeyboard(QStackedWidget):
 
     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/ec_program.py

@@ -48,7 +48,7 @@ class Program:
 		self.externalControl = False
 		self.ticker = 0
 		self.running = True
-		self.start()
+#		self.start()
 
 	# This is called at 10msec intervals by the GUI code
 	def flushCB(self):

easycoder/ec_pyside.py

@@ -1,8 +1,7 @@
 import sys
 from .ec_handler import Handler
 from .ec_classes import RuntimeError
-from .ec_keyboard import Keyboard, TextReceiver
-from PySide6.QtCore import Qt, QTimer
+from PySide6.QtCore import Qt, QTimer, Signal
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import (
     QApplication,
@@ -80,6 +79,34 @@ class Graphics(Handler):
         def afterShown(self):
             if 'action' in self.record: self.record['action']()
 
+    class ClickableLineEdit(QLineEdit):
+        clicked = Signal()
+
+        def __init__(self):
+            super().__init__()
+        
+        def setContainer(self, container):
+            self.container = container
+
+        def mousePressEvent(self, event):
+            self.clicked.emit()
+            super().mousePressEvent(event)
+            if self.container != None: self.container.setClickSource(self)
+
+    class ClickablePlainTextEdit(QPlainTextEdit):
+        clicked = Signal()
+
+        def __init__(self):
+            super().__init__()
+        
+        def setContainer(self, container):
+            self.container = container
+
+        def mousePressEvent(self, event):
+            self.clicked.emit()
+            super().mousePressEvent(event)
+            if self.container != None: self.container.setClickSource(self)
+
     #############################################################################
     # Keyword handlers
 
@@ -297,6 +324,7 @@ class Graphics(Handler):
 
     def k_createLabel(self, command):
         text = self.compileConstant('')
+        size = self.compileConstant(20)
         while True:
             token = self.peek()
             if token == 'text':
@@ -304,7 +332,7 @@ class Graphics(Handler):
                 text = self.nextValue()
             elif token == 'size':
                 self.nextToken()
-                command['size'] = self.nextValue()
+                size = self.nextValue()
             elif token == 'align':
                 self.nextToken()
                 token = self.nextToken()
@@ -312,6 +340,7 @@ class Graphics(Handler):
                     command['align'] = token
             else: break
         command['text'] = text
+        command['size'] = size
         self.add(command)
         return True
 
@@ -340,11 +369,19 @@ class Graphics(Handler):
         return True
 
     def k_createLineEdit(self, command):
-        if self.peek() == 'size':
-            self.nextToken()
-            size = self.nextValue()
-        else: size = self.compileConstant(10)
+        text = self.compileConstant('')
+        size = self.compileConstant(40)
+        while True:
+            token = self.peek()
+            if token == 'text':
+                self.nextToken()
+                text = self.nextValue()
+            elif token == 'size':
+                self.nextToken()
+                size = self.nextValue()
+            else: break;
         command['size'] = size
+        command['text'] = text
         self.add(command)
         return True
 
@@ -479,6 +516,10 @@ class Graphics(Handler):
     
     def r_createLabel(self, command, record):
         label = QLabel(str(self.getRuntimeValue(command['text'])))
+        label.setStyleSheet("""
+            background-color: transparent;
+            border: none;
+        """)
         if 'size' in command:
             fm = label.fontMetrics()
             c = label.contentsMargins()
@@ -500,7 +541,7 @@ class Graphics(Handler):
         if 'size' in command:
             fm = pushbutton.fontMetrics()
             c = pushbutton.contentsMargins()
-            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) +c.left()+c.right()
+            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) + c.left()+c.right()
             pushbutton.setMaximumWidth(w)
         record['widget'] = pushbutton
         return self.nextPC()
@@ -511,7 +552,8 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createLineEdit(self, command, record):
-        lineinput = QLineEdit()
+        lineinput = self.ClickableLineEdit()
+        lineinput.setText(self.getRuntimeValue(command['text']))
         fm = lineinput.fontMetrics()
         m = lineinput.textMargins()
         c = lineinput.contentsMargins()
@@ -521,7 +563,7 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createMultiLineEdit(self, command, record):
-        textinput = QPlainTextEdit()
+        textinput = self.ClickablePlainTextEdit()
         fontMetrics = textinput.fontMetrics()
         charWidth = fontMetrics.horizontalAdvance('x')
         charHeight = fontMetrics.height()
@@ -552,13 +594,13 @@ class Graphics(Handler):
             mainLayout.addWidget(QLabel(prompt))
         elif dialogType == 'lineedit':
             mainLayout.addWidget(QLabel(prompt))
-            dialog.lineEdit = QLineEdit(dialog)
+            dialog.lineEdit = self.ClickableLineEdit(dialog)
             dialog.value = self.getRuntimeValue(command['value'])
             dialog.lineEdit.setText(dialog.value)
             mainLayout.addWidget(dialog.lineEdit)
         elif dialogType == 'multiline':
             mainLayout.addWidget(QLabel(prompt))
-            dialog.textEdit = QPlainTextEdit(self)
+            dialog.textEdit = self.ClickablePlainTextEdit(self)
             dialog.textEdit.setText(dialog.value)
             mainLayout.addWidget(dialog.textEdit)
         buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
@@ -690,7 +732,7 @@ class Graphics(Handler):
     def r_multiline(self, command):
         return self.nextPC()
 
-    # on click {pushbutton}
+    # on click {pushbutton}/{lineinput}/{multiline}
     # on select {combobox}/{listbox}
     # on tick
     def k_on(self, command):
@@ -723,7 +765,7 @@ class Graphics(Handler):
         if token == 'click':
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] == 'pushbutton':
+                if record['keyword'] in ['pushbutton', 'lineinput', 'multiline']:
                     command['name'] = record['name']
                     setupOn()
                     return True
@@ -895,7 +937,7 @@ class Graphics(Handler):
             self.skip('of')
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] in ['label', 'pushbutton', 'lineinput', 'multiline']:
+                if record['keyword'] in ['label', 'pushbutton', 'lineinput', 'multiline', 'element']:
                     command['name'] = record['name']
                     self.skip('to')
                     command['value'] = self.nextValue()
@@ -968,7 +1010,8 @@ class Graphics(Handler):
             widget = self.getVariable(command['name'])['widget']
             text = self.getRuntimeValue(command['value'])
             keyword = record['keyword']
-            if keyword in ['label', 'pushbutton', 'lineinput']:
+            setText = getattr(widget, "setText", None)
+            if callable(setText):
                 widget.setText(text)
             elif keyword == 'multiline':
                 widget.setPlainText(text)

{easycoder-250807.2.dist-info → easycoder-250809.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250807.2
+Version: 250809.2
 Summary: Rapid scripting in English
 Keywords: compiler,scripting,prototyping,programming,coding,python,low code,hypertalk,computer language,learn to code
 Author-email: Graham Trott <gtanyware@gmail.com>

{easycoder-250807.2.dist-info → easycoder-250809.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
-easycoder/__init__.py,sha256=opggwOClYib2H_ErPp_TmmXLg38MI45-iZfwjJl0B7E,314
+easycoder/__init__.py,sha256=EGFyNysNl5UBOZuxEa4TXaCnXig6lIPpJaMcVhx-h6A,314
 easycoder/close.png,sha256=3B9ueRNtEu9E4QNmZhdyC4VL6uqKvGmdfeFxIV9aO_Y,9847
 easycoder/ec_classes.py,sha256=PWPaJuTfaWD4-tgT-2WWOgeFV_jXxlxyKCxvXyylCUU,1824
 easycoder/ec_compiler.py,sha256=-uuXDbfgFBGXSrr7EneDnnneFOFsU-UuCIpNHsCqY0s,5289
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
 easycoder/ec_core.py,sha256=r0bFQV3LXCCh4CP6289h6UvK6gpq4L0BQDrEWkeVo_0,98040
 easycoder/ec_handler.py,sha256=ohf3xUuWw_Qb5SZnulGtDhvCb11kvWtYfgbQTiOXpIY,2261
-easycoder/ec_keyboard.py,sha256=q_ALcZ7C5lgwGXQbKaXBsrzr7OyNHvWdv8ZoVKbpoEQ,19420
-easycoder/ec_program.py,sha256=gt9qhz37kBVovh8LJbQEuwcbRvIi7_I9pyVvBGG-Hm4,9980
-easycoder/ec_pyside.py,sha256=s1KdvAEqDppLnUBs8J3u40PRa0KZGL7p6wpLVbYrLfk,45396
+easycoder/ec_keyboard.py,sha256=3ijJSC_lG4Q3tLfYknzBE_UoDoNARBDVfnA1jGKRa40,20307
+easycoder/ec_program.py,sha256=IxebQZtTuoUJitfel-CxTAOdbDEV_aD18adooQWxtfc,9981
+easycoder/ec_pyside.py,sha256=uTDoIQnwTBmsOyfc5_7g0dSDaFEvqAs1ksPj2bF16zg,46825
 easycoder/ec_timestamp.py,sha256=myQnnF-mT31_1dpQKv2VEAu4BCcbypvMdzq7_DUi1xc,277
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250807.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250807.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250807.2.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250807.2.dist-info/METADATA,sha256=76YHVlElsRKuBZQeEynkd6fYwfM-8LfIKWGG_qNW32M,6875
-easycoder-250807.2.dist-info/RECORD,,
+easycoder-250809.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250809.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250809.2.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250809.2.dist-info/METADATA,sha256=KniIbnGJC-3u35cmtR-qkMdwxxyQbTKPp7oZxrAxNMQ,6875
+easycoder-250809.2.dist-info/RECORD,,