Added "Show time in menu bar" function

nyok · nyok · commit 09aae3be9a56 · 2022-06-17T10:57:41.000+03:00
diff --git a/TinyTimeTracker/TinyTimeTracker.xcodeproj/project.pbxproj b/TinyTimeTracker/TinyTimeTracker.xcodeproj/project.pbxproj
@@ -330,7 +330,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = nyok.TinyTimeTracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -360,7 +360,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = nyok.TinyTimeTracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/TinyTimeTracker/TinyTimeTracker/AppDelegate.swift b/TinyTimeTracker/TinyTimeTracker/AppDelegate.swift
@@ -8,7 +8,7 @@ import LaunchAtLogin
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
-    
+    let userDefaults = UserDefaults.standard
     let appName = Bundle.main.infoDictionary?["CFBundleName"] as! String
     var appRunning: Bool = false
     var appTimerWorkRunning: Bool = false
@@ -22,13 +22,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let iconWork = NSImage(named:NSImage.Name("IconWork"))
     let iconRest = NSImage(named:NSImage.Name("IconRest"))
     let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
+    let font = NSFont(name: "Helvetica", size: 12)
 
     @IBOutlet weak var statusMenu: NSMenu!
     @IBOutlet weak var startStopMenuItem: NSMenuItem!
     @IBOutlet weak var changeModeMenuItem: NSMenuItem!
     @IBOutlet weak var statisticsMenuItem: NSMenuItem!
     @IBOutlet weak var workTimerMenuItem: NSMenuItem!
     @IBOutlet weak var restTimerMenuItem: NSMenuItem!
+    @IBOutlet weak var settingsMenuItem: NSMenuItem!
+    @IBOutlet weak var showTimeTitleMenuItem: NSMenuItem!
     @IBOutlet weak var launchAtLoginMenuItem: NSMenuItem!
     @IBOutlet weak var quitMenuItem: NSMenuItem!
 
@@ -62,6 +65,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         NSWorkspace.shared.open(logFile)
     }
 
