easycoder 250820.1__tar.gz → 250824.2__tar.gz

{easycoder-250820.1 → easycoder-250824.2}/PKG-INFO

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

@@ -6,9 +6,10 @@ from .ec_condition import *
 from .ec_core import *
 from .ec_handler import *
 from .ec_keyboard import *
+from .ec_border import *
 from .ec_program import *
 from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250820.1"
+__version__ = "250824.2"

easycoder-250824.2/easycoder/ec_border.py

@@ -0,0 +1,63 @@
+import os
+from PySide6.QtWidgets import QWidget
+from PySide6.QtGui import QPixmap, QPainter
+from PySide6.QtCore import Qt, Signal, QRect
+
+class Border(QWidget):
+    tickClicked = Signal()
+    closeClicked = Signal()
+
+    def __init__(self):
+        super().__init__()
+        self.size = 40
+        self.setFixedHeight(self.size)
+        self._drag_active = False
+        self._drag_start_pos = None
+
+    def paintEvent(self, event):
+        painter = QPainter(self)
+        painter.setRenderHint(QPainter.Antialiasing)
+        # Draw the tick icon
+        self.tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/tick.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        x = 0
+        y = 0
+        painter.drawPixmap(x, y, self.tick)
+        # Draw the close icon
+        self.close = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        x = self.width() - self.close.width()
+        y = 0
+        painter.drawPixmap(x, y, self.close)
+
+    def mousePressEvent(self, event):
+        # Tick icon
+        x = 0
+        y = 0
+        tickRect = self.tick.rect().translated(x, y)
+        # Close icon
+        x = self.width() - self.close.width()
+        y = 0
+        closeRect = self.close.rect().translated(x, y)
+        if tickRect.contains(event.pos()):
+            self.tickClicked.emit()
+        if closeRect.contains(event.pos()):
+            self.closeClicked.emit()
+        elif QRect(0, 0, self.width(), self.height()).contains(event.pos()):
+            if hasattr(self.window().windowHandle(), 'startSystemMove'):
+                self.window().windowHandle().startSystemMove()
+            else:
+                self._drag_active = True
+                self._drag_start_pos = event.globalPosition().toPoint()
+                self._dialog_start_pos = self.window().pos()
+        else:
+            super().mousePressEvent(event)
+
+    def mouseMoveEvent(self, event):
+        if self._drag_active:
+            delta = event.globalPosition().toPoint() - self._drag_start_pos
+            self.window().move(self._dialog_start_pos + delta)
+        else:
+            super().mouseMoveEvent(event)
+
+    def mouseReleaseEvent(self, event):
+        self._drag_active = False
+        super().mouseReleaseEvent(event)

{easycoder-250820.1 → easycoder-250824.2}/easycoder/ec_keyboard.py

@@ -1,5 +1,5 @@
-import os
 from .ec_handler import Handler
