Skip to content

Commit 0dbd428

Browse files
zengtianyu1215zengtianyu1215
committed
Prepare to Release v2.0(10)
1 parent fe5ea76 commit 0dbd428

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

‎SimpleClock/Base.lproj/Main.storyboard

+12-12
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ DQ
628628
<window key="window" title="Stopwatch" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" frameAutosaveName="" tabbingMode="disallowed" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="ain-dA-UCM">
629629
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES" fullSizeContentView="YES"/>
630630
<rect key="contentRect" x="196" y="240" width="529" height="333"/>
631-
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
631+
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1440"/>
632632
<value key="minSize" type="size" width="529" height="333"/>
633633
<connections>
634634
<outlet property="delegate" destination="zWa-RP-J5V" id="63t-uD-ALi"/>
@@ -653,7 +653,7 @@ DQ
653653
<touchBarItem id="Akh-Rt-k46">
654654
<viewController key="viewController" id="Vjd-He-0Ey">
655655
<button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N6a-jj-Wc9">
656-
<rect key="frame" x="0.0" y="-11" width="156" height="41"/>
656+
<rect key="frame" x="0.0" y="0.0" width="151" height="30"/>
657657
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
658658
<buttonCell key="cell" type="push" title="Start Stopwatch" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ofz-Zu-HlL">
659659
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -669,7 +669,7 @@ DQ
669669
<touchBarItem id="LZ5-gb-ID0">
670670
<viewController key="viewController" id="oEM-lP-6Su">
671671
<button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1bQ-bh-lwq">
672-
<rect key="frame" x="0.0" y="-11" width="156" height="41"/>
672+
<rect key="frame" x="0.0" y="0.0" width="151" height="30"/>
673673
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
674674
<buttonCell key="cell" type="push" title="Pause Stopwatch" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ugi-qn-5kE">
675675
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -685,7 +685,7 @@ DQ
685685
<touchBarItem id="EcF-8Q-WdZ">
686686
<viewController key="viewController" id="eOC-bG-BqU">
687687
<button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7EW-OE-uN1">
688-
<rect key="frame" x="0.0" y="-11" width="151" height="41"/>
688+
<rect key="frame" x="0.0" y="0.0" width="151" height="30"/>
689689
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
690690
<buttonCell key="cell" type="push" title="End Stopwatch" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="V5x-Lj-8od">
691691
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -702,7 +702,7 @@ DQ
702702
<touchBarItem id="gDk-AT-I4h">
703703
<viewController key="viewController" id="OdC-GI-PkU">
704704
<segmentedControl key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mRo-lU-Btf">
705-
<rect key="frame" x="0.0" y="-1.5" width="116" height="3"/>
705+
<rect key="frame" x="0.0" y="0.0" width="112" height="30"/>
706706
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
707707
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="LUQ-dU-J88">
708708
<font key="font" metaFont="system"/>
@@ -818,7 +818,7 @@ DQ
818818
<window key="window" title="SimpleClock" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="alertPanel" frameAutosaveName="" tabbingMode="disallowed" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="Ckk-yw-fiv">
819819
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES" fullSizeContentView="YES"/>
820820
<rect key="contentRect" x="196" y="366" width="529" height="333"/>
821-
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
821+
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1440"/>
822822
<value key="minSize" type="size" width="529" height="333"/>
823823
<connections>
824824
<outlet property="delegate" destination="jGA-0Y-lOj" id="98r-iN-zZc"/>
@@ -843,8 +843,8 @@ DQ
843843
</touchBarItem>
844844
<touchBarItem id="dgM-78-7YT">
845845
<viewController key="viewController" id="Wlg-tI-47x">
846-
<segmentedControl key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tdo-Tl-v86">
847-
<rect key="frame" x="0.0" y="0.0" width="144" height="0.0"/>
846+
<segmentedControl key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tdo-Tl-v86">
847+
<rect key="frame" x="0.0" y="0.0" width="144" height="30"/>
848848
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
849849
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="Jcg-Vc-M2T">
850850
<font key="font" metaFont="system"/>
@@ -877,8 +877,8 @@ DQ
877877
</touchBarItem>
878878
<touchBarItem id="eHE-gX-mha">
879879
<viewController key="viewController" id="I9J-NQ-zKp">
880-
<segmentedControl key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hOr-77-8TR">
881-
<rect key="frame" x="0.0" y="0.0" width="144" height="0.0"/>
880+
<segmentedControl key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hOr-77-8TR">
881+
<rect key="frame" x="0.0" y="0.0" width="144" height="30"/>
882882
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
883883
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="pem-Hr-P9W">
884884
<font key="font" metaFont="system"/>
@@ -911,8 +911,8 @@ DQ
911911
</touchBarItem>
912912
<touchBarItem id="3A1-kI-5TX">
913913
<viewController key="viewController" id="ym2-b5-dym">
914-
<segmentedControl key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="apB-yj-cCY">
915-
<rect key="frame" x="0.0" y="0.0" width="144" height="0.0"/>
914+
<segmentedControl key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="apB-yj-cCY">
915+
<rect key="frame" x="0.0" y="0.0" width="144" height="30"/>
916916
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
917917
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="JBs-y0-iUz">
918918
<font key="font" metaFont="system"/>

