Remove duration slider tick marks + other general UI cleanup

Author: cstigler

Base.lproj/DomainList.xib

@@ -91,7 +91,7 @@
             <point key="canvasLocation" x="140" y="152"/>
         </menu>
         <window title="Domain Blocklist" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" texturedBackground="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="342" y="259" width="449" height="315"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2048" height="1255"/>
@@ -275,8 +275,8 @@ CA
         <userDefaultsController representsSharedInstance="YES" id="113"/>
     </objects>
     <resources>
-        <image name="NSAddTemplate" width="15" height="13"/>
-        <image name="NSRemoveTemplate" width="15" height="4"/>
+        <image name="NSAddTemplate" width="14" height="13"/>
+        <image name="NSRemoveTemplate" width="14" height="4"/>
         <image name="buttonCell:80:image" width="1" height="1">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T

Base.lproj/TimerWindow.xib

@@ -197,7 +197,7 @@ DQ
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="418" width="338" height="170"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2048" height="1255"/>
-            <view key="contentView" misplaced="YES" id="mZd-qZ-baN">
+            <view key="contentView" id="mZd-qZ-baN">
                 <rect key="frame" x="0.0" y="0.0" width="359" height="170"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
@@ -220,7 +220,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V5b-TT-ZSv">
-                        <rect key="frame" x="271" y="13" width="76" height="32"/>
+                        <rect key="frame" x="270" y="13" width="76" height="32"/>
                         <buttonCell key="cell" type="push" title="Extend" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="HNV-5F-fhQ">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -233,7 +233,7 @@ DQ
                         </connections>
                     </button>
                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rd1-Af-eXQ" customClass="SCDurationSlider">
-                        <rect key="frame" x="18" y="74" width="324" height="30"/>
+                        <rect key="frame" x="18" y="74" width="323" height="30"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="xty-Ul-pJS"/>
                         </constraints>
@@ -245,7 +245,7 @@ DQ
                         </connections>
                     </slider>
                     <textField verticalHuggingPriority="750" id="ljO-W1-kqG">
-                        <rect key="frame" x="110" y="61" width="140" height="17"/>
+                        <rect key="frame" x="-2" y="61" width="363" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="1 minute" id="ikq-N5-jYi">
                             <font key="font" metaFont="system"/>

SCDurationSlider.m

@@ -42,45 +42,8 @@ - (void)initializeDurationProperties {
 
 - (void)setMaxDuration:(NSInteger)maxDuration {
     _maxDuration = maxDuration;
-    [self recalculateSliderIntervals];
-}
-
-- (void)recalculateSliderIntervals {
     [self setMinValue: 1]; // never start a block shorter than 1 minute
     [self setMaxValue: self.maxDuration];
-    
-    // how many tick marks should we have? it's based on the max block duration
-    // TODO: can we make this work better with the start at 1-minute (vs 0)? if not, should we just eliminate ticks?
-    long tickInterval = 1;
-    if (self.maxDuration >= 5256000) {
-        // if max block duration is at least 10 years, tick marks are per-year
-        tickInterval = 525600;
-    } else if (self.maxDuration >= 525600) {
-        // if max block duration is at least 1 year, tick marks are per-month
-        tickInterval = 43800;
-    } else if (self.maxDuration >= 131400) {
-        // if max block duration is at least 3 months, tick marks are per-week
-        tickInterval = 10080;
-    } else if (self.maxDuration >= 10080) {
-        // if max block duration is at least 1 week, tick marks are per-day
-        tickInterval = 1440;
-    } else if (self.maxDuration >= 5760) {
-        // if max block duration is at least 4 days, tick marks are per 6 hours
-        tickInterval = 360;
-    } else if (self.maxDuration >= 1440) {
-        // if max block duration is at least 1 day, tick marks are per hour
-        tickInterval = 60;
-    } else if (self.maxDuration >= 720) {
-        // if max block duration is at least 12 hours, tick marks are per 30 minutes
-        tickInterval = 30;
-    } else if (self.maxDuration >= 60) {
-        // if max block duration is at least 1 hour, tick marks are per minute
-        tickInterval = 1;
-    }
-    
-    // no more than 72 ticks max
-    long numTicks = MIN(self.maxDuration / tickInterval, 72) + 1;
-    [self setNumberOfTickMarks: numTicks];
 }
 
 - (void)registerMinutesValueTransformer {