88
99import Cocoa
1010import LoginServiceKit
11+ import Defaults
1112
1213@NSApplicationMain
13- class AppDelegate : NSObject , NSApplicationDelegate {
14+ class AppDelegate : NSObject , NSApplicationDelegate , NSTextFieldDelegate {
1415
1516 @IBOutlet weak var statusBarMenu : NSMenu !
1617 @IBOutlet weak var preferencesWindowVersionNum : NSTextField !
1718 @IBOutlet weak var aboutWindowVersionNum : NSTextField !
1819 @IBOutlet weak var launchAtLoginCheckbox : NSButton !
19- @IBOutlet weak var timeFormat12h : NSButton !
20- @IBOutlet weak var timeFormat24h : NSButton !
20+ @IBOutlet weak var time1Text : NSTextField !
21+ @IBOutlet weak var time2Text : NSTextField !
2122 @IBOutlet weak var preferencesWindow : NSWindow !
2223 @IBOutlet weak var aboutWindow : NSWindow !
2324 @IBOutlet weak var alertWindow : NSWindow !
@@ -38,14 +39,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
3839
3940 launchAtLoginCheckbox. state = LoginServiceKit . isExistLoginItems ( ) ? . on : . off
4041
41- switch UserDefaults . standard. string ( forKey: " timeFormat " ) {
42- case " HH:mm " :
43- timeFormat12h. state = . off
44- timeFormat24h. state = . on
45- default :
46- timeFormat12h. state = . on
47- timeFormat24h. state = . off
48- }
42+ time1Text. delegate = self
43+ time2Text. delegate = self
44+ time1Text. stringValue = Defaults [ . time1]
45+ time2Text. stringValue = Defaults [ . time2]
4946
5047 clockBar ( )
5148
@@ -57,26 +54,45 @@ class AppDelegate: NSObject, NSApplicationDelegate {
5754 // Insert code here to tear down your application
5855 }
5956
57+ func showTime( ) {
58+ switch Defaults [ . shouldShowTime1] {
59+ case true :
60+ Defaults [ . showTime] = Defaults [ . time1]
61+ default :
62+ Defaults [ . showTime] = Defaults [ . time2]
63+ }
64+ }
65+
66+ func controlTextDidChange( _ obj: Notification ) {
67+ Defaults [ . time1] = time1Text. stringValue
68+ Defaults [ . time2] = time2Text. stringValue
69+ showTime ( )
70+ }
6071
6172 // add clockbar to touch bar
6273 func clockBar( ) {
6374 DFRSystemModalShowsCloseBoxWhenFrontMost ( true )
6475
6576 timeFormatter = DateFormatter ( )
66- timeFormatter? . dateFormat = UserDefaults . standard . string ( forKey : " timeFormat " ) ?? " h:mm "
77+ timeFormatter? . dateFormat = Defaults [ . showTime ]
6778 let nowTime = timeFormatter? . string ( from: Date ( ) )
6879
6980 let clockBarIdentifier = NSTouchBarItem . Identifier ( rawValue: " ClockBar " )
7081 let clockBar = NSCustomTouchBarItem . init ( identifier: clockBarIdentifier)
71- touchBarButton = NSButton ( title: nowTime!, target: self , action: nil )
82+ touchBarButton = NSButton ( title: nowTime!, target: self , action: #selector ( changeTime ) )
7283 clockBar. view = touchBarButton!
7384 NSTouchBarItem . addSystemTrayItem ( clockBar)
7485 DFRElementSetControlStripPresenceForIdentifier ( clockBarIdentifier, true )
7586 }
7687
88+ @objc func changeTime( ) {
89+ showTime ( )
90+ Defaults [ . shouldShowTime1] = !Defaults[ . shouldShowTime1]
91+ }
92+
7793 // update time
7894 @objc func updateTime( ) {
79- timeFormatter? . dateFormat = UserDefaults . standard . string ( forKey : " timeFormat " ) ?? " h:mm "
95+ timeFormatter? . dateFormat = Defaults [ . showTime ]
8096 touchBarButton? . title = ( timeFormatter? . string ( from: Date ( ) ) ) !
8197 }
8298
@@ -130,10 +146,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
130146 switch sender. tag {
131147 case 0 :
132148 UserDefaults . standard. set ( " h:mm " , forKey: " timeFormat " )
133- timeFormat24h . state = . off
149+
134150 case 1 :
135151 UserDefaults . standard. set ( " HH:mm " , forKey: " timeFormat " )
136- timeFormat12h . state = . off
152+
137153 default :
138154 return
139155 }
@@ -164,6 +180,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
164180 @IBAction func didClickURL( _ sender: NSButton ) {
165181 let url : String
166182 switch sender. tag {
183+ case 0 :
184+ url = " https://blog.licardo.cn/posts/33030 "
167185 case 1 :
168186 url = " https://github.com/L1cardo "
169187 case 2 :
@@ -185,3 +203,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
185203 }
186204
187205}
206+
207+ extension Defaults . Keys {
208+ static let time1 = Key < String > ( " time1 " , default: " h:mm " )
209+ static let time2 = Key < String > ( " time2 " , default: " HH:mm " )
210+ static let showTime = Key < String > ( " showTime " , default: " h:mm " )
211+ static let shouldShowTime1 = Key < Bool > ( " showTime1 " , default: true )
212+ }
0 commit comments