fix: add清明节/提前三天提醒

Author: fancymax

12306ForMac/Preferences/ReminderPreferenceViewController.swift

@@ -49,6 +49,7 @@ class ReminderPreferenceViewController: NSViewController,MASPreferencesViewContr
         //key,name,isLunar
         ["01-01","元旦节",false],
         ["02-14","情人节",false],
+        ["04-04","清明节",false],
         ["05-01","劳动节",false],
         ["05-05","端午节",true],
         ["07-07","七夕节",true],
@@ -170,7 +171,7 @@ class ReminderPreferenceViewController: NSViewController,MASPreferencesViewContr
                 else {
                     date = DateComponents(calendar: lunarCal,year:lunarYear + 1, month: m, day: d).date!
                 }
-                reminderDate = date.addingTimeInterval(-3600*24*30)
+                reminderDate = date.addingTimeInterval(-3600*24*33)
             }
 
             ret.append(Festival2Reminder(name:name,date:date,reminderDate:reminderDate,shouldReminder:true))
@@ -187,7 +188,7 @@ class ReminderPreferenceViewController: NSViewController,MASPreferencesViewContr
 
         var isSuccess:Bool?
         for item in festivalReminderInfos where item.shouldReminder {
-            let eventTitle = "\(item.name) 火车票 预售提醒(明天预售)"
+            let eventTitle = "\(item.name) 火车票 预售提醒"
             let startDate = item.reminderDate
             let endDate = startDate.addingTimeInterval(24*3600)
             isSuccess = CalendarManager.sharedInstance.createEvent(title:eventTitle,startDate:startDate,endDate:endDate)

12306ForMac/Preferences/ReminderPreferenceViewController.xib

@@ -153,7 +153,7 @@
                                         </prototypeCellViews>
                                     </tableColumn>
                                     <tableColumn identifier="" width="116" minWidth="10" maxWidth="3.4028234663852886e+38" id="y1J-Rw-HDW">
-                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="提醒日期(第二天预售)">
+                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="提醒日期(提前三天)">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -229,7 +229,7 @@
                         </subviews>
                     </clipView>
                     <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="sLs-PQ-2AC">
-                        <rect key="frame" x="1" y="197" width="348" height="16"/>
+                        <rect key="frame" x="1" y="7" width="0.0" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Xpi-Be-66e">