plover2cat 3.1.0a0__tar.gz → 3.1.1__tar.gz

{plover2cat-3.1.0a0/plover2cat.egg-info → plover2cat-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: plover2cat
-Version: 3.1.0a0
+Version: 3.1.1
 Summary: A CAT software for Plover
 Home-page: https://github.com/greenwyrt/plover2CAT/
 Author: plants
@@ -18,12 +18,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: plover>=4.0.0.dev8
+Requires-Dist: plover<5.0.0,>=4.0.0.dev8
 Requires-Dist: odfpy
 Requires-Dist: pyparsing>3.0.7
 Requires-Dist: spylls
 Requires-Dist: dulwich
 Requires-Dist: obsws-python>1.6.0
+Dynamic: license-file
 
 # plover2CAT
 

{plover2cat-3.1.0a0 → plover2cat-3.1.1/plover2cat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: plover2cat
-Version: 3.1.0a0
+Version: 3.1.1
 Summary: A CAT software for Plover
 Home-page: https://github.com/greenwyrt/plover2CAT/
 Author: plants
@@ -18,12 +18,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: plover>=4.0.0.dev8
+Requires-Dist: plover<5.0.0,>=4.0.0.dev8
 Requires-Dist: odfpy
 Requires-Dist: pyparsing>3.0.7
 Requires-Dist: spylls
 Requires-Dist: dulwich
 Requires-Dist: obsws-python>1.6.0
+Dynamic: license-file
 
 # plover2CAT
 

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover2cat.egg-info/requires.txt

@@ -1,4 +1,4 @@
-plover>=4.0.0.dev8
+plover<5.0.0,>=4.0.0.dev8
 odfpy
 pyparsing>3.0.7
 spylls

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover_cat/PloverCATWindow.py

@@ -3,17 +3,12 @@ import string
 import re
 import pathlib
 import json
-from datetime import datetime, timezone, timedelta
+from datetime import datetime, timedelta
 import time
 from collections import Counter, deque
-from shutil import copyfile
-from copy import deepcopy, copy
+from copy import deepcopy
 from sys import platform
-from tempfile import gettempdir
-from spylls.hunspell import Dictionary
-from dulwich.repo import Repo
-from dulwich.errors import NotGitRepository
-from dulwich import porcelain
+from tempfile import gettempdir, TemporaryDirectory
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -22,7 +17,7 @@ QCursor, QStandardItem, QStandardItemModel, QPageSize, QTextBlock, QTextFormat,
 QTextOption, QTextCharFormat, QKeySequence, QPalette, QDesktopServices, QPixmap, QIcon)
 from PyQt5.QtWidgets import (QMainWindow, QFileDialog, QInputDialog, QListWidgetItem, QTableWidgetItem, 
 QStyle, QMessageBox, QDialog, QFontDialog, QColorDialog, QLabel, QMenu,
-QCompleter, QApplication, QTextEdit, QPlainTextEdit, QProgressBar, QAction, QToolButton)
+QCompleter, QApplication, QTextEdit, QPlainTextEdit, QProgressBar, QAction, QToolButton, QDockWidget)
 from PyQt5.QtMultimedia import (QMediaPlayer, QMediaRecorder, 
 QMultimedia, QVideoEncoderSettings, QAudioEncoderSettings)
 from PyQt5.QtMultimediaWidgets import QVideoWidget
@@ -117,6 +112,11 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.flowparent.addLayout(self.recentfileflow)
         self.flowparent.addStretch()
         self.video = None
+        self.dock_status = {}
+        for doc in self.findChildren(QDockWidget):
+            self.dock_status[doc.objectName()] = False
+            doc.visibilityChanged.connect(lambda status, dock = doc.objectName(): self.dock_handler(status, dock))
+            doc.visibilityChanged.connect(lambda status: self.update_gui())
         # vars for startup
         ## on very first startup, set tabs up
         ## later configs will use window settings
