From 8c60aca7004bcd01c04cbed883d2efe6efe55451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Wei=C3=9F?= <jan@geheimwerk.de>
Date: Wed, 5 May 2021 13:34:44 +0200
Subject: [PATCH] Move formatter setup into XIB.

---
 Base.lproj/MainMenu.xib | 17 +++++++++++------
 Playlist/PlaylistView.m | 12 ------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 0c2f0e601..8ca33ddec 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -46,7 +46,8 @@
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                                     </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" title="Text Cell" id="1507" customClass="MonospacedDigitTextFieldCell">
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" id="1507" customClass="MonospacedDigitTextFieldCell">
+                                                        <customFormatter key="formatter" id="nTf-SH-hvf" customClass="IndexFormatter"/>
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -147,16 +148,18 @@
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" title="Text Cell" id="1510" customClass="MonospacedDigitTextFieldCell">
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" id="1510" customClass="MonospacedDigitTextFieldCell">
+                                                        <customFormatter key="formatter" id="tMx-da-cg2" customClass="SecondsFormatter"/>
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <connections>
-                                                        <binding destination="218" name="value" keyPath="arrangedObjects.length" id="1658">
+                                                        <binding destination="218" name="value" keyPath="arrangedObjects.length" id="3wK-vR-bZH">
                                                             <dictionary key="options">
-                                                                <integer key="NSConditionallySetsEditable" value="1"/>
+                                                                <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                                <string key="NSNullPlaceholder">0</string>
                                                             </dictionary>
                                                         </binding>
                                                         <binding destination="1689" name="fontSize" keyPath="values.fontSize" id="1919"/>
@@ -167,7 +170,8 @@
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" title="Text Cell" id="1511" customClass="MonospacedDigitTextFieldCell">
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" id="1511" customClass="MonospacedDigitTextFieldCell">
+                                                        <customFormatter key="formatter" id="uVF-7t-Nw2" customClass="BlankZeroFormatter"/>
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -200,7 +204,8 @@
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
-                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" title="Text Cell" id="1513" customClass="MonospacedDigitTextFieldCell">
+                                                    <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="right" id="1513" customClass="MonospacedDigitTextFieldCell">
+                                                        <customFormatter key="formatter" id="QXs-TV-W1R" customClass="BlankZeroFormatter"/>
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
index b121d69ba..20d4bdd45 100644
--- a/Playlist/PlaylistView.m
+++ b/Playlist/PlaylistView.m
@@ -42,18 +42,6 @@
     }
 #endif
 
-    // Set up formatters
-    NSFormatter *secondsFormatter = [[SecondsFormatter alloc] init];
-    [[[self tableColumnWithIdentifier:@"length"] dataCell] setFormatter:secondsFormatter];
-
-    NSFormatter *indexFormatter = [[IndexFormatter alloc] init];
-    [[[self tableColumnWithIdentifier:@"index"] dataCell] setFormatter:indexFormatter];
-
-    NSFormatter *blankZeroFormatter = [[BlankZeroFormatter alloc] init];
-    [[[self tableColumnWithIdentifier:@"track"] dataCell] setFormatter:blankZeroFormatter];
-    [[[self tableColumnWithIdentifier:@"year"] dataCell] setFormatter:blankZeroFormatter];
-    // end setting up formatters
-
     [self setVerticalMotionCanBeginDrag:YES];
 
     // Set up header context menu