easycoder 250810.3__tar.gz → 250811.2__tar.gz

{easycoder-250810.3 → easycoder-250811.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250810.3
+Version: 250811.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-250810.3 → easycoder-250811.2}/easycoder/__init__.py

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

{easycoder-250810.3 → easycoder-250811.2}/easycoder/ec_keyboard.py

@@ -20,29 +20,42 @@ class Keyboard(Handler):
     iconClicked = Signal()
 
     class Border(QWidget):
-        iconClicked = Signal()
+        tickClicked = Signal()
+        closeClicked = Signal()
 
         def __init__(self):
             super().__init__()
-            self.setFixedHeight(25)
+            self.setFixedHeight(30)
             self._drag_active = False
             self._drag_start_pos = None
 
         def paintEvent(self, event):
             painter = QPainter(self)
             painter.setRenderHint(QPainter.Antialiasing)
+            # Draw the tick icon
+            self.tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/tick.png').scaled(30, 30, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            x = 0
+            y = 0
+            painter.drawPixmap(x, y, self.tick)
             # Draw the close icon
-            self.pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(25, 25, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-            x = self.width() - self.pixmap.width()
+            self.close = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(30, 30, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            x = self.width() - self.close.width()
             y = 0
-            painter.drawPixmap(x, y, self.pixmap)
+            painter.drawPixmap(x, y, self.close)
 
         def mousePressEvent(self, event):
-            x = self.width() - self.pixmap.width()
+            # Tick icon
+            x = 0
+            y = 0
+            tickRect = self.tick.rect().translated(x, y)
+            # Close icon
+            x = self.width() - self.close.width()
             y = 0
-            iconRect = self.pixmap.rect().translated(x, y)
-            if iconRect.contains(event.pos()):
-                self.iconClicked.emit()
+            closeRect = self.close.rect().translated(x, y)
+            if tickRect.contains(event.pos()):
+                self.tickClicked.emit()
+            if closeRect.contains(event.pos()):
+                self.closeClicked.emit()
             elif QRect(0, 0, self.width(), self.height()).contains(event.pos()):
                 if hasattr(self.window().windowHandle(), 'startSystemMove'):
                     self.window().windowHandle().startSystemMove()
@@ -91,7 +104,8 @@ class Keyboard(Handler):
         layout = QVBoxLayout(dialog)
 
         border = self.Border()
-        border.iconClicked.connect(self.reject)
+        border.tickClicked.connect(self.dialog.accept)
+        border.closeClicked.connect(self.reject)
         layout.addWidget(border)
         layout.addLayout(receiverLayout)
         self.vk = VirtualKeyboard(keyboardType, 42, receivers[0], dialog.accept)
@@ -124,7 +138,6 @@ class Keyboard(Handler):
                 return
 
     def reject(self):
-        selectedReceiver = self.vk.getReceiver()
         receivers = self.receivers
         index = 0
         for receiver in receivers:
@@ -144,9 +157,9 @@ class TextReceiver():
             raise ValueError("Only single characters are allowed.")
 
     def backspace(self):
-        current_text = self.field.text()
+        current_text = self.getContent()
         if current_text:
-            self.field.setText(current_text[:-1])
+            self.setContent(current_text[:-1])
 
     def setContent(self, text):
         if isinstance(self.field, QLineEdit):

{easycoder-250810.3 → easycoder-250811.2}/easycoder/ec_pyside.py

@@ -187,14 +187,21 @@ class Graphics(Handler):
         if 'value' in command:
             value = self.getRuntimeValue(command['value'])
             widget = self.getVariable(command['widget'])
-            if widget['keyword'] in ['listbox', 'combobox']:
+            if widget['keyword'] == 'listbox':
                 widget['widget'].addItem(value)
+            elif widget['keyword'] == 'combobox':
+                if isinstance(value, list): widget['widget'].addItems(value)
+                else: widget['widget'].addItem(value)
         elif 'row' in command and 'col' in command:
             layout = self.getVariable(command['layout'])['widget']
-            widget = self.getVariable(command['widget'])['widget']
+            widgetVar = self.getVariable(command['widget'])
+            widget = widgetVar['widget']
             row = self.getRuntimeValue(command['row'])
             col = self.getRuntimeValue(command['col'])
-            layout.addWidget(widget, row, col)
+            if widgetVar['keyword'] == 'layout':
+                layout.addLayout(widget, row, col)
+            else:
+                layout.addWidget(widget, row, col)
         else:
             layoutRecord = self.getVariable(command['layout'])
             widget = command['widget']
@@ -563,6 +570,22 @@ class Graphics(Handler):
     
     def r_createCheckBox(self, command, record):
         checkbox = QCheckBox(self.getRuntimeValue(command['text']))
+        checkbox.setStyleSheet("""
+            QCheckBox::indicator {
+                border: 1px solid black;
+                border-radius: 3px;
+                background: white;
+                width: 16px;
+                height: 16px;
+            }
+            QCheckBox::indicator:checked {
+                background: #0078d7;
+            }
+            QCheckBox {
+                border: none;
+                background: transparent;
+            }
+        """)
         checkbox.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred)
         record['widget'] = checkbox
         return self.nextPC()
@@ -910,7 +933,7 @@ class Graphics(Handler):
     # set [the] spacing of {layout} to {value}
     # set [the] text [of] {label}/{button}/{lineinput}/{multiline} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput}/{multiline} [to] {color}
-    # set [the] state [of] {checkbox} [to] {color}
+    # set [the] state [of] {checkbox} [to] {state}
     # set {listbox} to {list}
     # set blocked true/false
     def k_set(self, command):
@@ -966,7 +989,7 @@ class Graphics(Handler):
                 if record['keyword'] == 'checkbox':
                     command['name'] = record['name']
                     self.skip('to')
-                    command['value'] = self.nextValue()
+                    command['value'] = self.nextToken()
                     self.add(command)
                     return True
         elif token == 'alignment':
@@ -1057,9 +1080,10 @@ class Graphics(Handler):
             if record['keyword'] == 'pushbutton':
                 widget.setAccessibleName(text)
         elif what == 'state':
-            widget = self.getVariable(command['name'])['widget']
-            state = self.getRuntimeValue(command['value'])
-            widget.setChecked(state)
+            record = self.getVariable(command['name'])
+            if record['keyword'] == 'checkbox':
+                state = True if command['value'] == 'checked' else False
+                record['widget'].setChecked(state)
         elif what == 'alignment':
             widget = self.getVariable(command['name'])['widget']
             flags = command['value']