@@ -373,9 +373,15 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.statusBar.showMessage(txt)
         log.debug(txt)
 
+    def dock_handler(self, status, name):
+        """Update dock visibility status"""
+        self.dock_status[name] = status
+
     def update_gui(self):
         """Wrapper for updating parts of GUI when cursor changes position.
         """
+        if not self.textEdit:
+            return
         current_cursor = self.textEdit.textCursor()
         if current_cursor.block().userData():
             self.text_to_stroke_move()
@@ -443,6 +449,10 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
 
         :param cursor: a ``QTextCursor``, default ``None`` for current cursor
         """
+        if not self.textEdit:
+            return
+        if not self.dock_status["dockStenoData"]:
+            return
         if not cursor:
             cursor = self.textEdit.textCursor()
         block_strokes = cursor.block().userData()["strokes"]
@@ -456,30 +466,20 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
             if user_choice == QMessageBox.No:
                 return
         self.textEdit.gen_style_formats()
-        block = self.textEdit.document().begin()
-        current_cursor = self.textEdit.textCursor()
-        self.progressBar = QProgressBar(self)
-        self.progressBar.setMaximum(self.textEdit.document().blockCount())
-        self.progressBar.setFormat("Re-style paragraph %v")
-        self.statusBar.addWidget(self.progressBar)
-        self.progressBar.show()
+        # self.progressBar = QProgressBar(self)
+        # self.progressBar.setMaximum(self.textEdit.document().blockCount())
+        # self.progressBar.setFormat("Re-style paragraph %v")
+        # self.statusBar.addWidget(self.progressBar)
+        # self.progressBar.show()
         self.mainTabs.hide()
         self.textEdit.setUpdatesEnabled(False)
         self.textEdit.document().blockSignals(True)
         self.textEdit.blockSignals(True)
-        while True:
-            block_data = block.userData()["strokes"]
-            try:
-                block_style = block.userData()["style"]
-            except TypeError:
-                # block_style = ""
-                continue  
-            self.textEdit.refresh_par_style(block)                        
-            self.progressBar.setValue(block.blockNumber())
-            QApplication.processEvents()
-            if block == self.textEdit.document().lastBlock():
-                break
-            block = block.next()
+        # todo: make tempfile, use with, then autosave to tempfile, then reload from tempfile with load_transcript
+        with TemporaryDirectory() as f:
+            temp_path = pathlib.Path(f, "temp.transcript")
+            self.textEdit.save_transcript(temp_path)
+            self.textEdit.load_transcript(temp_path)
         self.textEdit.setUpdatesEnabled(True)
         self.textEdit.document().blockSignals(False)
         self.textEdit.blockSignals(False)
@@ -723,7 +723,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         """
         if not self.textEdit:
             return
-        if not self.dockSuggest.isVisible():
+        if not self.dock_status["dockSuggest"]:
             return
         if self.suggest_source.currentText() == "tapey-tape":
             self.get_tapey_tape()
@@ -828,6 +828,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         self.update_highlight_color()
         if self.textEdit:
             self.textEdit.get_highlight_colors()
+            self.refresh_editor_styles()
     
     def update_highlight_color(self):
         settings = QSettings("Plover2CAT", "OpenCAT")
@@ -873,7 +874,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
 
         :param pane: a ``QWidget`` in the Toolbox dock's ``QTabWidget``
         """
-        if not self.dockProp.isVisible():
+        if not self.dock_status["dockProp"]:
             self.dockProp.setVisible(True)    
         self.tabWidget.setCurrentWidget(pane)
         log.debug(f"User set {pane.objectName()} pane.") 
@@ -883,7 +884,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
         """
         if self.textEdit.textCursor().hasSelection() and self.search_text.isChecked():
             self.search_term.setText(self.textEdit.textCursor().selectedText())
