v250116.4

Author: graham-trott

dist/easycoder-250116.3-py2.py3-none-any.whl renamed to dist/easycoder-250116.4-py2.py3-none-any.whl

@@ -9,4 +9,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250116.3"
+__version__ = "250116.4"

dist/easycoder-250116.3.tar.gz renamed to dist/easycoder-250116.4.tar.gz

@@ -27,10 +27,9 @@ def k_add(self, command):
                 elements.append(name)
                 command['args'] = name
             else: FatalError(self.compiler.program, f'\'{name}\' is not a layout')
-        elif token[0:2] == 'g_':
+        else:
             command['type'] = token
             command['args'] = self.utils.getArgs(self)
-        else: return False
         if self.nextIs('to'):
             if self.nextIsSymbol():
                 symbolRecord = self.getSymbolRecord()

easycoder/__init__.py

@@ -21,13 +21,13 @@ def getArgs(self, handler):
     # Get the default args for a graphic element
     def getDefaultArgs(self, type):
         args = {}
-        if type == 'g_text':
+        if type == 'Text':
             args['text'] = '(empty)'
             args['expand_x'] = False
-        elif type == 'g_input':
+        elif type == 'Input':
             args['key'] = None
             args['size'] = (None, None)
-        elif type == 'g_button':
+        elif type == 'Button':
             args['button_text'] = '(empty)'
         return args
 
@@ -43,10 +43,10 @@ def decode(self, args, text):
 
     # Create an element
     def createElement(self, type, args):
-        if type == 'g_text': return psg.Text(text=args['text'], expand_x=args['expand_x'])
-        elif type == 'g_input':
+        if type == 'Text': return psg.Text(text=args['text'], expand_x=args['expand_x'])
+        elif type == 'Input':
             size = args['size'].split()
             size = (size[0], size[1])
             return psg.Input(key=args['key'], size=size)
-        elif type == 'g_button': return psg.Button(button_text=args['button_text'])
+        elif type == 'Button': return psg.Button(button_text=args['button_text'])
         else: return None

easycoder/ec_graphics.py

@@ -11,19 +11,19 @@
     popup `Hello!`
 !    debug step
 
-    set Row to g_text text `Date (YYYY-MM-DD):` and expand_x true
-    add g_input key `-DATE-` and size `20 1` to Row
+    set Row to Text text `Date (YYYY-MM-DD):` and expand_x true
+    add Input key `-DATE-` and size `20 1` to Row
     add Row to Layout
 
-    set Row to g_text text `Time (HH:MM):` and expand_x true
-    add g_input key `-TIME-` and size `20 1` to Row
+    set Row to Text text `Time (HH:MM):` and expand_x true
+    add Input key `-TIME-` and size `20 1` to Row
     add Row to Layout
 
-    set Row to g_text text `Your name:` and expand_x true
-    add g_input key `-NAME-` and size `20 1` to Row
+    set Row to Text text `Your name:` and expand_x true
+    add Input key `-NAME-` and size `20 1` to Row
     add Row to Layout
 
-    set Row to g_button button_text `Click me`
+    set Row to Button button_text `Click me`
     add Row to Layout
 
     create Window `Graphics Test`