pyqttoolkit 0.8.0.dev1__tar.gz → 0.8.2__tar.gz

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.8.0.dev1
+Version: 0.8.2
 Summary: A toolkit for PyQt 5
-Home-page: https://github.com/Simmovation/pyqttoolkit
-Author: Simmovation Ltd
-Author-email: info@simmovation.tech
+Home-page: https://github.com/BitBloomTech/pyqttoolkit
+Author: Bitbloom Ltd
+Author-email: info@bitbloom.tech
 License: GPLv3
 Description: # PyQtToolkit
         
@@ -12,5 +12,6 @@ Description: # PyQtToolkit
 Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: publish
 Provides-Extra: test
+Provides-Extra: ui
+Provides-Extra: publish

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2022-11-24T10:18:56+0000",
+ "date": "2025-08-20T11:31:02+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "3235793eccec3f7d7b99aa7e3734985153e3242e",
- "version": "0.8.0.dev1"
+ "full-revisionid": "821c2bf119c1f87df7dabc550793fed84592812d",
+ "version": "0.8.2"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/application/application.py

@@ -30,7 +30,7 @@ class Application(QApplication):
     def __init__(self, argv):
         QApplication.__init__(self, argv)
         self._dependency_container = DependencyContainer()
-        self._garbage_collector = GarbageCollector(self, None)
+        self._garbage_collector = GarbageCollector(self)
 
         self._module_service = None
         self._message_board = None

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/config/environment.py

@@ -15,11 +15,18 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 import os
+import json
 from .base import BaseApplicationConfiguration
 
 class EnvironmentApplicationConfiguration(BaseApplicationConfiguration):    
     def get_value(self, key):
-        return os.getenv(self._format_key(key))
+        value = os.getenv(self._format_key(key))
+        if value is None:
+            return value
+        try:
+            return json.loads(value)
+        except json.decoder.JSONDecodeError:
+            return value
 
     def set_value(self, key, value):
         os.environ[self._format_key(key)] = str(value)

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/data/__init__.py

@@ -18,3 +18,4 @@ from .cache import Cache
 from .interval import calculate_interval
 from .bits import get_next_available_bit
 from .names import get_next_available_name
+from .message import MessageType, MessageResponse

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/data/interval.py

@@ -14,16 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+import pandas as pd
+
 def calculate_interval(values, sort=True):
-    interval = None
-    last_value = None
+    if len(values) < 2:
+        return None
+    values_series = pd.Series(values)
     if sort:
-        values = sorted(values)
-    for value in values:
-        if last_value is not None:
-            next_interval = value - last_value
-            if next_interval == interval:
-                return interval
-            interval = next_interval
-        last_value = value
-    return interval
+        values_series = values_series.sort_values()
+    # We want to ensure that the calculated interval is accurate for 90% of values to avoid mistakenly losing values
+    return (values_series - values_series.shift(1)).quantile(0.1)

pyqttoolkit-0.8.2/pyqttoolkit/data/message.py

@@ -0,0 +1,29 @@
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from enum import Enum, IntEnum
+
+class MessageType(Enum):
+    validation_error = 0
+    confirmation = 1
+    application_exception = 2
+
+class MessageResponse(IntEnum):
+    ok = 1
+    cancel = 2
+    save = 4
+    discard = 8
+    ignore = 16

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/datetime/qdatetime.py