‎SimpleClock/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
<key>CFBundlePackageType</key>
8787
<string>APPL</string>
8888
<key>CFBundleShortVersionString</key>
89-
<string>1.9</string>
89+
<string>2.0</string>
9090
<key>CFBundleVersion</key>
91-
<string>9</string>
91+
<string>10</string>
9292
<key>LSApplicationCategoryType</key>
9393
<string>public.app-category.utilities</string>
9494
<key>LSMinimumSystemVersion</key>

‎SimpleClock/ViewController/TimerViewController.swift

+3
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ class TimerViewController : NSViewController, NSUserNotificationCenterDelegate{
9191
@IBAction func StartTimer(_ sender: NSButton) {
9292
if isStart==false{
9393
isStart = true
94+
if(SecondText.stringValue.count>10 || MinuteText.stringValue.count>10 || HourText.stringValue.count>10){
95+
return;
96+
}
9497
if HourText.stringValue == ""{
9598
HourText.stringValue = "0"
9699
}

‎SimpleClockTests/SimpleClockTests.swift

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import XCTest
10-
@testable import SimpleClock
1110

1211
class SimpleClockTests: XCTestCase {
1312

‎appcast.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
33
<channel>
44
<title>SimpleClock Changelog</title>
5-
<description>Most recent changes with links to updates.</description>
5+
<description></description>
66
<language>en</language>
77
<item>
88
<title>SimpleClock Release 2.0</title>
99
<sparkle:releaseNotesLink>
1010
https://github.com/zengtianyu1215/SimpleClock/releases/tag/v2.0(10)
1111
</sparkle:releaseNotesLink>
12-
<pubDate>2019/01/18 15:21:26</pubDate>
12+
<pubDate>2019/01/18 16:21:26</pubDate>
1313
<enclosure url="https://github.com/zengtianyu1215/SimpleClock/releases/download/v2.0(10)/SimpleClock.v2.0.10.Release.dmg" sparkle:version="10" length="xxx" type="application/octet-stream" sparkle:shortVersionString="2.0" />
1414
<sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
1515
</item>

‎docs/_includes/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<div class="row">
4343
<div class="col-lg-12">
4444
<div class="intro-message">
45-
<img src="http://localhost:4000/img/services/ipad.png" width="50%">
45+
<img src="https://zengtianyu1215.github.io/SimpleClock/img/services/ipad.png" width="50%">
4646
<br>
4747
<h1>{{ page.title }}</h1>
4848
<h3>{{ page.subTitle }}</h3>

0 commit comments

Comments
 (0)