easycoder 251013.1__tar.gz → 251016.1__tar.gz

{easycoder-251013.1 → easycoder-251016.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easycoder
-Version: 251013.1
+Version: 251016.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-251013.1 → easycoder-251016.1}/easycoder/__init__.py

@@ -12,4 +12,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "251013.1"
+__version__ = "251016.1"

{easycoder-251013.1 → easycoder-251016.1}/easycoder/ec_keyboard.py

@@ -158,6 +158,8 @@ class KeyboardView(QVBoxLayout):
         for row in rows:
             self.addLayout(row)
 
+###############################################################################
+# VirtualKeyboard Class
 class VirtualKeyboard(QStackedWidget):
     def __init__(self, keyboardType, buttonHeight, receiver, onFinished):
         super().__init__()
@@ -173,6 +175,8 @@ class VirtualKeyboard(QStackedWidget):
         self.addKeyboardLayout2()
         self.addKeyboardLayout3()
 
+    ###########################################################################
+    # Add the first keyboard layout (lowercase letters)
     def addKeyboardLayout0(self):
         rowList = []
 
@@ -214,7 +218,7 @@ class VirtualKeyboard(QStackedWidget):
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickNumbers, None, 'img/numbers.png'),
             QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
-            KeyboardButton(self.buttonHeight * 5, self.buttonHeight, self.onClickSpace, None, 'skeyboard/pace.png'),
+            KeyboardButton(self.buttonHeight * 5, self.buttonHeight, self.onClickSpace, None, 'keyboard/space.png'),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, "."),
             QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
@@ -228,6 +232,8 @@ class VirtualKeyboard(QStackedWidget):
         container.setLayout(keyboardView)
         self.addWidget(container)
 
+    ###########################################################################
+    # Add the second keyboard layout (uppercase letters)
     def addKeyboardLayout1(self):
         rowList = []
 
@@ -283,6 +289,8 @@ class VirtualKeyboard(QStackedWidget):
         container.setLayout(keyboardView)
         self.addWidget(container)
 
+    ###########################################################################
+    # Add the third keyboard layout (numbers and symbols)
     def addKeyboardLayout2(self):
         rowList = []
 
@@ -320,11 +328,11 @@ class VirtualKeyboard(QStackedWidget):
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickLetters, None, 'img/letters.png'),
             QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, ","),
-            KeyboardButton(self.buttonHeight * 6, self.buttonHeight, self.onClickSpace, None, 'img/space.png'),
+            KeyboardButton(self.buttonHeight * 5.2, self.buttonHeight, self.onClickSpace, None, 'keyboard/space.png'),
             KeyboardButton(self.buttonHeight, self.buttonHeight, self.onClickChar, "."),
             QSpacerItem(self.buttonHeight * 0.05, 0, QSizePolicy.Fixed, QSizePolicy.Minimum),
             KeyboardButton(self.buttonHeight * 1.5, self.buttonHeight, self.onClickEnter, None, 'img/enter.png'),
-            QSpacerItem(20, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
+            QSpacerItem(10, 40, QSizePolicy.Expanding, QSizePolicy.Minimum)
         ])
         rowList.append(row4)
 
@@ -334,6 +342,8 @@ class VirtualKeyboard(QStackedWidget):
         container.setLayout(keyboardView)
         self.addWidget(container)
 
+    ###########################################################################
+    # Add the fourth keyboard layout (additional symbols)
     def addKeyboardLayout3(self):
         rowList = []
 

{easycoder-251013.1 → easycoder-251016.1}/easycoder/ec_pyside.py

@@ -114,7 +114,7 @@ class Graphics(Handler):
     # (2) add {widget} to {layout}
     # (3) add stretch {widget} to {layout}
     # (4) add stretch to {layout}
-    # (5) add spacer {size} to {layout}
+    # (5) add spacer [size] {size} to {layout}
     # (6) add {widget} at {col} {row} in {grid layout}
     def k_add(self, command):
         def addToLayout():
@@ -146,6 +146,7 @@ class Graphics(Handler):
         
         elif token == 'spacer':
             self.nextToken()
+            self.skip('size')
             command['widget'] = 'spacer'
             command['size'] = self.nextValue()
             self.skip('to')
@@ -370,17 +371,18 @@ class Graphics(Handler):
         return True
 
     def k_createPushbutton(self, command):
-        text = ''
         while True:
             token = self.peek()
             if token == 'text':
                 self.nextToken()
-                text = self.nextValue()
+                command['text'] = self.nextValue()
+            elif token == 'icon':
+                self.nextToken()
+                command['icon'] = self.nextValue()
             elif token == 'size':
                 self.nextToken()
                 command['size'] = self.nextValue()
             else: break
-        command['text'] = text
         self.add(command)
         return True
 
@@ -566,14 +568,27 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createPushbutton(self, command, record):
-        text = self.getRuntimeValue(command['text'])
-        pushbutton = QPushButton(text)
-        pushbutton.setAccessibleName(text)
         if 'size' in command:
-            fm = pushbutton.fontMetrics()
-            c = pushbutton.contentsMargins()
-            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) + c.left()+c.right()
-            pushbutton.setMaximumWidth(w)
+            size = self.getRuntimeValue(command['size'])
+        else: size = None
+        if 'icon' in command:
+            iconPath = self.getRuntimeValue(command['icon'])
+            pixmap = QPixmap(iconPath)
+            if pixmap.isNull():
+                RuntimeError(self.program, f'Icon not found: {iconPath}')
+            icon = pixmap.scaledToHeight(size if size != None else 24, Qt.SmoothTransformation)
+            pushbutton = QPushButton()
+            pushbutton.setIcon(icon)
+            pushbutton.setIconSize(icon.size())
+        elif 'text' in command:
+            text = self.getRuntimeValue(command['text'])
+            pushbutton = QPushButton(text)
+            pushbutton.setAccessibleName(text)
+            if size != None:
+                fm = pushbutton.fontMetrics()
+                c = pushbutton.contentsMargins()
+                w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) + c.left()+c.right()
+                pushbutton.setMaximumWidth(w)
         self.putSymbolValue(record, pushbutton)
         record['widget'] = pushbutton
         return self.nextPC()
@@ -758,6 +773,21 @@ class Graphics(Handler):
     def r_group(self, command):
         return self.nextPC()
 
+    # hide {widget}
+    def k_hide(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            if self.isWidget(record['keyword']):
+                command['widget'] = record['name']
+                self.add(command)
+                return True
+        return False
+        
+    def r_hide(self, command):
+        record = self.getVariable(command['widget'])
+        if 'widget' in record: record['widget'].hide()
+        return self.nextPC()
+
     # Initialize the graphics environment
     def k_init(self, command):
         if self.nextIs('graphics'):
@@ -1218,6 +1248,10 @@ class Graphics(Handler):
                     command['result'] = self.getSymbolRecord()['name']
                     self.add(command)
                     return True
+            elif self.isWidget(keyword):
+                command['name'] = record['name']
+                self.add(command)
+                return True
         return False
         
     def r_show(self, command):
@@ -1271,6 +1305,9 @@ class Graphics(Handler):
                 if dialog.exec() == QDialog.Accepted:
                     record['result'] = dialog.textEdit.toPlainText()
                 else: record['result'] = dialog.value
+        elif 'name' in command:
+            record = self.getVariable(command['name'])
+            if 'widget' in record: record['widget'].show()
         return self.nextPC()
 
     # Start the graphics