@@ -37,7 +37,7 @@ def pd_timestamp_to_q_datetime(pd_timestamp: datetime):
         return QDateTime()
     return QDateTime(
         QDate(pd_timestamp.year, pd_timestamp.month, pd_timestamp.day),
-        QTime(pd_timestamp.hour, pd_timestamp.minute, pd_timestamp.second, pd_timestamp.microsecond / 1000)
+        QTime(pd_timestamp.hour, pd_timestamp.minute, pd_timestamp.second, pd_timestamp.microsecond // 1000)
     )
 
 def step_qdatetime(control, fraction, interval, range_start, range_end):

pyqttoolkit-0.8.2/pyqttoolkit/exceptions/__init__.py

@@ -0,0 +1,18 @@
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+class TaskCancelled(Exception):
+    pass

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/logs/__init__.py

@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from typing import Callable
+from io import StringIO
 import logging
 from logging import handlers
 from functools import wraps
@@ -109,3 +111,30 @@ def logf(level, log_args=True):
             return result
         return _
     return logf_decorator
+
+
+class LogStream:
+    def __init__(self, notify_update: Callable = None):
+        self._buffer = StringIO()
+        self._notify_update = notify_update
+
+    def __iadd__(self, other):
+        self.write(other)
+        return self
+
+    def write(self, message):
+        self._buffer.write(message)
+        if self._notify_update:
+            self._notify_update()
+
+    def flush(self):
+        self._buffer.flush()
+
+    def getvalue(self):
+        return self._buffer.getvalue()
+
+    def clear(self):
+        self._buffer.close()
+        self._buffer = StringIO()
+        if self._notify_update:
+            self._notify_update()

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/models/code_text.py

@@ -17,6 +17,7 @@
 from PyQt5.QtCore import QObject, pyqtSignal
 
 from pyqttoolkit.properties import AutoProperty
+from pyqttoolkit.logs import LogStream
 
 class CodeTextModel(QObject):
     def __init__(self, parent, validator):
@@ -24,16 +25,19 @@ class CodeTextModel(QObject):
         self.textChanged.connect(self._validate)
         self._validator = validator
         self.text = ''
-        self.output = ''
+        self.output = LogStream(self._handle_output_buffer_changed)
 
     textChanged = pyqtSignal(str)
-    outputChanged = pyqtSignal(str)
+    outputChanged = pyqtSignal(LogStream)
     validationMessageChanged = pyqtSignal(str)
 
     text = AutoProperty(str)
-    output = AutoProperty(str)
+    output = AutoProperty(LogStream)
     validationMessage = AutoProperty(str)
 
     def _validate(self, value):
         validation_model = self._validator(value)
         self.validationMessage = validation_model.error if validation_model else ''
+
+    def _handle_output_buffer_changed(self):
+        self.outputChanged.emit(self.output)

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/models/dicttable.py

@@ -61,11 +61,14 @@ class DictTableModel(QAbstractTableModel):
             value = self._value[self._ids[index.row()]].get(self.displayProperties[index.column()])
             if value is None:
                 return None
-            if role == Qt.DisplayRole and isinstance(value, float):
-                return '{:0.2f}'.format(value)
-            return value
+            return self._format_value(value, index)
         return None
     
+    def _format_value(self, value, index):
+        if isinstance(value, float):
+            return '{:0.2f}'.format(value)
+        return value
+
     def setData(self, index, value, role=None):
         role = role or Qt.EditRole
         if role == Qt.EditRole:

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/models/span.py

@@ -1,31 +1,36 @@
-# pyqttoolkit
-# Copyright (C) 2018-2019, Simmovation Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-from PyQt5.QtCore import QObject
-
-class SpanModel(QObject):
-    def __init__(self, parent, left, right):
-        QObject.__init__(self, parent)
-        self._left = left
-        self._right = right
-    
-    @property
-    def left(self):
-        return self._left
-
-    @property
-    def right(self):
-        return self._right
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from PyQt5.QtCore import QObject
+
+class SpanModel(QObject):
+    def __init__(self, parent, left, right, radians=False):
+        QObject.__init__(self, parent)
+        self._left = left
+        self._right = right
+        self._radians = radians
+    
+    @property
+    def left(self):
+        return self._left
+
+    @property
+    def right(self):
+        return self._right
+
+    @property
+    def radians(self):
+        return self._radians

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/scripting/script_runner.py

@@ -15,6 +15,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from contextlib import contextmanager
+from functools import partial
 import re
 import builtins
 import sys
@@ -80,21 +81,36 @@ class ScriptRunner:
             self._context = None
         
     def _globals(self, context):
-        return {'__builtins__': {**__builtins__, '__import__': self._import, 'exit': self._exit, **{g: self._not_implemented for g in self._disallowed_globals}}}
+        return {'__builtins__': {**__builtins__, '__import__': self._import(builtins.__import__), 'exit': self._exit, **{g: self._not_implemented for g in self._disallowed_globals}}}
 
     def compile(self, script):
         return compile(script, 'code', 'exec')
-    
-    def _import(self, module_name, *args, **kwargs):
-        if any(re.match(m, module_name) for m in self._disallowed_modules):
-            raise ImportError('Module not found')
-        try:
-                
-            with add_paths(self._additional_paths):
-                module = builtins.__import__(module_name, *args, **kwargs)
-            return module
-        except KeyError:
-            raise ImportError('Module not found')
+
+    def _patch_plt_show(self, module):
+        def plt_show_as_show_figure(plt, block=None):
+            # Block is not used in the context of the script runner
+            for no, label in zip(plt.get_fignums(), plt.get_figlabels()):
+                self._context.show_figure(plt.figure(no), str(label))
+            plt.close('all')
+        if module.__name__ == 'matplotlib.pyplot':
+            module.show = partial(plt_show_as_show_figure, module)
+        if module.__name__ == 'matplotlib':
+            module.pyplot.show = partial(plt_show_as_show_figure, module.pyplot)
+        return module
+
+    def _import(self, import_function):
+        def _(module_name, *args, **kwargs):
+            if any(re.match(m, module_name) for m in self._disallowed_modules):
+                raise ImportError('Module not found')
+            try:
+                with add_paths(self._additional_paths):
+                    module = import_function(module_name, *args, **kwargs)
+                if module_name in 'importlib':
+                    module.import_module = self._import(importlib.import_module)
+                return self._patch_plt_show(module)
+            except KeyError:
+                raise ImportError('Module not found')
+        return _
     
     def _additional_paths(self):
         return self._additional_paths

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/services/event_registry.py

@@ -21,6 +21,7 @@ class EventTypes:
     save_requested = 'save_requested'
     close_project_requested = 'close_project_requested'
     project_closed = 'project_closed'
+    save_dialog_finished = 'save_dialog_finished'
 
 class FutureConnector:
     def __init__(self):

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/services/file_dialog.py

@@ -16,16 +16,32 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from os import path
 
-from PyQt5.QtCore import QStandardPaths
+from PyQt5.QtCore import QStandardPaths, QTimer
 from PyQt5.QtWidgets import QFileDialog
 
+from .event_registry import EventTypes
+
 class FileDialogService:
-    def __init__(self, project_manager, application_configuration):
+    def __init__(self, project_manager, application_configuration, event_registry):
         self._project_manager = project_manager
         self._application_configuration = application_configuration
-    
+        self._event_registry = event_registry
+
+    def _get_dialog(self, parent, filter_, default_directory=None):
+        dialog = QFileDialog(
+            parent,
+            directory=default_directory or self._get_default_directory(),
+            filter=filter_
+        )
+        def _notify_save_dialog_finished(result):
+            self._event_registry.event(EventTypes.save_dialog_finished).emit(result)
+        dialog.finished.connect(_notify_save_dialog_finished)
+        return dialog
+
     def get_save_filename(self, parent, filter_, default_name=None):
-        dialog = QFileDialog(parent, directory=self._get_default_directory(), filter=filter_)
+        default_directory = path.dirname(default_name) if default_name else None
+        dialog = self._get_dialog(parent, filter_, default_directory)
+
         if default_name:
             dialog.selectFile(default_name)
         dialog.setModal(True)
@@ -35,7 +51,7 @@ class FileDialogService:
         return dialog.selectedFiles()[0]
     
     def get_open_filename(self, parent, filter_, file_mode=None):
-        dialog = QFileDialog(parent, directory=self._get_default_directory(), filter=filter_)
+        dialog = self._get_dialog(parent, filter_)
         if file_mode:
             dialog.setFileMode(file_mode)
         if dialog.exec_():
@@ -49,5 +65,7 @@ class FileDialogService:
             if default_location and path.isdir(default_location):
                 return default_location
             return QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation)
