diff --git a/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/Contents.json b/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/Contents.json new file mode 100644 index 0000000..f73a679 --- /dev/null +++ b/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "shifty-icon-small.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-icon-small.png b/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/shifty-icon-small.png similarity index 100% rename from Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-icon-small.png rename to Shifty/Assets.xcassets/shiftyCircleIcon.imageset/shifty-icon-small.png diff --git a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json index f73a679..a0d11f0 100644 --- a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json +++ b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "shifty-icon-small.png", + "filename" : "shifty-color-512.png", "scale" : "1x" }, { diff --git a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-color-512.png b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-color-512.png new file mode 100644 index 0000000..26894f7 Binary files /dev/null and b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-color-512.png differ diff --git a/Shifty/Base.lproj/CustomTimeWindow.xib b/Shifty/Base.lproj/CustomTimeWindow.xib index 4aa001f..3d668f5 100644 --- a/Shifty/Base.lproj/CustomTimeWindow.xib +++ b/Shifty/Base.lproj/CustomTimeWindow.xib @@ -32,7 +32,7 @@ - + @@ -190,6 +190,6 @@ Gw - + diff --git a/Shifty/Info.plist b/Shifty/Info.plist index c99ef6d..950b3cf 100644 --- a/Shifty/Info.plist +++ b/Shifty/Info.plist @@ -19,9 +19,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.4.2 + 0.5 CFBundleVersion - 32 + 37 Fabric APIKey diff --git a/Shifty/PrefAboutViewController.swift b/Shifty/PrefAboutViewController.swift index 2286701..e075970 100644 --- a/Shifty/PrefAboutViewController.swift +++ b/Shifty/PrefAboutViewController.swift @@ -21,7 +21,7 @@ class PrefAboutViewController: NSViewController, MASPreferencesViewController { var viewIdentifier: String = "PrefAboutViewController" var toolbarItemImage: NSImage? { - get { return #imageLiteral(resourceName: "shiftyColorIcon") } + get { return #imageLiteral(resourceName: "shiftyCircleIcon") } } var toolbarItemLabel: String? { diff --git a/Shifty/Setup.storyboard b/Shifty/Setup.storyboard index 192fda4..cedb958 100644 --- a/Shifty/Setup.storyboard +++ b/Shifty/Setup.storyboard @@ -57,7 +57,7 @@ - + @@ -550,17 +550,17 @@ DQ - + - +