250517.1

Author: easycoder

.gitignore

@@ -1 +1,4 @@
 */__pycache__/*
+*.code-workspace
+*.py
+*.ecs

dist/easycoder-250508.2-py2.py3-none-any.whl

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250508.2"
+__version__ = "250517.1"

dist/easycoder-250517.1-py2.py3-none-any.whl

@@ -1,6 +1,6 @@
-import json, math, hashlib, threading, os, subprocess, sys, requests, time, numbers, base64, binascii, random
+import json, math, hashlib, threading, os, subprocess, sys, time, numbers, base64, binascii, random, requests
 from psutil import Process
-from datetime import datetime, timezone
+from datetime import datetime
 from random import randrange
 from .ec_classes import FatalError, RuntimeWarning, RuntimeError, AssertionError, NoValueError, NoValueRuntimeError, Condition, Object
 from .ec_handler import Handler
@@ -381,7 +381,7 @@ def k_exit(self, command):
 
     def r_exit(self, command):
         if self.program.graphics != None:
-            self.program.graphics.force_exit()
+            self.program.graphics.force_exit(None)
         return -1
 
     # Declare a file variable

dist/easycoder-250508.2.tar.gz renamed to dist/easycoder-250517.1.tar.gz

@@ -386,9 +386,13 @@ def r_createWindow(self, command, record):
         if y == None: y = (self.screenHeight - h) / 2
         else: y = self.getRuntimeValue(x)
         window.setGeometry(x, y, w, h)
-        container = QWidget()
-        container.setLayout(self.getVariable(command['layout'])['widget'])
-        window.setCentralWidget(container)
+        # content = self.getVariable(command['layout'])['widget']
+        # if isinstance(content, QWidget):
+        #     container = content
+        # else:
+        #     container = QWidget()
+        #     container.setLayout(content)
+        # window.setCentralWidget(container)
         record['window'] = window
         return self.nextPC()
 
@@ -712,6 +716,7 @@ def r_select(self, command):
         return self.nextPC()
 
     # set [the] width/height [of] {widget} [to] {value}
+    # set [the] layout of {window} to {layout}
     # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput} [to] {color}
     # set [the] state [of] {checkbox} [to] {color}
@@ -730,6 +735,18 @@ def k_set(self, command):
                     command['value'] = self.nextValue()
                     self.add(command)
                     return True
+        elif token == 'layout':
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['keyword'] == 'window':
+                    command['name'] = record['name']
+                    self.skip('to')
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        command['layout'] = record['name']
+                        self.add(command)
+                        return True
         elif token == 'text':
             self.skip('of')
             if self.nextIsSymbol():
@@ -790,6 +807,13 @@ def r_set(self, command):
         elif what == 'width':
             widget = self.getVariable(command['name'])['widget']
             widget.setFixedWidth(self.getRuntimeValue(command['value']))
+        elif what == 'layout':
+            window = self.getVariable(command['name'])['window']
+            layout = self.getVariable(command['layout'])
+            content = self.getVariable(command['layout'])['widget']
+            container = QWidget()
+            container.setLayout(content)
+            window.setCentralWidget(container)
         elif what == 'text':
             record = self.getVariable(command['name'])
             widget = self.getVariable(command['name'])['widget']