-        if not self.dockProp.isVisible():
+        if not self.dock_status["dockProp"]:
             self.dockProp.setVisible(True)
         self.tabWidget.setCurrentWidget(self.find_replace_pane)
         log.debug("User set find pane visible.")
@@ -901,7 +902,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
             underlying_strokes = current_block.userData()["strokes"].extract_steno(start_stroke_pos[0], end_stroke_pos[1])
             underlying_steno = underlying_strokes.to_strokes()
             self.steno_outline.setText(underlying_steno)
-        if not self.dockProp.isVisible():
+        if not self.dock_status["dockProp"]:
             self.dockProp.setVisible(True) 
         self.tabWidget.setCurrentWidget(self.stenospell_pane)  
         log.debug("User set steno spell pane visible.")
@@ -1034,11 +1035,12 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
     def update_navigation(self):     
         """Create ``QListWidgetItems`` to display headings in navigation dock.
         """
-        if not self.dockNavigation.isVisible():
+        self.navigationList.clear()
+        if not self.dock_status["dockNavigation"]:
+            return
+        if not self.textEdit:
             return
         block = self.textEdit.document().begin()
-        self.navigationList.clear()
-        log.debug("Nagivation pane updated.")
         for i in range(self.textEdit.document().blockCount()):
             block_data = block.userData()
             if not block_data: continue
@@ -1052,6 +1054,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
             if block == self.textEdit.document().lastBlock():
                 break
             block = block.next()   
