easycoder 250725.1__tar.gz → 250725.3__tar.gz

{easycoder-250725.1 → easycoder-250725.3}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: easycoder
-Version: 250725.1
+Version: 250725.3
 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-250725.1 → easycoder-250725.3}/easycoder/__init__.py

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

{easycoder-250725.1 → easycoder-250725.3}/easycoder/ec_compiler.py

@@ -82,7 +82,7 @@ class Compiler:
 		self.code.append(command)
 
 	def isSymbol(self):
-		token=self.getToken()
+		token = self.getToken()
 		try:
 			self.symbols[token]
 		except:

{easycoder-250725.1 → easycoder-250725.3}/easycoder/ec_core.py

@@ -2196,7 +2196,7 @@ class Core(Handler):
             fmt = self.getRuntimeValue(fmt)
         value = {}
         value['type'] = 'text'
-        value['content'] = datetime.fromtimestamp(ts/1000).strftime(fmt)
+        value['content'] = datetime.fromtimestamp(ts).strftime(fmt)
         return value
 
     def v_decode(self, v):

{easycoder-250725.1 → easycoder-250725.3}/easycoder/ec_keyboard.py

@@ -36,22 +36,13 @@ class Keyboard(Handler):
             y = 0
             painter.drawPixmap(x, y, self.pixmap)
 
-            # Draw the drag bar in the center
-            bar_width = 100
-            bar_height = 20
-            bar_x = (self.width() - bar_width) // 2
-            bar_y = (self.height() - bar_height) // 2
-            painter.setBrush(QColor("#bbb"))
-            painter.setPen(Qt.NoPen)
-            painter.drawRoundedRect(bar_x, bar_y, bar_width, bar_height, 10, 10)
-
         def mousePressEvent(self, event):
             x = self.width() - self.pixmap.width()
             y = 0
             iconRect = self.pixmap.rect().translated(x, y)
             if iconRect.contains(event.pos()):
                 self.iconClicked.emit()
-            elif self.barRect().contains(event.pos()):
+            elif QRect(0, 0, self.width(), self.height()).contains(event.pos()):
                 if hasattr(self.window().windowHandle(), 'startSystemMove'):
                     self.window().windowHandle().startSystemMove()
                 else:
@@ -71,26 +62,23 @@ class Keyboard(Handler):
         def mouseReleaseEvent(self, event):
             self._drag_active = False
             super().mouseReleaseEvent(event)
-
-        def barRect(self):
-            bar_width = 100
-            bar_height = 20
-            bar_x = (self.width() - bar_width) // 2
-            bar_y = (self.height() - bar_height) // 2
-            return QRect(bar_x, bar_y, bar_width, bar_height)
     
-    def __init__(self, program, receiver, caller = None, parent=None):
+    def __init__(self, program, keyboardType, receiver, caller = None, parent=None):
         super().__init__(program.compiler)
 
         self.program = program
+        self.keyboardType = keyboardType
+        self.receiver = receiver
 
         dialog = QDialog(caller)
+        self.dialog = dialog
         
 #        dialog.setWindowTitle('')
         dialog.setWindowFlags(Qt.FramelessWindowHint)
         dialog.setModal(True)
         dialog.setFixedSize(500, 250)
         dialog.setStyleSheet('background-color: white;border:1px solid black;')
+        self.originalText = receiver.getContent()
 
         # Add drop shadow
         shadow = QGraphicsDropShadowEffect(dialog)
@@ -103,9 +91,9 @@ class Keyboard(Handler):
         layout = QVBoxLayout(dialog)
 
         border = self.Border()
-        border.iconClicked.connect(dialog.reject)
+        border.iconClicked.connect(self.reject)
         layout.addWidget(border)
-        layout.addWidget(VirtualKeyboard(42, receiver, dialog.reject))
+        layout.addWidget(VirtualKeyboard(keyboardType, 42, receiver, dialog.accept))
         
         # Position at bottom of parent window
         dialog.show()  # Ensure geometry is calculated
@@ -117,17 +105,15 @@ class Keyboard(Handler):
 
         dialog.exec()
 
+    def reject(self):
+        self.receiver.setContent(self.originalText)
+        self.dialog.reject()
 
 class TextReceiver():
     def __init__(self, field):
         self.field = field
 
-    def add_character(self, char):
-        """
-        Add a character to the text field.
-        
-        :param char: A single character to add to the field.
-        """
+    def addCharacter(self, char):
         char = char.replace('&&', '&')
         if len(char) == 1:
             self.field.setText(self.field.text() + char)
@@ -135,20 +121,14 @@ class TextReceiver():
             raise ValueError("Only single characters are allowed.")
 
     def backspace(self):
