Add customizable shortcuts settings

docs/accessibility/keybinds.rst

@@ -97,9 +97,9 @@ Toolbars
       - Description
     * - Ctrl + Space
       - Add current frame as single frame scene
-    * - Q (AZERTY layout: A)
+    * - Q
       - Toggle whether current frame is first frame
-    * - W (AZERTY layout: Z)
+    * - W
       - Toggle whether current frame is last frame
     * - E
       - Add current A-B selection to current scene list

setup.cfg

@@ -1,6 +1,6 @@
 [flake8]
 count = True
-ignore = W503
+ignore = W503, E704
 max-line-length = 120
 exclude = stubs/*
 show-source = True

vspreview/core/abstracts.py

@@ -7,8 +7,8 @@
 from PyQt6.QtCore import QObject, Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import QKeySequence, QShortcut
 from PyQt6.QtWidgets import (
-    QApplication, QBoxLayout, QCheckBox, QDialog, QDoubleSpinBox, QFrame, QHBoxLayout, QLineEdit, QProgressBar,
-    QPushButton, QSpacerItem, QSpinBox, QTableView, QVBoxLayout, QWidget
+    QApplication, QBoxLayout, QCheckBox, QDialog, QDoubleSpinBox, QFrame, QHBoxLayout, QLineEdit,
+    QProgressBar, QPushButton, QScrollArea, QSpacerItem, QSpinBox, QTableView, QVBoxLayout, QWidget
 )
 
 from .bases import QABC, QYAMLObjectSingleton, SafeYAMLObject
@@ -30,13 +30,15 @@
 
     'SpinBox', 'PushButton', 'LineEdit', 'CheckBox', 'Timer', 'ProgressBar', 'DoubleSpinBox',
 
+    'Shortcut',
+
     'AbstractQItem', 'AbstractYAMLObject',
 
-    'ExtendedWidgetBase', 'ExtendedWidget', 'ExtendedDialog', 'ExtendedTableView',
+    'ExtendedWidgetBase', 'ExtendedWidget', 'ExtendedDialog', 'ExtendedTableView', 'ExtendedScrollArea',
 
     'NotchProvider',
 
-    'AbstractSettingsWidget',
+    'AbstractSettingsWidget', 'AbstractSettingsScrollArea',
 
     'AbstractToolbar', 'AbstractToolbarSettings',
 
@@ -261,13 +263,19 @@ class DoubleSpinBox(ExtendedItemInit, QDoubleSpinBox):
     ...
 
 
+class Shortcut(QShortcut):
+    def __init__(
+        self, key: QKeySequence | QKeySequence.StandardKey | str | int | None,
+        parent: QObject | None, handler: Callable[[], None]
+    ) -> None:
+        super().__init__(key, parent)
+        self.activated.connect(handler)
+
+
 class AbstractQItem:
     __slots__: tuple[str, ...]
     storable_attrs: ClassVar[tuple[str, ...]] = ()
 
-    def add_shortcut(self, key: int, handler: Callable[[], None]) -> None:
-        QShortcut(QKeySequence(key), self, activated=handler)  # type: ignore
-
     def set_qobject_names(self) -> None:
         if not hasattr(self, '__slots__'):
             return
@@ -307,9 +315,6 @@ def setup_ui(self) -> None:
         self.vlayout = VBoxLayout(self)
         self.hlayout = HBoxLayout(self.vlayout)
 
-    def add_shortcuts(self) -> None:
-        pass
-
     def get_separator(self, horizontal: bool = False) -> QFrame:
         separator = QFrame(self)
         separator.setFrameShape(QFrame.Shape.HLine if horizontal else QFrame.Shape.VLine)
@@ -329,6 +334,21 @@ class ExtendedTableView(AbstractQItem, QTableView):
     ...
 
 
+class ExtendedScrollArea(ExtendedWidgetBase, QScrollArea):
+    frame: QFrame
+
+    def setup_ui(self) -> None:
+        self.setWidgetResizable(True)
+
+        self.frame = QFrame(self)
+
+        super().setup_ui()
+
+        self.frame.setLayout(self.vlayout)
+
+        self.setWidget(self.frame)
+
+
 class AbstractSettingsWidget(ExtendedWidget, QYAMLObjectSingleton):
     __slots__ = ()
 
@@ -350,6 +370,23 @@ def __getstate__(self) -> dict[str, Any]:
         return {}
 
 
+class AbstractSettingsScrollArea(ExtendedScrollArea, QYAMLObjectSingleton):
+    def __init__(self) -> None:
+        super().__init__()
+
+        self.setup_ui()
+
+        self.set_defaults()
+
+        self.set_qobject_names()
+
+    def set_defaults(self) -> None:
+        pass
+
+    def __getstate__(self) -> dict[str, Any]:
+        return {}
+
+
 class AbstractToolbarSettings(AbstractSettingsWidget):
     _add_to_tab = True
 

vspreview/main/dialog.py

@@ -3,7 +3,7 @@
 import sys
 from typing import TYPE_CHECKING
 
-from PyQt6.QtCore import QKeyCombination, Qt
+from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QCloseEvent
 from PyQt6.QtWidgets import QLabel, QTabWidget, QWidget
 
@@ -30,7 +30,6 @@ def __init__(self, main_window: MainWindow) -> None:
         self.setModal(True)
 
         self.setup_ui()
-        self.setup_shortcuts()
 
         self.set_qobject_names()
 
@@ -48,12 +47,6 @@ def setup_ui(self) -> None:
             [self.reload_button, self.exit_button] if self.main.reload_enabled else [self.exit_button]
         ))
 
-    def setup_shortcuts(self) -> None:
-        if self.main.reload_enabled:
-            self.add_shortcut(QKeyCombination(Qt.Modifier.CTRL, Qt.Key.Key_R).toCombined(), self.reload_button.click)
-
-        self.add_shortcut(Qt.Key.Key_Escape, self.exit_button.click)
-
     def on_reload_clicked(self, clicked: bool | None = None) -> None:
         self.hide()
         self.main.reload_script()

vspreview/main/settings.py

@@ -28,7 +28,7 @@ class MainSettings(AbstractToolbarSettings):
         'png_compressing_spinbox', 'statusbar_timeout_control',
         'timeline_notches_margin_spinbox', 'usable_cpus_spinbox',
         'zoom_levels_combobox', 'zoom_levels_lineedit', 'zoom_level_default_combobox',
-        'azerty_keyboard_checkbox', 'dragnavigator_timeout_spinbox', 'dragtimeline_timeout_spinbox',
+        'dragnavigator_timeout_spinbox', 'dragtimeline_timeout_spinbox',
         'color_management_checkbox', 'plugins_save_position_combobox'
     )
 
@@ -61,8 +61,6 @@ def setup_ui(self) -> None:
 
         self.usable_cpus_spinbox = SpinBox(self, 1, self.get_usable_cpus_count())
 
-        self.azerty_keyboard_checkbox = CheckBox('AZERTY Keyboard', self)
-
         self.zoom_levels_combobox = ComboBox[int](editable=True, insertPolicy=QComboBox.InsertPolicy.NoInsert)
         self.zoom_levels_lineedit = self.zoom_levels_combobox.lineEdit()
 
@@ -91,10 +89,8 @@ def setup_ui(self) -> None:
 
         HBoxLayout(self.vlayout, [QLabel('Base PPI'), self.base_ppi_spinbox])
 
-        HBoxLayout(self.vlayout, [
-            VBoxLayout([self.dark_theme_checkbox, self.opengl_rendering_checkbox]),
-            VBoxLayout([self.force_old_storages_removal_checkbox, self.azerty_keyboard_checkbox])
-        ])
+        HBoxLayout(self.vlayout, [self.dark_theme_checkbox, self.force_old_storages_removal_checkbox])
+        HBoxLayout(self.vlayout, [self.opengl_rendering_checkbox])
 
         HBoxLayout(self.vlayout, [QLabel('Default output index'), self.output_index_spinbox])
 
@@ -141,7 +137,6 @@ def set_defaults(self) -> None:
         self.statusbar_timeout_control.setValue(Time(seconds=2.5))
         self.timeline_notches_margin_spinbox.setValue(20)
         self.force_old_storages_removal_checkbox.setChecked(False)
-        self.azerty_keyboard_checkbox.setChecked(False)
         self.usable_cpus_spinbox.setValue(self.get_usable_cpus_count())
         self.dragnavigator_timeout_spinbox.setValue(250)
         self.dragtimeline_timeout_spinbox.setValue(40)
@@ -187,10 +182,6 @@ def timeline_label_notches_margin(self) -> int:
     def force_old_storages_removal(self) -> int:
         return main_window().force_storage or self.force_old_storages_removal_checkbox.isChecked()
 
-    @property
-    def azerty_keybinds(self) -> bool:
-        return self.azerty_keyboard_checkbox.isChecked()
-
     @property
     def usable_cpus_count(self) -> int:
         return self.usable_cpus_spinbox.value()
@@ -329,7 +320,6 @@ def __getstate__(self) -> dict[str, Any]:
             'dragtimeline_timeout': self.dragtimeline_timeout,
             'plugins_bar_save_behaviour_index': self.plugins_bar_save_behaviour,
             'color_management': self.color_management,
-            'azerty_keybinds': self.azerty_keybinds,
         }
 
     def __setstate__(self, state: dict[str, Any]) -> None:
@@ -349,7 +339,6 @@ def __setstate__(self, state: dict[str, Any]) -> None:
         try_load(state, 'output_primaries_index', int, self.primaries_combobox.setCurrentIndex)
         try_load(state, 'plugins_bar_save_behaviour_index', int, self.plugins_save_position_combobox.setCurrentIndex)
         try_load(state, 'color_management', bool, self.color_management_checkbox.setChecked)
-        try_load(state, 'azerty_keybinds', bool, self.azerty_keyboard_checkbox.setChecked)
 
 
 class WindowSettings(QYAMLObjectSingleton):