easycoder 250423.2__py2.py3-none-any.whl → 250424.3__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__ = "250423.2"
+__version__ = "250424.3"

easycoder/ec_core.py

@@ -717,7 +717,7 @@ class Core(Handler):
         try:
             with open(filename) as f: content = f.read()
         except:
-            RuntimeError(self.program, f'File \'{filename}\' not found')
+            content = ''
         try:
             if filename.endswith('.json'): content = json.loads(content)
         except:

easycoder/ec_pyside6.py

@@ -30,7 +30,8 @@ from PySide6.QtWidgets import (
     QSpacerItem,
     QSizePolicy,
     QDialog,
-    QMessageBox
+    QMessageBox,
+    QDialogButtonBox
 )
 
 class Graphics(Handler):
@@ -132,6 +133,31 @@ class Graphics(Handler):
                     else: layout.addWidget(widget)
         return self.nextPC()
 
+    # Center one window on another
+    # center {window2} on {window1}
+    def k_center(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            if record['keyword'] == 'window':
+                command['window2'] = record['name']
+                if self.nextIs('on'):
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'window':
+                            command['window1'] = record['name']
+                            self.add(command)
+                            return True
+        return False
+    
+    def r_center(self, command):
+        window1 = self.getVariable(command['window1'])['window']
+        window2 = self.getVariable(command['window2'])['window']
+        geo1 = window1.geometry()
+        geo2 = window2.geometry()
+        geo2.moveCenter(geo1.center())
+        window2.setGeometry(geo2)
+        return self.nextPC()
+
     # Declare a checkbox variable
     def k_checkbox(self, command):
         return self.compileVariable(command, False)
@@ -140,6 +166,7 @@ class Graphics(Handler):
         return self.nextPC()
 
     # Close a window
+    # close {window}
     def k_close(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
@@ -165,24 +192,30 @@ class Graphics(Handler):
         command['title'] = 'Default'
         x = None
         y = None
-        w = 640
-        h = 480
+        w = self.compileConstant(640)
+        h = self.compileConstant(480)
         while True:
             token = self.peek()
-            if token in ['title', 'at', 'size']:
+            if token in ['title', 'at', 'size', 'layout']:
                 self.nextToken()
                 if token == 'title': command['title'] = self.nextValue()
                 elif token == 'at':
                     x = self.nextValue()
                     y = self.nextValue()
                 elif token == 'size':
-                    command['w'] = self.nextValue()
-                    command['h'] = self.nextValue()
+                    w = self.nextValue()
+                    h = self.nextValue()
+                elif token == 'layout':
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'layout':
+                            command['layout'] = record['name']
+                else: return False
             else: break
-        command['w'] = self.compileConstant(w)
-        command['h'] = self.compileConstant(h)
         command['x'] = x
         command['y'] = y
+        command['w'] = w
+        command['h'] = h
         self.add(command)
         return True
 
@@ -260,38 +293,50 @@ class Graphics(Handler):
         return True
 
     def k_createDialog(self, command):
-        if self.peek() == 'title':
+        if self.peek() == 'on':
             self.nextToken()
-            title = self.nextValue()
-        else: title = ''
+            if self.nextIsSymbol():
+                command['window'] = self.getSymbolRecord()['name']
+        else: command['window'] = None
+        title = ''
+        while True:
+            if self.peek() == 'title':
+                self.nextToken()
+                title = self.nextValue()
+            elif self.peek() == 'layout':
+                self.nextToken()
+                if self.nextIsSymbol():
+                    command['layout'] = self.getSymbolRecord()['name']
+            else: break
         command['title'] = title
         self.add(command)
         return True
 
     def k_createMessageBox(self, command):
-        if self.nextIs('on'):
+        if self.peek() == 'on':
+            self.nextToken()
             if self.nextIsSymbol():
                 command['window'] = self.getSymbolRecord()['name']
-                style = 'question'
-                title = ''
-                message = ''
-                while True:
-                    if self.peek() == 'style':
-                        self.nextToken()
-                        style = self.nextToken()
-                    elif self.peek() == 'title':
-                        self.nextToken()
-                        title = self.nextValue()
-                    elif self.peek() == 'message':
-                        self.nextToken()
-                        message = self.nextValue()
-                    else: break
-                command['style'] = style
-                command['title'] = title
-                command['message'] = message
-                self.add(command)
-                return True
-        return False
+        else: command['window'] = None
+        style = 'question'
+        title = ''
+        message = ''
+        while True:
+            if self.peek() == 'style':
+                self.nextToken()
+                style = self.nextToken()
+            elif self.peek() == 'title':
+                self.nextToken()
+                title = self.nextValue()
+            elif self.peek() == 'message':
+                self.nextToken()
+                message = self.nextValue()
+            else: break
+        command['style'] = style
+        command['title'] = title
+        command['message'] = message
+        self.add(command)
+        return True
 
     def k_create(self, command):
         if self.nextIsSymbol():
@@ -323,6 +368,9 @@ class Graphics(Handler):
         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)
         record['window'] = window
         return self.nextPC()
     
@@ -347,7 +395,7 @@ class Graphics(Handler):
         if 'size' in command:
             fm = label.fontMetrics()
             c = label.contentsMargins()
-            w = fm.horizontalAdvance('x') * self.getRuntimeValue(command['size']) +c.left()+c.right()
+            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) +c.left()+c.right()
             label.setMaximumWidth(w)
         record['widget'] = label
         return self.nextPC()
