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

easycoder/ec_program.py

@@ -349,8 +349,10 @@ class Program:
 			return 0
 		v1 = val1['content']
 		v2 = val2['content']
-		if v1 == None and v2 != None or v1 != None and v2 == None:
-			return 0
+#		if v1 == None and v2 != None or v1 != None and v2 == None:
+#			return 0
+		if v1 == None and v2 != None: return -1
+		elif v2 == None and v1 != None: return 1
 		if v1 != None and val1['type'] == 'int':
 			if not val2['type'] == 'int':
 				if type(v2) is str:

easycoder/ec_pyside.py

@@ -323,14 +323,17 @@ class Graphics(Handler):
         else: command['window'] = None
         title = ''
         while True:
-            if self.peek() == 'title':
+            if self.peek() == 'type':
+                self.nextToken()
+                command['type'] =  self.nextToken()
+            elif self.peek() == 'title':
                 self.nextToken()
                 title = self.nextValue()
-            elif self.peek() == 'type':
+            elif self.peek() == 'prompt':
                 self.nextToken()
-                command['type'] =  self.nextToken()
+                command['prompt'] =  self.nextValue()
             else: break
-        command['title'] = title
+        command['title'] = self.compileConstant(title)
         self.add(command)
         return True
 
@@ -465,8 +468,11 @@ class Graphics(Handler):
         mainLayout = QVBoxLayout(dialog)
         dialog.setWindowTitle(self.getRuntimeValue(command['title']))
         dialogType = command['type']
-        if dialogType in ['lineinput']:
-            if dialogType == 'lineinput':
+        dialog.dialogType = dialogType
+        if dialogType in ['confirm', 'lineEdit']:
+            if dialogType == 'confirm':
+                mainLayout.addWidget(QLabel(self.getRuntimeValue(command['prompt'])))
+            elif dialogType == 'lineinput':
                 dialog.lineEdit = QLineEdit(dialog)
                 mainLayout.addWidget(dialog.lineEdit)
         buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, dialog)
@@ -476,7 +482,7 @@ class Graphics(Handler):
         record['dialog'] = dialog
         return self.nextPC()
     
-    # Creates a message box but doesn'r run it
+    # Creates a message box but doesn't run it
     def r_createMessageBox(self, command, record):
         data = {}
         data['window'] = command['window']
@@ -952,7 +958,12 @@ class Graphics(Handler):
         elif 'dialog' in command:
             record = self.getVariable(command['dialog'])
             dialog = record['dialog']
-            record['result'] = dialog.exec()
+            if dialog.dialogType == 'confirm':
+                record['result'] = True if dialog.exec() == QDialog.Accepted else False
+            elif dialog.dialogType == 'lineinput':
+                if dialog.exec() == QDialog.Accepted:
+                    record['result'] = dialog.lineEdit.text()
+                else: return ''
         return self.nextPC()
 
     # Start the graphics
@@ -1072,8 +1083,7 @@ class Graphics(Handler):
             v['content'] = content
             return v
         elif keyword == 'dialog':
-            dialog = symbolRecord['dialog']
-            content = dialog.lineEdit.text() if symbolRecord['result'] == QDialog.Accepted else ''
+            content = symbolRecord['result']
             v = {}
             v['type'] = 'text'
             v['content'] = content

{easycoder-250718.1.dist-info → easycoder-250721.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 250718.1
+Version: 250721.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-250718.1.dist-info → easycoder-250721.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=p8s4OHASTXKcaL9Rb9-SuXaILKYna6K9BbHdFEVEMWw,262
+easycoder/__init__.py,sha256=xAuCHNIDNn3RDSa_sEh8fW65cAHRYorwbRdWuSv1M34,262
 easycoder/ec_classes.py,sha256=PWPaJuTfaWD4-tgT-2WWOgeFV_jXxlxyKCxvXyylCUU,1824
 easycoder/ec_compiler.py,sha256=9byLqJZgMHAyFFyD8eGhY77oTsY1GY1aVcVrU4JAbd4,5287
 easycoder/ec_condition.py,sha256=YXvSBQKEzKGCcgUGo3Qp8iHolXmm2BpEm0NimSDszIM,785
 easycoder/ec_core.py,sha256=he_8KO2lSR9vcj9_2jauBBvwE2QqkeSVDEcagHdVnHU,99575
 easycoder/ec_handler.py,sha256=ohf3xUuWw_Qb5SZnulGtDhvCb11kvWtYfgbQTiOXpIY,2261
-easycoder/ec_program.py,sha256=VIpy8mEdLy-zAzqFZtmzvx6NxmgbBJb47ESC_tDOz9k,10004
-easycoder/ec_pyside.py,sha256=ELqG95R8zcYcxCGgb0pD3GTmpS9NhXYgE2UejeYlO0c,40695
+easycoder/ec_program.py,sha256=FxM9I3Wu1sXBkM5byaKjXyu0MGiILSaa_VeAtuw1g9Q,10091
+easycoder/ec_pyside.py,sha256=q-6amHVMM12fUOASnsXJvTWcWPElCRSDk_yAMfe2PsA,41214
 easycoder/ec_timestamp.py,sha256=myQnnF-mT31_1dpQKv2VEAu4BCcbypvMdzq7_DUi1xc,277
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250718.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250718.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250718.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-easycoder-250718.1.dist-info/METADATA,sha256=pkBltNxENp45nVxwQyZOU1hxSxKUv3fMfMfwcjDx6-M,6897
-easycoder-250718.1.dist-info/RECORD,,
+easycoder-250721.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
+easycoder-250721.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+easycoder-250721.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+easycoder-250721.1.dist-info/METADATA,sha256=_Wt7tdXZbeRQpqu2HCAYKuOLk804iby__NCgV6m2jgk,6897
+easycoder-250721.1.dist-info/RECORD,,