Anchor-annotator 0.8.0__tar.gz → 0.8.2__tar.gz

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/.pre-commit-config.yaml

@@ -13,6 +13,12 @@ repos:
         language: pygrep
         types: [ python ]
         files: ^anchor/
+      - id: resource-import-check
+        name: resource import check
+        entry: 'import resources_rc'
+        language: pygrep
+        types: [ python ]
+        files: ^anchor/
   - repo: https://github.com/psf/black
     rev: 23.9.1
     hooks:

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/.readthedocs.yaml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: "ubuntu-20.04"
+  os: "ubuntu-lts-latest"
   tools:
-    python: "mambaforge-4.10"
+    python: "mambaforge-latest"
 
 sphinx:
    configuration: docs/source/conf.py

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2/Anchor_annotator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Anchor_annotator
-Version: 0.8.0
+Version: 0.8.2
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools
@@ -24,6 +24,7 @@ License-File: LICENSE
 Requires-Dist: montreal-forced-aligner
 Requires-Dist: pyqtgraph
 Requires-Dist: pyside6
+Dynamic: license-file
 
 # Anchor annotator
 Anchor annotator is a program for inspecting corpora for the [Montreal Forced Aligner](https://montreal-forced-aligner.readthedocs.io/en/latest/) and correcting transcriptions and pronunciations

{anchor_annotator-0.8.0/Anchor_annotator.egg-info → anchor_annotator-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Anchor_annotator
-Version: 0.8.0
+Version: 0.8.2
 Summary: Anchor annotator is a program for inspecting corpora for the Montreal Forced Aligner and correcting transcriptions and pronunciations.
 Home-page: https://github.com/MontrealCorpusTools/Anchor-annotator
 Author: Montreal Corpus Tools
@@ -24,6 +24,7 @@ License-File: LICENSE
 Requires-Dist: montreal-forced-aligner
 Requires-Dist: pyqtgraph
 Requires-Dist: pyside6
+Dynamic: license-file
 
 # Anchor annotator
 Anchor annotator is a program for inspecting corpora for the [Montreal Forced Aligner](https://montreal-forced-aligner.readthedocs.io/en/latest/) and correcting transcriptions and pronunciations

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/anchor/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.8.0'
-__version_tuple__ = version_tuple = (0, 8, 0)
+__version__ = version = '0.8.2'
+__version_tuple__ = version_tuple = (0, 8, 2)

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/anchor/settings.py

@@ -181,8 +181,8 @@ class AnchorSettings(QtCore.QSettings):
             AnchorSettings.ZOOM_IN_KEYBIND: "Ctrl+I",
             AnchorSettings.ZOOM_OUT_KEYBIND: "Ctrl+O",
             AnchorSettings.ZOOM_TO_SELECTION_KEYBIND: "Ctrl+N",
-            AnchorSettings.PAN_LEFT_KEYBIND: "LeftArrow",
-            AnchorSettings.PAN_RIGHT_KEYBIND: "RightArrow",
+            AnchorSettings.PAN_LEFT_KEYBIND: "Left",
+            AnchorSettings.PAN_RIGHT_KEYBIND: "Right",
             AnchorSettings.UNDO_KEYBIND: "Ctrl+Z",
             AnchorSettings.REDO_KEYBIND: "Ctrl+Shift+Z",
             AnchorSettings.RESULTS_PER_PAGE: 100,
@@ -251,6 +251,27 @@ class AnchorSettings(QtCore.QSettings):
             "Transcribed phones": AnchorSettings.TIER_TRANSCRIBED_PHONES_VISIBLE,
         }
 
+    @property
+    def all_keybinds(self):
+        return {
+            QtGui.QKeySequence(self.value(x))
+            for x in [
+                self.DELETE_KEYBIND,
+                self.MERGE_KEYBIND,
+                self.PAN_LEFT_KEYBIND,
+                self.PAN_RIGHT_KEYBIND,
+                self.PLAY_KEYBIND,
+                self.REDO_KEYBIND,
+                self.UNDO_KEYBIND,
+                self.SAVE_KEYBIND,
+                self.SEARCH_KEYBIND,
+                self.SPLIT_KEYBIND,
+                self.ZOOM_IN_KEYBIND,
+                self.ZOOM_OUT_KEYBIND,
+                self.ZOOM_TO_SELECTION_KEYBIND,
+            ]
+        }
+
     @property
     def right_to_left(self) -> bool:
         return self.value(AnchorSettings.TIME_DIRECTION) == AnchorSettings.RTL

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/anchor/ui_main_window.py

@@ -8,7 +8,6 @@
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
 
-import resources_rc
 from PySide6.QtCore import (
     QCoreApplication,
     QDate,
@@ -55,6 +54,7 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
+import anchor.resources_rc
 from anchor.widgets import (
     AcousticModelWidget,
     AlignmentWidget,

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/anchor/widgets.py

@@ -377,6 +377,8 @@ class BaseTableView(QtWidgets.QTableView):
             current = self.selectionModel().currentIndex()
             text = self.selectionModel().model().data(current, QtCore.Qt.ItemDataRole.DisplayRole)
             clipboard.setText(str(text))
+        elif QtGui.QKeySequence(event.keyCombination()) not in self.settings.all_keybinds:
+            super().keyPressEvent(event)
 
     def setModel(self, model: QtCore.QAbstractItemModel) -> None:
         super().setModel(model)
@@ -677,7 +679,7 @@ class UtteranceListWidget(QtWidgets.QWidget):  # pragma: no cover
 
         layout.addWidget(self.table_widget)
         self.pagination_toolbar = PaginationWidget()
-        self.pagination_toolbar.pageRequested.connect(self.table_widget.scrollToTop())
+        self.pagination_toolbar.pageRequested.connect(self.table_widget.scrollToTop)
         layout.addWidget(self.pagination_toolbar)
         self.setLayout(layout)
         self.dictionary = None
@@ -2856,7 +2858,7 @@ class DiarizationWidget(QtWidgets.QWidget):
         self.current_page = 0
         self.num_pages = 0
         self.pagination_toolbar = PaginationWidget()
-        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop())
+        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop)
         layout.addWidget(self.pagination_toolbar)
         self.setLayout(layout)
         self.table.referenceUtteranceSelected.connect(self.update_reference_utterance)
@@ -3047,7 +3049,7 @@ class OovWidget(QtWidgets.QWidget):
         dict_layout.addWidget(self.toolbar)
         dict_layout.addWidget(self.table)
         self.pagination_toolbar = PaginationWidget()
-        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop())
+        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop)
         dict_layout.addWidget(self.pagination_toolbar)
 
         self.setLayout(dict_layout)
