250424.3

Author: graham-trott

config.ecs

@@ -5,13 +5,15 @@
     use graphics
 
     window Window
-    window Popup
+    window Dialog
     layout MainPanel
     layout LeftPanel
     layout RightPanel
     layout DeviceHPanel
     layout OuterLayout
     layout Layout
+    layout VLayout
+    layout HLayout
     groupbox Group
     label Label
     label MasterDeviceLabel
@@ -32,6 +34,9 @@
     pushbutton RelayOnButton
     pushbutton SaveWidgetDataButton
     pushbutton SelectHostButton
+    pushbutton OKButton
+    pushbutton CancelButton
+    lineinput LineInput
     lineinput SSIDInput
     lineinput PasswordInput
     lineinput DeviceNameInput
@@ -44,14 +49,12 @@
     combobox SystemsCombo
     checkbox LEDInvertCheckbox
     checkbox RelayInvertCheckbox
-    dialog Dialog
     messagebox MessageBox
 
 !    debug step
 
     log `Starting`
     init graphics
-    create Window title `RBR-Now configurator` size 700 500
     create MainPanel type QHBoxLayout
 
     ! Do the left-hand panel
@@ -228,23 +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
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+    variable Config
     variable Name
     variable Value
-    variable HostSSID
+    variable ReturnValue
+    variable Title
     variable Result
 
-PopulateForm:
-    log `Populate the form`
+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:
@@ -278,7 +287,19 @@ Exit:
 
 ScanSystems:
     log `Scan systems`
-    if SSIDInput is empty gosub to GetHostSSID
+    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
@@ -311,20 +332,47 @@ RelayOn:
     log `Turn the relay ON`
     stop
 
-GetHostSSID:
+!   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
-    on click SelectHostButton close Popup
     add stretch to Layout
     add SelectHostButton to Layout
-    create Popup title `Host SSID` size 320 240
-    center Popup on Window
-    show Layout in Popup
-
-!    create Dialog on Window title `Host SSID` layout Layout
-!    show Dialog giving Result
+    create Dialog title `Host SSID` layout Layout
+    show Dialog
     return

dist/easycoder-250424.2-py2.py3-none-any.whl renamed to dist/easycoder-250424.3-py2.py3-none-any.whl

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

dist/easycoder-250424.2.tar.gz renamed to dist/easycoder-250424.3.tar.gz

@@ -133,10 +133,6 @@ def r_add(self, command):
                     else: layout.addWidget(widget)
         return self.nextPC()
 
-    # Declare a checkbox variable
-    def k_checkbox(self, command):
-        return self.compileVariable(command, False)
-
     # Center one window on another
     # center {window2} on {window1}
     def k_center(self, command):
@@ -158,10 +154,14 @@ def r_center(self, command):
         window2 = self.getVariable(command['window2'])['window']
         geo1 = window1.geometry()
         geo2 = window2.geometry()
-        geo1.moveCenter(geo2.center())
-        window1.setGeometry(geo1)
+        geo2.moveCenter(geo1.center())
+        window2.setGeometry(geo2)
         return self.nextPC()
 
+    # Declare a checkbox variable
+    def k_checkbox(self, command):
+        return self.compileVariable(command, False)
+
     def r_checkbox(self, command):
         return self.nextPC()
 
@@ -196,18 +196,26 @@ def k_createWindow(self, command):
         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['x'] = x
         command['y'] = y
+        command['w'] = w
+        command['h'] = h
         self.add(command)
         return True
 
@@ -360,6 +368,9 @@ def r_createWindow(self, command, record):
         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()
 
@@ -384,7 +395,7 @@ def r_createLabel(self, command, record):
         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()
@@ -394,7 +405,7 @@ def r_createPushbutton(self, command, record):
         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()
@@ -644,30 +655,21 @@ def r_set(self, command):
             groupbox.setFixedHeight(self.getRuntimeValue(command['value']))
         return self.nextPC()
 
-    # Show something
-    # show {name} in {window}
-    # show {dialog} giving {result}}
+    # 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']
-                if self.nextIs('giving'):
-                    if self.nextIsSymbol():
-                        command['result'] = self.getSymbolRecord()['name']
-                        self.add(command)
-                        return True
+                self.add(command)
+                return True
             elif keyword == 'messagebox':
                 command['messagebox'] = record['name']
                 if self.nextIs('giving'):
@@ -698,17 +700,12 @@ def r_show(self, command):
             v['type'] = 'text'
             v['content'] = result
             self.putSymbolValue(symbolRecord, v)
-        elif 'dialog' in command:
-            dialog = self.getVariable(command['dialog'])['dialog']
-            result = dialog.exec()
-            print('Result:',result)
-        else:
-            layout = self.getVariable(command['layout'])['widget']
+        elif 'window' in command:
             window = self.getVariable(command['window'])['window']
-            container = QWidget()
-            container.setLayout(layout)
-            window.setCentralWidget(container)
             window.show()
+        elif 'dialog' in command:
+            dialog = self.getVariable(command['dialog'])['dialog']
+            dialog.exec()
         return self.nextPC()
 
     # Start the graphics