easycoder 250807.2__tar.gz → 250809.1__tar.gz

{easycoder-250807.2 → easycoder-250809.1}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: easycoder
-Version: 250807.2
+Version: 250809.1
 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>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
+License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: psutil

{easycoder-250807.2 → easycoder-250809.1}/easycoder/__init__.py

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

{easycoder-250807.2 → easycoder-250809.1}/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,13 @@ 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
+        self.selectedReceiver = receivers[0]
 
         dialog = QDialog(caller)
         self.dialog = dialog
@@ -78,9 +78,9 @@ 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()
+        self.originalText = self.selectedReceiver.getContent()
 
         # Add drop shadow
         shadow = QGraphicsDropShadowEffect(dialog)
@@ -95,7 +95,8 @@ 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)
+        layout.addWidget(VirtualKeyboard(keyboardType, 42, self.selectedReceiver, dialog.accept))
         
         # Position at bottom of parent window
         dialog.show()  # Ensure geometry is calculated
@@ -108,7 +109,7 @@ class Keyboard(Handler):
         dialog.exec()
 
     def reject(self):
-        self.receiver.setContent(self.originalText)
+        self.selectedReceiver.setContent(self.originalText)
         self.dialog.reject()
 
 class TextReceiver():

{easycoder-250807.2 → easycoder-250809.1}/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-250807.2 → easycoder-250809.1}/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,38 @@ class Graphics(Handler):
         def afterShown(self):
             if 'action' in self.record: self.record['action']()
 
+    class ClickableLineEdit(QLineEdit):
+        clicked = Signal()
+
+        def __init__(self):
+            super().__init__()
+            self.program = None
+        
+        def setCallback(self, program, pc):
+            self.program = program
+            self.pc = pc
+
+        def mousePressEvent(self, event):
+            self.clicked.emit()
+            super().mousePressEvent(event)
+            if self.program != None: self.program.run(self.pc)
+
+    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 mousePressEvent(self, event):
+            self.clicked.emit()
+            super().mousePressEvent(event)
+            if self.program != None: self.program.run(self.pc)
+
     #############################################################################
     # Keyword handlers
 
@@ -297,6 +328,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 +336,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 +344,7 @@ class Graphics(Handler):
                     command['align'] = token
             else: break
         command['text'] = text
+        command['size'] = size
         self.add(command)
         return True
 
@@ -340,11 +373,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 +520,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 +545,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 +556,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 +567,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 +598,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 +736,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 +769,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
@@ -770,6 +816,8 @@ class Graphics(Handler):
             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':
@@ -895,7 +943,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 +1016,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-250809.1/testrc.py

@@ -0,0 +1,7 @@
+#!/bin/python3
+
+import os
+from easycoder import Program
+
+os.chdir('../../rbr/roombyroom/Controller/ui')
+Program('rbrconf.ecs').start()

{easycoder-250807.2 → easycoder-250809.1}/testui.py

@@ -4,4 +4,4 @@ import os
 from easycoder import Program
 
 os.chdir('../../rbr/roombyroom/Controller/ui')
-Program('rbr_ui.ecs')
+Program('rbr_ui.ecs').start()

easycoder-250807.2/scripts/findxr.ecs

@@ -1,26 +0,0 @@
-!   Find an XR device
-
-    script FindXR
-
-    variable N
-    variable IPAddr
-    variable Data
-
-    put system `hostname -I` into IPAddr
-    put the position of the last `.` in IPAddr into N
-    increment N
-    put left N of IPAddr into IPAddr
-    print `Looking for an XR server on network ` cat IPAddr cat `x`
-    put 1 into N
-    while N is less than 255
-    begin
-        get Data from `http://` cat IPAddr cat N timeout 1 or put empty into Data
-        if left 6 of Data is `RBR-XR`
-        begin
-            print IPAddr cat N cat `: Data: ` cat Data
-            exit
-        end
-        increment N
-    end
-
-    exit

easycoder-250807.2/testrc.py

@@ -1,7 +0,0 @@
-#!/bin/python3
-
-import os
-from easycoder import Program
-
-os.chdir('../../rbr/')
-Program('rbrconf.ecs')