BlackSnaker/PortProtonQt
1
0
Fork 0
forked from Boria138/PortProtonQt
Code Pull Requests Activity

fix: fix code work with pyside 6.10

Browse Source 
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
Boris Yumankulov
2025-11-27 15:51:39 +05:00
parent 3522764c3e
commit 3026e7da4e
8 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
portprotonqt/game_card.py
View File

@@ -1,7 +1,6 @@
from PySide6.QtGui import QPainter, QColor, QDesktopServices from PySide6.QtGui import QPainter, QColor, QDesktopServices
from PySide6.QtCore import Signal, Property, Qt, QUrl, QTimer from PySide6.QtCore import Signal, Property, Qt, QUrl, QTimer
from PySide6.QtWidgets import QFrame, QGraphicsDropShadowEffect, QVBoxLayout, QWidget, QStackedLayout, QLabel from PySide6.QtWidgets import QFrame, QGraphicsDropShadowEffect, QVBoxLayout, QWidget, QStackedLayout, QLabel
from collections.abc import Callable
from portprotonqt.image_utils import load_pixmap_async, round_corners from portprotonqt.image_utils import load_pixmap_async, round_corners
from portprotonqt.localization import _ from portprotonqt.localization import _
from portprotonqt.config_utils import read_favorites, save_favorites, read_display_filter, read_theme_from_config from portprotonqt.config_utils import read_favorites, save_favorites, read_display_filter, read_theme_from_config
@@ -10,8 +9,6 @@ from portprotonqt.custom_widgets import ClickableLabel
from portprotonqt.portproton_api import PortProtonAPI from portprotonqt.portproton_api import PortProtonAPI
from portprotonqt.downloader import Downloader from portprotonqt.downloader import Downloader
from portprotonqt.animations import GameCardAnimations from portprotonqt.animations import GameCardAnimations
from typing import cast
class GameCard(QFrame): class GameCard(QFrame):
borderWidthChanged = Signal() borderWidthChanged = Signal()
@@ -455,9 +452,9 @@ class GameCard(QFrame):
self.update_scale() self.update_scale()
self.scaleChanged.emit() self.scaleChanged.emit()
borderWidth = Property(int, getBorderWidth, setBorderWidth, None, "", notify=cast(Callable[[], None], borderWidthChanged)) borderWidth = Property(int, getBorderWidth, setBorderWidth, None, "", notify=borderWidthChanged)
gradientAngle = Property(float, getGradientAngle, setGradientAngle, None, "", notify=cast(Callable[[], None], gradientAngleChanged)) gradientAngle = Property(float, getGradientAngle, setGradientAngle, None, "", notify=gradientAngleChanged)
scale = Property(float, getScale, setScale, None, "", notify=cast(Callable[[], None], scaleChanged)) scale = Property(float, getScale, setScale, None, "", notify=scaleChanged)
def paintEvent(self, event): def paintEvent(self, event):

14
portprotonqt/game_library_manager.py
View File

@@ -222,13 +222,17 @@ class GameLibraryManager:
def force_update_cards_library(self): def force_update_cards_library(self):
if self.gamesListWidget and self.gamesListLayout: if self.gamesListWidget and self.gamesListLayout:
# Use singleShot to ensure UI updates happen after all other operations complete
# This prevents potential freezing in PySide 6.10.1
QTimer.singleShot(0, self._perform_force_update)
def _perform_force_update(self):
"""Perform the actual force update on the layout."""
if self.gamesListLayout:
self.gamesListLayout.invalidate() self.gamesListLayout.invalidate()
if self.gamesListWidget:
self.gamesListWidget.adjustSize()
self.gamesListWidget.updateGeometry() self.gamesListWidget.updateGeometry()
widget = self.gamesListWidget
QTimer.singleShot(0, lambda: (
widget.adjustSize(),
widget.updateGeometry()
))
def _update_game_grid_immediate(self): def _update_game_grid_immediate(self):
"""Updates the game grid with the provided or current game list.""" """Updates the game grid with the provided or current game list."""

6
portprotonqt/image_utils.py
View File

