Browse Source

Reducing window size + image change for ellipsis in the panel rows.

master
Abhi 2 years ago
parent
commit
35a8acc080
  1. 5
      Clocker/Clocker/en.lproj/Panel.xib
  2. 10
      Clocker/Overall App/Themer.swift
  3. 26
      Clocker/Panel/UI/FloatingWindow.xib

5
Clocker/Clocker/en.lproj/Panel.xib

@ -159,9 +159,9 @@
<constraint firstAttribute="height" constant="35" id="KT8-zo-Jox"/> <constraint firstAttribute="height" constant="35" id="KT8-zo-Jox"/>
<constraint firstAttribute="width" constant="30" id="YCy-Bh-1Ik"/> <constraint firstAttribute="width" constant="30" id="YCy-Bh-1Ik"/>
</constraints> </constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="Extra" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="cSd-0p-P5N"> <buttonCell key="cell" type="bevel" bezelStyle="rounded" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="cSd-0p-P5N">
<behavior key="behavior" lightByContents="YES"/> <behavior key="behavior" lightByContents="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="systemBold"/>
</buttonCell> </buttonCell>
<connections> <connections>
<action selector="showExtraOptions:" target="qbN-ba-fho" id="IRR-6f-iwZ"/> <action selector="showExtraOptions:" target="qbN-ba-fho" id="IRR-6f-iwZ"/>
@ -676,7 +676,6 @@
<resources> <resources>
<image name="Add Icon" width="700" height="700"/> <image name="Add Icon" width="700" height="700"/>
<image name="CurrentLocation" width="350" height="350"/> <image name="CurrentLocation" width="350" height="350"/>
<image name="Extra" width="700" height="700"/>
<image name="Float-White" width="15" height="13"/> <image name="Float-White" width="15" height="13"/>
<image name="PowerIcon" width="350" height="350"/> <image name="PowerIcon" width="350" height="350"/>
<image name="PowerIcon-White" width="350" height="350"/> <image name="PowerIcon-White" width="350" height="350"/>

10
Clocker/Overall App/Themer.swift

