easycoder 250508.2__py2.py3-none-any.whl → 250518.1__py2.py3-none-any.whl

easycoder/__init__.py

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

easycoder/ec_core.py

@@ -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 @@ class Core(Handler):
 
     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

easycoder/ec_pyside.py

@@ -37,11 +37,6 @@ from PySide6.QtWidgets import (
 
 class Graphics(Handler):
 
-    class MainWindow(QMainWindow):
-
-        def __init__(self):
-            super().__init__()
-
     def __init__(self, compiler):
         Handler.__init__(self, compiler)
 
@@ -375,20 +370,17 @@ class Graphics(Handler):
         return False
     
     def r_createWindow(self, command, record):
-        window = self.MainWindow()
+        window = QMainWindow()
         window.setWindowTitle(self.getRuntimeValue(command['title']))
         w = self.getRuntimeValue(command['w'])
         h = self.getRuntimeValue(command['h'])
         x = command['x']
         y = command['y']
-        if x == None: x = (self.screenWidth - w) / 2
+        if x == None: x = (self.program.screenWidth - w) / 2
         else: x = self.getRuntimeValue(x)
-        if y == None: y = (self.screenHeight - h) / 2
+        if y == None: y = (self.program.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)
         record['window'] = window
         return self.nextPC()
     
@@ -545,9 +537,9 @@ class Graphics(Handler):
     def r_init(self, command):
         self.app = QApplication(sys.argv)
         screen = QApplication.screens()[0].size().toTuple()
-        self.screenWidth = screen[0]
-        self.screenHeight = screen[1]
-        print(f'Screen: {self.screenWidth}x{self.screenHeight}')
+        self.program.screenWidth = screen[0]
+        self.program.screenHeight = screen[1]
+        print(f'Screen: {self.program.screenWidth}x{self.program.screenHeight}')
         return self.nextPC()
 
     # Declare a label variable
@@ -712,6 +704,7 @@ class Graphics(Handler):
         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 +723,18 @@ class Graphics(Handler):
                     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 +795,13 @@ class Graphics(Handler):
         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']

{easycoder-250508.2.dist-info → easycoder-250518.1.dist-info}/METADATA

@@ -1,13 +1,13 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: easycoder
-Version: 250508.2
+Version: 250518.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: pyside6
 Project-URL: Home, https://github.com/easycoder/easycoder-py
 

{easycoder-250508.2.dist-info → easycoder-250518.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=9qZ72mcJekd5Oj43RwSPCNOlN_I3nZhIaxKNtRIjLm8,262
+easycoder/__init__.py,sha256=8yrJdKMAo1fcUBele7RuG120U6R5ChqSYPzPPZ7UnT0,262
 easycoder/ec_classes.py,sha256=L6-6yWHDHw8yF9TGL4WWc4p1aUyXzYz6Gom7jJ43h8o,1823
 easycoder/ec_compiler.py,sha256=vNOAKIK2pX_cW4mcxwCe0OR16iqeZqvZQ6JCgQ5MqtU,5062
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=SX2tXGgQ1aJr8cyb8NZ3ESgnr57G1e0wLDwkJbo3C5E,92003
+easycoder/ec_core.py,sha256=OZRsF90uesePweZZQ64XEPlQ_se7xEMd3wUoNoSgOvg,91997
 easycoder/ec_graphics.py,sha256=WXxKMB4GJSmxvk-FVbOTyufiUx4TYIzyDoB1PCAO3JY,16067
 easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
 easycoder/ec_handler.py,sha256=zPDZ_hqdgNnkCd8B5HmSLkqsGgf4aDmqcUBOPHgo47U,2305
 easycoder/ec_program.py,sha256=d_CchiglkCdAgX2CSIQ_WTWcDEvFWCQmRKdoqLCaooU,10087
-easycoder/ec_pyside.py,sha256=N-sHBWIZ-rcFVcwMbqiRbU0IJO9Hpum4jZxeh8L_wvE,37023
+easycoder/ec_pyside.py,sha256=9A2F3giJyvbBb8Xj4Zd08kvkmCdmBz1g5eoasURadAQ,37733
 easycoder/ec_timestamp.py,sha256=myQnnF-mT31_1dpQKv2VEAu4BCcbypvMdzq7_DUi1xc,277
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250508.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250508.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250508.2.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-easycoder-250508.2.dist-info/METADATA,sha256=pAANohi7XVy7aZiBt6I5JhAMQ4fAkgrJB8WBnwQVCsQ,6827
-easycoder-250508.2.dist-info/RECORD,,
+easycoder-250518.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250518.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250518.1.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250518.1.dist-info/METADATA,sha256=vHvoEYT1IDX4_-oDsSR7UB6ffNwuBuuiDxQ-xUkbNK4,6829
+easycoder-250518.1.dist-info/RECORD,,

{easycoder-250508.2.dist-info → easycoder-250518.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: flit 3.12.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any