+        elif self._project_manager.filename and not path.isdir(path.dirname(self._project_manager.filename)):
+            return QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation)
         else:
             return path.dirname(self._project_manager.filename)

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/services/message_board.py

@@ -14,32 +14,21 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-from enum import Enum, IntEnum
 
 #pylint: disable=no-name-in-module
-from PyQt5.QtCore import QObject, pyqtSignal
+from PyQt5.QtCore import QObject, pyqtSignal, Qt
 #pylint: enable=no-name-in-module
 
 from ..properties import AutoProperty
-
-class MessageType(Enum):
-    validation_error = 0
-    confirmation = 1
-    application_exception = 2
-
-class MessageResponse(IntEnum):
-    ok = 1
-    cancel = 2
-    save = 4
-    discard = 8
-    ignore = 16
+from ..data import MessageType, MessageResponse
 
 class MessageArgs:
-    def __init__(self, message_type, message, checkbox_message, response_type):
+    def __init__(self, message_type, message, checkbox_message, response_type, text_format):
         self._message_type = message_type
         self._message = message
         self._checkbox_message = checkbox_message
         self._response_type = response_type
+        self._text_format = text_format
         self._response = None
         self._checkbox_value = None
     
@@ -58,7 +47,11 @@ class MessageArgs:
     @property
     def response_type(self):
         return self._response_type
