Skip to content

Commit

Permalink
version 0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyleduo
kyleduo committed Jul 13, 2016
1 parent a714c5f commit 64451a8
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 3 deletions.
4 changes: 4 additions & 0 deletions source/tinypng4mac.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/* Begin PBXBuildFile section */
272C50A01D2D545300EEECC2 /* SpinnerProgressIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272C509F1D2D545300EEECC2 /* SpinnerProgressIndicator.swift */; };
272C50AD1D2EB03100EEECC2 /* InputKeyAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272C50AC1D2EB03100EEECC2 /* InputKeyAlert.swift */; };
2730E9011D3680A80030A459 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2730E9001D3680A80030A459 /* Credits.rtf */; };
277AAF531D23F24900788F37 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277AAF521D23F24900788F37 /* AppDelegate.swift */; };
277AAF571D23F24900788F37 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 277AAF561D23F24900788F37 /* Assets.xcassets */; };
277AAF5A1D23F24900788F37 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 277AAF581D23F24900788F37 /* Main.storyboard */; };
Expand All @@ -30,6 +31,7 @@
/* Begin PBXFileReference section */
272C509F1D2D545300EEECC2 /* SpinnerProgressIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinnerProgressIndicator.swift; sourceTree = "<group>"; };
272C50AC1D2EB03100EEECC2 /* InputKeyAlert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputKeyAlert.swift; sourceTree = "<group>"; };
2730E9001D3680A80030A459 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
277AAF4F1D23F24900788F37 /* TinyPNG4Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TinyPNG4Mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
277AAF521D23F24900788F37 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
277AAF561D23F24900788F37 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -107,6 +109,7 @@
27A949C71D2C00120043DECE /* MainWindowController.swift */,
27A949CA1D2C02BA0043DECE /* MainViewController.swift */,
27C12A151D35411800F0FD81 /* Localizable.strings */,
2730E9001D3680A80030A459 /* Credits.rtf */,
);
path = tinypng4mac;
sourceTree = "<group>";
Expand Down Expand Up @@ -223,6 +226,7 @@
277AAF571D23F24900788F37 /* Assets.xcassets in Resources */,
27C12A171D35411800F0FD81 /* Localizable.strings in Resources */,
277AAF5A1D23F24900788F37 /* Main.storyboard in Resources */,
2730E9011D3680A80030A459 /* Credits.rtf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
21 changes: 21 additions & 0 deletions source/tinypng4mac/Assets.xcassets/icon_finish.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added source/tinypng4mac/Assets.xcassets/icon_finish.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions source/tinypng4mac/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,14 @@
<constraint firstAttribute="height" constant="16" id="bND-6C-JLT"/>
</constraints>
</customView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LuB-vO-cOE">
<rect key="frame" x="285" y="19" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="sN6-TY-4Ts"/>
<constraint firstAttribute="height" constant="16" id="vbV-iA-8wO"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="icon_finish" id="MDJ-Td-VXQ"/>
</imageView>
</subviews>
<constraints>
<constraint firstItem="c8G-p9-kpA" firstAttribute="leading" secondItem="j8i-Ad-2S2" secondAttribute="leading" id="7RZ-nx-bXS"/>
Expand All @@ -366,12 +374,15 @@
<constraint firstItem="mYs-1G-Pt8" firstAttribute="centerY" secondItem="H7A-f0-c2x" secondAttribute="centerY" id="YL7-Am-xEz"/>
<constraint firstAttribute="trailing" secondItem="k4b-cK-7xA" secondAttribute="trailing" constant="16" id="Zy2-bz-jdU"/>
<constraint firstItem="mYs-1G-Pt8" firstAttribute="leading" secondItem="H7A-f0-c2x" secondAttribute="leading" constant="16" id="c9p-kb-z0w"/>
<constraint firstItem="LuB-vO-cOE" firstAttribute="centerY" secondItem="k4b-cK-7xA" secondAttribute="centerY" id="cAB-8t-ZYI"/>
<constraint firstItem="j8i-Ad-2S2" firstAttribute="top" secondItem="H7A-f0-c2x" secondAttribute="top" constant="6" id="cfo-F8-lny"/>
<constraint firstItem="j8i-Ad-2S2" firstAttribute="leading" secondItem="mYs-1G-Pt8" secondAttribute="trailing" constant="8" id="jPF-7M-gZY"/>
<constraint firstItem="k4b-cK-7xA" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="j8i-Ad-2S2" secondAttribute="trailing" constant="8" id="oGo-dJ-VFN"/>
<constraint firstItem="k4b-cK-7xA" firstAttribute="centerY" secondItem="H7A-f0-c2x" secondAttribute="centerY" id="yqq-bd-GOG"/>
<constraint firstItem="LuB-vO-cOE" firstAttribute="centerX" secondItem="k4b-cK-7xA" secondAttribute="centerX" id="z74-Pe-ZBL"/>
</constraints>
<connections>
<outlet property="finishIndicator" destination="LuB-vO-cOE" id="9L3-Qk-ZIQ"/>
<outlet property="name" destination="j8i-Ad-2S2" id="Fqs-oz-NyP"/>
<outlet property="preview" destination="mYs-1G-Pt8" id="rRi-vF-NZ0"/>
<outlet property="progressBar" destination="k4b-cK-7xA" id="7R3-JX-tsh"/>
Expand Down Expand Up @@ -453,6 +464,7 @@
<image name="box" width="88" height="88"/>
<image name="drop_background" width="320" height="320"/>
<image name="icon_finder" width="32" height="32"/>
<image name="icon_finish" width="16" height="16"/>
<image name="icon_setting" width="32" height="32"/>
</resources>
</document>
7 changes: 7 additions & 0 deletions source/tinypng4mac/Credits.rtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{\rtf1\ansi\ansicpg936\cocoartf1404\cocoasubrtf470
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0

\f0\fs24 \cf0 Image compress service is provided by {\field{\*\fldinst{HYPERLINK "https://tinypng.com"}}{\fldrslt TinyPNG.com}}}
4 changes: 2 additions & 2 deletions source/tinypng4mac/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.9</string>
<string>0.9.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2</string>
<string>3</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
Expand Down
6 changes: 5 additions & 1 deletion source/tinypng4mac/views/TaskTableCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class TaskTableCell: NSTableCellView {
@IBOutlet weak var preview: NSImageView!
@IBOutlet weak var progressBar: SpinnerProgressIndicator!
@IBOutlet weak var status: NSTextField!
@IBOutlet weak var finishIndicator: NSImageView!

override func awakeFromNib() {
super.awakeFromNib()
Expand Down Expand Up @@ -54,20 +55,23 @@ class TaskTableCell: NSTableCellView {
self.status.textColor = NSColor(deviceRed:0.55, green:1, blue:0.65, alpha:1)
self.name.textColor = NSColor(deviceRed:0.87, green:0.87, blue:0.87, alpha:1)
self.name.font = NSFont.systemFontOfSize(16)
self.finishIndicator.hidden = false
} else if taskStatus == .ERROR {
debugPrint(task?.errorMessage)
self.status.stringValue = statusText
self.status.textColor = NSColor(deviceRed:0.86, green:0.27, blue:0.26, alpha:1)
self.name.textColor = NSColor(deviceRed:0.87, green:0.87, blue:0.87, alpha:1)
self.name.font = NSFont.systemFontOfSize(16)
self.finishIndicator.hidden = true
} else {
self.status.stringValue = statusText
self.status.textColor = NSColor(deviceRed:0.87, green:0.87, blue:0.87, alpha:1)
self.name.textColor = NSColor.whiteColor()
self.name.font = NSFont.boldSystemFontOfSize(16)
self.finishIndicator.hidden = true
}

// self.progressBar.hidden = taskStatus == .ERROR || taskStatus == .FINISH
self.progressBar.hidden = taskStatus == .FINISH
self.progressBar.progress = Double(progress)
}
}
Expand Down

0 comments on commit 64451a8

Please sign in to comment.