Merge branch 'master' of https://github.com/n0shake/Clocker

Clocker/ClockerHelper/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -599,7 +599,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -659,39 +659,5 @@
             </objects>
             <point key="canvasLocation" x="75" y="0.0"/>
         </scene>
-        <!--Window Controller-->
-        <scene sceneID="R2V-B0-nI4">
-            <objects>
-                <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
-                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-                        <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-                        <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
-                        <connections>
-                            <outlet property="delegate" destination="B8D-0N-5wS" id="cvb-RO-ZWY"/>
-                        </connections>
-                    </window>
-                    <connections>
-                        <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
-                    </connections>
-                </windowController>
-                <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="75" y="250"/>
-        </scene>
-        <!--View Controller-->
-        <scene sceneID="hIz-AP-VOD">
-            <objects>
-                <viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
-                    <view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                    </view>
-                </viewController>
-                <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="75" y="655"/>
-        </scene>
     </scenes>
 </document>

Clocker/Preferences/General/PreferencesViewController.swift

@@ -45,7 +45,6 @@ class PreferencesViewController: ParentViewController {
     @IBOutlet private var timezoneTableView: NSTableView!
     @IBOutlet private var availableTimezoneTableView: NSTableView!
     @IBOutlet private var timezonePanel: Panelr!
-    @IBOutlet private var stackView: NSStackView!
     @IBOutlet private var progressIndicator: NSProgressIndicator!
     @IBOutlet private var addButton: NSButton!
     @IBOutlet private var recorderControl: SRRecorderControl!
@@ -69,8 +68,9 @@ class PreferencesViewController: ParentViewController {
 
     @IBOutlet var sortToggle: NSButton!
     private var themeDidChangeNotification: NSObjectProtocol?
-    private var selectionsDataSource: PreferencesDataSource!
 
+    // Selected Timezones Data Source
+    private var selectionsDataSource: PreferencesDataSource!
     // Search Results Data Source Handler
     private var searchResultsDataSource: SearchDataSource!
 
@@ -219,7 +219,7 @@ class PreferencesViewController: ParentViewController {
 
         deleteButton.isEnabled = false
 
-        [placeholderLabel, additionalSortOptions].forEach { $0.isHidden = true }
+        [placeholderLabel].forEach { $0.isHidden = true }
 
         messageLabel.stringValue = CLEmptyString
 

Clocker/Preferences/Preferences.storyboard

@@ -489,7 +489,7 @@
                                     <rect key="frame" x="-100" y="-100" width="219" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
-                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" horizontal="NO" id="1lL-VM-dm3" customClass="ClockerScroller" customModule="Clocker" customModuleProvider="target">
+                                <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" arrowsPosition="none" controlSize="mini" horizontal="NO" id="1lL-VM-dm3">
                                     <rect key="frame" x="325" y="1" width="14" height="180"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
@@ -1630,7 +1630,6 @@ CA
                         <outlet property="recorderControl" destination="PbD-dt-goz" id="ZH4-DH-X0L"/>
                         <outlet property="searchField" destination="Dha-h9-Nd0" id="SNI-zE-aNT"/>
                         <outlet property="sortToggle" destination="VGu-Z8-ktt" id="7dH-BI-HrP"/>
-                        <outlet property="stackView" destination="1sT-pO-jK4" id="VKO-mK-cJO"/>
                         <outlet property="startAtLoginLabel" destination="aCf-xC-UkE" id="dZk-TD-VBU"/>
                         <outlet property="startupCheckbox" destination="aGE-ap-6NE" id="G1Q-Rq-gYE"/>
                         <outlet property="tableview" destination="eI7-Vb-R7J" id="vgV-nN-mEQ"/>
@@ -1645,7 +1644,7 @@ CA
                     <windowStyleMask key="styleMask" closable="YES" miniaturizable="YES" nonactivatingPanel="YES"/>
                     <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                     <rect key="contentRect" x="120" y="64" width="345" height="320"/>
-                    <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+                    <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
                     <value key="minSize" type="size" width="345" height="320"/>
                     <value key="maxSize" type="size" width="345" height="320"/>
                     <view key="contentView" id="MAe-t5-3A2">

Readme.md

@@ -3,13 +3,13 @@
 
 [![Twitter: @abgbm](https://img.shields.io/badge/contact-@n0shake-blue.svg?style=flat)](https://twitter.com/n0shake) [![Build Status](https://travis-ci.org/n0shake/Clocker.svg?branch=master)](https://travis-ci.org/n0shake/Clocker) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 
-![Clocker](https://raw.githubusercontent.com/Abhishaker17/Clocker/v1.2.1/GitHub.png "Clocker")
+![Clocker](https://raw.githubusercontent.com/n0shake/Clocker/master/New%20Icons/Github.png "Clocker")
 
 **Clocker** is an OSX menubar utility designed to help you keep track of your friends in different time zones.  It's written using ~~Objective-C~~ Swift 5 and is completely ad-free.
 
 If you'd like to donate, you can do so [here](https://www.paypal.me/AbhishekBanthia). You can find a review of the app by SoftPedia [here](http://mac.softpedia.com/get/Utilities/Clocker-Banthia.shtml). Need any help? Open an issue!
 
-[![Download on the App Store](https://github.com/Abhishaker17/Clocker/blob/v1.2.1/Clocker/Images/MacAppStore.png)](https://itunes.apple.com/us/app/clocker-menubar-world-clock/id1056643111?mt=12)
+[![Download on the App Store](https://github.com/n0shake/Clocker/blob/v1.2.1/Clocker/Images/MacAppStore.png)](https://itunes.apple.com/us/app/clocker-menubar-world-clock/id1056643111?mt=12)
 
 **Features**
 ---