@@ -3107,7 +3109,7 @@ class DictionaryWidget(QtWidgets.QWidget):
         dict_layout.addWidget(self.toolbar)
         dict_layout.addWidget(self.table)
         self.pagination_toolbar = PaginationWidget()
-        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop())
+        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop)
         dict_layout.addWidget(self.pagination_toolbar)
 
         self.setLayout(dict_layout)
@@ -3252,7 +3254,7 @@ class SpeakerWidget(QtWidgets.QWidget):
         self.current_page = 0
         self.num_pages = 0
         self.pagination_toolbar = PaginationWidget()
-        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop())
+        self.pagination_toolbar.pageRequested.connect(self.table.scrollToTop)
         speaker_layout.addWidget(self.pagination_toolbar)
         self.tool_bar_wrapper = QtWidgets.QVBoxLayout()
         self.tool_bar = QtWidgets.QToolBar()

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/docs/source/changelog/index.rst

@@ -6,6 +6,11 @@ Changelog
 
    Alpha releases
 
+0.8.1
+-----
+
+- Fixed keyboard interaction on table views
+
 0.8.0
 -----
 

{anchor_annotator-0.8.0 → anchor_annotator-0.8.2}/rtd_environment.yml

@@ -15,3 +15,4 @@ dependencies:
   - sphinx-design
   - kalpy
   - kaldi =*=cpu*
+  - pip