-    
+
+    @property
+    def text_format(self):
+        return self._text_format
+
     @property
     def response(self):
         return self._response
@@ -78,9 +71,18 @@ class MessageArgs:
 class MessageBoard(QObject):
     def __init__(self, parent):
         QObject.__init__(self, parent)
-    
-    def post(self, message_type, message, response_type=MessageResponse.ok, checkbox_message=None):
-        self.message = MessageArgs(message_type, message, checkbox_message, response_type)
+        self._message_enabled = True
+
+    def messageEnabled(self):
+        return self._message_enabled
+
+    def setMessageEnabled(self, value):
+        self._message_enabled = value
+
+    def post(self, message_type, message, response_type=MessageResponse.ok, checkbox_message=None, text_format=Qt.AutoText):
+        if not self._message_enabled:
+            return
+        self.message = MessageArgs(message_type, message, checkbox_message, response_type, text_format)
         return self.message
 
     messageChanged = pyqtSignal(MessageArgs)

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/services/task_runner.py

@@ -26,6 +26,7 @@ from PyQt5.QtWidgets import QApplication
 from concurrent.futures import ThreadPoolExecutor
 
 from ..properties import AutoProperty
+from ..exceptions import TaskCancelled
 
 LOGGER = logging.getLogger(__name__)
 
@@ -71,8 +72,6 @@ class BusyArgs(QObject):
         if self._cancellable:
             self.cancelled.emit()
 
-class TaskCancelled(Exception):
-    pass
 
 class Worker:
     def __init__(self, task_runner, f, args, busy_args, on_completed, on_cancelled, on_error, error_description):
@@ -178,7 +177,7 @@ class TaskRunner(QObject):
         self._is_cancelled = False
         self._executor = ThreadPoolExecutor(max_workers=1, thread_name_prefix='TaskRunner_Thread')
 
