easycoder 250714.1__tar.gz → 250718.1__tar.gz

{easycoder-250714.1 → easycoder-250718.1}/PKG-INFO

@@ -1,11 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: easycoder
-Version: 250714.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>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
+License-File: LICENSE
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: psutil

{easycoder-250714.1 → easycoder-250718.1}/easycoder/__init__.py

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

{easycoder-250714.1 → easycoder-250718.1}/easycoder/ec_core.py

@@ -2635,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-250714.1 → easycoder-250718.1}/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-250714.1 → easycoder-250718.1}/easycoder/ec_pyside.py

@@ -467,12 +467,12 @@ class Graphics(Handler):
         dialogType = command['type']
         if dialogType in ['lineinput']:
             if dialogType == 'lineinput':
-                input = QLineEdit()
-                mainLayout.addWidget(input)
-        dialog.buttonBox = QDialogButtonBox((QDialogButtonBox.Ok | QDialogButtonBox.Cancel))
-        dialog.buttonBox.accepted.connect(dialog.accept)
-        dialog.buttonBox.rejected.connect(dialog.reject)
-        mainLayout.addWidget(dialog.buttonBox, alignment=Qt.AlignHCenter)
+                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()
     
@@ -504,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()
@@ -950,9 +950,9 @@ class Graphics(Handler):
             window = self.getVariable(command['window'])['window']
             window.show()
         elif 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            result = dialog.exec()
-            # TODO: Finish the dialog box for getting the request relay name
+            record = self.getVariable(command['dialog'])
+            dialog = record['dialog']
+            record['result'] = dialog.exec()
         return self.nextPC()
 
     # Start the graphics
@@ -1071,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):