Use the white image for the feed tab

mipstian · Jul 13, 2014 · a552ada · a552ada
1 parent 92e7d1a
commit a552ada
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/Assets.xcassets/rss.imageset/Contents.json b/Assets.xcassets/rss.imageset/Contents.json
@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "RSSWhite.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "[email protected]"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/RSSWhite.png → Assets.xcassets/rss.imageset/RSSWhite.png b/RSSWhite.png → Assets.xcassets/rss.imageset/RSSWhite.png
diff --git a/[email protected] → Assets.xcassets/rss.imageset/[email protected] b/[email protected] → Assets.xcassets/rss.imageset/[email protected]
diff --git a/Base.lproj/UI.xib b/Base.lproj/UI.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -128,7 +128,7 @@
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="552" userLabel="PreferencesWindow">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <rect key="contentRect" x="310" y="248" width="700" height="316"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
             <view key="contentView" id="553">
                 <rect key="frame" x="0.0" y="0.0" width="700" height="316"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -450,7 +450,7 @@ DQ
             </view>
             <toolbar key="toolbar" implicitIdentifier="CA2F34B0-7A44-4395-8E3C-8B6D18CC3ECC" autosavesConfiguration="NO" displayMode="iconAndLabel" sizeMode="regular" id="604">
                 <allowedToolbarItems>
-                    <toolbarItem implicitItemIdentifier="414BD815-8F03-4AFC-AF27-7A671CD0847F" explicitItemIdentifier="Feed" label="Feed" paletteLabel="Feed" image="RSS" selectable="YES" id="612">
+                    <toolbarItem implicitItemIdentifier="414BD815-8F03-4AFC-AF27-7A671CD0847F" explicitItemIdentifier="Feed" label="Feed" paletteLabel="Feed" image="rss" selectable="YES" id="612">
                         <size key="minSize" width="64" height="0.0"/>
                         <connections>
                             <action selector="showFeeds:" target="vyd-92-YXh" id="QSV-1w-pHR"/>
@@ -473,7 +473,7 @@ DQ
     </objects>
     <resources>
         <image name="NSAdvanced" width="32" height="32"/>
-        <image name="RSS" width="32" height="32"/>
+        <image name="rss" width="32" height="32"/>
         <image name="warning" width="9" height="9"/>
     </resources>
 </document>
diff --git a/Catch.xcodeproj/project.pbxproj b/Catch.xcodeproj/project.pbxproj
@@ -37,10 +37,6 @@
 		44EAD12E1916682D002C7443 /* CTCApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 44EAD12D1916682D002C7443 /* CTCApplication.m */; };
 		44FBC67B196312A400434B01 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 44FBC67A196312A400434B01 /* QuartzCore.framework */; };
 		44FBC67E196316E900434B01 /* NSWindow+ShakeAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 44FBC67D196316E900434B01 /* NSWindow+ShakeAnimation.m */; };
-		49A776FA1971B5C00084F12F /* RSS.png in Resources */ = {isa = PBXBuildFile; fileRef = 49A776F81971B5C00084F12F /* RSS.png */; };
-		49A776FB1971B5C00084F12F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 49A776F91971B5C00084F12F /* [email protected] */; };
-		49A776FE1971B60C0084F12F /* RSSWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = 49A776FC1971B60C0084F12F /* RSSWhite.png */; };
-		49A776FF1971B60C0084F12F /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 49A776FD1971B60C0084F12F /* [email protected] */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -156,10 +152,6 @@
 		44FBC67A196312A400434B01 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		44FBC67C196316E900434B01 /* NSWindow+ShakeAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWindow+ShakeAnimation.h"; sourceTree = "<group>"; };
 		44FBC67D196316E900434B01 /* NSWindow+ShakeAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSWindow+ShakeAnimation.m"; sourceTree = "<group>"; };
-		49A776F81971B5C00084F12F /* RSS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RSS.png; sourceTree = "<group>"; };
-		49A776F91971B5C00084F12F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		49A776FC1971B60C0084F12F /* RSSWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RSSWhite.png; sourceTree = "<group>"; };
-		49A776FD1971B60C0084F12F /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Catch-Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist.xml; fileEncoding = 4; path = "Catch-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* Catch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Catch.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -244,10 +236,6 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				49A776F81971B5C00084F12F /* RSS.png */,
-				49A776F91971B5C00084F12F /* [email protected] */,
-				49A776FC1971B60C0084F12F /* RSSWhite.png */,
-				49A776FD1971B60C0084F12F /* [email protected] */,
 				4403ACF31914041C002F286C /* Assets.xcassets */,
 				38DB9D5911C7FEC5000DA168 /* app-icon.icns */,
 				2F7446970DB6B7EA00F9684A /* UI.xib */,
@@ -508,12 +496,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49A776FE1971B60C0084F12F /* RSSWhite.png in Resources */,
-				49A776FA1971B5C00084F12F /* RSS.png in Resources */,
 				2F7446990DB6B7EA00F9684A /* UI.xib in Resources */,
-				49A776FB1971B5C00084F12F /* [email protected] in Resources */,
 				38DB9D5A11C7FEC5000DA168 /* app-icon.icns in Resources */,
-				49A776FF1971B60C0084F12F /* [email protected] in Resources */,
 				38A3FD0D11CA01DD00157AEF /* Localizable.strings in Resources */,
 				4403ACF41914041C002F286C /* Assets.xcassets in Resources */,
 				445D97A6191579C7006CD77C /* UI.strings in Resources */,

diff --git a/RSS.png b/RSS.png
diff --git a/[email protected] b/[email protected]