250804.1

Author: graham-trott

dist/easycoder-250729.1-py2.py3-none-any.whl renamed to dist/easycoder-250804.1-py2.py3-none-any.whl

@@ -11,4 +11,4 @@
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250729.1"
+__version__ = "250804.1"

dist/easycoder-250729.1.tar.gz renamed to dist/easycoder-250804.1.tar.gz

@@ -6,6 +6,8 @@
     QVBoxLayout,
     QHBoxLayout,
     QPushButton,
+    QLineEdit,
+    QPlainTextEdit,
     QWidget,
     QStackedWidget,
     QSpacerItem,
@@ -126,10 +128,16 @@ def backspace(self):
             self.field.setText(current_text[:-1])
 
     def setContent(self, text):
-        self.field.setText(text)
+        if isinstance(self.field, QLineEdit):
+            self.field.setText(text)
+        elif isinstance(self.field, QPlainTextEdit):
+            self.field.setPlainText(text)
 
     def getContent(self):
-        return self.field.text()
+        if isinstance(self.field, QLineEdit):
+            return self.field.text()
+        elif isinstance(self.field, QPlainTextEdit):
+            return self.field.toPlainText()
 
 class KeyboardButton(QPushButton):
     def __init__(self, width, height, onClick, text=None, icon=None):

easycoder/__init__.py

@@ -16,6 +16,7 @@
     QLabel,
     QLCDNumber,
     QLineEdit,
+    QPlainTextEdit,
     QListWidget,
     QMainWindow,
     QProgressBar,
@@ -52,7 +53,20 @@ def closeEvent(self):
         print('window closed')
 
     def isWidget(self, keyword):
-        return keyword in ['layout', 'groupbox', 'label', 'pushbutton', 'checkbox', 'lineinput', 'listbox', 'combobox']
+        return keyword in [
+            'layout',
+            'groupbox',
+            'label',
+            'pushbutton',
+            'checkbox',
+            'lineinput',
+            'multiline',
+            'listbox',
+            'combobox'
+            ]
+
+    def dialogTypes(self):
+        return ['confirm', 'lineedit', 'multiline']
 
     class ECDialog(QDialog):
         def __init__(self, parent, record):
@@ -334,6 +348,23 @@ def k_createLineEdit(self, command):
         self.add(command)
         return True
 
+    def k_createMultiLineEdit(self, command):
+        cols = self.compileConstant(30)
+        rows = self.compileConstant(5)
+        while True:
+            next = self.peek()
+            if next == 'cols':
+                self.nextToken()
+                cols = self.nextValue()
+            elif next == 'rows':
+                self.nextToken()
+                rows = self.nextValue()
+            else: break;
+        command['cols'] = cols
+        command['rows'] = rows
+        self.add(command)
+        return True
+
     def k_createListWidget(self, command):
         self.add(command)
         return True
@@ -351,7 +382,9 @@ def k_createDialog(self, command):
         while True:
             if self.peek() == 'type':
                 self.nextToken()
-                command['type'] =  self.nextToken()
+                dialogType = self.nextToken()
+                if dialogType in self.dialogTypes(): command['type'] = dialogType
+                else: return False
             elif self.peek() == 'title':
                 self.nextToken()
                 command['title'] = self.nextValue()
@@ -406,6 +439,7 @@ def k_create(self, command):
             elif keyword == 'pushbutton': return self.k_createPushbutton(command)
             elif keyword == 'checkbox': return self.k_createCheckBox(command)
             elif keyword == 'lineinput': return self.k_createLineEdit(command)
+            elif keyword == 'multiline': return self.k_createMultiLineEdit(command)
             elif keyword == 'listbox': return self.k_createListWidget(command)
             elif keyword == 'combobox': return self.k_createComboBox(command)
             elif keyword == 'dialog': return self.k_createDialog(command)
@@ -486,6 +520,16 @@ def r_createLineEdit(self, command, record):
         record['widget'] = lineinput
         return self.nextPC()
 
+    def r_createMultiLineEdit(self, command, record):
+        textinput = QPlainTextEdit()
+        fontMetrics = textinput.fontMetrics()
+        charWidth = fontMetrics.horizontalAdvance('x')
+        charHeight = fontMetrics.height()
+        textinput.setFixedWidth(charWidth * self.getRuntimeValue(command['cols']))
+        textinput.setFixedHeight(charHeight * self.getRuntimeValue(command['rows']))
+        record['widget'] = textinput
+        return self.nextPC()
+    
     def r_createListWidget(self, command, record):
         record['widget'] = QListWidget()
         return self.nextPC()
@@ -504,18 +548,22 @@ def r_createDialog(self, command, record):
         dialogType = command['type'].lower()
         dialog.dialogType = dialogType
         prompt = self.getRuntimeValue(command['prompt'])
