playground
/
menu-clock-macos
mirror of https://github.com/n0shake/Clocker.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Minor fixes.

pull/92/head
Abhishek 4 years ago
parent
e048b3ac2a
commit
109bd9bf83
4 changed files with 14 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Clocker/Overall App/DataStore.swift
  2. 2
      Clocker/Overall App/Strings.swift
  3. 2
      Clocker/Preferences/Appearance/AppearanceViewController.swift
  4. 17
      Clocker/Preferences/Preferences.storyboard

3
Clocker/Overall App/DataStore.swift
Unescape View File

@ -11,6 +11,7 @@ enum ViewType {
case showMeetingInMenubar
case showAllDayEventsInMenubar
case showAppInForeground
case appDisplayOptions
case dateInMenubar
case placeInMenubar
case dayInMenubar
@ -135,6 +136,8 @@ class DataStore: NSObject {
return shouldDisplayHelper(CLShowPlaceInMenu)
case .dayInMenubar:
return shouldDisplayHelper(CLShowDayInMenu)
case .appDisplayOptions:
return shouldDisplayHelper(CLAppDisplayOptions)
case .menubarCompactMode:
guard let value = retrieve(key: CLMenubarCompactMode) as? Int else {
return false

2
Clocker/Overall App/Strings.swift
Unescape View File

@ -28,7 +28,7 @@ let CLTruncateTextLength = "truncateTextLength"
let CLFutureSliderRange = "sliderDayRange"
let CLSelectedCalendars = "SelectedCalendars"
let CLShowOnboardingFlow = "com.abhishek.showOnboardingFlow"
let CLAppDislayOptions = "com.abhishek.appDisplayOptions"
let CLAppDisplayOptions = "com.abhishek.appDisplayOptions"
let CLLongStatusBarWarningMessage = "com.abhishek.longStatusBarWarning"
let CLUITestingLaunchArgument = "isUITesting"
let CLOnboaringTestsLaunchArgument = "isTestingTheOnboardingFlow"

2
Clocker/Preferences/Appearance/AppearanceViewController.swift
Unescape View File

@ -104,7 +104,7 @@ class AppearanceViewController: ParentViewController {
let shouldDisplayCompact = DataStore.shared().shouldDisplay(.menubarCompactMode)
menubarMode.setSelected(true, forSegment: shouldDisplayCompact ? 0 : 1)
let appDisplayOptions = DataStore.shared().shouldDisplay(.showAppInForeground)
let appDisplayOptions = DataStore.shared().shouldDisplay(.appDisplayOptions)
appDisplayControl.setSelected(true, forSegment: appDisplayOptions ? 1 : 0)
}

17
Clocker/Preferences/Preferences.storyboard
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@ -1444,6 +1444,7 @@
</constraints>
</customView>
<connections>
<outlet property="appDisplayControl" destination="DjV-qq-hr9" id="Q4N-i2-oWr"/>
<outlet property="appDisplayLabel" destination="HNj-dh-8gr" id="A6U-gp-sje"/>
<outlet property="appearanceTab" destination="SGu-yd-JQh" id="CJn-3E-Ujd"/>
<outlet property="dayDisplayOptionsLabel" destination="gFE-hZ-J92" id="tVv-pC-MSW"/>
@ -1492,7 +1493,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dha-h9-Nd0" customClass="ClockerSearchField" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="8" y="169" width="329" height="23"/>
<rect key="frame" x="8" y="97" width="329" height="23"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="Enter a city, state, country name" usesSingleLineMode="YES" maximumRecents="5" id="ikU-Tm-0WZ">
<font key="font" size="13" name="Avenir-Light"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@ -1549,13 +1550,13 @@ DQ
</connections>
</button>
<scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0wY-ff-FLW">
<rect key="frame" x="8" y="30" width="329" height="129"/>
<rect key="frame" x="8" y="30" width="329" height="57"/>
<clipView key="contentView" drawsBackground="NO" id="rGc-3M-cCq">
<rect key="frame" x="0.0" y="0.0" width="329" height="129"/>
<rect key="frame" x="0.0" y="0.0" width="329" height="57"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" viewBased="YES" id="xkl-2X-ZCb">
<rect key="frame" x="0.0" y="0.0" width="329" height="129"/>
<rect key="frame" x="0.0" y="0.0" width="329" height="57"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -1645,14 +1646,14 @@ DQ
</scroller>
</scrollView>
<progressIndicator wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="0A5-gp-lay">
<rect key="frame" x="165" y="114" width="16" height="16"/>
<rect key="frame" x="165" y="78" width="16" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="fgE-77-Vda"/>
<constraint firstAttribute="width" constant="16" id="pwe-em-e0a"/>
</constraints>
</progressIndicator>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xgb-wU-8RU">
<rect key="frame" x="18" y="84" width="309" height="22"/>
<rect key="frame" x="18" y="48" width="309" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="zqt-d8-yas"/>
</constraints>

Write Preview
Loading…
Cancel
Save