From ba84423904e6ce238a09b444996d2df313f0c5e9 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 17 Aug 2024 19:17:02 +0100 Subject: [PATCH 1/4] Fix mismerge which broke PySide2 support. --- .../no_mans_sky_base_builder/asset_browser/main.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/addons/no_mans_sky_base_builder/asset_browser/main.py b/src/addons/no_mans_sky_base_builder/asset_browser/main.py index 2fff357..b37aa60 100644 --- a/src/addons/no_mans_sky_base_builder/asset_browser/main.py +++ b/src/addons/no_mans_sky_base_builder/asset_browser/main.py @@ -6,19 +6,16 @@ import time from functools import partial -import yaml - -try: - from PySide6 import QtCore, QtGui, QtWidgets -except ImportError: - from PySide2 import QtCore, QtGui, QtWidgets import asset_browser.icons.icons import yaml from asset_browser.collapsable_frame import CollapsableFrame from asset_browser.flow_layout import FlowLayout from asset_browser.item import Item, Preset -from PySide6 import QtCore, QtGui, QtWidgets +try: + from PySide6 import QtCore, QtGui, QtWidgets +except ImportError: + from PySide2 import QtCore, QtGui, QtWidgets FILE_DIR = os.path.dirname(os.path.realpath(__file__)) SEND_SNIPPET = os.path.join(FILE_DIR, "build_part_snippet.txt") From 2695b7b7b3d12e6cea9ef7f96340ee53e430b5cd Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 17 Aug 2024 19:19:19 +0100 Subject: [PATCH 2/4] Re-fix generated icon resource files (PySide2 support got lost). --- automation_tools/icon_generator/icon_export/icons.py | 5 ++++- .../no_mans_sky_base_builder/asset_browser/icons/icons.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation_tools/icon_generator/icon_export/icons.py b/automation_tools/icon_generator/icon_export/icons.py index 7132a38..17d412e 100644 --- a/automation_tools/icon_generator/icon_export/icons.py +++ b/automation_tools/icon_generator/icon_export/icons.py @@ -3,7 +3,10 @@ # Created by: The Resource Compiler for Qt version 6.4.1 # WARNING! All changes made in this file will be lost! -from PySide6 import QtCore +try: + from PySide6 import QtCore +except ImportError: + from PySide2 import QtCore qt_resource_data = b"\ \x00\x00\x0bD\ diff --git a/src/addons/no_mans_sky_base_builder/asset_browser/icons/icons.py b/src/addons/no_mans_sky_base_builder/asset_browser/icons/icons.py index 7132a38..17d412e 100644 --- a/src/addons/no_mans_sky_base_builder/asset_browser/icons/icons.py +++ b/src/addons/no_mans_sky_base_builder/asset_browser/icons/icons.py @@ -3,7 +3,10 @@ # Created by: The Resource Compiler for Qt version 6.4.1 # WARNING! All changes made in this file will be lost! -from PySide6 import QtCore +try: + from PySide6 import QtCore +except ImportError: + from PySide2 import QtCore qt_resource_data = b"\ \x00\x00\x0bD\ From 940c5452fae7e7cd55e87a48dab3f00d8bfb2afa Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 18 Aug 2024 18:28:20 +0100 Subject: [PATCH 3/4] As PyYAML is used and pyaml isn't, install PyYAML instead. Closes: #104 --- README.md | 4 ++-- src/addons/no_mans_sky_base_builder/asset_browser/load.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 95265bc..8bfe3d1 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,10 @@ https://djmonkeyuk.github.io/nms-base-builder-presets/ ## Technical Dependencies -Casual users may ignore this section. These Python dependencies are installed automatically on exeuction of the Asset Browser UI. +Casual users may ignore this section. These Python dependencies are installed automatically on execution of the Asset Browser UI. * PySide6 -* pyaml +* PyYAML ## Mod Compatibility diff --git a/src/addons/no_mans_sky_base_builder/asset_browser/load.py b/src/addons/no_mans_sky_base_builder/asset_browser/load.py index 82ff2b3..236ba3f 100644 --- a/src/addons/no_mans_sky_base_builder/asset_browser/load.py +++ b/src/addons/no_mans_sky_base_builder/asset_browser/load.py @@ -22,9 +22,9 @@ def install_package(package_name): try: import yaml - print ("Yaml found.") + print ("PyYAML found.") except: - install_package("pyaml") + install_package("PyYAML") try: import PySide6 From 3c3bd8e9f1f28b0d1aeb3688de0f3e250cb8770b Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 18 Aug 2024 19:40:20 +0100 Subject: [PATCH 4/4] List PySide2 fallback; add package names for Debian-like systems. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8bfe3d1..61796b2 100644 --- a/README.md +++ b/README.md @@ -88,10 +88,16 @@ https://djmonkeyuk.github.io/nms-base-builder-presets/ ## Technical Dependencies Casual users may ignore this section. These Python dependencies are installed automatically on execution of the Asset Browser UI. +(Fallback dependencies, in parentheses, won't be.) -* PySide6 +* PySide6 (or PySide2) * PyYAML +For Linux users, the corresponding packages (for Debian-like systems) are: + +* python3-pyside6 (or python3-pyside2) +* python3-yaml + ## Mod Compatibility The tool is designed towards supporting the vanilla game as much as possible, however