-        if dialogType in ['confirm', 'lineedit']:
-            if dialogType == 'confirm':
-                mainLayout.addWidget(QLabel(prompt))
-            elif dialogType == 'lineedit':
-                mainLayout.addWidget(QLabel(prompt))
-                dialog.lineEdit = QLineEdit(dialog)
-                dialog.value = self.getRuntimeValue(command['value'])
-                dialog.lineEdit.setText(dialog.value)
-                mainLayout.addWidget(dialog.lineEdit)
-        buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel, dialog)
-        buttonBox.accepted.connect(dialog.accept)
-        buttonBox.rejected.connect(dialog.reject)
+        if dialogType == 'confirm':
+            mainLayout.addWidget(QLabel(prompt))
+        elif dialogType == 'lineedit':
+            mainLayout.addWidget(QLabel(prompt))
+            dialog.lineEdit = QLineEdit(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 = QPlainTextEdit(self)
+            dialog.textEdit.setText(dialog.value)
+            mainLayout.addWidget(dialog.textEdit)
+        buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        buttonBox.accepted.connect(self.accept)
+        buttonBox.rejected.connect(self.reject)
         mainLayout.addWidget(buttonBox, alignment=Qt.AlignHCenter)
         record['dialog'] = dialog
         return self.nextPC()
@@ -540,6 +588,7 @@ def r_create(self, command):
         elif keyword == 'pushbutton': return self.r_createPushbutton(command, record)
         elif keyword == 'checkbox': return self.r_createCheckBox(command, record)
         elif keyword == 'lineinput': return self.r_createLineEdit(command, record)
+        elif keyword == 'multiline': return self.r_createMultiLineEdit(command, record)
         elif keyword == 'listbox': return self.r_createListWidget(command, record)
         elif keyword == 'combobox': return self.r_createComboBox(command, record)
         elif keyword == 'dialog': return self.r_createDialog(command, record)
@@ -634,6 +683,13 @@ def k_messagebox(self, command):
     def r_messagebox(self, command):
         return self.nextPC()
 
+    # Declare a multiline input variable
+    def k_multiline(self, command):
+        return self.compileVariable(command, 'gui')
+
+    def r_multiline(self, command):
+        return self.nextPC()
+
     # on click {pushbutton}
     # on select {combobox}/{listbox}
     # on tick
@@ -794,8 +850,8 @@ def r_select(self, command):
     # set [the] width/height [of] {widget} [to] {value}
     # set [the] layout of {window} to {layout}
     # set [the] spacing of {layout} to {value}
-    # set [the] text [of] {label}/{button}/{lineinput} [to] {text}
-    # set [the] color [of] {label}/{button}/{lineinput} [to] {color}
+    # 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] {color}
     # set {listbox} to {list}
     # set blocked true/false
@@ -839,7 +895,7 @@ def k_set(self, command):
             self.skip('of')
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] in ['label', 'pushbutton', 'lineinput']:
+                if record['keyword'] in ['label', 'pushbutton', 'lineinput', 'multiline']:
                     command['name'] = record['name']
                     self.skip('to')
                     command['value'] = self.nextValue()
@@ -870,7 +926,7 @@ def k_set(self, command):
             self.skip('of')
             if self.nextIsSymbol():
                 record = self.getSymbolRecord()
-                if record['keyword'] in ['label', 'pushbutton', 'lineinput']:
+                if record['keyword'] in ['label', 'pushbutton', 'lineinput', 'multiline']:
                     command['name'] = record['name']
                     self.skip('to')
                     command['value'] = self.nextValue()
@@ -911,7 +967,10 @@ def r_set(self, command):
             record = self.getVariable(command['name'])
             widget = self.getVariable(command['name'])['widget']
             text = self.getRuntimeValue(command['value'])
-            widget.setText(text)
+            if isinstance(widget, QLineEdit):
+                widget.setText(text)
+            elif isinstance(widget, QPlainTextEdit):
+                widget.setPlainText(text)
             if record['keyword'] == 'pushbutton':
                 widget.setAccessibleName(text)
         elif what == 'state':
@@ -996,13 +1055,16 @@ def r_show(self, command):
         elif 'dialog' in command:
             record = self.getVariable(command['dialog'])
             dialog = record['dialog']
-            if dialog.dialogType in ['confirm', 'lineedit']:
-                if dialog.dialogType == 'confirm':
-                    record['result'] = True if dialog.exec() == QDialog.Accepted else False
-                elif dialog.dialogType == 'lineedit':
-                    if dialog.exec() == QDialog.Accepted:
-                        record['result'] = dialog.lineEdit.text()
-                    else: record['result'] = dialog.value
+            if dialog.dialogType == 'confirm':
+                record['result'] = True if dialog.exec() == QDialog.Accepted else False
+            elif dialog.dialogType == 'lineedit':
+                if dialog.exec() == QDialog.Accepted:
+                    record['result'] = dialog.lineEdit.text()
+                else: record['result'] = dialog.value
+            elif dialog.dialogType == 'multiline':
+                if dialog.exec() == QDialog.Accepted:
+                    record['result'] = dialog.textEdit.toPlainText()
+                else: record['result'] = dialog.value
         return self.nextPC()
 
     # Start the graphics
@@ -1101,6 +1163,12 @@ def v_symbol(self, symbolRecord):
             v['type'] = 'text'
             v['content'] = lineinput.displayText()
             return v
+        elif keyword == 'multiline':
+            multiline = symbolRecord['widget']
+            v = {}
+            v['type'] = 'text'
+            v['content'] = multiline.toPlainText()
+            return v
         elif keyword == 'combobox':
             combobox = symbolRecord['widget']
             v = {}