pyqttoolkit 0.8.0.dev0__tar.gz → 0.8.0.post1__tar.gz

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.8.0.dev0
+Version: 0.8.0.post1
 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
         
@@ -13,4 +13,5 @@ Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Provides-Extra: publish
+Provides-Extra: ui
 Provides-Extra: test

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2022-10-05T14:38:52+0100",
+ "date": "2025-02-10T10:45:17-0600",
  "dirty": false,
  "error": null,
- "full-revisionid": "4768565a6b3943d43446ed9ccf696915f2525c91",
- "version": "0.8.0.dev0"
+ "full-revisionid": "c01a30f0721570aa53de3b069854c5c25e9ebdb6",
+ "version": "0.8.0-1"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/application/application.py

@@ -17,9 +17,8 @@
 import sys
 import logging
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import QApplication, QWidget, pyqtSignal
-#pyline: enable=no-name-in-module
+from PyQt5.QtCore import pyqtSignal
+from PyQt5.QtWidgets import QApplication, QWidget
 
 from pyqttoolkit.services import MessageBoard, TaskRunner, ToolWindowService, EventRegistry, ObjectConverter
 from pyqttoolkit.dependencies import DependencyContainer
@@ -54,14 +53,6 @@ class Application(QApplication):
         self.mainWindowLoaded.emit(self._module_service.openModule('Base'))
         return self.exec_()
     
-    def notify(self, receiver, event):
-        try:
-            return QApplication.notify(self, receiver, event)
-        #pylint: disable=broad-except
-        except Exception as e:
-            self._handle_exception(type(e), e, e.__traceback__)
-            return True
-    
     def _handle_exception(self, ex_type, ex_value, traceback_obj):
         LOGGER.error('Application Exception: %s, %s', ex_type, ex_value)
         if self._handling_exception:

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/application/garbage_collector.py

@@ -17,9 +17,7 @@
 import gc
 import logging
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import QObject, QTimer
-#pyline: enable=no-name-in-module
+from PyQt5.QtCore import QObject, QTimer
 
 from pyqttoolkit.logs import TRACE
 