@@ -357,7 +405,7 @@ class Graphics(Handler):
         if 'size' in command:
             fm = pushbutton.fontMetrics()
             c = pushbutton.contentsMargins()
-            w = fm.horizontalAdvance('x') * self.getRuntimeValue(command['size']) +c.left()+c.right()
+            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) +c.left()+c.right()
             pushbutton.setMaximumWidth(w)
         record['widget'] = pushbutton
         return self.nextPC()
@@ -386,8 +434,14 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createDialog(self, command, record):
+        layout = self.getVariable(command['layout'])['widget']
         dialog = QDialog()
         dialog.setWindowTitle(self.getRuntimeValue(command['title']))
+        dialog.buttonBox = QDialogButtonBox((QDialogButtonBox.Ok | QDialogButtonBox.Cancel))
+        dialog.buttonBox.accepted.connect(dialog.accept)
+        dialog.buttonBox.rejected.connect(dialog.reject)
+        layout.addWidget(dialog.buttonBox)
+        dialog.setLayout(layout)
         record['dialog'] = dialog
         return self.nextPC()
     
@@ -601,22 +655,17 @@ class Graphics(Handler):
             groupbox.setFixedHeight(self.getRuntimeValue(command['value']))
         return self.nextPC()
 
-    # Show something
-    # show {name} in {window}}
-    # show {dialog}/{messagebox}
+    # show {window}
+    # show {dialog}
+    # show {messagebox} giving {result}}
     def k_show(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
             keyword = record['keyword']
-            if keyword == 'layout':
-                command['layout'] = record['name']
-                if self.nextIs('in'):
-                    if self.nextIsSymbol():
-                        record = self.getSymbolRecord()
-                        if record['keyword'] == 'window':
-                            command['window'] = record['name']
-                            self.add(command)
-                            return True
+            if keyword == 'window':
+                command['window'] = record['name']
+                self.add(command)
+                return True
             elif keyword == 'dialog':
                 command['dialog'] = record['name']
                 self.add(command)
@@ -631,13 +680,7 @@ class Graphics(Handler):
         return False
         
     def r_show(self, command):
-        if 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            b1 = QPushButton("ok",dialog)
-            b1.move(50,50)
-            dialog.setWindowModality(Qt.ApplicationModal)
-            dialog.exec_()
-        elif 'messagebox' in command:
+        if 'messagebox' in command:
             data = self.getVariable(command['messagebox'])['data']
             symbolRecord = self.getVariable(command['result'])
             window = self.getVariable(data['window'])['window']
@@ -657,14 +700,12 @@ class Graphics(Handler):
             v['type'] = 'text'
             v['content'] = result
             self.putSymbolValue(symbolRecord, v)
-        else:
-            layoutRecord = self.getVariable(command['layout'])
-            windowRecord = self.getVariable(command['window'])
-            window = windowRecord['window']
-            container = QWidget()
-            container.setLayout(layoutRecord['widget'])
-            window.setCentralWidget(container)
+        elif 'window' in command:
+            window = self.getVariable(command['window'])['window']
             window.show()
+        elif 'dialog' in command:
+            dialog = self.getVariable(command['dialog'])['dialog']
+            dialog.exec()
         return self.nextPC()
 
     # Start the graphics
@@ -734,7 +775,13 @@ class Graphics(Handler):
     def v_symbol(self, symbolRecord):
         symbolRecord = self.getVariable(symbolRecord['name'])
         keyword = symbolRecord['keyword']
-        if keyword == 'combobox':
+        if keyword == 'lineinput':
+            lineinput = symbolRecord['widget']
+            v = {}
+            v['type'] = 'text'
+            v['content'] = lineinput.displayText()
+            return v
+        elif keyword == 'combobox':
             combobox = symbolRecord['widget']
             v = {}
             v['type'] = 'text'

{easycoder-250423.2.dist-info → easycoder-250424.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250423.2
+Version: 250424.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>

{easycoder-250423.2.dist-info → easycoder-250424.3.dist-info}/RECORD

@@ -1,18 +1,18 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=rXpc2iuRmzM8KsgUZWefLoHMii_uABr61154GK0iZ_0,262
+easycoder/__init__.py,sha256=U91pzIS30xf6fU78HzxaL0kYq6R3saY-_c-EAacke8w,262
 easycoder/ec_classes.py,sha256=xnWBNak8oKydkFoxHLlq9wo3lIsB3aMnTDrqbtCfoWo,1512
 easycoder/ec_compiler.py,sha256=WN4DMTU66kzOAwOGJe3KDoXj2nPvq19ACegQ-RSMglo,4780
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
-easycoder/ec_core.py,sha256=X66TBECPnp-82lEcCpaiJuXSy4Ex519iBK2BM-wGHaQ,90611
+easycoder/ec_core.py,sha256=RHFdEMgudlLPUOisbzj_sdvrWfokoPOYKv_T8oV19ag,90563
 easycoder/ec_graphics.py,sha256=WXxKMB4GJSmxvk-FVbOTyufiUx4TYIzyDoB1PCAO3JY,16067
 easycoder/ec_gutils.py,sha256=yqu4RRQ6VdRkC5B2ADBYsXzgNu76dLnekd9aUjdEgPw,6399
 easycoder/ec_handler.py,sha256=K7nBuQTH8l0k8hX1o2b4KhTnhZHGdf2fkEuX4FJXJs8,2277
 easycoder/ec_program.py,sha256=ZCcvI36iq9HG4o8rFwFxzVElzZ7PEeNOPMr8eqwz8ns,10010
-easycoder/ec_pyside6.py,sha256=0Z-uWrCq7Uz_C6WjN-9E0TDI-IHny14-j5sTc1a3LLg,26627
+easycoder/ec_pyside6.py,sha256=Ii3k3UV8nrmv_QqE6FrZuDSjnBXVTzhPy65k0KlvcGE,28339
 easycoder/ec_timestamp.py,sha256=_3QFJPzIWZ9Rzk3SQOQJ-gwmvB07pg78k23SPntoZtY,288
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250423.2.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250423.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250423.2.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
-easycoder-250423.2.dist-info/METADATA,sha256=XZhRQ-0z-KpgImt8Nvyk46I6V_lZ1M2aet5VoR8hHYs,5617
-easycoder-250423.2.dist-info/RECORD,,
+easycoder-250424.3.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250424.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250424.3.dist-info/WHEEL,sha256=ssQ84EZ5gH1pCOujd3iW7HClo_O_aDaClUbX4B8bjKY,100
+easycoder-250424.3.dist-info/METADATA,sha256=spAxnp7GfGJlgr_oHMB3ekXEnOvLE7XOiMXAbT2byrY,5617
+easycoder-250424.3.dist-info/RECORD,,