@ -177,7 +177,7 @@ extension Themer {
// MARK: Images // MARK: Images
func shutdownImage() -> NSImage { func shutdownImage() -> NSImage {
if let symbolImageForShutdown = symbolImage(for: "ellipsis.circle") { if let symbolImageForShutdown = symbolImage(for: "ellipsis") {
return symbolImageForShutdown return symbolImageForShutdown
} }
@ -248,6 +248,10 @@ extension Themer {
} }
func extraOptionsImage() -> NSImage { func extraOptionsImage() -> NSImage {
if let xmarkImage = symbolImage(for: "ellipsis.circle") {
return xmarkImage
}
return fallbackImageProvider(NSImage(named: NSImage.Name("Extra"))!, return fallbackImageProvider(NSImage(named: NSImage.Name("Extra"))!,
NSImage(named: NSImage.Name("ExtraWhite"))!, NSImage(named: NSImage.Name("ExtraWhite"))!,
NSImage(named: NSImage.Name("Extra Dynamic"))!, NSImage(named: NSImage.Name("Extra Dynamic"))!,
@ -271,6 +275,10 @@ extension Themer {
} }
func extraOptionsHighlightedImage() -> NSImage { func extraOptionsHighlightedImage() -> NSImage {
if let xmarkImage = symbolImage(for: "ellipsis.circle.fill") {
return xmarkImage
}
return fallbackImageProvider(NSImage(named: NSImage.Name("ExtraHighlighted"))!, return fallbackImageProvider(NSImage(named: NSImage.Name("ExtraHighlighted"))!,
NSImage(named: NSImage.Name("ExtraWhiteHighlighted"))!, NSImage(named: NSImage.Name("ExtraWhiteHighlighted"))!,
NSImage(named: NSImage.Name("ExtraHighlighted Dynamic"))!, NSImage(named: NSImage.Name("ExtraHighlighted Dynamic"))!,

26
Clocker/Panel/UI/FloatingWindow.xib

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
@ -35,12 +35,12 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" utility="YES" nonactivatingPanel="YES" texturedBackground="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES" resizable="YES" utility="YES" nonactivatingPanel="YES" texturedBackground="YES"/>
<windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/> <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="1000" y="379" width="350" height="460"/> <rect key="contentRect" x="1000" y="379" width="300" height="460"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/> <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
<value key="minSize" type="size" width="150" height="50"/> <value key="minSize" type="size" width="150" height="50"/>
<value key="maxSize" type="size" width="350" height="800"/> <value key="maxSize" type="size" width="300" height="800"/>
<view key="contentView" misplaced="YES" id="qEx-SC-5Qd"> <view key="contentView" misplaced="YES" id="qEx-SC-5Qd">
<rect key="frame" x="0.0" y="0.0" width="350" height="460"/> <rect key="frame" x="0.0" y="0.0" width="300" height="460"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bn4-fy-Lm6"> <stackView focusRingType="none" distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bn4-fy-Lm6">
@ -59,7 +59,7 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns> <tableColumns>
<tableColumn width="337.80335195531063" minWidth="303" maxWidth="1000" id="009-6N-KRz"> <tableColumn width="338" minWidth="303" maxWidth="1000" id="009-6N-KRz">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@ -381,7 +381,7 @@
</subviews> </subviews>
<color key="backgroundColor" name="Accent Color"/> <color key="backgroundColor" name="Accent Color"/>
</clipView> </clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="MFX-8H-T4e"> <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="MFX-8H-T4e" customClass="ThinScroller" customModule="Clocker" customModuleProvider="target">
<rect key="frame" x="-100" y="-100" width="370" height="16"/> <rect key="frame" x="-100" y="-100" width="370" height="16"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
@ -419,7 +419,7 @@
</connections> </connections>
</button> </button>
<button toolTip="Switch between Menubar/Floating mode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KWj-8n-2K0"> <button toolTip="Switch between Menubar/Floating mode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KWj-8n-2K0">
<rect key="frame" x="219" y="10" width="29" height="19"/> <rect key="frame" x="184" y="10" width="29" height="19"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="18" id="8yd-3c-2Nc"/> <constraint firstAttribute="height" constant="18" id="8yd-3c-2Nc"/>
<constraint firstAttribute="width" constant="29" id="D7P-eC-faV"/> <constraint firstAttribute="width" constant="29" id="D7P-eC-faV"/>
@ -434,7 +434,7 @@
</connections> </connections>
</button> </button>
<button toolTip="Share Clocker!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GMo-5B-bnh"> <button toolTip="Share Clocker!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GMo-5B-bnh">
<rect key="frame" x="119" y="7" width="30" height="26"/> <rect key="frame" x="99" y="7" width="30" height="26"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="25" id="WBC-l8-Gc1"/> <constraint firstAttribute="height" constant="25" id="WBC-l8-Gc1"/>
<constraint firstAttribute="width" constant="30" id="h85-UM-Kfy"/> <constraint firstAttribute="width" constant="30" id="h85-UM-Kfy"/>
@ -467,8 +467,8 @@
</button> </button>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="KWj-8n-2K0" firstAttribute="leading" secondItem="GMo-5B-bnh" secondAttribute="trailing" constant="70" id="0wr-fp-XKy"/> <constraint firstItem="KWj-8n-2K0" firstAttribute="leading" secondItem="GMo-5B-bnh" secondAttribute="trailing" constant="55" id="0wr-fp-XKy"/>
<constraint firstItem="GMo-5B-bnh" firstAttribute="leading" secondItem="iFk-kj-d5a" secondAttribute="trailing" constant="70" id="6Kp-gC-dhg"/> <constraint firstItem="GMo-5B-bnh" firstAttribute="leading" secondItem="iFk-kj-d5a" secondAttribute="trailing" constant="50" id="6Kp-gC-dhg"/>
<constraint firstItem="iFk-kj-d5a" firstAttribute="leading" secondItem="YQL-kL-NAx" secondAttribute="leading" constant="20" id="NW8-KV-vPc"/> <constraint firstItem="iFk-kj-d5a" firstAttribute="leading" secondItem="YQL-kL-NAx" secondAttribute="leading" constant="20" id="NW8-KV-vPc"/>
<constraint firstItem="GMo-5B-bnh" firstAttribute="centerY" secondItem="YQL-kL-NAx" secondAttribute="centerY" id="Pfa-z9-wko"/> <constraint firstItem="GMo-5B-bnh" firstAttribute="centerY" secondItem="YQL-kL-NAx" secondAttribute="centerY" id="Pfa-z9-wko"/>
<constraint firstItem="KWj-8n-2K0" firstAttribute="centerY" secondItem="YQL-kL-NAx" secondAttribute="centerY" id="iVM-fu-Mx5"/> <constraint firstItem="KWj-8n-2K0" firstAttribute="centerY" secondItem="YQL-kL-NAx" secondAttribute="centerY" id="iVM-fu-Mx5"/>
@ -521,7 +521,7 @@
<image name="CurrentLocation" width="350" height="350"/> <image name="CurrentLocation" width="350" height="350"/>
<image name="Extra" width="700" height="700"/> <image name="Extra" width="700" height="700"/>
<image name="Float" width="15" height="13"/> <image name="Float" width="15" height="13"/>
<image name="NSShareTemplate" width="15" height="17"/> <image name="NSShareTemplate" width="19" height="22"/>
<image name="PowerIcon" width="350" height="350"/> <image name="PowerIcon" width="350" height="350"/>
<image name="Sunrise" width="700" height="700"/> <image name="Sunrise" width="700" height="700"/>
<namedColor name="Accent Color"> <namedColor name="Accent Color">

Loading…
Cancel
Save