plover2cat 4.0.0a1__py3-none-any.whl → 4.0.2__py3-none-any.whl

{plover2cat-4.0.0a1.dist-info → plover2cat-4.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plover2cat
-Version: 4.0.0a1
+Version: 4.0.2
 Summary: A CAT software for Plover
 Home-page: https://github.com/greenwyrt/plover2CAT/
 Author: plants
@@ -19,7 +19,8 @@ Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: plover>=5.0.0.dev2
-Requires-Dist: PySide6-Addons>=6.9.0
+Requires-Dist: PySide6-Essentials>=6.10.0
+Requires-Dist: PySide6-Addons>=6.10.0
 Requires-Dist: odfpy
 Requires-Dist: pyparsing>3.0.7
 Requires-Dist: spylls
@@ -29,8 +30,6 @@ Dynamic: license-file
 
 # plover2CAT
 
-Note: In line with the new Plover 5 release, Plover2CAT is releasing 4.0.0-alpha, which should retain all existing functionalities and is installable on Plover 5 by Github. All issues can be reported here or in Discord.
-
 Plover2CAT is a plugin for Plover, the open-source stenography engine. If the only user requirement is to write steno on the computer, this plugin is not needed as Plover is more than sufficient. Plover2CAT supplements Plover by providing some features of a computer-aided-transcription (CAT) program.
 
 ## Features Overview
@@ -55,7 +54,7 @@ Plover2CAT is a plugin for Plover, the open-source stenography engine. If the on
   - timestamped paper tape
   - creation and loading of transcript-specific dictionaries for each transcript
 
-- audiovisual synchonization and recording
+- media (audio/video) synchonization and recording
 
 - captioning features such as:
   - separate window to display captions

plover2cat-4.0.2.dist-info/RECORD

@@ -0,0 +1,42 @@
+plover2cat-4.0.2.dist-info/licenses/LICENSE.txt,sha256=nmGAW0AJG4ke0VT1kvbz6m_jBMcnRRcJQnBtJmKAKU0,1084
+plover_cat/FlowLayout.py,sha256=3sCpVJCNJNwIimyFFlSOaNt-TNb-6kFwvlxwRI3QtNg,3707
+plover_cat/PloverCATWindow.py,sha256=hQRmN6UY9i0jmj2qhCUwTo6gYnC_V-4rsE4AXULJfXA,157834
+plover_cat/TextEditor.py,sha256=1YC2DMczfNMs_nzF0iBJ2TYRR4AgHU6fnZzFLMmIYlo,63269
+plover_cat/__init__.py,sha256=Lq2ydZPCJhq4vEbiuNtFEoBM4i4vU8onupJY3N5r2do,964
+plover_cat/__version__.py,sha256=45KtQfHIsnl8P4MO15r2HBP33RYIRoThY4TQan3SXgo,25
+plover_cat/affixDialogWindow.py,sha256=p-SlQR7rDYeTWJeSwjT0RqqLUtvxgeWQUzA9HBLwSME,2729
+plover_cat/affix_dialog_ui.py,sha256=R0aLLClSJiAFu6IALryqIwp_ZvHHDiVP146js2iEvIw,5666
+plover_cat/captionDialogWindow.py,sha256=Zc3JqwaHasJF7FsmLH7hAEYDvbvbuKNihsXDIBqlZN0,2817
+plover_cat/captionWorker.py,sha256=MFjoYnJ2pEeU9KalUlN0PmygVoOvKAdlc1LM8SPQRlw,8210
+plover_cat/caption_dialog_ui.py,sha256=-IYGhZ8QyGQTEqsC2gXFvfpy0YX6BLvncZean4mWEXI,9726
+plover_cat/constants.py,sha256=wDKCJPJuasBpHu6DsiOPW2dlRTWR1ayUYCjEEutQvKs,4933
+plover_cat/create_dialog_ui.py,sha256=6RF0zDPmhO3nreLJtXy7qmSj0IAMaAFbCg8wr_Duye4,4388
+plover_cat/documentWorker.py,sha256=VmgqscHSEjxIEOpdHSydTkOm9mg1zUc5Djkgkc4S1uA,33512
+plover_cat/export_helpers.py,sha256=Tw2r8JroK3lbFpinmBuZKEpt7M1N9-USehwT-EHbXMQ,20116
+plover_cat/fieldDialogWindow.py,sha256=DhVxHb5r1Hp_JUvEX9zicH695pG2RUQXol6PTOKsJjA,3134
+plover_cat/field_dialog_ui.py,sha256=-lDA5-lXV8mtwjRBj7nwiu4F0l7tRtvbHrARrY9KOxw,5586
+plover_cat/helpers.py,sha256=xImF2Rgj246TGotVfvW8jOJEdbo3IfqzwGnSb5mw87U,5582
+plover_cat/indexDialogWindow.py,sha256=tx5dIAVKuEAMBsmudjb8G4le22ySEQ1blXe-WT_VyUA,5640
+plover_cat/index_dialog_ui.py,sha256=zKm4XrS6tLE1noA5G3CnnQqKth5cwochjJmettSh7lY,8063
+plover_cat/plover_cat_ui.py,sha256=it_ZMR1rNjM19Fx0lpSqt0X32BBFYUONUojpmY1xNis,159256
+plover_cat/qcommands.py,sha256=5HGazgGS_KgOjowzEMpBiP4O5dQGYvKhc3GhlFjGjaM,39342
+plover_cat/recorderDialogWindow.py,sha256=PqcM4kmg1ipNiNG3g97MWC5Wfaeu7wQqLxmZ9-6gf1I,2917
+plover_cat/recorder_dialog_ui.py,sha256=ej6Mu54haTFlxBBLhUntiimLgINmJ67WkcoroZK04xQ,7782
+plover_cat/resources_rc.py,sha256=prG98RZmEMVqs7NeA6JoJurYrDdqBDCsliI3KZ0Mpbk,126111
+plover_cat/rtf_parsing.py,sha256=6p-9oH73vep4dG53tl9TDfNfoX0Ggv8KPeDXolXH5nY,21299
+plover_cat/shortcutDialogWindow.py,sha256=8Tlk6v2-z6lyRdDR4Y7rquKxoqGL1UkCnYiKVHipgoQ,2453
+plover_cat/shortcut_dialog_ui.py,sha256=BLr5BMPEdtmXXnJpJf83nKJLTgjmFQlx2SRcCJTNLz8,4504
+plover_cat/spellcheck.py,sha256=r0dO34PGLpMbPypkFHE08jTrClGWen8C89BdmMidKVU,6695
+plover_cat/steno_objects.py,sha256=JEEL3f5sXolLp3q68DMbJuvSsqiXWcoRFIlTHrq1qQY,42778
+plover_cat/suggestDialogWindow.py,sha256=Oa2HSh9b8rsxjtcxgMFSqpNnwmPuYoLywIkYUL_19z0,6404
+plover_cat/suggest_dialog_ui.py,sha256=65HVlhpI08Ke4MonXK2c4-kKsdsm-ML7oKPAW4me8xg,8783
+plover_cat/tapeDialogWindow.py,sha256=yLzBLrJzj27MqOSYFiwR2nYzX7LLOkwLp-i6SApPL6A,4085
+plover_cat/tape_dialog_ui.py,sha256=2t1gyuZ80j-G9dBb2a7V4uyi8j6OHWP45LlDXJZ9g_Q,4049
+plover_cat/testDialogWindow.py,sha256=wqkk_6mGRcKlNHdVc3P_yTkt4x70MOtUZlLYU3RN0bM,21821
+plover_cat/test_dialog_ui.py,sha256=P6joXflNVjhVkvY-pmgpQDqelQDRe_E92MqK1sBVwvc,4736
+plover2cat-4.0.2.dist-info/METADATA,sha256=w6L8busygoyPRkuGna3mfFqXz7GUpmTzmW0HaT4pZ64,4900
+plover2cat-4.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+plover2cat-4.0.2.dist-info/entry_points.txt,sha256=bZekpaOB8tv7DjkjuOBYrIdcMgCNuOYDrXKmV6Mgd1o,55
+plover2cat-4.0.2.dist-info/top_level.txt,sha256=q7Rw-aE6ep8anwrqhiZOlCig80KhoV4bmE8yWiIlL4E,11
+plover2cat-4.0.2.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+plover2cat-4.0.2.dist-info/RECORD,,

{plover2cat-4.0.0a1.dist-info → plover2cat-4.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

plover_cat/PloverCATWindow.py

@@ -9,32 +9,23 @@ from collections import Counter, deque
 from copy import deepcopy
 from sys import platform
 from tempfile import gettempdir, TemporaryDirectory
-
-
 from PySide6 import QtCore, QtGui, QtWidgets
-from PySide6.QtGui import (QBrush, QColor, QTextCursor, QFont, QFontMetrics, QTextDocument, 
-QCursor, QStandardItem, QStandardItemModel, QPageSize, QTextBlock, QTextFormat, QTextBlockFormat, 
-QTextOption, QTextCharFormat, QKeySequence, QPalette, QDesktopServices, QPixmap, QAction, QIcon)
+from PySide6.QtGui import (QColor, QTextCursor, QFont, QFontMetrics, QTextDocument, 
+QStandardItem, QStandardItemModel, QPageSize,
+QTextOption, QKeySequence, QPalette, QDesktopServices, QPixmap, QAction, QIcon)
 from PySide6.QtWidgets import (QMainWindow, QFileDialog, QInputDialog, QListWidgetItem, QTableWidgetItem, 
-QStyle, QStyleFactory, QMessageBox, QDialog, QFontDialog, QColorDialog, QLabel, QMenu, 
+QMessageBox, QDialog, QFontDialog, QColorDialog, QLabel, QMenu, 
 QCompleter, QApplication, QTextEdit, QPlainTextEdit, QProgressBar,  QToolButton, QDockWidget)
 from PySide6.QtMultimedia import (QMediaPlayer, QMediaRecorder, QMediaFormat, QMediaDevices, QAudioInput)
 from PySide6.QtMultimediaWidgets import QVideoWidget
-from PySide6.QtCore import Qt, QFile, QTextStream, QUrl, QTime, QDateTime, QSettings, QRegularExpression, QSize, QStringListModel, QSizeF, QTimer, QThread
-_ = lambda txt: QtCore.QCoreApplication.translate("Plover2CAT", txt)
+from PySide6.QtCore import Qt, QFile, QLocale, QUrl, QTime, QDateTime, QSettings, QRegularExpression, QSize, QStringListModel, QSizeF, QTimer, QThread
 from PySide6.QtTextToSpeech import QTextToSpeech
-
 import plover
-
-from plover.engine import StenoEngine
 from plover.steno import Stroke, normalize_steno, normalize_stroke
-from plover.dictionary.base import load_dictionary
 from plover.system.english_stenotype import DICTIONARIES_ROOT, ORTHOGRAPHY_WORDLIST
 from plover.system import _load_wordlist
 from plover import log
-
 from plover_cat.__version__ import __version__
-
 from plover_cat.plover_cat_ui import Ui_PloverCAT
 from plover_cat.TextEditor import PloverCATEditor
 from plover_cat.fieldDialogWindow import fieldDialogWindow
@@ -44,8 +35,8 @@ from plover_cat.indexDialogWindow import indexDialogWindow
 from plover_cat.suggestDialogWindow import suggestDialogWindow
 from plover_cat.captionDialogWindow import captionDialogWindow
 from plover_cat.recorderDialogWindow import recorderDialogWindow
+from plover_cat.tapeDialogWindow import tapeDialogWindow
 from plover_cat.testDialogWindow import testDialogWindow
-
 from plover_cat.rtf_parsing import *
 from plover_cat.constants import *
 from plover_cat.qcommands import *
@@ -57,6 +48,8 @@ from plover_cat.FlowLayout import FlowLayout
 from plover_cat.documentWorker import documentWorker
 from plover_cat.captionWorker import captionWorker
 
+_ = lambda txt: QtCore.QCoreApplication.translate("Plover2CAT", txt)
+
 scowl = _load_wordlist(ORTHOGRAPHY_WORDLIST, DICTIONARIES_ROOT)
 
 try:
@@ -92,6 +85,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
     :ivar textEdit: hold current transcript 
     :ivar index_dialog: instance of ``indexDialogWindow``
     :ivar caption_dialog: instance of ``captionDialogWindow``
+    :ivar tape_dialog: instance of ``tapeDialogWindow``
     :ivar suggest_dialog: instance of ``suggestDialogWindow``
     :ivar cap_worker: instance of ``capWorker``
     :ivar autosave_time: autosave timer as ``QTimer``
@@ -152,6 +146,8 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.index_dialog = indexDialogWindow({})
         self.caption_dialog = captionDialogWindow() 
         self.suggest_dialog = suggestDialogWindow(None, self.engine, scowl)
+        self.tape_dialog = tapeDialogWindow()
+        self.tape_dialog.translate_stroke_from_tape.connect(self.tape_stroke_translate)
         self.cap_worker = None
         self.autosave_time = QTimer()
         self.cutcopy_storage = deque(maxlen = 5)
@@ -1529,7 +1525,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         else:
             self.close_file()
         self.display_message("Closing window.")
-        self.parent().close()
+        self.parent().done(1)
 
     def close_file(self, tab_index = None):
         """Close transcript tab, checking for changes.
@@ -1859,10 +1855,10 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
             return
         self.textEdit.log_to_tape(stroke)             
 
-    def on_send_string(self, string):
+    def on_send_string(self, txt_string):
         """Set string sent by Plover in transcript.
         """
-        self.textEdit.last_string_sent = string
+        self.textEdit.last_string_sent = txt_string
 
     def count_backspaces(self, backspace):
         """Set number of backspaces sent by Plover in transcript.
@@ -1888,6 +1884,9 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.display_captions()
         self.textEdit.on_stroke(stroke_pressed, self.actionCursorAtEnd.isChecked())
 
+    def reconnect_keyboard(self):
+        self.engine._keyboard_emulation = self.kc
+
     def tape_translate(self):
         """Translate tape contents into transcript.
         """
@@ -1897,71 +1896,40 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
                 self.engine.set_output(True)
             else:
                 return
-        # do not erase any content before, case of too many asterisks for example
         self.engine.clear_translator_state()
-        # bit of a hack since triggering stroked hook through code
-        selected_file = QFileDialog.getOpenFileName(
-            self,
-            _("Select tape file to translate"),
-            str(self.textEdit.file_name), _("Tape (*.tape *.txt)"))[0]
-        if not selected_file:
-            return
-        transcript_dir = self.textEdit.file_name 
-        if pathlib.Path(selected_file) == transcript_dir.joinpath(transcript_dir.stem).with_suffix(".tape"):
-            self.statusBar.showMessage("Cannot translate from own transcript tape.")
-            return
-        selected_file = pathlib.Path(selected_file)   
-        paper_format, ok = QInputDialog.getItem(self, "Translate Tape", "Format of tape file:", ["Plover2CAT", "Plover (raw)", "Plover (paper)"], editable = False)
-        log.debug(f"Translating tape from {selected_file} with {paper_format} format.")
-        self.mainTabs.hide()
-        self.textEdit.blockSignals(True)
-        self.textEdit.document().blockSignals(True)
         self.kc = self.engine._keyboard_emulation
         self.engine._keyboard_emulation = mock_output()        
-        count = 0
-        if paper_format == "Plover (raw)":
-            with open(selected_file) as f:
-                for line in f:
-                    stroke = Stroke(normalize_stroke(line.strip().replace(" ", "")))
-                    self.engine._translator.translate(stroke)
-                    self.engine._trigger_hook('stroked', stroke)
-                    count += 1
-                    if count > 100:
-                        self.textEdit.undo_stack.clear()
-                        count = 0
-        elif paper_format == "Plover2CAT":
-            with open(selected_file) as f:
-                for line in f:
-                    stroke_contents = line.strip().split("|")[3]
-                    keys = []
-                    for i in range(len(stroke_contents)):
-                        if not stroke_contents[i].isspace() and i < len(plover.system.KEYS):
-                            keys.append(plover.system.KEYS[i])                    
-                    self.engine._translator.translate(Stroke(keys))
-                    self.engine._trigger_hook('stroked', Stroke(keys))
-                    count += 1
-                    if count > 100:
-                        self.textEdit.undo_stack.clear()
-                        count = 0
-        elif paper_format == "Plover (paper)":
-            with open(selected_file) as f:
-                for line in f:
-                    keys = []
-                    for i in range(len(line)):
-                        if not line[i].isspace() and i < len(plover.system.KEYS):
-                            keys.append(plover.system.KEYS[i])
-                    self.engine._translator.translate(Stroke(keys))
-                    self.engine._trigger_hook('stroked', Stroke(keys))
-                    count += 1
-                    if count > 100:
-                        self.textEdit.undo_stack.clear()
-                        count = 0
-        self.textEdit.undo_stack.clear()
+        self.tape_dialog.open()
+        self.tape_dialog.finished.connect(self.reconnect_keyboard)
+        # # do not erase any content before, case of too many asterisks for example
+        # self.engine.clear_translator_state()
+        # self.mainTabs.hide()
+        # self.textEdit.blockSignals(True)
+        # self.textEdit.document().blockSignals(True)
+
+        # self.textEdit.undo_stack.clear()
+        # self.textEdit.document().blockSignals(False)
+        # self.textEdit.blockSignals(False)
+        # self.mainTabs.show()
+        # self.engine._keyboard_emulation = self.kc
+        # todo, if format has time data, that should be inserted into stroke data of editor too
+
+    def tape_stroke_translate(self, strokes = 1):
+        if strokes > 50:
+            self.mainTabs.hide()
+        self.textEdit.blockSignals(True)
+        self.textEdit.document().blockSignals(True)
+        selected_row = self.tape_dialog.tape_view.currentIndex().row()
+        for idx in range(selected_row, selected_row + strokes):
+            if idx >= self.tape_dialog.tape_model.rowCount():
+                break
+            stroke_data = self.tape_dialog.tape_model.item(idx)
+            print(stroke_data.data(Qt.UserRole))
+            self.engine._translator.translate(Stroke(stroke_data.data(Qt.UserRole)))
         self.textEdit.document().blockSignals(False)
         self.textEdit.blockSignals(False)
-        self.mainTabs.show()
-        self.engine._keyboard_emulation = self.kc
-        # todo, if format has time data, that should be inserted into stroke data of editor too
+        if strokes > 50:
+            self.mainTabs.show()
 
     def reset_paragraph(self):
         """Remove all data from paragraph block, and erase action history.
@@ -2772,42 +2740,117 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.textEdit.recorder.durationChanged.disconnect()
 
     def tts_synthesize(self):
-        pass
+        """TTS synthesize from selection or cursor position"""
+        self.tts_play.setEnabled(False)
+        current_cursor = self.textEdit.textCursor()
+        if current_cursor.hasSelection():
+            document_text = current_cursor.selectedText()
+        else:
+            document_text = self.textEdit.toPlainText()
+            document_text = document_text[current_cursor.position():]
+        print(document_text)
+        if document_text.strip():            
+            self.tts_instance.enqueue(document_text)
+
 
     def tts_setup(self):
+        """Set up TTS engine and connections"""
         self.tts_instance = QTextToSpeech(self)
-        for engine in QTextToSpeech.availableEngines():
-            if engine != "mock":
-                self.tts_engine.addItem(engine)
-        self.tts_engine.setCurrentIndex(0)
-        self.tts_instance.setEngine(self.tts_engine.currentText())
+        self.tts_pop_engine()
+        if self.tts_instance.engineCapabilities() & QTextToSpeech.Capability.PauseResume:
+            self.tts_pause.setVisible(True)
+            self.tts_resume.setVisible(True)
+        else:
+            self.tts_pause.setVisible(False)
+            self.tts_resume.setVisible(False)            
         self.tts_pitch.valueChanged.connect(self.tts_set_pitch)
         self.tts_volume.valueChanged.connect(self.tts_set_volume)
         self.tts_rate.valueChanged.connect(self.tts_set_rate)
-        self.tts_locale.currentIndexChanged.connect(self.tts_set_locale)
-        self.tts_voice.currentIndexChanged.connect(self.tts_set_voice)
         self.tts_engine.currentIndexChanged.connect(self.tts_set_engine)
-
-    def tts_set_engine(self, index):
-        pass
+        self.tts_locale.currentIndexChanged.connect(self.tts_set_locale)
+        self.tts_voice.currentIndexChanged.connect(self.tts_set_voice)    
+        self.tts_play.clicked.connect(self.tts_synthesize)
+        self.tts_stop.clicked.connect(self.tts_end)
+        self.tts_pause.clicked.connect(lambda: self.tts_instance.pause())
+        self.tts_resume.clicked.connect(lambda: self.tts_instance.resume())
+        self.tts_instance.stateChanged.connect(self.tts_state_manage)
+        self.tts_set_engine()
+
+    def tts_end(self):
+        """Stop TTS playback"""
+        self.tts_instance.stop()
+        self.tts_play.setEnabled(True)
+
+    def tts_pop_engine(self, index=None):
+        """Populate TTS engine choices"""
+        self.tts_engine.blockSignals(True)
+        self.tts_engine.clear()
+        for engine in QTextToSpeech.availableEngines():
+            if engine != "mock":
+                self.tts_engine.addItem(engine)
+        self.tts_engine.blockSignals(False)
+        if index:
+            self.tts_engine.setCurrentIndex(index)
+        else:
+            self.tts_engine.setCurrentIndex(0)
+
+    def tts_state_manage(self, state):
+        """Respond to changes in TTS state"""
+        if state == QTextToSpeech.State.Ready:
+            self.tts_play.setEnabled(True)
+        elif state == QTextToSpeech.State.Error:
+            self.display_message(self.tts_instance.errorString())
+
+    def tts_set_engine(self, index = None):
+        """Set TTS engine"""
+        user_select = self.tts_engine.currentText()
+        self.tts_instance.setEngine(user_select)
+        self.tts_pop_locale()
+
+    def tts_pop_locale(self):
+        """Populate locales in ui for selected TTS engine"""
+        self.tts_locale.blockSignals(True)
+        self.tts_locale.clear()
+        for loc in self.tts_instance.availableLocales():
+            self.tts_locale.addItem(f"{QLocale.languageToString(loc.language())} ({QLocale.territoryToString(loc.territory())})", loc)
+        self.tts_locale.blockSignals(False)
+        self.tts_locale.setCurrentIndex(0)
+        self.tts_pop_voice()
 
     def tts_set_locale(self, index):
-        pass
+        """Set locale for present TTS engine"""
+        user_select = self.tts_locale.currentData()
+        self.tts_instance.setLocale(user_select)
+        self.tts_pop_voice()
+
+    def tts_pop_voice(self):
+        """Populate voices in ui for selected TTS engine"""
+        self.tts_voice.blockSignals(True)
+        self.tts_voice.clear()
+        for voice in self.tts_instance.availableVoices():
+            self.tts_voice.addItem(voice.name(), voice)
+        self.tts_voice.blockSignals(False)
+        self.tts_voice.setCurrentIndex(0)
 
     def tts_set_voice(self, index):
-        pass
+        """Set voice for present TTS engine"""
+        user_select = self.tts_voice.currentData()
+        self.tts_instance.setVoice(user_select)
 
     def tts_set_pitch(self, pitch):
+        """Set TTS pitch"""
         pitch = pitch / 10
         if self.tts_instance:
             self.tts_instance.setPitch(pitch)
 
     def tts_set_volume(self, volume):
+        """Set TTS volume"""
         volume = volume / 10
         if self.tts_instance:
             self.tts_instance.setVolume(volume)
 
     def tts_set_rate(self, rate):
+        """Set TTS rate"""
         rate = rate / 10
         if self.tts_instance:
             self.tts_instance.setRate(rate)

plover_cat/TextEditor.py

@@ -1,4 +1,3 @@
-import string
 import pathlib
 import json
 import os
@@ -9,13 +8,11 @@ from dulwich.errors import NotGitRepository
 from dulwich import porcelain
 from spylls.hunspell import Dictionary
 
-from PySide6 import QtCore, QtGui, QtWidgets
-from PySide6.QtGui import QCursor, QKeySequence, QTextCursor, QTextDocument, QColor, QUndoStack
-from PySide6.QtCore import QFile, QStringListModel, Qt, QModelIndex, Signal, QUrl, QSettings
+from PySide6 import QtCore, QtGui
+from PySide6.QtGui import QTextCursor, QTextDocument, QColor, QUndoStack
+from PySide6.QtCore import Qt, Signal, QUrl, QSettings
 from PySide6.QtWidgets import QCompleter, QTextEdit,  QMessageBox, QApplication
-from PySide6.QtMultimedia import (QMediaPlayer, QMediaRecorder, QMediaDevices, QMediaCaptureSession, QMediaFormat, QAudioOutput)
-
-_ = lambda txt: QtCore.QCoreApplication.translate("Plover2CAT", txt)
+from PySide6.QtMultimedia import (QMediaPlayer, QMediaRecorder, QMediaCaptureSession, QAudioOutput)
 
 import plover
 
@@ -29,6 +26,8 @@ from plover_cat.export_helpers import load_odf_styles, recursive_style_format, p
 from plover_cat.helpers import ms_to_hours, save_json, backup_dictionary_stack, add_custom_dicts, load_dictionary_stack_from_backup, return_commits, hide_file
 from plover_cat.constants import default_styles, default_config, default_dict
 
+_ = lambda txt: QtCore.QCoreApplication.translate("Plover2CAT", txt)
+
 class PloverCATEditor(QTextEdit):
     """Editor object for a transcript.
 
@@ -185,6 +184,7 @@ class PloverCATEditor(QTextEdit):
                     self.mock_type(event.text())
             # print(event.key())
             QTextEdit.keyPressEvent(self, event)
+
     def recorder_error(self, error, message):
         log.debug(f"{error}: {message}")
 

plover_cat/__init__.py

@@ -1,5 +1,5 @@
-from PySide6.QtCore import Qt, QTimer
-from PySide6.QtWidgets import QMainWindow, QHBoxLayout
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QHBoxLayout
 
 from plover.gui_qt.tool import Tool
 
@@ -18,12 +18,14 @@ class PloverCAT(Tool):
 
     def __init__(self, engine):
         super().__init__(engine)
-
         self.setWindowFlags(Qt.Window | Qt.WindowMinMaxButtonsHint)
         self.layout = QHBoxLayout()
-        self.layout.addWidget(PloverCATWindow(engine))
+        self.everything = PloverCATWindow(engine)
+        self.layout.addWidget(self.everything)
         self.layout.setContentsMargins(0,0,0,0)
         self.setLayout(self.layout)
-
         #what does this do?
-        self.finished.connect(lambda: None)
+        # self.finished.connect(lambda: None)
+    def keyPressEvent(self, event):
+        if event.key() != Qt.Key_Escape:
+            Tool.keyPressEvent(self, event)

plover_cat/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "4.0.0-alpha.1"
+__version__ = "4.0.2"
 

plover_cat/affix_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'affix_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/caption_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'caption_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/create_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'create_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/field_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'field_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/index_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'index_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/plover_cat_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'plover_cat.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -387,6 +387,10 @@ class Ui_PloverCAT(object):
         self.actionColorField.setObjectName(u"actionColorField")
         self.actionColorIndex = QAction(PloverCAT)
         self.actionColorIndex.setObjectName(u"actionColorIndex")
+        self.actionPlayTTS = QAction(PloverCAT)
+        self.actionPlayTTS.setObjectName(u"actionPlayTTS")
+        self.actionStopTTS = QAction(PloverCAT)
+        self.actionStopTTS.setObjectName(u"actionStopTTS")
         self.centralwidget = QWidget(PloverCAT)
         self.centralwidget.setObjectName(u"centralwidget")
         self.verticalLayout_24 = QVBoxLayout(self.centralwidget)
@@ -1584,12 +1588,12 @@ class Ui_PloverCAT(object):
         self.tabWidget.addTab(self.stenospell_pane, icon32, "")
         self.tts_pane = QWidget()
         self.tts_pane.setObjectName(u"tts_pane")
-        self.tts_pane.setEnabled(False)
+        self.tts_pane.setEnabled(True)
         self.verticalLayout_8 = QVBoxLayout(self.tts_pane)
         self.verticalLayout_8.setObjectName(u"verticalLayout_8")
         self.tts_settings_group = QGroupBox(self.tts_pane)
         self.tts_settings_group.setObjectName(u"tts_settings_group")
-        self.tts_settings_group.setEnabled(False)
+        self.tts_settings_group.setEnabled(True)
         self.verticalLayout_9 = QVBoxLayout(self.tts_settings_group)
         self.verticalLayout_9.setObjectName(u"verticalLayout_9")
         self.formLayout = QFormLayout()
@@ -1675,21 +1679,25 @@ class Ui_PloverCAT(object):
         self.horizontalLayout_19.setObjectName(u"horizontalLayout_19")
         self.tts_play = QPushButton(self.tts_pane)
         self.tts_play.setObjectName(u"tts_play")
+        self.tts_play.setFocusPolicy(Qt.FocusPolicy.NoFocus)
 
         self.horizontalLayout_19.addWidget(self.tts_play)
 
         self.tts_pause = QPushButton(self.tts_pane)
         self.tts_pause.setObjectName(u"tts_pause")
+        self.tts_pause.setFocusPolicy(Qt.FocusPolicy.NoFocus)
 
         self.horizontalLayout_19.addWidget(self.tts_pause)
 
         self.tts_resume = QPushButton(self.tts_pane)
         self.tts_resume.setObjectName(u"tts_resume")
+        self.tts_resume.setFocusPolicy(Qt.FocusPolicy.NoFocus)
 
         self.horizontalLayout_19.addWidget(self.tts_resume)
 
         self.tts_stop = QPushButton(self.tts_pane)
         self.tts_stop.setObjectName(u"tts_stop")
+        self.tts_stop.setFocusPolicy(Qt.FocusPolicy.NoFocus)
 
         self.horizontalLayout_19.addWidget(self.tts_stop)
 
@@ -1858,6 +1866,9 @@ class Ui_PloverCAT(object):
         self.menuAudio.addAction(self.actionFlushCaption)
         self.menuAudio.addSeparator()
         self.menuAudio.addAction(self.actionAddChangeAudioTimestamps)
+        self.menuAudio.addSeparator()
+        self.menuAudio.addAction(self.actionPlayTTS)
+        self.menuAudio.addAction(self.actionStopTTS)
         self.menuView.addAction(self.actionShowAllCharacters)
         self.menuView.addAction(self.actionWindowFont)
         self.menuView.addAction(self.actionBackgroundColor)
@@ -1957,9 +1968,11 @@ class Ui_PloverCAT(object):
         self.dockSuggest.visibilityChanged.connect(self.actionSuggestions.setChecked)
         self.actionNavigation.triggered["bool"].connect(self.dockNavigation.setVisible)
         self.actionAutomaticAffixes.toggled.connect(self.actionEditAffixes.setEnabled)
+        self.actionPlayTTS.triggered.connect(self.tts_play.click)
+        self.actionStopTTS.triggered.connect(self.tts_stop.click)
 
         self.mainTabs.setCurrentIndex(0)
-        self.tabWidget.setCurrentIndex(5)
+        self.tabWidget.setCurrentIndex(6)
 
 
         QMetaObject.connectSlotsByName(PloverCAT)
@@ -2042,28 +2055,28 @@ class Ui_PloverCAT(object):
 #endif // QT_CONFIG(shortcut)
         self.actionOpenAudio.setText(QCoreApplication.translate("PloverCAT", u"Open Media", None))
 #if QT_CONFIG(tooltip)
-        self.actionOpenAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Select an audiovisual file on computer to play", None))
+        self.actionOpenAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Select a media file to play", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionOpenAudio.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+Shift+O", None))
 #endif // QT_CONFIG(shortcut)
         self.actionSkipBack.setText(QCoreApplication.translate("PloverCAT", u"Skip Back", None))
 #if QT_CONFIG(tooltip)
