easycoder 250423.2__tar.gz → 250424.3__tar.gz

{easycoder-250423.2 → easycoder-250424.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: easycoder
-Version: 250423.2
+Version: 250424.3
 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-250423.2 → easycoder-250424.3}/config.ecs

@@ -5,12 +5,15 @@
     use graphics
 
     window Window
+    window Dialog
     layout MainPanel
     layout LeftPanel
     layout RightPanel
     layout DeviceHPanel
     layout OuterLayout
     layout Layout
+    layout VLayout
+    layout HLayout
     groupbox Group
     label Label
     label MasterDeviceLabel
@@ -24,12 +27,16 @@
     pushbutton UpdateSlaveButton
     pushbutton DeleteFileButton
     pushbutton ExitButton
-    pushbutton AddSystemButton
+    pushbutton ScanSystemsButton
     pushbutton RemoveSystemButton
     pushbutton SaveHostButton
     pushbutton RelayOffButton
     pushbutton RelayOnButton
     pushbutton SaveWidgetDataButton
+    pushbutton SelectHostButton
+    pushbutton OKButton
+    pushbutton CancelButton
+    lineinput LineInput
     lineinput SSIDInput
     lineinput PasswordInput
     lineinput DeviceNameInput
@@ -42,16 +49,12 @@
     combobox SystemsCombo
     checkbox LEDInvertCheckbox
     checkbox RelayInvertCheckbox
-    dialog Dialog
     messagebox MessageBox
-    variable Name
-    variable Value
 
 !    debug step
 
     log `Starting`
     init graphics
-    create Window title `RBR-Now configurator` size 700 500
     create MainPanel type QHBoxLayout
 
     ! Do the left-hand panel
@@ -105,9 +108,9 @@
     add Layout to Group
     create SystemsCombo
     add stretch SystemsCombo to Layout
-    create AddSystemButton text `Add`
-    on click AddSystemButton go to AddSystem
-    add AddSystemButton to Layout
+    create ScanSystemsButton text `Scan`
+    on click ScanSystemsButton go to ScanSystems
+    add ScanSystemsButton to Layout
     create RemoveSystemButton text `Remove`
     disable RemoveSystemButton
     on click RemoveSystemButton go to RemoveSystem
@@ -228,20 +231,29 @@
     
     add stretch to RightPanel
 
-    show MainPanel in Window
+    create Window title `RBR-Now configurator` size 700 500 layout MainPanel
+    show Window
 
     start graphics
 
-PopulateForm:
-    log `Populate the form`
-    add `System 1` to SystemsCombo
-    add `System 2` to SystemsCombo
-    add `System 3` to SystemsCombo
-    if the count of SystemsCombo is not 0 enable RemoveSystemButton
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+    variable Config
+    variable Name
+    variable Value
+    variable ReturnValue
+    variable Title
+    variable Result
+
+LoadConfigFile:
+    log `Load the config file`
+    load Config from `~/.rbr.conf`
+    if Config is empty put json `{}` into Config
     stop
 
 ResetConfigFile:
     log `Reset the configuration file`
+    put json `{}` into Config
     stop
 
 ScanNetwork:
@@ -273,10 +285,23 @@ Exit:
     close Window
     exit
 
-AddSystem:
-    log `Add a system`
-    create Dialog title `Select system`
-    show Dialog
+ScanSystems:
+    log `Scan systems`
+    if Config does not have property `host-ssid`
+    begin
+        put `Enter host SSID` into Title
+        gosub to GetRequestedText
+        if Result is `OK` set property `host-ssid` of Config to ReturnValue
+        if Config does not have property `host-password`
+        begin
+            put `Enter host password` into Title
+            gosub to GetRequestedText
+            if Result is `OK` set property `host-password` of Config to ReturnValue
+        end
+    end
+    log Config
+!    create Dialog title `Select a system`
+!    show Layout in Dialog
     stop
 
 RemoveSystem:
@@ -307,3 +332,47 @@ RelayOn:
     log `Turn the relay ON`
     stop
 
+!   Get requested text
+GetRequestedText:
+    create VLayout type QVBoxLayout
+    create HLayout type QHBoxLayout
+    add HLayout to VLayout
+    create LineInput size 40
+    add stretch LineInput to HLayout
+    create HLayout type QHBoxLayout
+    add HLayout to VLayout
+    create OKButton text `OK` size 6
+    on click OKButton
+    begin
+        put LineInput into ReturnValue
+        put `OK` into Result
+        close Dialog
+        return
+    end
+    add OKButton to HLayout
+    create CancelButton text `Cancel` size 6
+    on click CancelButton
+    begin
+        put `Cancel` into Result
+        close Dialog
+        return
+    end
+    add CancelButton to HLayout
+    create Dialog title Title layout VLayout size 300 80
+    center Dialog on Window
+    show Dialog
+    stop
+
+SelectSystemFromList:
+    create Layout type QVBoxLayout
+    create SelectHostButton text `Select`
+    on click SelectHostButton
+    begin
+        log `Select Host SSID`
+        close Dialog
+    end
+    add stretch to Layout
+    add SelectHostButton to Layout
+    create Dialog title `Host SSID` layout Layout
+    show Dialog
+    return

