Add ability to edit text

Author: Stanislas Chevallier

Subtitler/Base.lproj/Main.storyboard

@@ -262,13 +262,13 @@ CA
                                         <autoresizingMask key="autoresizingMask"/>
                                         <subviews>
                                             <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ob9-1O-CVB">
-                                                <rect key="frame" x="0.0" y="46" width="380" height="162"/>
+                                                <rect key="frame" x="0.0" y="46" width="380" height="78"/>
                                                 <clipView key="contentView" id="bus-Px-5FW">
-                                                    <rect key="frame" x="1" y="1" width="378" height="160"/>
+                                                    <rect key="frame" x="1" y="1" width="378" height="76"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" tableStyle="fullWidth" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="18" usesAutomaticRowHeights="YES" headerView="IK9-0e-Sxy" viewBased="YES" id="8su-3M-rp4">
-                                                            <rect key="frame" x="0.0" y="0.0" width="378" height="132"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="378" height="48"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <size key="intercellSpacing" width="17" height="0.0"/>
                                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -291,13 +291,14 @@ CA
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="XT2-sz-zwD">
-                                                                                    <rect key="frame" x="2" y="2" width="142" height="32"/>
-                                                                                    <textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Sample line with very long text" id="oNC-L2-X9N">
+                                                                                    <rect key="frame" x="2" y="2" width="142" height="16"/>
+                                                                                    <textFieldCell key="cell" selectable="YES" editable="YES" allowsUndo="NO" title="Sample line with very long text" id="oNC-L2-X9N">
                                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                                     </textFieldCell>
                                                                                     <connections>
+                                                                                        <action selector="tableViewLineTextFieldChangedWithSender:" target="rPt-NT-nkU" id="tYi-E4-pHc"/>
                                                                                         <binding destination="B9k-E3-fIe" name="value" keyPath="objectValue" id="dpA-F4-Bqz"/>
                                                                                     </connections>
                                                                                 </textField>
@@ -443,7 +444,7 @@ CA
                                         <autoresizingMask key="autoresizingMask"/>
                                         <subviews>
                                             <avPlayerView controlsStyle="inline" translatesAutoresizingMaskIntoConstraints="NO" id="fFl-Ef-s8W" customClass="PlayerView" customModule="Subtitler" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="112" width="419" height="96"/>
+                                                <rect key="frame" x="0.0" y="112" width="419" height="12"/>
                                             </avPlayerView>
                                             <button verticalHuggingPriority="750" springLoaded="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EV0-6E-XRp" customClass="PressButton" customModule="Subtitler" customModuleProvider="target">
                                                 <rect key="frame" x="2" y="2" width="415" height="40"/>

Subtitler/Models/Subtitle.swift

@@ -119,6 +119,20 @@ class Subtitle: NSDocument {
         return newLineIndex
     }
 
+    func updateText(for lineIndex: Int, text: String) {
+        isTransient = false
+        updateChangeCount(.changeDone)
+        
+        let previousText = lines[lineIndex].text
+        lines[lineIndex].text = text.replacingOccurrences(of: "\n\n", with: "\n")
+
+        undoManager?.registerUndo(withTarget: self, handler: { selfTarget in
+            selfTarget.updateText(for: lineIndex, text: previousText)
+            selfTarget.contentViewController?.updateTableView()
+        })
+        undoManager?.setActionName("Update text")
+    }
+    
     func updateTimings(for lineIndex: Int, start: TimeInterval, end: TimeInterval) {
         isTransient = false
         updateChangeCount(.changeDone)
@@ -135,7 +149,7 @@ class Subtitle: NSDocument {
         })
         undoManager?.setActionName("Update timings")
     }
-    
+
     func move(from originalIndex: Int, to destinationIndex: Int) {
         isTransient = false
         updateChangeCount(.changeDone)

Subtitler/VCs/ViewController.swift

@@ -9,7 +9,7 @@ import Cocoa
 import AVKit
 import SnapKit
 
-// TODO: allow text editing (timings too ? with validation using binding and value transformer ?)
+// TODO: allow timing editing as text ? with validation using binding and value transformer ?
 
 class ViewController: NSViewController {
 
@@ -265,6 +265,13 @@ extension ViewController: NSTableViewDelegate {
         player.seek(to: min(desiredTime, maxTime))
     }
 
+    @IBAction private func tableViewLineTextFieldChanged(sender: AnyObject?) {
+        guard let field = sender as? NSTextField else { return }
+        let row = tableView.row(for: field)
+        guard row >= 0 else { return }
+        subtitle.updateText(for: row, text: field.stringValue)
+    }
+    
     // https://samwize.com/2018/11/27/drag-and-drop-to-reorder-nstableview/
     func tableView(_ tableView: NSTableView, pasteboardWriterForRow row: Int) -> NSPasteboardWriting? {
         let pasteboardItem = NSPasteboardItem()