easycoder 251017.1__tar.gz → 251021.1__tar.gz

{easycoder-251017.1 → easycoder-251021.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 251017.1
+Version: 251021.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>

{easycoder-251017.1 → easycoder-251021.1}/easycoder/__init__.py

@@ -12,4 +12,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "251017.1"
+__version__ = "251021.1"

{easycoder-251017.1 → easycoder-251021.1}/easycoder/ec_core.py

@@ -323,7 +323,8 @@ class Core(Handler):
             symbolRecord = self.getVariable(command['var'])
             value = self.getSymbolValue(symbolRecord)
             content = value['content']
-            content.remove(key)
+            if key >= 0 and key < len(content): del(content[key])
+            else: RuntimeError(self.program, f'Index {key} out of range')
             value['content'] = content
             self.putSymbolValue(symbolRecord, value)
         return self.nextPC()

{easycoder-251017.1 → easycoder-251021.1}/easycoder/ec_pyside.py

@@ -26,6 +26,7 @@ from PySide6.QtWidgets import (
     QSlider,
     QSpinBox,
     QTimeEdit,
+    QLayout,
     QVBoxLayout,
     QHBoxLayout,
     QGridLayout,
@@ -75,7 +76,7 @@ class Graphics(Handler):
     
     def getWidget(self, record):
         if 'widget' in record and record['widget'] != None:
-            if record['keyword'] == 'layout': return record['widget'] 
+            if record['keyword'] in ['layout', 'group']: return record['widget'] 
             return record['widget'][record['index']]
         else:
             return None
@@ -196,11 +197,11 @@ class Graphics(Handler):
         if 'value' in command:
             value = self.getRuntimeValue(command['value'])
             record = self.getVariable(command['widget'])
-            if widget['keyword'] == 'listbox':
-                record['widget'].addItem(value)
+            if record['keyword'] == 'listbox':
+                self.getWidget(record).addItem(value)
             elif record['keyword'] == 'combobox':
                 if isinstance(value, list): record['widget'].addItems(value)
-                else: record['widget'].addItem(value)
+                else: self.getWidget(record).addItem(value)
         elif 'row' in command and 'col' in command:
             layout = self.getVariable(command['layout'])['widget']
             record = self.getVariable(command['widget'])
@@ -281,8 +282,41 @@ class Graphics(Handler):
         return False
     
     def r_clear(self, command):
+
+        def clearLayout(layout: QLayout) -> None:
+            if layout is None:
+                return
+            while layout.count() > 0:
+                item = layout.takeAt(0)
+                if item is None:
+                    continue
+                widget = item.widget()
+                if widget is not None:
+                    # Delete the widget
+                    widget.deleteLater()
+                elif item.layout() is not None:
+                    # Recursively clear sub-layout
+                    clearLayout(item.layout())
+                    item.layout().deleteLater()
+                # The QLayoutItem will be automatically cleaned up by Qt
+
+        def clearWidget(widget: QWidget) -> None:
+            if widget is None:
+                return
+            # Clear the layout first
+            layout = widget.layout()
+            if layout is not None:
+                clearLayout(layout)
+                layout.deleteLater()
+            # Clear any remaining child widgets
+            child_widgets = widget.findChildren(QWidget, "", Qt.FindDirectChildrenOnly)
+            for child in child_widgets:
+                child.deleteLater()
+
         widget = self.getWidget(self.getVariable(command['name']))
-        widget.clear()
+        clearWidget(widget)
+        return self.nextPC()
+
         return self.nextPC()
 
     # close {window}
@@ -1491,4 +1525,4 @@ class Graphics(Handler):
     # Force the application to exit
     def force_exit(self):
         QApplication.quit()  # Gracefully close the application
-        sys.exit(0)          # Force a complete system exit
+        sys.exit(0)          # Force a complete system exit