-        """
-        Remove the last character from the text field.
-        If the field is already empty, do nothing.
-        """
         current_text = self.field.text()
         if current_text:
             self.field.setText(current_text[:-1])
 
-    def get_content(self):
-        """
-        Return the current content of the text field.
-        
-        :return: The current text in the field.
-        """
+    def setContent(self, text):
+        self.field.setText(text)
+
+    def getContent(self):
         return self.field.text()
         
 class KeyboardButton(QPushButton):
@@ -196,8 +176,9 @@ class KeyboardView(QVBoxLayout):
             self.addLayout(row)
 
 class VirtualKeyboard(QStackedWidget):
-    def __init__(self, buttonHeight, textField, onFinished=None):
+    def __init__(self, keyboardType, buttonHeight, textField, onFinished):
         super().__init__()
+        self.keyboardType = keyboardType
         self.buttonHeight = buttonHeight
         self.textField = textField
         self.onFinished = onFinished
@@ -424,7 +405,7 @@ class VirtualKeyboard(QStackedWidget):
     # Callback functions
     def onClickChar(self,keycode):
         # print(f"Key pressed: {keycode}")
-        self.textField.add_character(keycode)
+        self.textField.addCharacter(keycode)
 
     def onClickShift(self,keycode):
         # print("Shift pressed")
@@ -451,9 +432,9 @@ class VirtualKeyboard(QStackedWidget):
 
     def onClickSpace(self,keycode):
         # print("Space pressed")
-        self.textField.add_character(' ')
+        self.textField.addCharacter(' ')
 
     def onClickEnter(self,keycode):
         # print("Enter pressed")
-        # print(self.textField.get_content())
-        if self.onFinished: self.onFinished()
+        if self.keyboardType == 'multiline': self.textField.addCharacter('\n')
+        else: self.onFinished()

{easycoder-250725.1 → easycoder-250725.3}/easycoder/ec_pyside.py

@@ -73,34 +73,44 @@ class Graphics(Handler):
     # (2) add {widget} to {layout}
     # (3) add stretch {widget} to {layout}
     # (4) add stretch to {layout}
+    # (5) add spacer {size} to {layout}
     def k_add(self, command):
         def addToLayout():
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                command['layout'] = record['name']
-                self.add(command)
-                return True
+                if record['keyword'] in ['layout', 'groupbox', 'element']:
+                    command['layout'] = record['name']
+                    self.add(command)
+                    return True
             return False
-
-        command['stretch'] = False
-        if self.nextIs('stretch'):
-            # It's either (3) or (4)
+        
+        token = self.peek()
+        if token == 'stretch':
             self.nextToken()
-            if self.tokenIs('to'):
+            # It's either (3) or (4)
+            if self.nextIs('to'):
                 # (4)
+                command['stretch'] = False
                 command['widget'] = 'stretch'
                 return addToLayout()
-            # (3)
             if self.isSymbol():
+                # (3)
                 record = self.getSymbolRecord()
                 command['widget'] = record['name']
                 command['stretch'] = True
                 if self.nextIs('to'):
                     return addToLayout()
             return False
+        
+        elif token == 'spacer':
+            self.nextToken()
+            command['widget'] = 'spacer'
+            command['size'] = self.nextValue()
+            self.skip('to')
+            return addToLayout()
 
         # Here it's either (1) or (2)
-        elif self.isSymbol():
+        elif self.nextIsSymbol():
             record = self.getSymbolRecord()
             if record['extra'] == 'gui':
                 if self.isWidget(record['keyword']):
@@ -134,12 +144,14 @@ class Graphics(Handler):
             widget = command['widget']
             if widget == 'stretch':
                 layoutRecord['widget'].addStretch()
+            elif widget == 'spacer':
+                layoutRecord['widget'].addSpacing(self.getRuntimeValue(command['size']))
             else:
                 widgetRecord = self.getVariable(widget)
                 layoutRecord = self.getVariable(command['layout'])
                 widget = widgetRecord['widget']
                 layout = layoutRecord['widget']
-                stretch = command['stretch']
+                stretch = 'stretch' in command
                 if widgetRecord['keyword'] == 'layout':
                     if layoutRecord['keyword'] == 'groupbox':
                         if widgetRecord['keyword'] == 'layout':
@@ -432,7 +444,7 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createLabel(self, command, record):
-        label = QLabel(self.getRuntimeValue(command['text']))
+        label = QLabel(str(self.getRuntimeValue(command['text'])))
         if 'size' in command:
             fm = label.fontMetrics()
             c = label.contentsMargins()

easycoder-250725.3/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-250725.1/testrc.py

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