+from .ec_border import Border
 from PySide6.QtWidgets import (
     QDialog,
     QVBoxLayout,
@@ -18,65 +18,6 @@ from PySide6.QtCore import Qt, QTimer, Signal, QRect
 
 class Keyboard(Handler):
     iconClicked = Signal()
-
-    class Border(QWidget):
-        tickClicked = Signal()
-        closeClicked = Signal()
-
-        def __init__(self):
-            super().__init__()
-            self.size = 40
-            self.setFixedHeight(self.size)
-            self._drag_active = False
-            self._drag_start_pos = None
-
-        def paintEvent(self, event):
-            painter = QPainter(self)
-            painter.setRenderHint(QPainter.Antialiasing)
-            # Draw the tick icon
-            self.tick = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/tick.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-            x = 0
-            y = 0
-            painter.drawPixmap(x, y, self.tick)
-            # Draw the close icon
-            self.close = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(self.size, self.size, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-            x = self.width() - self.close.width()
-            y = 0
-            painter.drawPixmap(x, y, self.close)
-
-        def mousePressEvent(self, event):
-            # Tick icon
-            x = 0
-            y = 0
-            tickRect = self.tick.rect().translated(x, y)
-            # Close icon
-            x = self.width() - self.close.width()
-            y = 0
-            closeRect = self.close.rect().translated(x, y)
-            if tickRect.contains(event.pos()):
-                self.tickClicked.emit()
-            if closeRect.contains(event.pos()):
-                self.closeClicked.emit()
-            elif QRect(0, 0, self.width(), self.height()).contains(event.pos()):
-                if hasattr(self.window().windowHandle(), 'startSystemMove'):
-                    self.window().windowHandle().startSystemMove()
-                else:
-                    self._drag_active = True
-                    self._drag_start_pos = event.globalPosition().toPoint()
-                    self._dialog_start_pos = self.window().pos()
-            else:
-                super().mousePressEvent(event)
-
-        def mouseMoveEvent(self, event):
-            if self._drag_active:
-                delta = event.globalPosition().toPoint() - self._drag_start_pos
-                self.window().move(self._dialog_start_pos + delta)
-            else:
-                super().mouseMoveEvent(event)
-
-        def mouseReleaseEvent(self, event):
-            self._drag_active = False
-            super().mouseReleaseEvent(event)
     
     def __init__(self, program, keyboardType, receiverLayout, receivers, caller = None, parent=None):
         super().__init__(program.compiler)
@@ -103,7 +44,7 @@ class Keyboard(Handler):
         # Add the keyboard
         layout = QVBoxLayout(dialog)
 
-        border = self.Border()
+        border = Border()
         border.tickClicked.connect(self.dialog.accept)
         border.closeClicked.connect(self.reject)
         layout.addWidget(border)

{easycoder-250820.1 → easycoder-250824.2}/easycoder/ec_pyside.py

@@ -1,8 +1,9 @@
-import sys
+import sys, os
 from .ec_handler import Handler
 from .ec_classes import RuntimeError
-from PySide6.QtCore import Qt, QTimer, Signal
-from PySide6.QtGui import QPixmap
+from .ec_border import Border
+from PySide6.QtCore import Qt, QTimer, Signal, QRect
+from PySide6.QtGui import QPixmap, QPainter
 from PySide6.QtWidgets import (
     QApplication,
     QCheckBox,
@@ -34,7 +35,8 @@ from PySide6.QtWidgets import (
     QSizePolicy,
     QDialog,
     QMessageBox,
-    QDialogButtonBox
+    QDialogButtonBox,
+    QGraphicsDropShadowEffect
 )
 
 class Graphics(Handler):
@@ -65,19 +67,7 @@ class Graphics(Handler):
             ]
 
     def dialogTypes(self):
-        return ['confirm', 'lineedit', 'multiline']
-
-    class ECDialog(QDialog):
-        def __init__(self, parent, record):
-            super().__init__(parent)
-            self.record = record
-        
-        def showEvent(self, event):
-            super().showEvent(event)
-            QTimer.singleShot(100, self.afterShown)
-        
-        def afterShown(self):
-            if 'action' in self.record: self.record['action']()
+        return ['confirm', 'lineedit', 'multiline', 'generic']
 
     class ClickableLineEdit(QLineEdit):
         clicked = Signal()
@@ -300,7 +290,7 @@ class Graphics(Handler):
 
     # Create a window
     def k_createWindow(self, command):
-        command['title'] = 'Default'
+        title = None
         x = None
         y = None
         w = self.compileConstant(640)
@@ -309,7 +299,7 @@ class Graphics(Handler):
             token = self.peek()
             if token in ['title', 'at', 'size', 'layout']:
                 self.nextToken()
-                if token == 'title': command['title'] = self.nextValue()
+                if token == 'title': title = self.nextValue()
                 elif token == 'at':
                     x = self.nextValue()
                     y = self.nextValue()
@@ -323,6 +313,7 @@ class Graphics(Handler):
                             command['layout'] = record['name']
                 else: return False
             else: break
+        command['title'] = title
         command['x'] = x
         command['y'] = y
         command['w'] = w
@@ -456,6 +447,9 @@ class Graphics(Handler):
             elif self.peek() == 'value':
                 self.nextToken()
                 command['value'] =  self.nextValue()
+            elif self.peek() == 'with':
+                self.nextToken()
+                command['layout'] =  self.nextToken()
             else: break
         if not 'title' in command: command['title'] = self.compileConstant('')
         if not 'value' in command: command['value'] = self.compileConstant('')
@@ -510,7 +504,9 @@ class Graphics(Handler):
     
     def r_createWindow(self, command, record):
         window = QMainWindow()
-        window.setWindowTitle(self.getRuntimeValue(command['title']))
+        title = self.getRuntimeValue(command['title'])
+        if title == None: title = 'EasyCoder Main Window'
+        window.setWindowTitle(title)
         w = self.getRuntimeValue(command['w'])
         h = self.getRuntimeValue(command['h'])
         x = command['x']
@@ -629,32 +625,61 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createDialog(self, command, record):
+
+        class ECDialog(QDialog):
+            def __init__(self, parent, record):
+                super().__init__(parent)
+                self.record = record
+            
+            def showEvent(self, event):
+                super().showEvent(event)
+                QTimer.singleShot(100, self.afterShown)
+            
+            def afterShown(self):
+                if 'action' in self.record: self.record['action']()
+
         win = command['window']
         if win != None:
             win = self.getVariable(win)['window']
-        dialog = self.ECDialog(win, record)
-        mainLayout = QVBoxLayout(dialog)
-        dialog.setWindowTitle(self.getRuntimeValue(command['title']))
+        dialog = ECDialog(win, record)
         dialogType = command['type'].lower()
         dialog.dialogType = dialogType
-        prompt = self.getRuntimeValue(command['prompt'])
-        if dialogType == 'confirm':
-            mainLayout.addWidget(QLabel(prompt))
-        elif dialogType == 'lineedit':
-            mainLayout.addWidget(QLabel(prompt))
-            dialog.lineEdit = self.ClickableLineEdit(dialog)
-            dialog.value = self.getRuntimeValue(command['value'])
-            dialog.lineEdit.setText(dialog.value)
-            mainLayout.addWidget(dialog.lineEdit)
-        elif dialogType == 'multiline':
-            mainLayout.addWidget(QLabel(prompt))
-            dialog.textEdit = self.ClickablePlainTextEdit(self)
-            dialog.textEdit.setText(dialog.value)
-            mainLayout.addWidget(dialog.textEdit)
-        buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        buttonBox.accepted.connect(dialog.accept)
-        buttonBox.rejected.connect(dialog.reject)
-        mainLayout.addWidget(buttonBox, alignment=Qt.AlignHCenter)
+        mainLayout = QVBoxLayout(dialog)
+        if dialogType == 'generic':
+            dialog.setFixedWidth(500)
+            dialog.setFixedHeight(500)
+            dialog.setWindowFlags(Qt.FramelessWindowHint)
+            dialog.setModal(True)
+            dialog.setStyleSheet('background-color: white;border:1px solid black;')
+
+            border = Border()
+            border.tickClicked.connect(dialog.accept)
+            border.closeClicked.connect(dialog.reject)
+            mainLayout.addWidget(border)
+            if 'layout' in command:
+                layout = self.getVariable(command['layout'])['widget']
+                mainLayout.addLayout(layout)
+            dialog.setLayout(mainLayout)
+        else:
+            dialog.setWindowTitle(self.getRuntimeValue(command['title']))
+            prompt = self.getRuntimeValue(command['prompt'])
+            if dialogType == 'confirm':
+                mainLayout.addWidget(QLabel(prompt))
+            elif dialogType == 'lineedit':
+                mainLayout.addWidget(QLabel(prompt))
+                dialog.lineEdit = self.ClickableLineEdit(dialog)
+                dialog.value = self.getRuntimeValue(command['value'])
+                dialog.lineEdit.setText(dialog.value)
+                mainLayout.addWidget(dialog.lineEdit)
+            elif dialogType == 'multiline':
+                mainLayout.addWidget(QLabel(prompt))
+                dialog.textEdit = self.ClickablePlainTextEdit(self)
+                dialog.textEdit.setText(dialog.value)
+                mainLayout.addWidget(dialog.textEdit)
+            buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+            buttonBox.accepted.connect(dialog.accept)
+            buttonBox.rejected.connect(dialog.reject)
+            mainLayout.addWidget(buttonBox, alignment=Qt.AlignHCenter)
         record['dialog'] = dialog
         return self.nextPC()
     
@@ -938,11 +963,12 @@ class Graphics(Handler):
         return self.nextPC()
 
     # set [the] width/height [of] {widget} [to] {value}
-    # set [the] layout of {window} to {layout}
+    # set [the] layout of {window}/{widget} to {layout}
     # set [the] spacing of {layout} to {value}
     # set [the] text [of] {label}/{button}/{lineinput}/{multiline} [to] {text}
     # set [the] color [of] {label}/{button}/{lineinput}/{multiline} [to] {color}
     # set [the] state [of] {checkbox} [to] {state}
+    # set [the] style of {widget} to {style}
     # set {listbox} to {list}
     # set blocked true/false
     def k_set(self, command):
@@ -963,7 +989,8 @@ class Graphics(Handler):
             self.skip('of')
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] == 'window':
+                keyword = record['keyword']
+                if keyword in ['window', 'widget']:
                     command['name'] = record['name']
                     self.skip('to')
                     if self.nextIsSymbol():
@@ -996,6 +1023,22 @@ class Graphics(Handler):
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
                 if record['keyword'] == 'checkbox':
+                    command['name'] = record['name']
+                    self.skip('to')
+                    if self.peek() == 'checked':
+                        command['value'] = self.compileConstant(True)
+                        self.nextToken()
+                    elif self.peek() == 'unchecked':
+                        command['value'] = self.compileConstant(False)
+                        self.nextToken()
+                    else: command['value'] = self.nextValue()
+                    self.add(command)
+                    return True
+        elif token == 'style':
+            self.skip('of')
+            if self.nextIsSymbol():
+                record = self.getSymbolRecord()
+                if record['extra'] == 'gui':
                     command['name'] = record['name']
                     self.skip('to')
                     command['value'] = self.nextValue()
@@ -1068,11 +1111,17 @@ class Graphics(Handler):
             widget = self.getVariable(command['name'])['widget']
             widget.setFixedWidth(self.getRuntimeValue(command['value']))
         elif what == 'layout':
-            window = self.getVariable(command['name'])['window']
             content = self.getVariable(command['layout'])['widget']
-            container = QWidget()
-            container.setLayout(content)
-            window.setCentralWidget(container)
+            record = self.getVariable(command['name'])
+            keyword = record['keyword']
+            if keyword == 'window':
+                window = record['widget']
+                container = QWidget()
+                container.setLayout(content)
+                window.setCentralWidget(container)
+            elif keyword == 'widget':
+                widget = record['widget']
+                widget.setLayout(content)
         elif what == 'spacing':
             layout = self.getVariable(command['name'])['widget']
             layout.setSpacing(self.getRuntimeValue(command['value']))
@@ -1188,7 +1237,9 @@ class Graphics(Handler):
         elif 'dialog' in command:
             record = self.getVariable(command['dialog'])
             dialog = record['dialog']
-            if dialog.dialogType == 'confirm':
+            if dialog.dialogType == 'generic':
+                record['result'] =  dialog.exec()
+            elif dialog.dialogType == 'confirm':
                 record['result'] = True if dialog.exec() == QDialog.Accepted else False
             elif dialog.dialogType == 'lineedit':
                 if dialog.exec() == QDialog.Accepted:
@@ -1224,6 +1275,13 @@ class Graphics(Handler):
         self.app.lastWindowClosed.connect(on_last_window_closed)
         self.app.exec()
 
+    # Declare a widget variable
+    def k_widget(self, command):
+        return self.compileVariable(command, 'gui')
+
+    def r_widget(self, command):
+        return self.nextPC()
+
     # Declare a window variable
     def k_window(self, command):
         return self.compileVariable(command)