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

chore: optimize and clean code

Browse Source 
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
Boris Yumankulov
2025-10-17 13:08:40 +05:00
parent cde92885d4
commit 464ad0fe9c
2 changed files with 221 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
portprotonqt/virtual_keyboard.py
View File

@@ -54,8 +54,8 @@ class VirtualKeyboard(QFrame):
self.main_window = cast(Any, parent_widget)
parent_widget = cast(QWidget | None, parent_widget.parent())
self.current_theme_name = read_theme_from_config()
self.current_theme_name = read_theme_from_config()
self.initUI()
self.hide()
@@ -132,27 +132,33 @@ class VirtualKeyboard(QFrame):
self.buttons: dict[str, QPushButton] = {}
self.update_keyboard()
def set_gamepad_icon(self, button, icon_type, gtype='default'):
"""Set gamepad icon on button based on type. Now works even without gamepad by using 'default' gtype."""
def set_gamepad_icon(self, button, icon_type, gtype=''):
"""Set gamepad icon on button based on type"""
if icon_type in ['back', 'add_game']:
icon_name = self.main_window.get_button_icon(icon_type, gtype) if self.main_window else f"{icon_type}_default.png"
icon_name = self.main_window.get_button_icon(icon_type, gtype)
else: # nav left/right
if icon_type in ['left', 'right']:
direction = icon_type
icon_name = self.main_window.get_nav_icon(direction, gtype) if self.main_window else f"{direction}_default.png"
icon_name = self.main_window.get_nav_icon(direction, gtype)
else:
direction = 'left' if icon_type == 'left' else 'right'
icon_name = self.main_window.get_nav_icon(direction, gtype) if self.main_window else f"{direction}_default.png"
icon_name = self.main_window.get_nav_icon(direction, gtype)
icon_path = theme_manager.get_theme_image(icon_name, self.current_theme_name)
pixmap = QPixmap()
if icon_path:
pixmap = QPixmap(str(icon_path))
if not pixmap.isNull():
button.setIcon(QIcon(pixmap))
pixmap.load(str(icon_path))
if not pixmap.isNull():
button.setIcon(QIcon(pixmap))
button.setIconSize(QSize(20, 20))
return
else:
# Fallback to placeholder
placeholder = theme_manager.get_theme_image("placeholder", self.current_theme_name)
if placeholder:
button.setIcon(QIcon(placeholder))
button.setIconSize(QSize(20, 20))
return
# Fallback: if no icon found, try standard Qt icon or leave empty
print(f"Warning: Icon {icon_name} not found for button {icon_type}")
def update_keyboard(self):
coords = self._save_focused_coords()
@@ -187,7 +193,7 @@ class VirtualKeyboard(QFrame):
button.setChecked(self.shift_pressed)
button.clicked.connect(lambda checked: self.on_shift_click(checked))
# Add gamepad icon for Shift (RB/R)
gtype = self.input_manager.gamepad_type if self.input_manager and self.input_manager.gamepad else 'default'
gtype = self.input_manager.gamepad_type
self.set_gamepad_icon(button, 'right', gtype)
else:
button.clicked.connect(lambda checked=False, k=key: self.on_button_click(k))
@@ -202,7 +208,7 @@ class VirtualKeyboard(QFrame):
shift.setChecked(self.shift_pressed)
shift.clicked.connect(lambda checked: self.on_shift_click(checked))
# Add gamepad icon for Shift (RB/R)
gtype = self.input_manager.gamepad_type if self.input_manager and self.input_manager.gamepad else 'default'
gtype = self.input_manager.gamepad_type
self.set_gamepad_icon(shift, 'right', gtype)
self.keyboard_layout.addWidget(shift, 3, 11, 1, 3)
@@ -221,7 +227,7 @@ class VirtualKeyboard(QFrame):
backspace.pressed.connect(self.on_backspace_pressed)
backspace.released.connect(self.stop_backspace_repeat)
# Add gamepad icon for Backspace (X/Triangle)
gtype = self.input_manager.gamepad_type if self.input_manager and self.input_manager.gamepad else 'default'
gtype = self.input_manager.gamepad_type
self.set_gamepad_icon(backspace, 'add_game', gtype)
self.keyboard_layout.addWidget(backspace, 0, 13, 1, 1)
@@ -234,7 +240,7 @@ class VirtualKeyboard(QFrame):
lang.setFixedSize(fixed_w, fixed_h)
lang.clicked.connect(self.on_lang_click)
# Add gamepad icon for Lang (LB/L)
gtype = self.input_manager.gamepad_type if self.input_manager and self.input_manager.gamepad else 'default'
gtype = self.input_manager.gamepad_type
self.set_gamepad_icon(lang, 'left', gtype)
self.keyboard_layout.addWidget(lang, 4, 0, 1, 1)
@@ -267,7 +273,7 @@ class VirtualKeyboard(QFrame):
hide_button.setFixedSize(fixed_w * 2 + self.spacing, fixed_h)
hide_button.clicked.connect(self.hide)
# Add gamepad icon for Hide (B/Circle)
gtype = self.input_manager.gamepad_type if self.input_manager and self.input_manager.gamepad else 'default'
gtype = self.input_manager.gamepad_type
self.set_gamepad_icon(hide_button, 'back', gtype)
self.keyboard_layout.addWidget(hide_button, 4, 12, 1, 2)