+        log.debug("Nagivation pane updated.")
 
     def stroke_to_text_move(self):
         """Locate text in transcript based on selected line in tape.
@@ -1079,6 +1082,10 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
     def text_to_stroke_move(self):
         """Locate stroke line in tape based on cursor position in transcript.
         """
+        if not self.dock_status["dockPaper"]:
+            return
+        if not self.textEdit:
+            return
         stroke_cursor = self.strokeList.textCursor()
         edit_cursor = self.textEdit.textCursor()
         edit_block = edit_cursor.block()
@@ -2726,7 +2733,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
                 # if captions are enabled in middle of document, don't start from beginning
                 self.caption_cursor_pos = self.textEdit.textCursor().position()
                 self.thread = QThread()
-                self.cap_worker = captionWorker(max_length = self.caption_dialog.capLength.value(), max_lines = self.caption_dialog.maxDisplayLines.value(),
+                self.cap_worker = captionWorker(roll_caps=self.caption_dialog.rollCaptions.isChecked(), max_length = self.caption_dialog.capLength.value(), max_lines = self.caption_dialog.maxDisplayLines.value(),
                                     remote = self.caption_dialog.remoteCapHost.currentText(), endpoint = self.caption_dialog.hostURL.text(), 
                                     port = self.caption_dialog.serverPort.text(), password = self.caption_dialog.serverPassword.text())
                 self.cap_worker.moveToThread(self.thread)
@@ -2758,7 +2765,7 @@ class PloverCATWindow(QMainWindow, Ui_PloverCAT):
             current_block = current_cursor.block()
             stroke_data = current_block.userData()["strokes"]
             track_pos = current_block.position()
-            print(f"initial: {track_pos}")
+            # print(f"initial: {track_pos}")
             while True:
                 # this loop can be slow if enormous paragraph
                 for el in stroke_data.data:

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover_cat/TextEditor.py

@@ -12,9 +12,9 @@ from spylls.hunspell import Dictionary
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtGui import QCursor, QKeySequence, QTextCursor, QTextDocument, QColor
 from PyQt5.QtCore import QFile, QStringListModel, Qt, QModelIndex, pyqtSignal, QUrl, QSettings
-from PyQt5.QtWidgets import QPlainTextEdit, QCompleter, QTextEdit, QUndoStack, QMessageBox, QApplication
+from PyQt5.QtWidgets import QCompleter, QTextEdit, QUndoStack, QMessageBox, QApplication
 from PyQt5.QtMultimedia import (QMediaContent, QMediaPlayer, QMediaRecorder, 
-QAudioRecorder, QMultimedia, QVideoEncoderSettings, QAudioEncoderSettings)
+QAudioRecorder)
 
 _ = lambda txt: QtCore.QCoreApplication.translate("Plover2CAT", txt)
 
@@ -25,6 +25,7 @@ from plover import log
 
 from plover_cat.qcommands import *
 from plover_cat.steno_objects import *
+from plover_cat.rtf_parsing import *
 from plover_cat.export_helpers import load_odf_styles, recursive_style_format, parprop_to_blockformat, txtprop_to_textformat
 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
@@ -176,7 +177,7 @@ class PloverCATEditor(QTextEdit):
             if event.key() != Qt.Key_Return:
                 if event.modifiers() in [Qt.NoModifier, Qt.ShiftModifier]:
                     self.mock_type(event.text())
-            print(event.key())
+            # print(event.key())
             QTextEdit.keyPressEvent(self, event)
 
     def load(self, path, engine, load_transcript = True):
@@ -220,86 +221,55 @@ class PloverCATEditor(QTextEdit):
             self.send_message.emit("Reading transcript data.")
             json_document = json.loads(f.read())
         self.backup_document = deepcopy(json_document)
-        self.moveCursor(QTextCursor.Start)
-        self.clear()
-        document_cursor = self.textCursor()
         self.send_message.emit("Loading transcript data.")
-        ef = element_factory()
-        ea = element_actions()
-        self.clear()
         # check if json document is older format
         if "data" in json_document[next(iter(json_document))]:
-            # old format json
-            for key, value in json_document.items():
-                if not key.isdigit():
-                    continue
-                block_data = BlockUserData()
-                el_list = []
-                for el in value["data"]["strokes"]:
-                    el_dict = {"time": el[0], "stroke": el[1], "data": el[2]}
-                    if len(el) == 4:
-                        el_dict["audiotime"] = el[4]
-                    new_stroke = stroke_text()
-                    new_stroke.from_dict(el_dict)
-                    el_list.append(new_stroke)
-                for k, v in value["data"].items():
-                    block_data[k] = v
-                block_data["strokes"] = element_collection(el_list)
-                document_cursor.setBlockFormat(self.par_formats[block_data["style"]])
-                current_format = self.txt_formats[block_data["style"]]
-                current_format.setForeground(self.highlight_colors["stroke"])            
-                # document_cursor.setCharFormat(current_format)
-                document_cursor.insertText(value["text"], current_format)
-                document_cursor.block().setUserData(block_data)
-                document_cursor.block().setUserState(1)
-                if len(block_data["strokes"]) > 0 and block_data["strokes"].ends_with("\n"):
-                    document_cursor.insertText("\n")
-                self.send_message.emit(f"Loading paragraph {document_cursor.blockNumber()} of {len(json_document)}")
-                QApplication.processEvents()
-        else:        
-            # new format json  
-            for key, value in json_document.items():
-                # skip if key is not a digit
-                if not key.isdigit():
-                    continue
-                block_data = BlockUserData()
-                el_list = [ef.gen_element(element_dict = i, user_field_dict = self.user_field_dict) for i in value["strokes"]]
-                # document_cursor.movePosition(QTextCursor.Start)
-                self.setTextCursor(document_cursor)
-                for k, v in value.items():
-                    block_data[k] = v
-                block_data["strokes"] = element_collection()
-                document_cursor.block().setUserData(block_data)
-                block_data["strokes"] = element_collection(el_list)
-                if block_data["style"] not in self.par_formats:
-                    block_data["style"] = next(iter(self.par_formats))
-                document_cursor.setBlockFormat(self.par_formats[block_data["style"]])
-                document_cursor.setCharFormat(self.txt_formats[block_data["style"]])                
-                # if any([el.element == "image" for el in el_list]):
-                for el in el_list:
-                    if el.element == "image":
-                        i_path = self.file_name / pathlib.Path(el.path)
-                        imageUri = QUrl(i_path.as_uri())
-                        el.path = i_path.as_posix()
-                        image = QImage(QImageReader(el.path).read())
-                        self.document().addResource(
-                            QTextDocument.ImageResource,
-                            imageUri,
-                            QVariant(image)
-                        )
-                        imageFormat = QTextImageFormat()
-                        imageFormat.setWidth(image.width())
-                        imageFormat.setHeight(image.height())
-                        imageFormat.setName(imageUri.toString())
-                        document_cursor.insertImage(imageFormat)
-                        document_cursor.setCharFormat(self.txt_formats[block_data["style"]])                
-                    else:
-                        current_format = self.txt_formats[block_data["style"]]
-                        current_format.setForeground(self.highlight_colors[el.element])            
-                        # document_cursor.setCharFormat(current_format)
-                        document_cursor.insertText(el.to_text(), current_format)
-                self.send_message.emit(f"Loading paragraph {document_cursor.blockNumber()} of {len(json_document)}")
-                QApplication.processEvents()
+            self.backup_document = import_version_one(json_document)
+        else:
+            self.backup_document = import_version_two(json_document)
+        self.clear()
+        self.moveCursor(QTextCursor.Start)
+        document_cursor = self.textCursor()
+        ef = element_factory()
+        for key, value in self.backup_document.items():
+            # skip if key is not a digit
+            if not key.isdigit():
+                continue
+            block_data = BlockUserData()
+            el_list = [ef.gen_element(element_dict = i, user_field_dict = self.user_field_dict) for i in value["strokes"]]
+            self.setTextCursor(document_cursor)
+            for k, v in value.items():
+                block_data[k] = v
+            block_data["strokes"] = element_collection()
+            document_cursor.block().setUserData(block_data)
+            block_data["strokes"] = element_collection(el_list)
+            if block_data["style"] not in self.par_formats:
+                block_data["style"] = next(iter(self.par_formats))
+            document_cursor.setBlockFormat(self.par_formats[block_data["style"]])
+            document_cursor.setCharFormat(self.txt_formats[block_data["style"]])                
+            for el in el_list:
+                if el.element == "image":
+                    i_path = self.file_name / pathlib.Path(el.path)
+                    imageUri = QUrl(i_path.as_uri())
+                    el.path = i_path.as_posix()
+                    image = QImage(QImageReader(el.path).read())
+                    self.document().addResource(
+                        QTextDocument.ImageResource,
+                        imageUri,
+                        QVariant(image)
+                    )
+                    imageFormat = QTextImageFormat()
+                    imageFormat.setWidth(image.width())
+                    imageFormat.setHeight(image.height())
+                    imageFormat.setName(imageUri.toString())
+                    document_cursor.insertImage(imageFormat)
+                    document_cursor.setCharFormat(self.txt_formats[block_data["style"]])                
+                else:
+                    current_format = self.txt_formats[block_data["style"]]
+                    current_format.setForeground(self.highlight_colors[el.element])            
+                    document_cursor.insertText(el.to_text(), current_format)
+            self.send_message.emit(f"Loading paragraph {document_cursor.blockNumber()} of {len(json_document)}")
+            QApplication.processEvents()
         if document_cursor.block().userData() == None:
             document_cursor.block().setUserData(BlockUserData())
             self.to_next_style()

plover2cat-3.1.1/plover_cat/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "3.1.1"
+

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover_cat/captionWorker.py

@@ -1,4 +1,5 @@
-from urllib import request, parse
+from urllib import request
+from urllib.parse import urlunparse, urlparse
 from urllib.error import HTTPError
 from PyQt5.QtCore import QObject, pyqtSignal
 from queue import Queue, Empty
@@ -14,7 +15,8 @@ class captionWorker(QObject):
     
     ``captionWorker`` is put into another thread and doesn't run on the main event thread.
     Text gets ingested and then sent out as formatted caption lines.
-
+    
+    :param roll_caps: boolean, whether to use incremental captions or transcript-like
     :param max_length: maximum number of characters for each caption line, 
         suggested value 32, default None
     :type max_length: int, optional
@@ -37,8 +39,9 @@ class captionWorker(QObject):
     """Signal sent when worker is done."""
     postMessage = pyqtSignal(str)
     """Signal sent with message to display."""
-    def __init__(self, max_length = None, max_lines = None, remote = None, endpoint = None, port = None, password = None):
+    def __init__(self, roll_caps = True, max_length = None, max_lines = None, remote = None, endpoint = None, port = None, password = None):
         QObject.__init__(self)
+        self.roll_caps = roll_caps
         self.max_length = max_length
         self.max_lines = max_lines
         self.remote = remote
@@ -52,13 +55,28 @@ class captionWorker(QObject):
                 self.endpoint = "localhost"
             self.obs = obs.ReqClient(host=self.endpoint, port=self.port, password=self.password, timeout=3) 
             self.obs_queue = deque(maxlen = self.max_lines)
+        if self.remote == "Zoom":
+            self.zoom_seq = 1
+            zoom_url = urlparse(self.endpoint)
+            zoom_params = zoom_url._replace(path="/closedcaption/seq")
+            seq_url = urlunparse(zoom_params)
+            req = request.Request(seq_url, method = "GET")
+            r = request.urlopen(req)   
+            if r.status == 200:
+                string_seq = r.read()
+                self.zoom_seq = int(string_seq.decode()) + 1
         self.word_queue = Queue()
         """Queue containing text split into word chunks."""
-        self.cap_queue = deque(maxlen = max_lines)
+        if not self.roll_caps:
+            self.cap_queue = Queue()
+        else:
+            self.cap_queue = deque(maxlen = max_lines)
         """Queue containing formatted caption lines ready for display."""
         self.next_word = "" 
-        self.zoom_seq = 1
         """Line number for caption, required for Zoom captions."""
+        self.cap_line = ""
+        """Buffer for holding caption, when non-rolling"""
+        
     def intake(self, text):
         """Receive text from main editor and create work chunks for captions
         :param text: text written into editor
