easycoder 250811.1__tar.gz → 250812.1__tar.gz

{easycoder-250811.1 → easycoder-250812.1}/PKG-INFO

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

@@ -11,4 +11,4 @@ from .ec_pyside import *
 from .ec_timestamp import *
 from .ec_value import *
 
-__version__ = "250811.1"
+__version__ = "250812.1"

{easycoder-250811.1 → easycoder-250812.1}/easycoder/ec_keyboard.py

@@ -20,29 +20,43 @@ class Keyboard(Handler):
     iconClicked = Signal()
 
     class Border(QWidget):
-        iconClicked = Signal()
+        tickClicked = Signal()
+        closeClicked = Signal()
 
         def __init__(self):
             super().__init__()
-            self.setFixedHeight(25)
+            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.pixmap = QPixmap(f'{os.path.dirname(os.path.abspath(__file__))}/close.png').scaled(25, 25, Qt.KeepAspectRatio, Qt.SmoothTransformation)
-            x = self.width() - self.pixmap.width()
+            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.pixmap)
+            painter.drawPixmap(x, y, self.close)
 
         def mousePressEvent(self, event):
-            x = self.width() - self.pixmap.width()
+            # Tick icon
+            x = 0
+            y = 0
+            tickRect = self.tick.rect().translated(x, y)
+            # Close icon
+            x = self.width() - self.close.width()
             y = 0
-            iconRect = self.pixmap.rect().translated(x, y)
-            if iconRect.contains(event.pos()):
-                self.iconClicked.emit()
+            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()
@@ -68,7 +82,6 @@ class Keyboard(Handler):
         super().__init__(program.compiler)
 
         self.program = program
-        self.keyboardType = keyboardType
         self.receivers = receivers
 
         dialog = QDialog(caller)
@@ -91,7 +104,8 @@ class Keyboard(Handler):
         layout = QVBoxLayout(dialog)
 
         border = self.Border()
-        border.iconClicked.connect(self.reject)
+        border.tickClicked.connect(self.dialog.accept)
+        border.closeClicked.connect(self.reject)
         layout.addWidget(border)
         layout.addLayout(receiverLayout)
         self.vk = VirtualKeyboard(keyboardType, 42, receivers[0], dialog.accept)
@@ -124,7 +138,6 @@ class Keyboard(Handler):
                 return
 
     def reject(self):
-        selectedReceiver = self.vk.getReceiver()
         receivers = self.receivers
         index = 0
         for receiver in receivers:
@@ -471,5 +484,5 @@ class VirtualKeyboard(QStackedWidget):
 
     def onClickEnter(self,keycode):
         # print("Enter pressed")
-        if self.keyboardType == 'multiline': self.receiver.addCharacter('\n')
+        if self.receiver.field.multiline: self.receiver.addCharacter('\n')
         else: self.onFinished()

{easycoder-250811.1 → easycoder-250812.1}/easycoder/ec_pyside.py

@@ -84,6 +84,7 @@ class Graphics(Handler):
 
         def __init__(self):
             super().__init__()
+            self.multiline = False
         
         def setContainer(self, container):
             self.container = container
@@ -98,6 +99,7 @@ class Graphics(Handler):
 
         def __init__(self):
             super().__init__()
+            self.multiline = True
         
         def setContainer(self, container):
             self.container = container