{easycoder-250423.2 → easycoder-250424.3}/easycoder/__init__.py

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

{easycoder-250423.2 → easycoder-250424.3}/easycoder/ec_core.py

@@ -717,7 +717,7 @@ class Core(Handler):
         try:
             with open(filename) as f: content = f.read()
         except:
-            RuntimeError(self.program, f'File \'{filename}\' not found')
+            content = ''
         try:
             if filename.endswith('.json'): content = json.loads(content)
         except:

{easycoder-250423.2 → easycoder-250424.3}/easycoder/ec_pyside6.py

@@ -30,7 +30,8 @@ from PySide6.QtWidgets import (
     QSpacerItem,
     QSizePolicy,
     QDialog,
-    QMessageBox
+    QMessageBox,
+    QDialogButtonBox
 )
 
 class Graphics(Handler):
@@ -132,6 +133,31 @@ class Graphics(Handler):
                     else: layout.addWidget(widget)
         return self.nextPC()
 
+    # Center one window on another
+    # center {window2} on {window1}
+    def k_center(self, command):
+        if self.nextIsSymbol():
+            record = self.getSymbolRecord()
+            if record['keyword'] == 'window':
+                command['window2'] = record['name']
+                if self.nextIs('on'):
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'window':
+                            command['window1'] = record['name']
+                            self.add(command)
+                            return True
+        return False
+    
+    def r_center(self, command):
+        window1 = self.getVariable(command['window1'])['window']
+        window2 = self.getVariable(command['window2'])['window']
+        geo1 = window1.geometry()
+        geo2 = window2.geometry()
+        geo2.moveCenter(geo1.center())
+        window2.setGeometry(geo2)
+        return self.nextPC()
+
     # Declare a checkbox variable
     def k_checkbox(self, command):
         return self.compileVariable(command, False)
@@ -140,6 +166,7 @@ class Graphics(Handler):
         return self.nextPC()
 
     # Close a window
+    # close {window}
     def k_close(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
@@ -165,24 +192,30 @@ class Graphics(Handler):
         command['title'] = 'Default'
         x = None
         y = None
-        w = 640
-        h = 480
+        w = self.compileConstant(640)
+        h = self.compileConstant(480)
         while True:
             token = self.peek()
-            if token in ['title', 'at', 'size']:
+            if token in ['title', 'at', 'size', 'layout']:
                 self.nextToken()
                 if token == 'title': command['title'] = self.nextValue()
                 elif token == 'at':
                     x = self.nextValue()
                     y = self.nextValue()
                 elif token == 'size':
-                    command['w'] = self.nextValue()
-                    command['h'] = self.nextValue()
+                    w = self.nextValue()
+                    h = self.nextValue()
+                elif token == 'layout':
+                    if self.nextIsSymbol():
+                        record = self.getSymbolRecord()
+                        if record['keyword'] == 'layout':
+                            command['layout'] = record['name']
+                else: return False
             else: break
-        command['w'] = self.compileConstant(w)
-        command['h'] = self.compileConstant(h)
         command['x'] = x
         command['y'] = y
+        command['w'] = w
+        command['h'] = h
         self.add(command)
         return True
 
@@ -260,38 +293,50 @@ class Graphics(Handler):
         return True
 
     def k_createDialog(self, command):
-        if self.peek() == 'title':
+        if self.peek() == 'on':
             self.nextToken()
-            title = self.nextValue()
-        else: title = ''
+            if self.nextIsSymbol():
+                command['window'] = self.getSymbolRecord()['name']
+        else: command['window'] = None
+        title = ''
+        while True:
+            if self.peek() == 'title':
+                self.nextToken()
+                title = self.nextValue()
+            elif self.peek() == 'layout':
+                self.nextToken()
+                if self.nextIsSymbol():
+                    command['layout'] = self.getSymbolRecord()['name']
+            else: break
         command['title'] = title
         self.add(command)
         return True
 
     def k_createMessageBox(self, command):
-        if self.nextIs('on'):
+        if self.peek() == 'on':
+            self.nextToken()
             if self.nextIsSymbol():
                 command['window'] = self.getSymbolRecord()['name']
-                style = 'question'
-                title = ''
-                message = ''
-                while True:
-                    if self.peek() == 'style':
-                        self.nextToken()
-                        style = self.nextToken()
-                    elif self.peek() == 'title':
-                        self.nextToken()
-                        title = self.nextValue()
-                    elif self.peek() == 'message':
-                        self.nextToken()
-                        message = self.nextValue()
-                    else: break
-                command['style'] = style
-                command['title'] = title
-                command['message'] = message
-                self.add(command)
-                return True
-        return False
+        else: command['window'] = None
+        style = 'question'
+        title = ''
+        message = ''
+        while True:
+            if self.peek() == 'style':
+                self.nextToken()
+                style = self.nextToken()
+            elif self.peek() == 'title':
+                self.nextToken()
+                title = self.nextValue()
+            elif self.peek() == 'message':
+                self.nextToken()
+                message = self.nextValue()
+            else: break
+        command['style'] = style
+        command['title'] = title
+        command['message'] = message
+        self.add(command)
+        return True
 
     def k_create(self, command):
         if self.nextIsSymbol():
@@ -323,6 +368,9 @@ class Graphics(Handler):
         if y == None: y = (self.screenHeight - h) / 2
         else: y = self.getRuntimeValue(x)
         window.setGeometry(x, y, w, h)
+        container = QWidget()
+        container.setLayout(self.getVariable(command['layout'])['widget'])
+        window.setCentralWidget(container)
         record['window'] = window
         return self.nextPC()
     
@@ -347,7 +395,7 @@ class Graphics(Handler):
         if 'size' in command:
             fm = label.fontMetrics()
             c = label.contentsMargins()
-            w = fm.horizontalAdvance('x') * self.getRuntimeValue(command['size']) +c.left()+c.right()
+            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) +c.left()+c.right()
             label.setMaximumWidth(w)
         record['widget'] = label
         return self.nextPC()