@@ -69,8 +87,26 @@ class captionWorker(QObject):
         for i in chunks:
             # tuple, first text, then time
             self.word_queue.put((i, text_time))
-        self.make_caps()
+        if not self.roll_caps:
+            self.make_caps()
+        else:
+            self.make_roll_caps()
     def make_caps(self):
+        while not self.word_queue.empty():
+            self.next_word, text_time = self.word_queue.get()
+            if self.max_length != 0 and (len(self.cap_line) + len(self.next_word)) > self.max_length:
+                self.cap_queue.put((self.cap_line, text_time))
+                self.cap_line = self.next_word
+                # self.send_cap()
+            elif "\u2029" in self.next_word:
+                self.cap_line += self.next_word.replace("\u2029", "")
+                self.cap_queue.put((self.cap_line, text_time))
+                self.cap_line = ""
+                # self.send_cap()
+            else:
+                self.cap_line += self.next_word       
+            self.send_cap()  
+    def make_roll_caps(self):
         """Ingest word chunks from queue and put lines into caption queue.
         """
         while not self.word_queue.empty():
@@ -92,8 +128,11 @@ class captionWorker(QObject):
         """Take caption from queue and send to display, and also if endpoint is defined.
         """
         try:
-            last_caps = list(self.cap_queue)
-            cap = "\n".join(c[0].lstrip(" ") for c in last_caps if c[0].lstrip(" "))
+            if not self.roll_caps:
+                cap, time = self.cap_queue.get_nowait()
+            else:
+                last_caps = list(self.cap_queue)
+                cap = "\n".join(c[0].lstrip(" ") for c in last_caps if c[0].lstrip(" "))
             self.capSend.emit(cap)
             if self.endpoint:
                 if self.remote == "Microsoft Teams":

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover_cat/caption_dialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>555</width>
-    <height>237</height>
+    <height>243</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,14 +26,14 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Maximum caption length:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QSpinBox" name="capLength">
        <property name="toolTip">
         <string>Maximum number of characters in one line</string>