-        self.actionSkipBack.setToolTip(QCoreApplication.translate("PloverCAT", u"Skip back in audio/video", None))
+        self.actionSkipBack.setToolTip(QCoreApplication.translate("PloverCAT", u"Skip back in media", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionSkipBack.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+J", None))
 #endif // QT_CONFIG(shortcut)
         self.actionSkipForward.setText(QCoreApplication.translate("PloverCAT", u"Skip Forward", None))
 #if QT_CONFIG(tooltip)
-        self.actionSkipForward.setToolTip(QCoreApplication.translate("PloverCAT", u"Skip forward in audio/video", None))
+        self.actionSkipForward.setToolTip(QCoreApplication.translate("PloverCAT", u"Skip forward in media", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionSkipForward.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+L", None))
 #endif // QT_CONFIG(shortcut)
         self.actionStopAudio.setText(QCoreApplication.translate("PloverCAT", u"Stop", None))
 #if QT_CONFIG(tooltip)
-        self.actionStopAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Stop selected audio/video being played", None))
+        self.actionStopAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Stop currently playing media", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionStopAudio.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+W", None))
@@ -2084,7 +2097,7 @@ class Ui_PloverCAT(object):
 #endif // QT_CONFIG(shortcut)
         self.actionPlayPause.setText(QCoreApplication.translate("PloverCAT", u"Play/Pause", None))
 #if QT_CONFIG(tooltip)
-        self.actionPlayPause.setToolTip(QCoreApplication.translate("PloverCAT", u"Play or pause selected audio/video", None))
+        self.actionPlayPause.setToolTip(QCoreApplication.translate("PloverCAT", u"Play or pause media", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionPlayPause.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+P", None))
@@ -2125,14 +2138,14 @@ class Ui_PloverCAT(object):
 #endif // QT_CONFIG(tooltip)
         self.actionRecordPause.setText(QCoreApplication.translate("PloverCAT", u"Record/Pause", None))
 #if QT_CONFIG(tooltip)
-        self.actionRecordPause.setToolTip(QCoreApplication.translate("PloverCAT", u"Start or pause the recording of audio", None))
+        self.actionRecordPause.setToolTip(QCoreApplication.translate("PloverCAT", u"Start or pause media recording", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(shortcut)
         self.actionRecordPause.setShortcut(QCoreApplication.translate("PloverCAT", u"Ctrl+Shift+P", None))
 #endif // QT_CONFIG(shortcut)
         self.actionStopRecording.setText(QCoreApplication.translate("PloverCAT", u"Stop Recording", None))
 #if QT_CONFIG(tooltip)
-        self.actionStopRecording.setToolTip(QCoreApplication.translate("PloverCAT", u"Stop recording audio", None))
+        self.actionStopRecording.setToolTip(QCoreApplication.translate("PloverCAT", u"Stop recording media", None))
 #endif // QT_CONFIG(tooltip)
         self.actionShowVideo.setText(QCoreApplication.translate("PloverCAT", u"Show/Hide Video", None))
 #if QT_CONFIG(tooltip)
@@ -2163,7 +2176,7 @@ class Ui_PloverCAT(object):
         self.actionSuggestions.setText(QCoreApplication.translate("PloverCAT", u"Suggestions", None))
         self.actionHistory.setText(QCoreApplication.translate("PloverCAT", u"History", None))
         self.actionRevealSteno.setText(QCoreApplication.translate("PloverCAT", u"Reveal Steno", None))
-        self.actionAudioControls.setText(QCoreApplication.translate("PloverCAT", u"Audio Controls", None))
+        self.actionAudioControls.setText(QCoreApplication.translate("PloverCAT", u"Media Controls", None))
         self.actionToolbox.setText(QCoreApplication.translate("PloverCAT", u"Toolbox", None))
         self.actionClearParagraph.setText(QCoreApplication.translate("PloverCAT", u"Reset Paragraph", None))
 #if QT_CONFIG(tooltip)
@@ -2301,7 +2314,7 @@ class Ui_PloverCAT(object):
         self.actionCaptioning.setText(QCoreApplication.translate("PloverCAT", u"Captioning", None))
         self.actionFlushCaption.setText(QCoreApplication.translate("PloverCAT", u"Flush Caption", None))
         self.actionMassTimestampChange.setText(QCoreApplication.translate("PloverCAT", u"Mass Timestamp Change", None))
-        self.actionAddChangeAudioTimestamps.setText(QCoreApplication.translate("PloverCAT", u"Add/Change All Audio Timestamps", None))
+        self.actionAddChangeAudioTimestamps.setText(QCoreApplication.translate("PloverCAT", u"Add/Change All Media Timestamps", None))
         self.actionTape.setText(QCoreApplication.translate("PloverCAT", u"Paper Tape (*.tape)", None))
 #if QT_CONFIG(tooltip)
         self.actionTape.setToolTip(QCoreApplication.translate("PloverCAT", u"Exports only the strokes from paper tape", None))
@@ -2357,6 +2370,8 @@ class Ui_PloverCAT(object):
         self.actionColorAutomatic.setText(QCoreApplication.translate("PloverCAT", u"Automatic", None))
         self.actionColorField.setText(QCoreApplication.translate("PloverCAT", u"Field", None))
         self.actionColorIndex.setText(QCoreApplication.translate("PloverCAT", u"Index", None))
+        self.actionPlayTTS.setText(QCoreApplication.translate("PloverCAT", u"Play (TTS)", None))
+        self.actionStopTTS.setText(QCoreApplication.translate("PloverCAT", u"Stop (TTS)", None))
         self.label_39.setText(QCoreApplication.translate("PloverCAT", u"Welcome to Plover2CAT. Create a new transcript or select a recent transcript below.", None))
         self.mainTabs.setTabText(self.mainTabs.indexOf(self.homeTab), QCoreApplication.translate("PloverCAT", u"Recent Files", None))
         self.menuFile.setTitle(QCoreApplication.translate("PloverCAT", u"File", None))
@@ -2387,7 +2402,7 @@ class Ui_PloverCAT(object):
 #endif // QT_CONFIG(accessibility)
 #if QT_CONFIG(tooltip)
         self.dockPaper.setToolTip(QCoreApplication.translate("PloverCAT", u"Displays steno notes, time of\n"
-"stroke, audio time, and cursor\n"
+"stroke, media time, and cursor\n"
 "position.", None))
 #endif // QT_CONFIG(tooltip)
 #if QT_CONFIG(whatsthis)
@@ -2420,16 +2435,16 @@ class Ui_PloverCAT(object):
 #endif // QT_CONFIG(tooltip)
         self.suggest_sort.setText(QCoreApplication.translate("PloverCAT", u"By Recency", None))
 #if QT_CONFIG(tooltip)
-        self.dockAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Audio seeker and other controls", None))
+        self.dockAudio.setToolTip(QCoreApplication.translate("PloverCAT", u"Media playback controls", None))
 #endif // QT_CONFIG(tooltip)
-        self.dockAudio.setWindowTitle(QCoreApplication.translate("PloverCAT", u"Audio Controls", None))
-        self.audio_label.setText(QCoreApplication.translate("PloverCAT", u"Select file to play audio", None))
+        self.dockAudio.setWindowTitle(QCoreApplication.translate("PloverCAT", u"Media Controls", None))
+        self.audio_label.setText(QCoreApplication.translate("PloverCAT", u"Select media file to play", None))
 #if QT_CONFIG(tooltip)
         self.playRate.setToolTip(QCoreApplication.translate("PloverCAT", u"Playback rate", None))
 #endif // QT_CONFIG(tooltip)
         self.playRate.setSuffix(QCoreApplication.translate("PloverCAT", u"x", None))
 #if QT_CONFIG(tooltip)
-        self.audioDelay.setToolTip(QCoreApplication.translate("PloverCAT", u"Millisecond adjustment between actual timestamp and audio and steno timestamps.", None))
+        self.audioDelay.setToolTip(QCoreApplication.translate("PloverCAT", u"Millisecond adjustment between actual timestamp and media and steno timestamps.", None))
 #endif // QT_CONFIG(tooltip)
         self.audioDelay.setSuffix(QCoreApplication.translate("PloverCAT", u"ms", None))
 #if QT_CONFIG(tooltip)
@@ -2707,14 +2722,14 @@ class Ui_PloverCAT(object):
         self.editorEditTime.setToolTip(QCoreApplication.translate("PloverCAT", u"Read only. Displays edit time of paragraph. Will change upon any cursor movement.", None))
 #endif // QT_CONFIG(tooltip)
         self.editorEditTime.setDisplayFormat(QCoreApplication.translate("PloverCAT", u"yyyy-MM-dd hh:mm:ss.zzz", None))
-        self.label_4.setText(QCoreApplication.translate("PloverCAT", u"Audio Start Time", None))
+        self.label_4.setText(QCoreApplication.translate("PloverCAT", u"Media Start Time", None))
 #if QT_CONFIG(tooltip)
-        self.editorAudioStart.setToolTip(QCoreApplication.translate("PloverCAT", u"Modifies audio start time of paragraph.", None))
+        self.editorAudioStart.setToolTip(QCoreApplication.translate("PloverCAT", u"Modifies media start time of paragraph.", None))
 #endif // QT_CONFIG(tooltip)
         self.editorAudioStart.setDisplayFormat(QCoreApplication.translate("PloverCAT", u"hh:mm:ss.zzz", None))
-        self.label_5.setText(QCoreApplication.translate("PloverCAT", u"Audio End Time", None))
+        self.label_5.setText(QCoreApplication.translate("PloverCAT", u"Media End Time", None))
 #if QT_CONFIG(tooltip)
-        self.editorAudioEnd.setToolTip(QCoreApplication.translate("PloverCAT", u"Sets audio end time for this paragraph. ", None))
+        self.editorAudioEnd.setToolTip(QCoreApplication.translate("PloverCAT", u"Sets media end time for this paragraph. ", None))
 #endif // QT_CONFIG(tooltip)
         self.editorAudioEnd.setDisplayFormat(QCoreApplication.translate("PloverCAT", u"hh:mm:ss.zzz", None))
         self.label_7.setText(QCoreApplication.translate("PloverCAT", u"Notes", None))
@@ -2760,9 +2775,9 @@ class Ui_PloverCAT(object):
 #if QT_CONFIG(accessibility)
         self.toolbarSteno.setAccessibleName(QCoreApplication.translate("PloverCAT", u"Editing Toolbar", None))
 #endif // QT_CONFIG(accessibility)
-        self.toolbarAudio.setWindowTitle(QCoreApplication.translate("PloverCAT", u"Audio Toolbar", None))
+        self.toolbarAudio.setWindowTitle(QCoreApplication.translate("PloverCAT", u"Media Toolbar", None))
 #if QT_CONFIG(accessibility)
-        self.toolbarAudio.setAccessibleName(QCoreApplication.translate("PloverCAT", u"Audiovisual Toolbar", None))
+        self.toolbarAudio.setAccessibleName(QCoreApplication.translate("PloverCAT", u"Media Toolbar", None))
 #endif // QT_CONFIG(accessibility)
         self.dockHistoryStack.setWindowTitle(QCoreApplication.translate("PloverCAT", u"History", None))
 #if QT_CONFIG(tooltip)

plover_cat/recorder_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'recorder_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/resources_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.9.2
+# Created by: The Resource Compiler for Qt version 6.10.2
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore

plover_cat/shortcut_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'shortcut_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/steno_objects.py

@@ -10,8 +10,8 @@ from plover_cat.constants import user_field_dict
 from PySide6.QtCore import QByteArray, QBuffer, QIODevice
 from PySide6.QtGui import QImage, QImageReader
 from odf.teletype import addTextToElement
-from odf.text import P, UserFieldDecls, UserFieldDecl, UserFieldGet, UserIndexMarkStart, UserIndexMarkEnd
-from odf.draw import Frame, TextBox, Image
+from odf.text import UserFieldDecls, UserFieldDecl, UserFieldGet, UserIndexMarkStart, UserIndexMarkEnd
+from odf.draw import Frame, Image
 
 _whitespace = '\u2029\t\n\x0b\x0c\r '
 whitespace = r'[%s]' % re.escape(_whitespace)
@@ -339,7 +339,7 @@ class text_field(text_element):
         user_declares = document.text.getElementsByType(UserFieldDecls)
         if user_declares:
             field_names = [i.getAttribute("name") for i in document.text.getElementsByType(UserFieldDecl)]
-            if not self.name in field_names:
+            if self.name not in field_names:
                 user_declares = document.text.getElementsByType(UserFieldDecls)[0]
                 user_dec = UserFieldDecl(name = self.name, stringvalue = self.data, valuetype = "string")
                 user_declares.addElement(user_dec)                
@@ -573,18 +573,19 @@ class element_factory:
         """
         # default is always a text element
         element = text_element()
-        if element_dict["element"] == "stroke":
-            element = stroke_text()
+        match element_dict["element"]:
+            case "stroke":
+                element = stroke_text()
         # elif element_dict["element"] == "dummy":
         #     element = dummy_element()
-        elif element_dict["element"] == "image":
-            element = image_text()
-        elif element_dict["element"] == "field":
-            element = text_field(user_dict = user_field_dict)
-        elif element_dict["element"] == "automatic":
-            element = automatic_text()
-        elif element_dict["element"] == "index":
-            element = index_text()
+            case "image":
+                element = image_text()
+            case "field":
+                element = text_field(user_dict = user_field_dict)
+            case "automatic":
+                element = automatic_text()
+            case "index":
+                element = index_text()
         element.from_dict(element_dict)
         return(element)
 
@@ -651,12 +652,12 @@ class element_collection(UserList):
             if first_whole == last_whole:
                 el_part.append(data[last_whole][first_remain:last_remain])
                 return(el_part)
-            if not start in el_lengths:
+            if start not in el_lengths:
                 el_part.append(data[first_whole][first_remain:])
             if (first_whole + 1) != last_whole:
                 for i in data[(first_whole + 1): last_whole]:
                     el_part.append(i)
-            if not end in el_lengths:
+            if end not in el_lengths:
                 el_part.append(data[last_whole][:last_remain])
             else:
                 el_part.append(data[last_whole])

plover_cat/suggest_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'suggest_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover_cat/tapeDialogWindow.py

@@ -0,0 +1,96 @@
+from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QListView
+from PySide6.QtGui import QStandardItem, QStandardItemModel
+from PySide6.QtCore import Qt, Signal
+import pathlib
+from plover_cat.tape_dialog_ui import Ui_tapeDialog
+from plover.steno import Stroke, normalize_stroke
+from plover import system
+
+class tapeDialogWindow(QDialog, Ui_tapeDialog):
+    """Set up configuration for translating from tape
+    """
+    translate_stroke_from_tape = Signal(int)
+    """Signal sent for translate, int being index at start"""
+    undo_from_tape = Signal()
+    """Signal sent to trigger undo of last stroke"""
+    def __init__(self):
+        super().__init__()
+        self.setupUi(self)
+        self.tape_data = []
+        self.select_tape.clicked.connect(self.load_tape)
+        self.tape_view.setUniformItemSizes(True)
+        self.tape_view.setLayoutMode(QListView.LayoutMode.Batched)
+        self.translate.clicked.connect(lambda: self.signal_stroke())
+        self.translate_ten.clicked.connect(lambda: self.signal_stroke(10))
+        self.translate_all.clicked.connect(lambda: self.signal_stroke_all())
+        self.undo_last.clicked.connect(lambda: self.signal_undo())
+
+    def signal_undo(self):
+        self.undo_from_tape.emit()
+        current = self.tape_view.currentIndex().row()
+        self.tape_view.setCurrentIndex(current - 1)
+
+    def signal_stroke(self, strokes = 1):
+        self.translate_stroke_from_tape.emit(strokes)
+        current = self.tape_view.currentIndex().row()
+        self.tape_view.setCurrentIndex(current + strokes)
+
+    def signal_stroke_all(self):
+        current = self.tape_view.currentIndex().row()
+        self.translate_stroke_from_tape.emit(self.tape_model.rowCount() - current + 1)
+
+    def load_tape(self):
+        selected_file = QFileDialog.getOpenFileName(
+            self,
+            "Select tape file to translate",
+            "", "Tape (*.tape *.txt)")[0]
+        if not selected_file:
+            return
+        selected_file = pathlib.Path(selected_file)
+        self.select_tape.setText(selected_file.stem)   
+        paper_format, ok = QInputDialog.getItem(self, "Translate Tape", "Format of tape file:", ["Plover2CAT", "Plover (raw)", "Plover (paper)"], editable = False)
+        if not ok:
+            return
+        self.tape_data = []
+        match paper_format:
+            case "Plover (raw)":
+                self.load_raw_paper(selected_file)
+            case "Plover2CAT":
+                self.load_plover2cat(selected_file)
+            case "Plover (paper)":
+                self.load_plover_paper(selected_file)
+        self.pop_view()
+
+    def load_raw_paper(self, file_path):
+        with open(file_path) as f:
+            for line in f:
+                stroke = Stroke(normalize_stroke(line.strip().replace(" ", "")))
+                self.tape_data.append(stroke.rtfcre)
+
+    def load_plover2cat(self, file_path):
+        with open(file_path) as f:
+            for line in f:
+                stroke_contents = line.strip().split("|")[3]
+                keys = []
+                for i in range(len(stroke_contents)):
+                    if not stroke_contents[i].isspace() and i < len(system.KEYS):
+                        keys.append(system.KEYS[i])
+                self.tape_data.append(Stroke(keys).rtfcre)              
+
+    def load_plover_paper(self, file_path):
+        with open(file_path) as f:
+            for line in f:
+                keys = []
+                for i in range(len(line)):
+                    if not line[i].isspace() and i < len(system.KEYS):
+                        keys.append(system.KEYS[i])   
+                self.tape_data.append(Stroke(keys).rtfcre) 
+
+    def pop_view(self):
+        self.tape_model = QStandardItemModel(self)
+        for stroke in self.tape_data:
+            item = QStandardItem()
+            item.setText(stroke)
+            item.setData(stroke, Qt.UserRole)
+            self.tape_model.appendRow(item)
+        self.tape_view.setModel(self.tape_model)

plover_cat/tape_dialog_ui.py

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'tape_dialog.ui'
+##
+## Created by: Qt User Interface Compiler version 6.10.2
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QAbstractButton, QAbstractItemView, QApplication, QDialog,
+    QDialogButtonBox, QHBoxLayout, QListView, QPushButton,
+    QSizePolicy, QVBoxLayout, QWidget)
+
+class Ui_tapeDialog(object):
+    def setupUi(self, tapeDialog):
+        if not tapeDialog.objectName():
+            tapeDialog.setObjectName(u"tapeDialog")
+        tapeDialog.resize(400, 300)
+        self.verticalLayout = QVBoxLayout(tapeDialog)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.horizontalLayout = QHBoxLayout()
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.verticalLayout_2 = QVBoxLayout()
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.select_tape = QPushButton(tapeDialog)
+        self.select_tape.setObjectName(u"select_tape")
+
+        self.verticalLayout_2.addWidget(self.select_tape)
+
+        self.translate = QPushButton(tapeDialog)
+        self.translate.setObjectName(u"translate")
+
+        self.verticalLayout_2.addWidget(self.translate)
+
+        self.translate_ten = QPushButton(tapeDialog)
+        self.translate_ten.setObjectName(u"translate_ten")
+
+        self.verticalLayout_2.addWidget(self.translate_ten)
+
+        self.translate_all = QPushButton(tapeDialog)
+        self.translate_all.setObjectName(u"translate_all")
+
+        self.verticalLayout_2.addWidget(self.translate_all)
+
+        self.undo_last = QPushButton(tapeDialog)
+        self.undo_last.setObjectName(u"undo_last")
+
+        self.verticalLayout_2.addWidget(self.undo_last)
+
+
+        self.horizontalLayout.addLayout(self.verticalLayout_2)
+
+        self.tape_view = QListView(tapeDialog)
+        self.tape_view.setObjectName(u"tape_view")
+        self.tape_view.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.tape_view.setProperty(u"showDropIndicator", False)
+
+        self.horizontalLayout.addWidget(self.tape_view)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.buttonBox = QDialogButtonBox(tapeDialog)
+        self.buttonBox.setObjectName(u"buttonBox")
+        self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
+        self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok)
+
+        self.verticalLayout.addWidget(self.buttonBox)
+
+
+        self.retranslateUi(tapeDialog)
+        self.buttonBox.accepted.connect(tapeDialog.accept)
+        self.buttonBox.rejected.connect(tapeDialog.reject)
+
+        QMetaObject.connectSlotsByName(tapeDialog)
+    # setupUi
+
+    def retranslateUi(self, tapeDialog):
+        tapeDialog.setWindowTitle(QCoreApplication.translate("tapeDialog", u"Dialog", None))
+        self.select_tape.setText(QCoreApplication.translate("tapeDialog", u"Select Tape File", None))
+        self.translate.setText(QCoreApplication.translate("tapeDialog", u"Translate 1", None))
+        self.translate_ten.setText(QCoreApplication.translate("tapeDialog", u"Translate 10", None))
+        self.translate_all.setText(QCoreApplication.translate("tapeDialog", u"Translate All Succeeding", None))
+        self.undo_last.setText(QCoreApplication.translate("tapeDialog", u"Undo Last", None))
+    # retranslateUi
+

plover_cat/test_dialog_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'test_dialog.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.9.2
+## Created by: Qt User Interface Compiler version 6.10.2
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

plover2cat-4.0.0a1.dist-info/RECORD

@@ -1,40 +0,0 @@
-plover2cat-4.0.0a1.dist-info/licenses/LICENSE.txt,sha256=nmGAW0AJG4ke0VT1kvbz6m_jBMcnRRcJQnBtJmKAKU0,1084
-plover_cat/FlowLayout.py,sha256=3sCpVJCNJNwIimyFFlSOaNt-TNb-6kFwvlxwRI3QtNg,3707
-plover_cat/PloverCATWindow.py,sha256=CGgJ381usOx9kC8zekVK70892hC8thi8uAmqla8vkqA,156212
-plover_cat/TextEditor.py,sha256=EdC3D60cLypoHg80jizljEkfJt7Ja-j5Ri9foiN_sV4,63383
-plover_cat/__init__.py,sha256=vg2Hh4rB32Uasptr9ZZPhBpAaI5lUV0m4G6WiLt3nOU,820
-plover_cat/__version__.py,sha256=_fsxWOZfbNI4mXLh4P-xhdbPcH5o8IXuGvbnQj1c3N0,33
-plover_cat/affixDialogWindow.py,sha256=p-SlQR7rDYeTWJeSwjT0RqqLUtvxgeWQUzA9HBLwSME,2729
-plover_cat/affix_dialog_ui.py,sha256=8dqlCZCEOA29fzOFpSa66lehjYt7QOJcwSUesKIZOPc,5665
-plover_cat/captionDialogWindow.py,sha256=Zc3JqwaHasJF7FsmLH7hAEYDvbvbuKNihsXDIBqlZN0,2817
-plover_cat/captionWorker.py,sha256=MFjoYnJ2pEeU9KalUlN0PmygVoOvKAdlc1LM8SPQRlw,8210
-plover_cat/caption_dialog_ui.py,sha256=hPLVru4II6CtHDMjr7qMZvG-1NXzEvIZES2xcHIyyo4,9725
-plover_cat/constants.py,sha256=wDKCJPJuasBpHu6DsiOPW2dlRTWR1ayUYCjEEutQvKs,4933
-plover_cat/create_dialog_ui.py,sha256=q3467-b9u4EVYcSf_a1n44Ob3kzhDHJSK1jWEFoZNzY,4387
-plover_cat/documentWorker.py,sha256=VmgqscHSEjxIEOpdHSydTkOm9mg1zUc5Djkgkc4S1uA,33512
-plover_cat/export_helpers.py,sha256=Tw2r8JroK3lbFpinmBuZKEpt7M1N9-USehwT-EHbXMQ,20116
-plover_cat/fieldDialogWindow.py,sha256=DhVxHb5r1Hp_JUvEX9zicH695pG2RUQXol6PTOKsJjA,3134
-plover_cat/field_dialog_ui.py,sha256=Mp6LEkjtsWC9rF6_ityZidv4vm2NRNIwJEJH7W3DLPg,5585
-plover_cat/helpers.py,sha256=xImF2Rgj246TGotVfvW8jOJEdbo3IfqzwGnSb5mw87U,5582
-plover_cat/indexDialogWindow.py,sha256=tx5dIAVKuEAMBsmudjb8G4le22ySEQ1blXe-WT_VyUA,5640
-plover_cat/index_dialog_ui.py,sha256=nX18ThtZi8uM0a-6W5Y7dxnahfm6LciKaJhmh6Cf9VU,8062
-plover_cat/plover_cat_ui.py,sha256=hwQeyvwIlfvBRGTX0977trX303AvwhyU9LaBZm4O3uI,158388
-plover_cat/qcommands.py,sha256=5HGazgGS_KgOjowzEMpBiP4O5dQGYvKhc3GhlFjGjaM,39342
-plover_cat/recorderDialogWindow.py,sha256=PqcM4kmg1ipNiNG3g97MWC5Wfaeu7wQqLxmZ9-6gf1I,2917
-plover_cat/recorder_dialog_ui.py,sha256=2Bn8RW3alXV29bU46R0YrM7rKTROrFGkGyopkZHWLXE,7781
-plover_cat/resources_rc.py,sha256=YMhA4nqYfp7vItP3zJL7qlItKGALOsMuPXB2ba8c7Mw,126110
-plover_cat/rtf_parsing.py,sha256=6p-9oH73vep4dG53tl9TDfNfoX0Ggv8KPeDXolXH5nY,21299
-plover_cat/shortcutDialogWindow.py,sha256=8Tlk6v2-z6lyRdDR4Y7rquKxoqGL1UkCnYiKVHipgoQ,2453
-plover_cat/shortcut_dialog_ui.py,sha256=_TayFrjTBdTj_y9dAV_Iz7GPLe0BEv9tbCOSQaq_Gtc,4503
-plover_cat/spellcheck.py,sha256=r0dO34PGLpMbPypkFHE08jTrClGWen8C89BdmMidKVU,6695
-plover_cat/steno_objects.py,sha256=RfMUofAC2TZvi4zhe8qdzY-2iHjn2ePxogLCH9aGVAQ,42843
-plover_cat/suggestDialogWindow.py,sha256=Oa2HSh9b8rsxjtcxgMFSqpNnwmPuYoLywIkYUL_19z0,6404
-plover_cat/suggest_dialog_ui.py,sha256=6Ds50LoSE7N2AqzYnvbh4uzyDqv4HMTvZHizFm_dtSA,8782
-plover_cat/testDialogWindow.py,sha256=wqkk_6mGRcKlNHdVc3P_yTkt4x70MOtUZlLYU3RN0bM,21821
-plover_cat/test_dialog_ui.py,sha256=BdJYfN7Ua7SGIUR-iOvs7MzbHlRj8cIyUu-HCMHpTfM,4735
-plover2cat-4.0.0a1.dist-info/METADATA,sha256=DQeqs9XoZ3i-tCzSizCapI07-y3ahv_-3w8nANukA6A,5073
-plover2cat-4.0.0a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-plover2cat-4.0.0a1.dist-info/entry_points.txt,sha256=bZekpaOB8tv7DjkjuOBYrIdcMgCNuOYDrXKmV6Mgd1o,55
-plover2cat-4.0.0a1.dist-info/top_level.txt,sha256=q7Rw-aE6ep8anwrqhiZOlCig80KhoV4bmE8yWiIlL4E,11
-plover2cat-4.0.0a1.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-plover2cat-4.0.0a1.dist-info/RECORD,,