+    @IBAction func showTimeTitleClicked(_ sender: NSMenuItem) {
+        sender.state = sender.state == .on ? .off : .on
+        userDefaults.set(sender.state, forKey: "showTimeTitleMenuValue")
+    }
+
     @IBAction func launchAtLoginClicked(_ sender: NSMenuItem) {
         sender.state = sender.state == .on ? .off : .on
         if sender.state == .on {
@@ -84,6 +92,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        userDefaults.register(defaults: ["showTimeTitleMenuValue": false])
         createStatusMenu()
     }
 
@@ -95,18 +104,27 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
 
     func createStatusMenu() {
+        statusItem.button!.font = font
         statusItem.button?.image = icon
+        statusItem.button?.imagePosition = NSControl.ImagePosition.imageRight
         icon?.isTemplate = true
         iconWork?.isTemplate = true
         iconRest?.isTemplate = true
         statusItem.menu = statusMenu
+        if userDefaults.bool(forKey: "showTimeTitleMenuValue") {
+            showTimeTitleMenuItem.state = .on
+        } else {
+            showTimeTitleMenuItem.state = .off
+        }
         if LaunchAtLogin.isEnabled {
             launchAtLoginMenuItem.state = .on
         } else {
             launchAtLoginMenuItem.state = .off
         }
         changeModeMenuItem.title = NSLocalizedString("menuTextChangemode", comment: "")
         statisticsMenuItem.title = NSLocalizedString("menuTextStatistics", comment: "")
+        settingsMenuItem.title = NSLocalizedString("menuTextSettings", comment: "")
+        showTimeTitleMenuItem.title = NSLocalizedString("menuTextShowTimeTitle", comment: "")
         launchAtLoginMenuItem.title = NSLocalizedString("menuTextLaunchAtLogin", comment: "")
         quitMenuItem.title = NSLocalizedString("menuTextQuit", comment: "")
     }
@@ -138,9 +156,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     func startTimerWork() {
         appRunning = true
         appTimerWorkRunning = true
-        statusItem.button?.image = iconWork
         timerWork = Timer(
-            timeInterval: 1,
+            timeInterval: 0.3,
             target: self,
             selector: #selector(updateTextWorkTimerMenuItem),
             userInfo: nil,
@@ -155,14 +172,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         elapsedTimeWork += mSecond
         let hms = secToTime(sec: elapsedTimeWork)
         workTimerMenuItem.title = NSLocalizedString("textWork", comment: "") + String(": ") + hms
+        statusItem.button?.image = iconWork
+        if showTimeTitleMenuItem.state == .on {
+            let timeTitle = secToTimeTitle(sec: elapsedTimeWork)
+            statusItem.button?.title = timeTitle
+        } else {
+            statusItem.button?.title = ""
+        }
     }
 
     func startTimerRest() {
         appRunning = true
         appTimerRestRunning = true
-        statusItem.button?.image = iconRest
         timerRest = Timer(
-            timeInterval: 1,
+            timeInterval: 0.3,
             target: self,
             selector: #selector(updateTextRestTimerMenuItem),
             userInfo: nil,
@@ -177,6 +200,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         elapsedTimeRest += mSecond
         let hms = secToTime(sec: elapsedTimeRest)
         restTimerMenuItem.title = NSLocalizedString("textRest", comment: "") + String(": ") + hms
+        statusItem.button?.image = iconRest
+        if showTimeTitleMenuItem.state == .on {
+            let timeTitle = secToTimeTitle(sec: elapsedTimeRest)
+            statusItem.button?.title = timeTitle
+        } else {
+            statusItem.button?.title = ""
+        }
     }
 
     func secToTime(sec: Double) -> String {
@@ -186,6 +216,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         let hms = String(format:"%02i:%02i:%02i", hours, minutes, seconds)
         return hms
     }
+    
+    func secToTimeTitle(sec: Double) -> String {
+        let hours = Int(sec) / 3600
+        let minutes = Int(sec) / 60 % 60
+        let hm = String(format:"%02i:%02i", hours, minutes)
+        return hm
+    }
 
     func stopTimerWork() {
         appTimerWorkRunning = false
@@ -199,6 +236,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
 
     func stopAllTimer() {
         appRunning = false
+        statusItem.button?.title = ""
         stopTimerWork()
         stopTimerRest()
     }
diff --git a/TinyTimeTracker/TinyTimeTracker/Base.lproj/Main.storyboard b/TinyTimeTracker/TinyTimeTracker/Base.lproj/Main.storyboard
@@ -15,6 +15,8 @@
                         <outlet property="launchAtLoginMenuItem" destination="kHe-cK-j9E" id="YjN-ax-Q9e"/>
                         <outlet property="quitMenuItem" destination="u81-b3-YS7" id="Def-Kc-Oyv"/>
                         <outlet property="restTimerMenuItem" destination="dmx-g4-gzN" id="9Vc-8P-9Np"/>
+                        <outlet property="settingsMenuItem" destination="UQJ-fn-iel" id="xVL-mX-Z3K"/>
+                        <outlet property="showTimeTitleMenuItem" destination="DiI-su-7jD" id="gJm-Aq-LH2"/>
                         <outlet property="startStopMenuItem" destination="k7j-Rw-Pdr" id="bR1-t9-XIO"/>
                         <outlet property="statisticsMenuItem" destination="Ocu-KO-qAu" id="76e-D7-uq2"/>
                         <outlet property="statusMenu" destination="VwX-F4-3Ia" id="CUE-Ev-wU3"/>
@@ -71,12 +73,26 @@
                             </connections>
                         </menuItem>
                         <menuItem isSeparatorItem="YES" id="uas-QH-cD5"/>
-                        <menuItem title="launchAtLogin" id="kHe-cK-j9E">
+                        <menuItem title="settings" id="UQJ-fn-iel">
                             <modifierMask key="keyEquivalentModifierMask"/>
-                            <connections>
-                                <action selector="launchAtLoginClicked:" target="Voe-Tx-rLC" id="ibo-Dk-ZVX"/>
-                            </connections>
+                            <menu key="submenu" id="Yz8-dx-ju2">
+                                <items>
+                                    <menuItem title="showTimeTitle" id="DiI-su-7jD">
+                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                        <connections>
+                                            <action selector="showTimeTitleClicked:" target="Voe-Tx-rLC" id="NA5-Uk-5gC"/>
+                                        </connections>
+                                    </menuItem>
+                                    <menuItem title="launchAtLogin" id="kHe-cK-j9E">
+                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                        <connections>
+                                            <action selector="launchAtLoginClicked:" target="Voe-Tx-rLC" id="ibo-Dk-ZVX"/>
+                                        </connections>
+                                    </menuItem>
+                                </items>
+                            </menu>
                         </menuItem>
+                        <menuItem isSeparatorItem="YES" id="nXO-s1-g1x"/>
                         <menuItem title="quit" keyEquivalent="q" id="u81-b3-YS7">
                             <connections>
                                 <action selector="quitClicked:" target="Voe-Tx-rLC" id="tIy-Hj-ZOV"/>
diff --git a/TinyTimeTracker/TinyTimeTracker/en.lproj/Localizable.strings b/TinyTimeTracker/TinyTimeTracker/en.lproj/Localizable.strings
@@ -7,6 +7,8 @@
 "menuTextStop" = "Stop";
 "menuTextChangemode" = "Change mode";
 "menuTextStatistics" = "Statistics";
+"menuTextSettings" = "Settings";
+"menuTextShowTimeTitle" = "Show time in menubar";
 "menuTextLaunchAtLogin" = "Launch at login";
 "menuTextQuit" = "Quit";
 "textWork" = "Work";
diff --git a/TinyTimeTracker/TinyTimeTracker/ru.lproj/Localizable.strings b/TinyTimeTracker/TinyTimeTracker/ru.lproj/Localizable.strings
@@ -7,6 +7,8 @@
 "menuTextStop" = "Стоп";
 "menuTextChangemode" = "Сменить режим";
 "menuTextStatistics" = "Статистика";
+"menuTextSettings" = "Настройки";
+"menuTextShowTimeTitle" = "Показывать время";
 "menuTextLaunchAtLogin" = "Запускать при старте";
 "menuTextQuit" = "Выход";
 "textWork" = "Работа";