@@ -357,7 +405,7 @@ class Graphics(Handler):
         if 'size' in command:
             fm = pushbutton.fontMetrics()
             c = pushbutton.contentsMargins()
-            w = fm.horizontalAdvance('x') * self.getRuntimeValue(command['size']) +c.left()+c.right()
+            w = fm.horizontalAdvance('m') * self.getRuntimeValue(command['size']) +c.left()+c.right()
             pushbutton.setMaximumWidth(w)
         record['widget'] = pushbutton
         return self.nextPC()
@@ -386,8 +434,14 @@ class Graphics(Handler):
         return self.nextPC()
     
     def r_createDialog(self, command, record):
+        layout = self.getVariable(command['layout'])['widget']
         dialog = QDialog()
         dialog.setWindowTitle(self.getRuntimeValue(command['title']))
+        dialog.buttonBox = QDialogButtonBox((QDialogButtonBox.Ok | QDialogButtonBox.Cancel))
+        dialog.buttonBox.accepted.connect(dialog.accept)
+        dialog.buttonBox.rejected.connect(dialog.reject)
+        layout.addWidget(dialog.buttonBox)
+        dialog.setLayout(layout)
         record['dialog'] = dialog
         return self.nextPC()
     
@@ -601,22 +655,17 @@ class Graphics(Handler):
             groupbox.setFixedHeight(self.getRuntimeValue(command['value']))
         return self.nextPC()
 
-    # Show something
-    # show {name} in {window}}
-    # show {dialog}/{messagebox}
+    # show {window}
+    # show {dialog}
+    # show {messagebox} giving {result}}
     def k_show(self, command):
         if self.nextIsSymbol():
             record = self.getSymbolRecord()
             keyword = record['keyword']
-            if keyword == 'layout':
-                command['layout'] = record['name']
-                if self.nextIs('in'):
-                    if self.nextIsSymbol():
-                        record = self.getSymbolRecord()
-                        if record['keyword'] == 'window':
-                            command['window'] = record['name']
-                            self.add(command)
-                            return True
+            if keyword == 'window':
+                command['window'] = record['name']
+                self.add(command)
+                return True
             elif keyword == 'dialog':
                 command['dialog'] = record['name']
                 self.add(command)
@@ -631,13 +680,7 @@ class Graphics(Handler):
         return False
         
     def r_show(self, command):
-        if 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            b1 = QPushButton("ok",dialog)
-            b1.move(50,50)
-            dialog.setWindowModality(Qt.ApplicationModal)
-            dialog.exec_()
-        elif 'messagebox' in command:
+        if 'messagebox' in command:
             data = self.getVariable(command['messagebox'])['data']
             symbolRecord = self.getVariable(command['result'])
             window = self.getVariable(data['window'])['window']
