Multiple fixes for PyQt6 and CI.

basic_features/basic_save_game_info.py

@@ -41,17 +41,19 @@ class BasicGameSaveGameInfoWidget(mobase.ISaveGameInfoWidget):
         layout = QVBoxLayout()
         self._label = QLabel()
         palette = self._label.palette()
-        palette.setColor(self._label.foregroundRole(), Qt.white)
+        palette.setColor(self._label.foregroundRole(), Qt.GlobalColor.white)
         self._label.setPalette(palette)
         layout.addWidget(self._label)
         self.setLayout(layout)
 
         palette = self.palette()
-        palette.setColor(self.backgroundRole(), Qt.black)
+        palette.setColor(self.backgroundRole(), Qt.GlobalColor.black)
         self.setAutoFillBackground(True)
         self.setPalette(palette)
 
-        self.setWindowFlags(Qt.ToolTip | Qt.BypassGraphicsProxyWidget)  # type: ignore
+        self.setWindowFlags(
+            Qt.WindowType.ToolTip | Qt.WindowType.BypassGraphicsProxyWidget
+        )
 
     def setSave(self, save: mobase.ISaveGame):
         # Resize the label to (0, 0) to hide it:

basic_game.py

@@ -19,12 +19,16 @@ def replace_variables(value: str, game: "BasicGame") -> str:
     if value.find("%DOCUMENTS%") != -1:
         value = value.replace(
             "%DOCUMENTS%",
-            QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
+            QStandardPaths.writableLocation(
+                QStandardPaths.StandardLocation.DocumentsLocation
+            ),
         )
     if value.find("%USERPROFILE%") != -1:
         value = value.replace(
             "%USERPROFILE%",
-            QStandardPaths.writableLocation(QStandardPaths.StandardLocation.HomeLocation),
+            QStandardPaths.writableLocation(
+                QStandardPaths.StandardLocation.HomeLocation
+            ),
         )
     if value.find("%GAME_DOCUMENTS%") != -1:
         value = value.replace(
@@ -211,11 +215,15 @@ class BasicGameMappings:
 
         folders = [
             "{}/My Games/{}".format(
-                QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
+                QStandardPaths.writableLocation(
+                    QStandardPaths.StandardLocation.DocumentsLocation
+                ),
                 game.gameName(),
             ),
             "{}/{}".format(
-                QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DocumentsLocation),
+                QStandardPaths.writableLocation(
+                    QStandardPaths.StandardLocation.DocumentsLocation
+                ),
                 game.gameName(),
             ),
         ]
@@ -332,8 +340,8 @@ class BasicGame(mobase.IPluginGame):
     @staticmethod
     def setup():
         from .gog_utils import find_games as find_gog_games
-        from .steam_utils import find_games as find_steam_games
         from .origin_utils import find_games as find_origin_games
+        from .steam_utils import find_games as find_steam_games
 
         BasicGame.steam_games = find_steam_games()
         BasicGame.gog_games = find_gog_games()

games/game_blackandwhite2.py

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-import os
-import sys
 import datetime
+import os
 import struct
+import sys
 import time
 from pathlib import Path
 from typing import List
 
-from PyQt6.QtCore import QDir, QFileInfo, QFile, QDateTime, Qt
-from PyQt6.QtGui import QPixmap, QPainter
+from PyQt6.QtCore import QDateTime, QDir, QFile, QFileInfo, Qt
+from PyQt6.QtGui import QPainter, QPixmap
 
 import mobase
 
-from ..basic_game import BasicGame
 from ..basic_features.basic_save_game_info import (
     BasicGameSaveGame,
-    BasicGameSaveGameInfoWidget,
     BasicGameSaveGameInfo,
+    BasicGameSaveGameInfoWidget,
 )
+from ..basic_game import BasicGame
 
 
 class BlackAndWhite2ModDataChecker(mobase.ModDataChecker):

games/game_da2.py

@@ -1,8 +1,9 @@
 from PyQt6.QtCore import QDir
-from ..basic_game import BasicGame
 
 import mobase
 
+from ..basic_game import BasicGame
+
 
 class DA2Game(BasicGame):
 

games/game_daggerfallunity.py

@@ -1,7 +1,7 @@
-from ..basic_game import BasicGame
-
 import mobase
 
+from ..basic_game import BasicGame
+
 
 class DaggerfallUnityModDataChecker(mobase.ModDataChecker):
     def __init__(self):

games/game_darkestdungeon.py

@@ -208,7 +208,9 @@ class DarkestDungeonGame(BasicGame):
     def savesDirectory(self) -> QDir:
         documentsSaves = QDir(
             "{}/Darkest".format(
-                QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation)
+                QStandardPaths.writableLocation(
+                    QStandardPaths.StandardLocation.DocumentsLocation
+                )
             )
         )
         if self.is_steam():

games/game_gta-3-de.py

@@ -1,6 +1,6 @@
 import os
-
 from pathlib import Path
+
 from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase

games/game_gta-san-andreas-de.py

@@ -1,6 +1,6 @@
 import os
-
 from pathlib import Path
+
 from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase

games/game_gta-vice-city-de.py

@@ -1,6 +1,6 @@
 import os
-
 from pathlib import Path
+
 from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase

games/game_masterduel.py

@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
 
-from PyQt6.QtCore import QFileInfo, QDir
-from typing import List, Optional, cast
-from os.path import join, exists
+from os.path import exists, join
+from typing import List, Optional
+
+from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase
 
@@ -54,9 +55,7 @@ class MasterDuelGame(BasicGame, mobase.IPluginFileMapper):
         dir = self.gameDirectory()
         dir.cd("LocalData")
 
