easycoder 250721.1__tar.gz → 250722.1__tar.gz

{easycoder-250721.1 → easycoder-250722.1}/PKG-INFO

@@ -1,12 +1,11 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: easycoder
-Version: 250721.1
+Version: 250722.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-250721.1 → easycoder-250722.1}/easycoder/__init__.py

@@ -8,5 +8,7 @@ from .ec_handler import *
 from .ec_program import *
 from .ec_timestamp import *
 from .ec_value import *
+from .ec_pyside import *
+from .keyboard import *
 
-__version__ = "250721.1"
+__version__ = "250722.1"

{easycoder-250721.1 → easycoder-250722.1}/easycoder/ec_core.py

@@ -1798,13 +1798,14 @@ class Core(Handler):
 
     # Use a plugin module
     def k_use(self, command):
-        if self.nextIs('graphics'):
-            print('Loading graphics module')
-            from .ec_pyside import Graphics
-            self.program.graphics = Graphics
-            self.program.classes.append(Graphics)
-            self.program.processClasses()
-            return True
+        if self.nextIs('plugin'):
+            if self.nextIs('graphics'):
+                print('Loading graphics module')
+                from .ec_pyside import Graphics
+                self.program.graphics = Graphics
+                self.program.useClass(Graphics)
+                return True
+        return False
 
     # Declare a general-purpose variable
     def k_variable(self, command):

{easycoder-250721.1 → easycoder-250722.1}/easycoder/ec_program.py

@@ -22,7 +22,6 @@ class Program:
 		if len(argv) == 0:
 			print('No script supplied')
 			exit()
-		self.classes=[Core]
 		scriptName = argv
 
 		f = open(scriptName, 'r')
@@ -44,7 +43,7 @@ class Program:
 		self.value = self.compiler.value
 		self.condition = self.compiler.condition
 		self.graphics = None
-		self.processClasses()
+		self.useClass(Core)
 		self.externalControl = False
 		self.ticker = 0
 		self.running = True
@@ -101,16 +100,13 @@ class Program:
 		module = module.replace('/','.').replace('.py','')
 		module = importlib.import_module(module)
 		plugin = getattr(module, args[1])
-		self.classes.append(plugin)
-		self.processClasses()
-
-	# Process the class list to get the domains
-	def processClasses(self):
-		self.domains=[]
-		for clazz in self.classes:
-			handler = clazz(self.compiler)
-			self.domains.append(handler)
-			self.domainIndex[handler.getName()] = handler
+		self.useClass(plugin)
+
+	# Use a specified class
+	def useClass(self, clazz):
+		handler = clazz(self.compiler)
+		self.domains.append(handler)
+		self.domainIndex[handler.getName()] = handler
 
 	# Get the domain list
 	def getDomains(self):

{easycoder-250721.1 → easycoder-250722.1}/easycoder/ec_pyside.py

@@ -41,6 +41,7 @@ class Graphics(Handler):
         Handler.__init__(self, compiler)
         self.blocked = False
         self.runOnTick = 0
+        self.vkb = False
 
     def getName(self):
         return 'graphics'
@@ -321,19 +322,23 @@ class Graphics(Handler):
             if self.nextIsSymbol():
                 command['window'] = self.getSymbolRecord()['name']
         else: command['window'] = None
-        title = ''
         while True:
             if self.peek() == 'type':
                 self.nextToken()
                 command['type'] =  self.nextToken()
             elif self.peek() == 'title':
                 self.nextToken()
-                title = self.nextValue()
+                command['title'] = self.nextValue()
             elif self.peek() == 'prompt':
                 self.nextToken()
                 command['prompt'] =  self.nextValue()
+            elif self.peek() == 'value':
+                self.nextToken()
+                command['value'] =  self.nextValue()
             else: break
-        command['title'] = self.compileConstant(title)
+        if not 'title' in command: command['title'] = self.compileConstant('')
+        if not 'value' in command: command['value'] = self.compileConstant('')
+        if not 'prompt' in command: command['prompt'] = self.compileConstant('')
         self.add(command)
         return True
 
@@ -467,13 +472,17 @@ class Graphics(Handler):
         dialog = QDialog()
         mainLayout = QVBoxLayout(dialog)
         dialog.setWindowTitle(self.getRuntimeValue(command['title']))
-        dialogType = command['type']
+        dialogType = command['type'].lower()
         dialog.dialogType = dialogType
-        if dialogType in ['confirm', 'lineEdit']:
+        prompt = self.getRuntimeValue(command['prompt'])
+        if dialogType in ['confirm', 'lineedit']:
             if dialogType == 'confirm':
-                mainLayout.addWidget(QLabel(self.getRuntimeValue(command['prompt'])))
-            elif dialogType == 'lineinput':
+                mainLayout.addWidget(QLabel(prompt))
+            elif dialogType == 'lineedit':
+                mainLayout.addWidget(QLabel(prompt))
                 dialog.lineEdit = QLineEdit(dialog)
+                dialog.value = self.getRuntimeValue(command['value'])
+                dialog.lineEdit.setText(dialog.value)
                 mainLayout.addWidget(dialog.lineEdit)
         buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, dialog)
         buttonBox.accepted.connect(dialog.accept)
@@ -958,12 +967,14 @@ class Graphics(Handler):
         elif 'dialog' in command:
             record = self.getVariable(command['dialog'])
             dialog = record['dialog']
-            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 ''
+            if dialog.dialogType in ['confirm', 'lineedit']:
+                if dialog.dialogType == 'confirm':
+                    record['result'] = True if dialog.exec() == QDialog.Accepted else False
+                elif dialog.dialogType == 'lineedit':
+                    if self.vkb: print('Show virtual keyboard')
+                    if dialog.exec() == QDialog.Accepted:
+                        record['result'] = dialog.lineEdit.text()
+                    else: record['result'] = dialog.value
         return self.nextPC()
 
     # Start the graphics
@@ -990,6 +1001,15 @@ class Graphics(Handler):
         self.app.lastWindowClosed.connect(on_last_window_closed)
         self.app.exec()
 
+    # use virtual keyboard
+    def k_use(self, command):
+        if self.nextIs('virtual'):
+            if self.nextIs('keyboard'):
+                print('Use the virtual keyboard')
+                self.vkb = True
+                return True
+        return False
+
     # Declare a window variable
     def k_window(self, command):
         return self.compileVariable(command)