From 099b5f546296f3bfd668a4ee8fc2042c8c7f272f Mon Sep 17 00:00:00 2001 From: iory Date: Sun, 28 Mar 2021 20:13:00 +0900 Subject: [PATCH] Add --- .gitmodules | 2 +- .../base_module/base_keys_events.py | 11 +++++++++++ .../pythonvideoannotator/settings.py | 7 +++++-- libraries/pyforms-gui | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index ed580eb..3240c6e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,7 +57,7 @@ url = https://github.com/video-annotator/pythonvideoannotator-module-virtualobjectgenerator.git [submodule "libraries/pyforms-gui"] path = libraries/pyforms-gui - url = https://github.com/UmSenhorQualquer/pyforms-gui.git + url = https://github.com/iory/pyforms-gui.git [submodule "libraries/geometry-designer"] path = libraries/geometry-designer url = https://github.com/video-annotator/geometry-designer.git diff --git a/base/pythonvideoannotator/pythonvideoannotator/base_module/base_keys_events.py b/base/pythonvideoannotator/pythonvideoannotator/base_module/base_keys_events.py index 94f099a..5a76835 100644 --- a/base/pythonvideoannotator/pythonvideoannotator/base_module/base_keys_events.py +++ b/base/pythonvideoannotator/pythonvideoannotator/base_module/base_keys_events.py @@ -144,6 +144,17 @@ def keyReleaseEvent(self, event): logger.debug('Jumps 1 frame forward.') self.player.forward_one_frame() + + # Jumps 1 frame backwards. + elif key == conf.SHORT_KEYS['Jumps 30 frame backward.']: + logger.debug('Jumps 30 frame backward.') + self.player.jump_backward_two() + + # Jumps 1 frame forward. + elif key == conf.SHORT_KEYS['Jumps 30 frame forward.']: + logger.debug('Jumps 30 frame forward.') + self.player.jump_forward_two() + # Jumps 20 seconds backward. elif key == conf.SHORT_KEYS['Jumps 20 seconds backward.']: logger.debug('Jumps 20 seconds backward.') diff --git a/base/pythonvideoannotator/pythonvideoannotator/settings.py b/base/pythonvideoannotator/pythonvideoannotator/settings.py index 5c354c5..2d80956 100644 --- a/base/pythonvideoannotator/pythonvideoannotator/settings.py +++ b/base/pythonvideoannotator/pythonvideoannotator/settings.py @@ -81,9 +81,12 @@ 'Select the previous event.': 'Alt+A', # PLAYER - 'Play or pause the video.': 'Ctrl+P', + # 'Play or pause the video.': 'Ctrl+P', + 'Play or pause the video.': 'Space', 'Jumps 1 frame backward.': 'Ctrl+I', 'Jumps 1 frame forward.': 'Ctrl+O', + 'Jumps 30 frame backward.': 'A', + 'Jumps 30 frame forward.': 'S', 'Jumps 20 seconds backward.': 'Ctrl+K', 'Jumps 20 seconds forward.': 'Ctrl+L', 'Set player speed to 1x.': 'Ctrl+1', @@ -103,4 +106,4 @@ } from AnyQt.QtWidgets import QColorDialog, QFileDialog -PYFORMS_COLORDIALOGS_OPTIONS = QColorDialog.ShowAlphaChannel \ No newline at end of file +PYFORMS_COLORDIALOGS_OPTIONS = QColorDialog.ShowAlphaChannel diff --git a/libraries/pyforms-gui b/libraries/pyforms-gui index 5bb69b4..ec9e7ba 160000 --- a/libraries/pyforms-gui +++ b/libraries/pyforms-gui @@ -1 +1 @@ -Subproject commit 5bb69b4f9ec5695f507d5f9accc7884d6f0d3b82 +Subproject commit ec9e7ba18ead8d4c0a6c261ed1a92f3f27ea4626