@@ -34,27 +32,29 @@ class GarbageCollector(QObject):
     thread, as otherwise Qt can crash.
     '''
 
-    def __init__(self, parent, interval=10000):
-        QObject.__init__(self, parent)
+    def __init__(self, parent, interval=60000):
+        super().__init__(parent)
         self._interval = interval
-
-        self._timer = QTimer(self)
-        self._timer.timeout.connect(self.check)
-
         self._threshold = gc.get_threshold()
         gc.disable()
-        self._timer.start(self._interval)
 
-    def check(self):
+        if self._interval:
+            self._timer = QTimer(self)
+            self._timer.timeout.connect(self.check)
+            self._timer.start(self._interval)
+        else:
+            self._timer = None
+
+    def check(self, full=False):
         l0, l1, l2 = gc.get_count()
         LOGGER.log(TRACE, 'gc_check called: l0=%d, l1=%d, l2=%d', l0, l1, l2)
-        if l0 > self._threshold[0]:
+        if full or l0 > self._threshold[0]:
             num = gc.collect(0)
             LOGGER.log(TRACE, 'Collecting gen 0, found: %d unreachable', num)
-            if l1 > self._threshold[1]:
+            if full or l1 > self._threshold[1]:
                 num = gc.collect(1)
                 LOGGER.log(TRACE, 'Collecting gen 1, found: %d unreachable', num)
-                if l2 > self._threshold[2]:
+                if full or l2 > self._threshold[2]:
                     num = gc.collect(2)
                     LOGGER.log(TRACE, 'Collecting gen 2, found: %d unreachable', num)
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/config/with_signal.py

@@ -14,7 +14,7 @@
 # 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.Qt import pyqtSignal, QObject
+from PyQt5.QtCore import pyqtSignal, QObject
 
 class WithValueChangedConfiguration(QObject):
     def __init__(self, inner):

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/config/with_value_changed.py

@@ -14,11 +14,11 @@
 # 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.Qt import pyqtSignal, QObject
+from PyQt5.QtCore import pyqtSignal, QObject
 
 class WithValueChangedConfiguration(QObject):
-    def __init__(self, inner):
-        super().__init__()
+    def __init__(self, parent, inner):
+        super().__init__(parent)
         self._inner = inner
     
     onValueChanged = pyqtSignal(str, object)

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/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.dev0 → pyqttoolkit-0.8.0.post1}/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.0.post1/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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/datetime/qdatetime.py

@@ -19,9 +19,7 @@ from .datetime import round_timedelta
 
 import pandas as pd
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import QDateTime, QDate, QTime
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QDateTime, QDate, QTime
 
 def q_datetime_to_datetime(q_datetime: QDateTime):
     if q_datetime is None or not q_datetime.isValid():
@@ -39,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.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/dependencies/__init__.py

@@ -37,12 +37,14 @@ class DependencyContainer:
     def resolve(self, type_, extras=None, none_for_missing=False):
         args = self._get_args(type_)
         all_dependencies = {**self._instances, **(extras or {})}
-        for a in args:
-            if a not in all_dependencies.keys():
-                if none_for_missing:
-                    all_dependencies[a] = None
+        for arg_name, arg in args.items():
+            if arg_name not in all_dependencies:
+                if arg.default != inspect.Parameter.empty:
+                    all_dependencies[arg_name] = arg.default
+                elif none_for_missing:
+                    all_dependencies[arg_name] = None
                 else:
-                    raise MissingDependency(type_, a)
+                    raise MissingDependency(type_, arg_name)
         return type_(**{a: all_dependencies[a] for a in args})
     
     def resolve_for(self, type_for, base_type, extras=None):

pyqttoolkit-0.8.0.post1/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.dev0 → pyqttoolkit-0.8.0.post1}/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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/code_text.py

@@ -14,10 +14,10 @@
 # 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.Qt import QObject, pyqtSignal
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QObject, pyqtSignal
 
 from pyqttoolkit.properties import AutoProperty
+from pyqttoolkit.logs import LogStream
 
 class CodeTextModel(QObject):
     def __init__(self, parent, validator):
@@ -25,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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/dataframetable.py

@@ -14,9 +14,7 @@
 # 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 pyqtSignal
-from PyQt5.Qt import QAbstractTableModel, Qt, QVariant, QModelIndex, QItemSelectionModel
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import pyqtSignal, QAbstractTableModel, Qt, QVariant, QModelIndex, QItemSelectionModel
 
 class DataFrameTableModel(QAbstractTableModel):
     def __init__(self, parent, data, display_column=None, editable=False, row_headers=False):

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/dictpropertytree.py

@@ -16,9 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from enum import Enum
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import Qt, QAbstractItemModel, pyqtSignal, QModelIndex, QVariant
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import Qt, QAbstractItemModel, pyqtSignal, QModelIndex, QVariant
 
 class DictPropertyTreeModel(QAbstractItemModel):
     def __init__(self, parent, data):

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/dicttable.py

@@ -14,8 +14,7 @@
 # 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.Qt import Qt, QAbstractTableModel, pyqtSignal, QModelIndex
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import Qt, QAbstractTableModel, pyqtSignal, QModelIndex
 
 from pyqttoolkit.models.roles import DataRole
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/json_text.py

@@ -16,9 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from json import loads, dumps, JSONDecodeError
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import QObject, pyqtSignal
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QObject, pyqtSignal
 
 from pyqttoolkit.properties import AutoProperty
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/list_model.py

@@ -14,8 +14,7 @@
 # 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.Qt import Qt, QAbstractListModel, QStringListModel
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import Qt, QAbstractListModel, QStringListModel
 
 from pyqttoolkit.models.roles import DataRole
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/models/span.py

@@ -1,32 +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.Qt import QObject
-#pylint: enable=no-name-in-module
-
-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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/modules/events/rejectable.py

@@ -14,8 +14,7 @@
 # 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.Qt import QObject
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QObject
 
 class RejectableEvent(QObject):
     def __init__(self):

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/modules/launcher_config.py

@@ -14,8 +14,7 @@
 # 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.Qt import QObject, pyqtSignal
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QObject, pyqtSignal
 
 from pyqttoolkit.properties import AutoProperty
 

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/modules/module.py

@@ -14,8 +14,7 @@
 # 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.Qt import QObject, pyqtSignal
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import QObject, pyqtSignal
 
 from .events import ModuleOpeningEvent
 
@@ -24,6 +23,8 @@ class ModuleBase(QObject):
         QObject.__init__(self)
         self._id = id_
         self._launcher_config = launcher_config
+        if self._launcher_config:
+            self._launcher_config.setParent(self)
     
     opening = pyqtSignal(ModuleOpeningEvent)
     opened = pyqtSignal()

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/scripting/script_runner.py

@@ -80,21 +80,24 @@ 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 _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 module
+            except KeyError:
+                raise ImportError('Module not found')
+        return _
     
     def _additional_paths(self):
         return self._additional_paths

{pyqttoolkit-0.8.0.dev0 → pyqttoolkit-0.8.0.post1}/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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/services/file_dialog.py

@@ -16,17 +16,32 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from os import path
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import QStandardPaths, QFileDialog
-#pylint: enable=no-name-in-module
+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)
@@ -36,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_():
@@ -50,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.dev0 → pyqttoolkit-0.8.0.post1}/pyqttoolkit/services/hotkey_manager.py

@@ -16,9 +16,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 from enum import Enum
 
-#pylint: disable=no-name-in-module
-from PyQt5.Qt import Qt
-#pylint: enable=no-name-in-module
+from PyQt5.QtCore import Qt
 
 class HotkeyEvents(Enum):
     next_instance_y = 0