Skip to content

Commit

Permalink
Fix xEdit path selection dialog using PyQt5 APIs that are no longer a…
Browse files Browse the repository at this point in the history
…vailable in PyQt6
  • Loading branch information
JonathanFeenstra committed Jan 4, 2024
1 parent 89013e4 commit 4e174e7
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 15 deletions.
10 changes: 5 additions & 5 deletions LOOT-Warning-Checker/CheckerPlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The LOOT Warning Checker plugin.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down Expand Up @@ -60,7 +60,7 @@ def description(self) -> str:
return self.__tr("Checks for LOOT warnings.")

def version(self) -> mobase.VersionInfo:
return mobase.VersionInfo(1, 3, 0, 2, release_type=mobase.ReleaseType.CANDIDATE)
return mobase.VersionInfo(1, 3, 0, 3, release_type=mobase.ReleaseType.CANDIDATE)

def requirements(self) -> List[mobase.IPluginRequirement]:
return [mobase.PluginRequirementFactory.gameDependency(games=list(SUPPORTED_GAMES.keys()))]
Expand Down Expand Up @@ -231,7 +231,7 @@ def __start_xEditDirectorySelectionDialog(self, game: xEditGame) -> Optional[str
'<a href="https://github.com/TES5Edit/TES5Edit/releases/latest">here</a>.'
),
)
if result != QMessageBox.Yes:
if result != QMessageBox.StandardButton.Yes:
return None

path = None
Expand All @@ -243,7 +243,7 @@ def __start_xEditDirectorySelectionDialog(self, game: xEditGame) -> Optional[str
self.__parentWidget,
self.__tr("Invalid path"),
self.__tr("The selected path is invalid. Would you like to try another location?"),
QMessageBox.StandardButtons(QMessageBox.Yes | QMessageBox.No),
QMessageBox.StandardButtons(QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No),
)
if result == QMessageBox.Yes:
continue
Expand All @@ -270,7 +270,7 @@ def __promptUserFor_xEditLocation(self, game: xEditGame) -> Optional[str]:
xEditDir = QFileDialog.getExistingDirectory(
self.__parentWidget,
self.__tr("Select the folder where the xEdit executable is located"),
options=QFileDialog.ShowDirsOnly,
options=QFileDialog.Option.ShowDirsOnly,
)
qDebug(f"Selected xEdit directory: {xEditDir}")
if xEditDir != "":
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/Games.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Games supported by xEdit and LOOT.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/TogglePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The plugin to toggle LOOT warnings.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The LOOT Warning Checker plugin module.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
4 changes: 2 additions & 2 deletions LOOT-Warning-Checker/tools/LOOT/Conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
References:
- https://loot-api.readthedocs.io/en/latest/metadata/conditions.html
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down Expand Up @@ -39,7 +39,7 @@
You should have received a copy of the GNU General Public License
along with Wrye Bash. If not, see <https://www.gnu.org/licenses/>.
Wrye Bash copyright (C) 2005-2009 Wrye, 2010-2023 Wrye Bash Team
Wrye Bash copyright (C) 2005-2009 Wrye, 2010-2024 Wrye Bash Team
https://github.com/wrye-bash
=============================================================================
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/tools/LOOT/Masterlist.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Detection and parsing of the LOOT masterlist and userlist files.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/tools/LOOT/Plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Plugins
=======
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/tools/LOOT/Warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Warnings
========
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/tools/LOOT/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The LOOT module.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
2 changes: 1 addition & 1 deletion LOOT-Warning-Checker/tools/xEdit.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Detection of the xEdit executable for Quick Auto Clean.
Copyright (C) 2021-2023 Jonathan Feenstra
Copyright (C) 2021-2024 Jonathan Feenstra
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
Expand Down
13 changes: 13 additions & 0 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,19 @@
"ReleaseNotes": [
"Update the valid form ID range for light plugins in Skyrim SE and Fallout 4 via esplugin"
]
},
{
"Version": "1.3.0-rc3",
"Released": "2024-01-04",
"MinSupport": "2.5.0",
"MaxSupport": "2.5.0",
"DownloadUrl": "https://github.com/JonathanFeenstra/modorganizer-loot-warning-checker/releases/download/v1.3.0-rc3/LOOT-Warning-Checker-v1.3.0-rc3.zip",
"PluginPath": [
"LOOT-Warning-Checker"
],
"ReleaseNotes": [
"Fix xEdit path selection dialog using PyQt5 APIs that are no longer available in PyQt6"
]
}
]
}

0 comments on commit 4e174e7

Please sign in to comment.