Stuff.

3 years ago · 34588af1e4
20 changed files with 46 additions and 14 deletions
--- a/Clocker/Clocker/ca.lproj/Localizable.strings
+++ b/Clocker/Clocker/ca.lproj/Localizable.strings
@ -161,3 +161,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/de.lproj/Localizable.strings
+++ b/Clocker/Clocker/de.lproj/Localizable.strings
@ -161,3 +161,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/en.lproj/Localizable.strings
+++ b/Clocker/Clocker/en.lproj/Localizable.strings
@ -163,3 +163,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/en.lproj/Panel.xib
+++ b/Clocker/Clocker/en.lproj/Panel.xib
@ -261,7 +261,7 @@
                                </scroller>
                            </scrollView>
                            <customView wantsLayer="YES" focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="C7R-Dq-MFr" userLabel="Slider View">
-                                <rect key="frame" x="0.0" y="235" width="350" height="30"/>
+                                <rect key="frame" x="0.0" y="145" width="350" height="30"/>
                                <subviews>
                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vf2-uI-yf3">
                                        <rect key="frame" x="7" y="2" width="201" height="23"/>
--- a/Clocker/Clocker/es.lproj/Localizable.strings
+++ b/Clocker/Clocker/es.lproj/Localizable.strings
@ -163,3 +163,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";s
--- a/Clocker/Clocker/fr.lproj/Localizable.strings
+++ b/Clocker/Clocker/fr.lproj/Localizable.strings
@ -162,3 +162,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/hi.lproj/Localizable.strings
+++ b/Clocker/Clocker/hi.lproj/Localizable.strings
@ -157,3 +157,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/hr.lproj/Localizable.strings
+++ b/Clocker/Clocker/hr.lproj/Localizable.strings
@ -163,3 +163,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/it.lproj/Localizable.strings
+++ b/Clocker/Clocker/it.lproj/Localizable.strings
@ -162,3 +162,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/ja.lproj/Localizable.strings
+++ b/Clocker/Clocker/ja.lproj/Localizable.strings
@ -161,3 +161,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/ko.lproj/Localizable.strings
+++ b/Clocker/Clocker/ko.lproj/Localizable.strings
@ -164,3 +164,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/nl.lproj/Localizable.strings
+++ b/Clocker/Clocker/nl.lproj/Localizable.strings
@ -161,3 +161,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/pt-BR.lproj/Localizable.strings
+++ b/Clocker/Clocker/pt-BR.lproj/Localizable.strings
@ -162,3 +162,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/ru.lproj/Localizable.strings
+++ b/Clocker/Clocker/ru.lproj/Localizable.strings
@ -154,3 +154,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
@ -155,3 +155,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
@ -162,3 +162,5 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
--- a/Events/ParentPanelController+UpcomingEvents.swift
+++ b/Events/ParentPanelController+UpcomingEvents.swift
@ -2,11 +2,11 @@
 import Foundation
-var avenirLightFont: NSFont {
+var avenirBookFont: NSFont {
-    if let avenirFont = NSFont(name: "Avenir-Light", size: 12) {
+    if let avenirFont = NSFont(name: "Avenir-Book", size: 13) {
        return avenirFont
    }
-    return NSFont.systemFont(ofSize: 12)
+    return NSFont.systemFont(ofSize: 13)
 }
 protocol UpcomingEventPanelDelegate: AnyObject {
--- a/Events/UpcomingEventViewItem.swift
+++ b/Events/UpcomingEventViewItem.swift
@ -57,7 +57,7 @@ class UpcomingEventViewItem: NSCollectionViewItem {
        }
        eventTitleLabel.stringValue = NSLocalizedString("No upcoming events for today!", comment: "Next Event Label with no upcoming event")
-        setCalendarButtonTitle(buttonTitle: NSLocalizedString("Inbox Zero!", comment: "Button Title for no upcoming event"))
+        setCalendarButtonTitle(buttonTitle: NSLocalizedString("Great going.", comment: "Button Title for no upcoming event"))
        calendarColorView.layer?.backgroundColor = NSColor.systemGreen.cgColor
        zoomButton.image = Themer.shared().removeImage()
    }
--- a/Events/UpcomingEventViewItem.xib
+++ b/Events/UpcomingEventViewItem.xib
@ -42,7 +42,7 @@
                                <constraint firstAttribute="height" constant="24" id="BA4-1v-xiZ"/>
                            </constraints>
                            <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Nandita Jaiswal's 35th birthday" placeholderString="" id="Dtv-o3-gqd">
-                                <font key="font" size="12" name="Avenir-Light"/>
+                                <font key="font" size="12" name="Avenir-Book"/>
                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                <color key="backgroundColor" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                            </textFieldCell>
--- a/Events/UpcomingEventsDataSource.swift
+++ b/Events/UpcomingEventsDataSource.swift
@ -44,13 +44,15 @@ class UpcomingEventsDataSource: NSObject, NSCollectionViewDataSource, NSCollecti
    }
    func collectionView(_ collectionView: NSCollectionView, layout _: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
-        if upcomingEvents.isEmpty || eventCenter.calendarAccessNotDetermined() {
+        if eventCenter.calendarAccessNotDetermined() {
-            return NSSize(width: collectionView.frame.width - 40, height: 50)
+          return NSSize(width: collectionView.frame.width - 40, height: collectionView.frame.height - 15)
-        }
+        } else if upcomingEvents.isEmpty {
-
+          return NSSize(width: collectionView.frame.width - 25, height: collectionView.frame.height - 15)
        } else {
          let currentEventInfo = upcomingEvents[indexPath.item]
-        let attributedString = NSAttributedString(string: currentEventInfo.event.title, attributes: [NSAttributedString.Key.font : avenirLightFont])
+          let attributedString = NSAttributedString(string: currentEventInfo.event.title, attributes: [NSAttributedString.Key.font : avenirBookFont])
          let maxWidth = max(attributedString.size().width + 60.0, collectionView.frame.width / 2)
-        return NSSize(width: maxWidth, height: 50)
+          return NSSize(width: maxWidth, height: collectionView.frame.height - 15)
        }
    }
 }