-    def run_task(self, task_function, task_args=None, on_completed=None, on_cancelled=None, on_error=None, description=None, error_description=None, show_progress=True, cancellable=False, **kwargs):
+    def run_task(self, task_function, task_args=None, on_completed=None, on_cancelled=None, on_error=None, description=None, error_description=None, show_progress=True, cancellable=False, force_indeterminate_start=False, **kwargs):
         """function::runTask(self, task_function, task_args, on_completed, on_error)
         :param task_function: The function to execute
         :param task_args: The arguments to pass to the function
@@ -194,7 +193,7 @@ class TaskRunner(QObject):
 
         if 'update_progress' in parameters:
             kwargs['update_progress'] = self.update_progress
-            indeterminate = False
+            indeterminate = force_indeterminate_start
         else:
             indeterminate = True
 

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/services/tool_window_service.py

@@ -25,8 +25,9 @@ class ToolWindowService:
         self._dependency_container = dependency_contianer
         self._active_tools = []
     
-    def open(self, parent, model, name):
-        view = self._dependency_container.resolve_for(type(model), QWidget, {'parent': None})
+    def open(self, parent, model, name, *args, extras=None):
+        extras = {'parent': None, **(extras or {})}
+        view = self._dependency_container.resolve_for(type(model), QWidget, extras, *args)
         if hasattr(model, 'showButtons'):
             show_buttons = model.showButtons
         else:

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/views/bulk_value_selector.py

@@ -69,8 +69,9 @@ class BulkValueSelectorWidget(QWidget):
     @auto_property(list)
     def selectedValues(self):
         if isinstance(self._value_selector.model(), QStringListModel):
+            string_list = self._value_selector.model().stringList()
             return [
-                self._value_selector.model().stringList()[i.row()]\
+                string_list[i.row()]\
                     for i in self._value_selector.selectedIndexes() if i.row() < self._value_selector.model().rowCount()
             ]
         return [self._value_selector.model().data(i, DataRole) for i in self._value_selector.selectedIndexes() if i.row() < self._value_selector.model().rowCount()]
@@ -82,7 +83,7 @@ class BulkValueSelectorWidget(QWidget):
             else self._select_values if self._value_selector.model()
             else None
         )
-        if select_values:
+        if select_values and values != self.selectedValues:
             signals_blocked = self.blockSignals(True)
             self._value_selector.clearSelection()
             select_values(values)

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/views/code/code_edit.py

@@ -115,7 +115,7 @@ class CodeTextEdit(QPlainTextEdit):
             if block.isVisible() and bottom >= event.rect().top():
                 number = str(block_number + 1)
                 painter.setPen(Qt.black)
-                painter.drawText(0, top, self._line_number_area.width(), self.fontMetrics().height(), Qt.AlignRight, number)
+                painter.drawText(0, int(top), self._line_number_area.width(), self.fontMetrics().height(), Qt.AlignRight, number)
             block = block.next()
             top = bottom
             bottom = top + self.blockBoundingRect(block).height()
@@ -194,7 +194,7 @@ class CodeEdit(QWidget):
         self._text_edit.setPlainText(model.text)
         model.textChanged.connect(self._set_text(self._text_edit))
         if hasattr(model, 'output'):
-            self._output_pane.setPlainText(model.output)
+            self._output_pane.setPlainText(model.output.getvalue())
             model.outputChanged.connect(self._set_text(self._output_pane, True))
             self._output_pane.setVisible(True)
         else:
@@ -207,6 +207,7 @@ class CodeEdit(QWidget):
         def _(text):
             widget_inst = widget_ref()
             if widget_inst:
+                text = text if isinstance(text, str) else text.getvalue()
                 if widget_inst.toPlainText() != text:
                     widget_inst.setPlainText(text)
                     if scroll_to_end:

{pyqttoolkit-0.8.0.dev1 → pyqttoolkit-0.8.2}/pyqttoolkit/views/datetime.py

@@ -40,7 +40,7 @@ class DateTimeEdit(QDateTimeEdit):
         self.isLimit = False
         self._default = default
         self.isLimitChanged.connect(self._handle_is_limit_changed)
-        self.dateTimeChanged.connect(self._handle_date_time_changed)
+        self.editingFinished.connect(self._handle_date_time_editing_finished)
         self.setCalendarPopup(calendar_popup)
         if calendar_popup:
             self.calendarWidget().clicked.connect(self._handle_date_changed_from_calendar)
@@ -50,7 +50,7 @@ class DateTimeEdit(QDateTimeEdit):
 
     isLimit = AutoProperty(bool)
     
-    def focusOutEvent(self, event):
+    def focusOutEvent(self, event=None):
         if self._start_date and self.dateTime() < self._start_date:
             self.setDateTime(self._start_date)
         elif self._min_date and self.dateTime() < self._min_date:
@@ -59,7 +59,7 @@ class DateTimeEdit(QDateTimeEdit):
             self.setDateTime(self._end_date)
         elif self._max_date and self.dateTime() > self._max_date:
             self.setDateTime(self._max_date)
-        return QDateTimeEdit.focusOutEvent(self, event)
+        return event and QDateTimeEdit.focusOutEvent(self, event)
     
     def setDateTimeRange(self, start_date, end_date):
         self._start_date = start_date
@@ -95,13 +95,15 @@ class DateTimeEdit(QDateTimeEdit):
         self.value = QDateTime()
     
     def _handle_is_limit_changed(self, is_limit):
-        stylesheet = 'DateTimeEdit {font: italic}' if is_limit else ''
+        stylesheet = 'DateTimeEdit {font: italic}' if is_limit else 'DateTimeEdit {font: normal}'
         self.setStyleSheet(stylesheet)
     
-    def _handle_date_time_changed(self, value):
+    def _handle_date_time_editing_finished(self):
+        value = self.dateTime()
         if value is not None or (isinstance(value, QDateTime) and value.isValid()):
             self.isLimit = False
         self.valueChanged.emit(self.value)
+        self.focusOutEvent()
 
     def _handle_date_changed_from_calendar(self, value):
         self.value = QDateTime(value, QTime(0, 0))