-        subdirs = dir.entryList(
-            filters=cast(QDir.Filters, QDir.Dirs | QDir.NoDotAndDotDot)
-        )
+        subdirs = dir.entryList(filters=QDir.Filter.Dirs | QDir.Filter.NoDotAndDotDot)
         dir.cd(subdirs[0])
 
         self._userDataDirCached = dir.absolutePath()

games/game_sims4.py

@@ -1,7 +1,7 @@
-from ..basic_game import BasicGame
-
 import mobase
 
+from ..basic_game import BasicGame
+
 
 class TS4Game(BasicGame):
 

games/game_stalkeranomaly.py

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
+from enum import IntEnum
 from pathlib import Path
 from typing import List
-from enum import IntEnum
 
-from PyQt6.QtCore import Qt, QDir, QFileInfo
+from PyQt6.QtCore import QDir, QFileInfo, Qt
 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget
 
 import mobase
@@ -14,7 +14,6 @@ from ..basic_features.basic_save_game_info import (
     BasicGameSaveGameInfo,
 )
 from ..basic_game import BasicGame
-
 from .stalkeranomaly import XRSave
 
 
@@ -176,16 +175,18 @@ class StalkerAnomalySaveGameInfoWidget(mobase.ISaveGameInfoWidget):
         self._labelRep = self.newLabel(layout)
         self.setLayout(layout)
         palette = self.palette()
-        palette.setColor(self.backgroundRole(), Qt.black)
+        palette.setColor(self.backgroundRole(), Qt.GlobalColor.black)
         self.setAutoFillBackground(True)
         self.setPalette(palette)
-        self.setWindowFlags(Qt.ToolTip | Qt.BypassGraphicsProxyWidget)  # type: ignore
+        self.setWindowFlags(
+            Qt.WindowType.ToolTip | Qt.WindowType.BypassGraphicsProxyWidget
+        )
 
     def newLabel(self, layout: QVBoxLayout) -> QLabel:
         label = QLabel()
-        label.setAlignment(Qt.AlignLeft)
+        label.setAlignment(Qt.AlignmentFlag.AlignLeft)
         palette = label.palette()
-        palette.setColor(label.foregroundRole(), Qt.white)
+        palette.setColor(label.foregroundRole(), Qt.GlobalColor.white)
         label.setPalette(palette)
         layout.addWidget(label)
         layout.addStretch()

games/game_starwars-empire-at-war-foc.py

@@ -1,10 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-import mobase
-from PyQt6.QtCore import QFileInfo
-from ..basic_game import BasicGame
 from typing import List
 
+from PyQt6.QtCore import QFileInfo
+
+import mobase
+
+from ..basic_game import BasicGame
+
 
 class StarWarsEmpireAtWarGame(BasicGame):
     Name = "STAR WARS Empire at War - Force of Corruption"

games/game_starwars-empire-at-war.py

@@ -1,10 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-import mobase
-from PyQt6.QtCore import QFileInfo
-from ..basic_game import BasicGame
 from typing import List
 
+from PyQt6.QtCore import QFileInfo
+
+import mobase
+
+from ..basic_game import BasicGame
+
 
 class StarWarsEmpireAtWarGame(BasicGame):
     Name = "STAR WARS Empire at War"

games/game_vampirebloodlines.py

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 import os
-import mobase
+from pathlib import Path
+from typing import List
 
 from PyQt6.QtCore import QDir
 
-from typing import List
-from pathlib import Path
+import mobase
 
 from ..basic_game import BasicGame, BasicGameSaveGame
 

games/game_witcher1.py

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
-from typing import List
 from pathlib import Path
+from typing import List
 
-from PyQt6.QtCore import QFileInfo, QDir
+from PyQt6.QtCore import QDir, QFileInfo
 
 import mobase
 

games/stalkeranomaly/XRObject.py

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 
 import io
-from typing import List
 from enum import IntFlag
+from typing import List
 
 from .XRIO import XRReader
-from .XRMath import IVec3, IFlag
+from .XRMath import IFlag, IVec3
 from .XRNET import XRNETState
 
 

games/stalkeranomaly/XRSave.py

@@ -2,13 +2,14 @@
 
 import io
 import struct
-import lzokay
+from datetime import datetime
 from pathlib import Path
 from typing import Optional
-from datetime import datetime
 
-from .XRObject import XRCreatureActor, XRFlag
+import lzokay
+
 from .XRIO import XRReader, XRStream
+from .XRObject import XRCreatureActor, XRFlag
 
 
 class XRSave:

games/stalkeranomaly/__init__.py

@@ -2,19 +2,19 @@
 # flake8: noqa
 
 from .XRIO import XRReader, XRStream
-from .XRMath import IVec3, IVec4, IFlag
+from .XRMath import IFlag, IVec3, IVec4
 from .XRNET import XRNETState
 from .XRObject import (
-    XRFlag,
     XRAbstract,
-    XRVisual,
     XRBoneData,
-    XRSkeleton,
-    XRObject,
+    XRCreatureAbstract,
+    XRCreatureActor,
     XRDynamicObject,
     XRDynamicObjectVisual,
-    XRCreatureAbstract,
+    XRFlag,
+    XRObject,
+    XRSkeleton,
     XRTraderAbstract,
-    XRCreatureActor,
+    XRVisual,
 )
 from .XRSave import XRSave

origin_utils.py

@@ -3,14 +3,14 @@
 # Heavily influenced by https://github.com/erri120/GameFinder
 
 import os
-import psutil
 import threading
 import time
-
 from pathlib import Path
 from typing import Dict, List
 from urllib import parse
 
+import psutil
+
 
 class OriginWatcher:
     """