@@ -46,7 +46,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="QSpinBox" name="maxDisplayLines">
        <property name="toolTip">
         <string>Only display this number of lines in caption window</string>
@@ -59,14 +59,14 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Display max lines:</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QPushButton" name="fontSelector">
        <property name="toolTip">
         <string>Font for display</string>
@@ -76,14 +76,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Display font:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="QComboBox" name="remoteCapHost">
        <property name="toolTip">
         <string>Destination to send captions to</string>
@@ -110,14 +110,14 @@
        </item>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Remote Endpoint:</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="7" column="1">
       <widget class="QLineEdit" name="hostURL">
        <property name="enabled">
         <bool>false</bool>
@@ -127,28 +127,28 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Remote URL/Token:</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="8" column="1">
       <widget class="QLineEdit" name="serverPort">
        <property name="enabled">
         <bool>false</bool>
        </property>
       </widget>
      </item>
-     <item row="7" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Port:</string>
        </property>
       </widget>
      </item>
-     <item row="8" column="1">
+     <item row="9" column="1">
       <widget class="QLineEdit" name="serverPassword">
        <property name="enabled">
         <bool>false</bool>
@@ -158,7 +158,7 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <widget class="QLabel" name="label_9">
        <property name="text">
         <string>Password:</string>
@@ -198,6 +198,23 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Roll Captions</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="rollCaptions">
+       <property name="text">
+        <string>Yes (Default)</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/plover_cat/rtf_parsing.py

