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

easycoder/ec_core.py

@@ -1941,9 +1941,6 @@ class Core(Handler):
             if keyword == 'module':
                 value['type'] = 'module'
                 return value
-            
-            if keyword == 'ssh':
-                pass
 
             if keyword in ['ssh', 'variable']:
                 value['type'] = 'symbol'
@@ -2638,7 +2635,7 @@ class Core(Handler):
         v = self.getRuntimeValue(v['content'])
         value = {}
         value['type'] = 'int'
-        value['content'] = int(v)
+        value['content'] = int(v) if v != '' else 0
         return value
 
     def v_weekday(self, v):

easycoder/ec_program.py

@@ -149,14 +149,14 @@ class Program:
 		elif valType == 'symbol':
 			name = value['name']
 			symbolRecord = self.getSymbolRecord(name)
-			if symbolRecord['hasValue']:
-				handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
-				result = handler(symbolRecord)
-			else:
-				# Call the given domain to handle a value
-				domain = self.domainIndex[value['domain']]
-				handler = domain.valueHandler(value['type'])
-				if handler: result = handler(value)
+			# if symbolRecord['hasValue']:
+			handler = self.domainIndex[symbolRecord['domain']].valueHandler('symbol')
+			result = handler(symbolRecord)
+		# 	else:
+		# 		# Call the given domain to handle a value
+		# 		# domain = self.domainIndex[value['domain']]
+		# 		handler = domain.valueHandler(value['type'])
+		# 		if handler: result = handler(value)
 		else:
 			# Call the given domain to handle a value
 			domain = self.domainIndex[value['domain']]

easycoder/ec_pyside.py

@@ -326,10 +326,9 @@ class Graphics(Handler):
             if self.peek() == 'title':
                 self.nextToken()
                 title = self.nextValue()
-            elif self.peek() == 'layout':
+            elif self.peek() == 'type':
                 self.nextToken()
-                if self.nextIsSymbol():
-                    command['layout'] = self.getSymbolRecord()['name']
+                command['type'] =  self.nextToken()
             else: break
         command['title'] = title
         self.add(command)
@@ -462,14 +461,18 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createDialog(self, command, record):
-        layout = self.getVariable(command['layout'])['widget']
         dialog = QDialog()
+        mainLayout = QVBoxLayout(dialog)
         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)
+        dialogType = command['type']
+        if dialogType in ['lineinput']:
+            if dialogType == 'lineinput':
+                dialog.lineEdit = QLineEdit(dialog)
+                mainLayout.addWidget(dialog.lineEdit)
+        buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, dialog)
+        buttonBox.accepted.connect(dialog.accept)
+        buttonBox.rejected.connect(dialog.reject)
+        mainLayout.addWidget(buttonBox, alignment=Qt.AlignHCenter)
         record['dialog'] = dialog
         return self.nextPC()
     
@@ -501,7 +504,7 @@ class Graphics(Handler):
 
     # Declare a dialog variable
     def k_dialog(self, command):
-        return self.compileVariable(command)
+        return self.compileVariable(command, 'gui')
 
     def r_dialog(self, command):
         return self.nextPC()
@@ -947,8 +950,9 @@ class Graphics(Handler):
             window = self.getVariable(command['window'])['window']
             window.show()
         elif 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            dialog.exec()
+            record = self.getVariable(command['dialog'])
+            dialog = record['dialog']
+            record['result'] = dialog.exec()
         return self.nextPC()
 
     # Start the graphics
@@ -1067,6 +1071,13 @@ class Graphics(Handler):
             v['type'] = 'boolean'
             v['content'] = content
             return v
+        elif keyword == 'dialog':
+            dialog = symbolRecord['dialog']
+            content = dialog.lineEdit.text() if symbolRecord['result'] == QDialog.Accepted else ''
+            v = {}
+            v['type'] = 'text'
+            v['content'] = content
+            return v
         return None
 
     def v_count(self, v):

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

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

@@ -1,16 +1,16 @@
 easycoder/README.md,sha256=BVXmYphcTJ6q6RN_9L6HtQukgCnOjSLVIsTM3lk-9aM,587
-easycoder/__init__.py,sha256=Zq-XYXsV_437d00UR-7ZjY1YyVGTP76aq7miy9ih5NQ,262
+easycoder/__init__.py,sha256=p8s4OHASTXKcaL9Rb9-SuXaILKYna6K9BbHdFEVEMWw,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=VF0ON4HSFgsJdkk5m7qi_dzBVT8R4XoyyXIb5kkkhio,99624
+easycoder/ec_core.py,sha256=he_8KO2lSR9vcj9_2jauBBvwE2QqkeSVDEcagHdVnHU,99575
 easycoder/ec_handler.py,sha256=ohf3xUuWw_Qb5SZnulGtDhvCb11kvWtYfgbQTiOXpIY,2261
-easycoder/ec_program.py,sha256=IDpfq9oghFJMJyRD9uab31VOP5MOF4M7kcUVfDn7d4I,9992
-easycoder/ec_pyside.py,sha256=-EHV8TBIw5jwlufzYcy8mcPXmfYC82Pf7Ep4_cvbceM,40240
+easycoder/ec_program.py,sha256=VIpy8mEdLy-zAzqFZtmzvx6NxmgbBJb47ESC_tDOz9k,10004
+easycoder/ec_pyside.py,sha256=ELqG95R8zcYcxCGgb0pD3GTmpS9NhXYgE2UejeYlO0c,40695
 easycoder/ec_timestamp.py,sha256=myQnnF-mT31_1dpQKv2VEAu4BCcbypvMdzq7_DUi1xc,277
 easycoder/ec_value.py,sha256=zgDJTJhIg3yOvmnnKIfccIizmIhGbtvL_ghLTL1T5fg,2516
-easycoder-250706.1.dist-info/entry_points.txt,sha256=JXAZbenl0TnsIft2FcGJbJ-4qoztVu2FuT8PFmWFexM,44
-easycoder-250706.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-easycoder-250706.1.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-easycoder-250706.1.dist-info/METADATA,sha256=tBTOgrA0Je5whSBvMo0B8ZsyzlZqeMBeJi3Kgd1kriA,6897
-easycoder-250706.1.dist-info/RECORD,,
+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,,