@@ -199,9 +199,9 @@ def load_pixmap_async(cover: str, width: int, height: int, callback: Callable[[Q
painter.end() painter.end()
finish_with(pixmap) finish_with(pixmap)
with queue_lock: # Submit the process_image function directly to the executor
image_load_queue.put(process_image) # This avoids the potential blocking issue with queue.get() in PySide 6.10.1
image_executor.submit(lambda: image_load_queue.get()()) image_executor.submit(process_image)
def round_corners(pixmap, radius): def round_corners(pixmap, radius):
""" """

22
portprotonqt/main_window.py
View File

@@ -855,19 +855,17 @@ class MainWindow(QMainWindow):
if mgr.gamesListWidget and mgr.gamesListLayout: if mgr.gamesListWidget and mgr.gamesListLayout:
games_layout = mgr.gamesListLayout games_layout = mgr.gamesListLayout
games_widget = mgr.gamesListWidget games_widget = mgr.gamesListWidget
QTimer.singleShot(0, lambda: ( # Update layout updates to be more compatible with PySide 6.10.1
games_layout.invalidate(), QTimer.singleShot(0, lambda: games_layout.invalidate())
games_widget.adjustSize(), QTimer.singleShot(10, lambda: games_widget.adjustSize())
games_widget.updateGeometry() QTimer.singleShot(15, lambda: games_widget.updateGeometry())
))
if hasattr(self, "autoInstallContainer") and hasattr(self, "autoInstallContainerLayout"): if hasattr(self, "autoInstallContainer") and hasattr(self, "autoInstallContainerLayout"):
auto_layout = self.autoInstallContainerLayout auto_layout = self.autoInstallContainerLayout
auto_widget = self.autoInstallContainer auto_widget = self.autoInstallContainer
QTimer.singleShot(0, lambda: ( # Update layout updates to be more compatible with PySide 6.10.1
auto_layout.invalidate(), QTimer.singleShot(0, lambda: auto_layout.invalidate())
auto_widget.adjustSize(), QTimer.singleShot(10, lambda: auto_widget.adjustSize())
auto_widget.updateGeometry() QTimer.singleShot(15, lambda: auto_widget.updateGeometry())
))
def openSystemOverlay(self): def openSystemOverlay(self):
@@ -1234,7 +1232,9 @@ class MainWindow(QMainWindow):
while self.autoInstallContainerLayout.count(): while self.autoInstallContainerLayout.count():
child = self.autoInstallContainerLayout.takeAt(0) child = self.autoInstallContainerLayout.takeAt(0)
if child: if child:
child.widget().deleteLater() widget = child.widget()
if widget:
widget.deleteLater()
self.autoInstallGameCards.clear() self.autoInstallGameCards.clear()
self.allAutoInstallCards.clear() self.allAutoInstallCards.clear()

58
portprotonqt/virtual_keyboard.py
View File

@@ -166,8 +166,10 @@ class VirtualKeyboard(QFrame):
# Очищаем предыдущие кнопки # Очищаем предыдущие кнопки
while self.keyboard_layout.count(): while self.keyboard_layout.count():
item = self.keyboard_layout.takeAt(0) item = self.keyboard_layout.takeAt(0)
if item.widget(): if item:
item.widget().deleteLater() widget = item.widget()
if widget:
widget.deleteLater()
fixed_w = self.button_width fixed_w = self.button_width
fixed_h = self.button_height fixed_h = self.button_height
@@ -280,8 +282,10 @@ class VirtualKeyboard(QFrame):
if coords: if coords:
row, col = coords row, col = coords
item = self.keyboard_layout.itemAtPosition(row, col) item = self.keyboard_layout.itemAtPosition(row, col)
if item and item.widget(): if item:
item.widget().setFocus() widget = item.widget()
if widget:
widget.setFocus()
def up_key(self): def up_key(self):
"""Перемещает курсор в QLineEdit вверх/в начало, если клавиатура видима""" """Перемещает курсор в QLineEdit вверх/в начало, если клавиатура видима"""
@@ -392,6 +396,7 @@ class VirtualKeyboard(QFrame):
if self.current_input_widget is not None: if self.current_input_widget is not None:
self.current_input_widget.insert('\t') self.current_input_widget.insert('\t')
self.keyPressed.emit('Tab') self.keyPressed.emit('Tab')
if self.current_input_widget:
self.current_input_widget.setFocus() self.current_input_widget.setFocus()
self.highlight_cursor_position() self.highlight_cursor_position()
@@ -530,8 +535,9 @@ class VirtualKeyboard(QFrame):
search_col = current_col + col_span search_col = current_col + col_span
while search_col < num_cols: while search_col < num_cols:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -544,8 +550,9 @@ class VirtualKeyboard(QFrame):
# Ищем первую кнопку в этой строке # Ищем первую кнопку в этой строке
while search_col < num_cols: while search_col < num_cols:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -557,8 +564,9 @@ class VirtualKeyboard(QFrame):
search_col = current_col - 1 search_col = current_col - 1
while search_col >= 0: while search_col >= 0:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -571,8 +579,9 @@ class VirtualKeyboard(QFrame):
# Ищем последнюю кнопку в этой строке # Ищем последнюю кнопку в этой строке
while search_col >= 0: while search_col >= 0:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -584,8 +593,9 @@ class VirtualKeyboard(QFrame):
search_row = current_row + row_span search_row = current_row + row_span
while search_row < num_rows: while search_row < num_rows:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -598,8 +608,9 @@ class VirtualKeyboard(QFrame):
# Ищем первую кнопку в этом столбце # Ищем первую кнопку в этом столбце
while search_row < num_rows: while search_row < num_rows:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -611,8 +622,9 @@ class VirtualKeyboard(QFrame):
search_row = current_row - 1 search_row = current_row - 1
while search_row >= 0: while search_row >= 0:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -625,8 +637,9 @@ class VirtualKeyboard(QFrame):
# Ищем последнюю кнопку в этом столбце # Ищем последнюю кнопку в этом столбце
while search_row >= 0: while search_row >= 0:
item = self.keyboard_layout.itemAtPosition(search_row, search_col) item = self.keyboard_layout.itemAtPosition(search_row, search_col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
next_button = cast(QPushButton, item.widget()) if widget and widget.isEnabled():
next_button = cast(QPushButton, widget)
next_button.setFocus() next_button.setFocus()
found = True found = True
break break
@@ -637,6 +650,7 @@ class VirtualKeyboard(QFrame):
for row in range(self.keyboard_layout.rowCount()): for row in range(self.keyboard_layout.rowCount()):
for col in range(self.keyboard_layout.columnCount()): for col in range(self.keyboard_layout.columnCount()):
item = self.keyboard_layout.itemAtPosition(row, col) item = self.keyboard_layout.itemAtPosition(row, col)
if item and item.widget() and item.widget().isEnabled(): widget = item.widget() if item else None
return cast(QPushButton, item.widget()) if widget and widget.isEnabled():
return cast(QPushButton, widget)
return None return None

2
pyproject.toml
View File

@@ -34,7 +34,7 @@ dependencies = [
"orjson>=3.11.3", "orjson>=3.11.3",
"pillow>=12.0.0", "pillow>=12.0.0",
"psutil>=7.1.0", "psutil>=7.1.0",
"pyside6==6.9.1", "pyside6>=6.9.1",
"pyudev>=0.24.3", "pyudev>=0.24.3",
"requests>=2.32.5", "requests>=2.32.5",
"tqdm>=4.67.1", "tqdm>=4.67.1",

2
renovate.json
View File

@@ -52,7 +52,7 @@
"groupName": "Python dependencies" "groupName": "Python dependencies"
}, },
{ {
"matchPackageNames": ["numpy", "setuptools", "python", "pyside6"], "matchPackageNames": ["numpy", "setuptools", "python"],
"enabled": false, "enabled": false,
"description": "Disabled due to Python 3.10 incompatibility with numpy>=2.3.2 (requires Python>=3.11)" "description": "Disabled due to Python 3.10 incompatibility with numpy>=2.3.2 (requires Python>=3.11)"
}, },

2
uv.lock generated
View File

@@ -560,7 +560,7 @@ requires-dist = [
{ name = "orjson", specifier = ">=3.11.3" }, { name = "orjson", specifier = ">=3.11.3" },
{ name = "pillow", specifier = ">=12.0.0" }, { name = "pillow", specifier = ">=12.0.0" },
{ name = "psutil", specifier = ">=7.1.0" }, { name = "psutil", specifier = ">=7.1.0" },
{ name = "pyside6", specifier = "==6.9.1" }, { name = "pyside6", specifier = ">=6.9.1" },
{ name = "pyudev", specifier = ">=0.24.3" }, { name = "pyudev", specifier = ">=0.24.3" },
{ name = "requests", specifier = ">=2.32.5" }, { name = "requests", specifier = ">=2.32.5" },
{ name = "tqdm", specifier = ">=4.67.1" }, { name = "tqdm", specifier = ">=4.67.1" },