@@ -29,6 +29,7 @@ from pyparsing import (
 from plover import log
 
 from plover_cat.steno_objects import *
+
 # control chars \ { }
 
 
@@ -479,3 +480,27 @@ def load_rtf_styles(parse_results):
         renamed_indiv_style.append(new_style_name)
     return(style_dict, renamed_indiv_style)    
 
+def import_version_one(json_document):
+    """Formats JSON file with older transcript format into standard transcript dict form"""
+    transcript_dict = {}
+    for key, value in json_document.items():
+        if not key.isdigit():
+            continue
+        el_list = []
+        for el in value["data"]["strokes"]:
+            el_dict = {"time": el[0], "stroke": el[1], "data": el[2]}
+            if len(el) == 4:
+                el_dict["audiotime"] = el[4]
+            new_stroke = stroke_text()
+            new_stroke.from_dict(el_dict)
+            el_list.append(new_stroke)
+        block_data = {}
+        for k, v in value["data"].items():
+            block_data[k] = v
+        block_data["strokes"] = element_collection(el_list).to_json()
+        transcript_dict[str(key)] = block_data
+    return(transcript_dict)
+
+def import_version_two(json_document):
+    """Formats JSON file with newer transcript format into standard transcript dict form"""
+    return(json_document)

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-	"plover[gui_qt]>=4.0.0.dev10",
+	"plover[gui_qt]>=4.0.0.dev10,<5.0.0",
 	"setuptools>=38.2.4",
 	"wheel",
 ]

{plover2cat-3.1.0a0 → plover2cat-3.1.1}/setup.cfg

@@ -23,7 +23,7 @@ keywords = plover plover_plugin
 [options]
 zip_safe = True
 install_requires = 
-	plover>=4.0.0.dev8
+	plover>=4.0.0.dev8,<5.0.0
 	odfpy
 	pyparsing > 3.0.7
 	spylls

plover2cat-3.1.0a0/plover_cat/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "3.1.0-alpha"
-