Skip to content

Commit

Permalink
Update Add/Update SpineOpt Wizard (#2982)
Browse files Browse the repository at this point in the history
- Required SpineOpt version is now 0.8.3
- Introduce new option to Troubleshooting section, which shows the instructions to Install or Update SpineOpt manually
- Remove Reset Registry button and show the instructions how to reset the registry manually
- Add Copy log button to Total Failure page
- Update links

Re Issue #2973
  • Loading branch information
ptsavol authored Oct 11, 2024
1 parent 7daf5be commit a2a11c2
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 134 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
### Added

### Changed
- **Add/Update SpineOpt** wizard in **File->Settings->Tools** now requires SpineOpt v0.8.3 or higher.

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion spinetoolbox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
LATEST_PROJECT_VERSION = 13

# For the Add/Update SpineOpt wizard
REQUIRED_SPINE_OPT_VERSION = "0.6.9"
REQUIRED_SPINE_OPT_VERSION = "0.8.3"

# Invalid characters for directory names
# NOTE: "." is actually valid in a directory name but this is
Expand Down
12 changes: 7 additions & 5 deletions spinetoolbox/ui_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class ToolboxUI(QMainWindow):
def __init__(self):
from .ui.mainwindow import Ui_MainWindow # pylint: disable=import-outside-toplevel

super().__init__(flags=Qt.Window)
super().__init__(flags=Qt.WindowType.Window)
self.set_app_style()
self.set_error_mode()
self._qsettings = QSettings("SpineProject", "Spine Toolbox", self)
Expand Down Expand Up @@ -227,16 +227,16 @@ def __init__(self):
def eventFilter(self, obj, ev):
# Save/restore splitter states when hiding/showing execution lists
if obj == self.ui.listView_console_executions:
if ev.type() == QEvent.Hide:
if ev.type() == QEvent.Type.Hide:
self._qsettings.setValue("mainWindow/consoleSplitterPosition", self.ui.splitter_console.saveState())
elif ev.type() == QEvent.Show:
elif ev.type() == QEvent.Type.Show:
splitter_state = self._qsettings.value("mainWindow/consoleSplitterPosition", defaultValue="false")
if splitter_state != "false":
self.ui.splitter_console.restoreState(splitter_state)
return super().eventFilter(obj, ev)

def _setup_properties_title(self):
self.label_item_name.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
self.label_item_name.setAlignment(Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter)
self.label_item_name.setMinimumHeight(28)
self._button_item_dir.setIcon(QIcon(":icons/folder-open-regular.svg"))
layout = QHBoxLayout(self._properties_title)
Expand Down Expand Up @@ -316,7 +316,9 @@ def connect_signals(self):
# Consoles
self.jupyter_console_requested.connect(self._setup_jupyter_console)
self.kernel_shutdown.connect(self._handle_kernel_shutdown)
self.persistent_console_requested.connect(self._setup_persistent_console, Qt.BlockingQueuedConnection)
self.persistent_console_requested.connect(
self._setup_persistent_console, Qt.ConnectionType.BlockingQueuedConnection
)

@staticmethod
def set_app_style():
Expand Down
Loading

0 comments on commit a2a11c2

Please sign in to comment.