@@ -657,14 +700,12 @@ class Graphics(Handler):
             v['type'] = 'text'
             v['content'] = result
             self.putSymbolValue(symbolRecord, v)
-        else:
-            layoutRecord = self.getVariable(command['layout'])
-            windowRecord = self.getVariable(command['window'])
-            window = windowRecord['window']
-            container = QWidget()
-            container.setLayout(layoutRecord['widget'])
-            window.setCentralWidget(container)
+        elif 'window' in command:
+            window = self.getVariable(command['window'])['window']
             window.show()
+        elif 'dialog' in command:
+            dialog = self.getVariable(command['dialog'])['dialog']
+            dialog.exec()
         return self.nextPC()
 
     # Start the graphics
@@ -734,7 +775,13 @@ class Graphics(Handler):
     def v_symbol(self, symbolRecord):
         symbolRecord = self.getVariable(symbolRecord['name'])
         keyword = symbolRecord['keyword']
-        if keyword == 'combobox':
+        if keyword == 'lineinput':
+            lineinput = symbolRecord['widget']
+            v = {}
+            v['type'] = 'text'
+            v['content'] = lineinput.displayText()
+            return v
+        elif keyword == 'combobox':
             combobox = symbolRecord['widget']
             v = {}
             v['type'] = 'text'

easycoder-250424.3/test.py

@@ -0,0 +1,52 @@
+import sys
+
+from PySide6.QtWidgets import (QApplication, 
+                               QDialog, 
+                               QMainWindow, 
+                               QPushButton, 
+                               QDialogButtonBox,
+                               QVBoxLayout,
+                               QLabel)
+
+
+class MainWindow(QMainWindow):
+    def __init__(self):
+        super().__init__()
+
+        self.setWindowTitle("My App")
+
+        button = QPushButton("Press me for a dialog!")
+        button.clicked.connect(self.button_clicked)
+        self.setCentralWidget(button)
+
+    def button_clicked(self, s):
+        print("click", s)
+
+        dlg = QDialog()
+        dlg.setWindowTitle("HELLO!")
+
+        QBtn = (
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
+
+        dlg.buttonBox = QDialogButtonBox(QBtn)
+        dlg.buttonBox.accepted.connect(dlg.accept)
+        dlg.buttonBox.rejected.connect(dlg.reject)
+
+        layout = QVBoxLayout()
+        message = QLabel("Something happened, is that OK?")
+        layout.addWidget(message)
+        layout.addWidget(dlg.buttonBox)
+        dlg.setLayout(layout)
+
+        result = dlg.exec()
+        print(result)
+        if result:
+            print("Success!")
+        else:
+            print("Cancel!")
+
+app = QApplication(sys.argv)
+window = MainWindow()
+window.show()
+app.exec()

easycoder-250423.2/test.py

@@ -1,52 +0,0 @@
-import sys
-from PySide6.QtWidgets import (QApplication, QMainWindow, QWidget, 
-                              QVBoxLayout, QHBoxLayout, QLabel, 
-                              QLineEdit, QFormLayout)
-
-class InputWindow(QMainWindow):
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("Two Column Input Form")
-        self.setGeometry(100, 100, 600, 300)
-        
-        # Create main widget and layout
-        main_widget = QWidget()
-        self.setCentralWidget(main_widget)
-        main_layout = QHBoxLayout(main_widget)
-        
-        # Create left column (wider)
-        left_column = QWidget()
-        left_layout = QFormLayout(left_column)
-        left_layout.setContentsMargins(0, 0, 0, 0)  # Right margin larger for more width
-        left_layout.setSpacing(5)
-        
-        # Add 4 label-input pairs to left column
-        left_labels = ["Name:", "Email:", "Address:", "Phone:"]
-        for label_text in left_labels:
-            line_edit = QLineEdit()
-            left_layout.addRow(QLabel(label_text), line_edit)
-        
-        # Create right column (narrower)
-        right_column = QWidget()
-        right_layout = QFormLayout(right_column)
-        right_layout.setContentsMargins(0, 0, 0, 0)
-        right_layout.setSpacing(5)
-        
-        # Add 4 label-input pairs to right column
-        right_labels = ["ID:", "Department:", "Position:", "Date:"]
-        for label_text in right_labels:
-            line_edit = QLineEdit()
-            right_layout.addRow(QLabel(label_text), line_edit)
-        
-        # Add columns to main layout with stretch factors to control width
-        main_layout.addWidget(left_column, stretch=2)  # Left column gets 2/3 of space
-        main_layout.addWidget(right_column, stretch=1)  # Right column gets 1/3 of space
-        
-        # Add some spacing between columns
-        main_layout.setSpacing(20)
-
-if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    window = InputWindow()
-    window.show()
-    sys.exit(app.exec())