diff --git a/source/tinypng4mac.xcodeproj/project.pbxproj b/source/tinypng4mac.xcodeproj/project.pbxproj index b5fc314..82af945 100644 --- a/source/tinypng4mac.xcodeproj/project.pbxproj +++ b/source/tinypng4mac.xcodeproj/project.pbxproj @@ -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 */; }; @@ -30,6 +31,7 @@ /* Begin PBXFileReference section */ 272C509F1D2D545300EEECC2 /* SpinnerProgressIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpinnerProgressIndicator.swift; sourceTree = ""; }; 272C50AC1D2EB03100EEECC2 /* InputKeyAlert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputKeyAlert.swift; sourceTree = ""; }; + 2730E9001D3680A80030A459 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 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 = ""; }; 277AAF561D23F24900788F37 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -107,6 +109,7 @@ 27A949C71D2C00120043DECE /* MainWindowController.swift */, 27A949CA1D2C02BA0043DECE /* MainViewController.swift */, 27C12A151D35411800F0FD81 /* Localizable.strings */, + 2730E9001D3680A80030A459 /* Credits.rtf */, ); path = tinypng4mac; sourceTree = ""; @@ -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; }; diff --git a/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/Contents.json b/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/Contents.json new file mode 100644 index 0000000..3256bb4 --- /dev/null +++ b/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "icon_finish@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/icon_finish@2x.png b/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/icon_finish@2x.png new file mode 100644 index 0000000..42b75ad Binary files /dev/null and b/source/tinypng4mac/Assets.xcassets/icon_finish.imageset/icon_finish@2x.png differ diff --git a/source/tinypng4mac/Base.lproj/Main.storyboard b/source/tinypng4mac/Base.lproj/Main.storyboard index 1fb06ca..dfc4ee2 100644 --- a/source/tinypng4mac/Base.lproj/Main.storyboard +++ b/source/tinypng4mac/Base.lproj/Main.storyboard @@ -358,6 +358,14 @@ + + + + + + + + @@ -366,12 +374,15 @@ + + + @@ -453,6 +464,7 @@ + diff --git a/source/tinypng4mac/Credits.rtf b/source/tinypng4mac/Credits.rtf new file mode 100644 index 0000000..5df0a4a --- /dev/null +++ b/source/tinypng4mac/Credits.rtf @@ -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}}} \ No newline at end of file diff --git a/source/tinypng4mac/Info.plist b/source/tinypng4mac/Info.plist index fc4dba3..1dab038 100644 --- a/source/tinypng4mac/Info.plist +++ b/source/tinypng4mac/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9 + 0.9.1 CFBundleSignature ???? CFBundleVersion - 2 + 3 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/source/tinypng4mac/views/TaskTableCell.swift b/source/tinypng4mac/views/TaskTableCell.swift index 17aa3d2..0dbcc11 100644 --- a/source/tinypng4mac/views/TaskTableCell.swift +++ b/source/tinypng4mac/views/TaskTableCell.swift @@ -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() @@ -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) } }