Skip to content

Commit

Permalink
Added "switch camera" icon.
Browse files Browse the repository at this point in the history 
Image courtesy of Simon Strandgaard
http://www.flickr.com/photos/12739382@N04/5463151636/
  • Loading branch information
@jeradesign
jeradesign committed Aug 14, 2012
1 parent 89c084d commit 7a13c8e
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CREDITS.txt
View file
@@ -0,0 +1,2 @@
Icon: Switch Camera Front/Rear by Simon Strandgaard
http://www.flickr.com/photos/12739382@N04/5463151636/
4 changes: 4 additions & 0 deletions CVFunhouse.xcodeproj/project.pbxproj
View file
Expand Up @@ -7,6 +7,7 @@
objects = { objects = {


/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
4201072015D9D75E002EBEBA /* SwitchCameraIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 4201071F15D9D75E002EBEBA /* SwitchCameraIcon.png */; };
4209534315C0AC0600C37CD8 /* CVFLukasKanade.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4209534215C0AC0600C37CD8 /* CVFLukasKanade.mm */; }; 4209534315C0AC0600C37CD8 /* CVFLukasKanade.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4209534215C0AC0600C37CD8 /* CVFLukasKanade.mm */; };
4209534715C0BEB200C37CD8 /* CVFMotionTemplates.m in Sources */ = {isa = PBXBuildFile; fileRef = 4209534615C0BEB200C37CD8 /* CVFMotionTemplates.m */; }; 4209534715C0BEB200C37CD8 /* CVFMotionTemplates.m in Sources */ = {isa = PBXBuildFile; fileRef = 4209534615C0BEB200C37CD8 /* CVFMotionTemplates.m */; };
420A3F8515BC6724004804EF /* CVFPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 420A3F8415BC6724004804EF /* CVFPassThru.m */; }; 420A3F8515BC6724004804EF /* CVFPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 420A3F8415BC6724004804EF /* CVFPassThru.m */; };
Expand Down Expand Up @@ -41,6 +42,7 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */


/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
4201071F15D9D75E002EBEBA /* SwitchCameraIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SwitchCameraIcon.png; sourceTree = "<group>"; };
4209534115C0ABF000C37CD8 /* CVFLukasKanade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFLukasKanade.h; path = CVFunhouse/CVFLukasKanade.h; sourceTree = "<group>"; }; 4209534115C0ABF000C37CD8 /* CVFLukasKanade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFLukasKanade.h; path = CVFunhouse/CVFLukasKanade.h; sourceTree = "<group>"; };
4209534215C0AC0600C37CD8 /* CVFLukasKanade.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CVFLukasKanade.mm; path = CVFunhouse/CVFLukasKanade.mm; sourceTree = "<group>"; }; 4209534215C0AC0600C37CD8 /* CVFLukasKanade.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CVFLukasKanade.mm; path = CVFunhouse/CVFLukasKanade.mm; sourceTree = "<group>"; };
4209534515C0BE8A00C37CD8 /* CVFMotionTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFMotionTemplates.h; path = CVFunhouse/CVFMotionTemplates.h; sourceTree = "<group>"; }; 4209534515C0BE8A00C37CD8 /* CVFMotionTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CVFMotionTemplates.h; path = CVFunhouse/CVFMotionTemplates.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -137,6 +139,7 @@
4285252915BF6CDF00622EE8 /* Resources */ = { 4285252915BF6CDF00622EE8 /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4201071F15D9D75E002EBEBA /* SwitchCameraIcon.png */,
427D67DF15D9CB81008A25FA /* Settings.bundle */, 427D67DF15D9CB81008A25FA /* Settings.bundle */,
4285252E15BF750000622EE8 /* haarcascade_frontalface_alt.xml */, 4285252E15BF750000622EE8 /* haarcascade_frontalface_alt.xml */,
42B3377815BA94A000CBD888 /* CVFunhouse57.png */, 42B3377815BA94A000CBD888 /* CVFunhouse57.png */,
Expand Down Expand Up @@ -274,6 +277,7 @@
42B3377915BA94A000CBD888 /* CVFunhouse57.png in Resources */, 42B3377915BA94A000CBD888 /* CVFunhouse57.png in Resources */,
4285252F15BF750000622EE8 /* haarcascade_frontalface_alt.xml in Resources */, 4285252F15BF750000622EE8 /* haarcascade_frontalface_alt.xml in Resources */,
427D67E015D9CB81008A25FA /* Settings.bundle in Resources */, 427D67E015D9CB81008A25FA /* Settings.bundle in Resources */,
4201072015D9D75E002EBEBA /* SwitchCameraIcon.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
Expand Down
11 changes: 8 additions & 3 deletions CVFunhouse/en.lproj/MainStoryboard_iPad.storyboard
View file
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E53" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="2"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2549" systemVersion="11E53" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="2">
<dependencies> <dependencies>
<deployment defaultVersion="1296" identifier="iOS"/> <deployment defaultVersion="1296" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1181"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1498"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Main View Controller--> <!--Main View Controller-->
Expand Down Expand Up @@ -37,7 +37,7 @@
<rect key="frame" x="20" y="20" width="37" height="37"/> <rect key="frame" x="20" y="20" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Palatino-Roman" family="Palatino" pointSize="24"/> <fontDescription key="fontDescription" name="Palatino-Roman" family="Palatino" pointSize="24"/>
<state key="normal" title="↺"> <state key="normal" image="SwitchCameraIcon.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state> </state>
Expand Down Expand Up @@ -109,6 +109,9 @@
<point key="canvasLocation" x="836" y="101"/> <point key="canvasLocation" x="836" y="101"/>
</scene> </scene>
</scenes> </scenes>
<resources>
<image name="SwitchCameraIcon.png" width="254" height="254"/>
</resources>
<classes> <classes>
<class className="CVFFlipsideViewController" superclassName="UIViewController"> <class className="CVFFlipsideViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/CVFFlipsideViewController.h"/> <source key="sourceIdentifier" type="project" relativePath="./Classes/CVFFlipsideViewController.h"/>
Expand All @@ -122,9 +125,11 @@
<source key="sourceIdentifier" type="project" relativePath="./Classes/CVFMainViewController.h"/> <source key="sourceIdentifier" type="project" relativePath="./Classes/CVFMainViewController.h"/>
<relationships> <relationships>
<relationship kind="action" name="flipAction:"/> <relationship kind="action" name="flipAction:"/>
<relationship kind="action" name="togglePopover:"/>
<relationship kind="outlet" name="flipCameraButton" candidateClass="UIButton"/> <relationship kind="outlet" name="flipCameraButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="fpsLabel" candidateClass="UILabel"/> <relationship kind="outlet" name="fpsLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="imageView" candidateClass="UIImageView"/> <relationship kind="outlet" name="imageView" candidateClass="UIImageView"/>
<relationship kind="outlet" name="previewView" candidateClass="UIView"/>
</relationships> </relationships>
</class> </class>
</classes> </classes>
Expand Down
34 changes: 28 additions & 6 deletions CVFunhouse/en.lproj/MainStoryboard_iPhone.storyboard
View file
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="1.1" toolsVersion="2182" systemVersion="11E53" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2549" systemVersion="11E53" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2">
<dependencies> <dependencies>
<deployment defaultVersion="1296" identifier="iOS"/> <deployment defaultVersion="1296" identifier="iOS"/>
<development defaultVersion="4200" identifier="xcode"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1498"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1181"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Main View Controller--> <!--Main View Controller-->
Expand All @@ -28,10 +27,10 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="lKb-tT-4x6"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="lKb-tT-4x6">
<rect key="frame" x="20" y="441" width="18" height="19"/> <rect key="frame" x="7" y="428.5" width="44" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Palatino-Roman" family="Palatino" pointSize="16"/> <fontDescription key="fontDescription" type="system" pointSize="9"/>
<state key="normal" title="↺"> <state key="normal" image="SwitchCameraIcon.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state> </state>
Expand Down Expand Up @@ -113,6 +112,29 @@
<point key="canvasLocation" x="368" y="182"/> <point key="canvasLocation" x="368" y="182"/>
</scene> </scene>
</scenes> </scenes>
<resources>
<image name="SwitchCameraIcon.png" width="254" height="254"/>
</resources>
<classes>
<class className="CVFFlipsideViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/CVFFlipsideViewController.h"/>
<relationships>
<relationship kind="action" name="done:"/>
<relationship kind="outlet" name="menuTable" candidateClass="UITableView"/>
<relationship kind="outlet" name="navBar" candidateClass="UINavigationBar"/>
</relationships>
</class>
<class className="CVFMainViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/CVFMainViewController.h"/>
<relationships>
<relationship kind="action" name="flipAction:"/>
<relationship kind="outlet" name="flipCameraButton" candidateClass="UIButton"/>
<relationship kind="outlet" name="fpsLabel" candidateClass="UILabel"/>
<relationship kind="outlet" name="imageView" candidateClass="UIImageView"/>
<relationship kind="outlet" name="previewView" candidateClass="UIView"/>
</relationships>
</class>
</classes>
<simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedMetricsContainer key="defaultSimulatedMetrics">
<nil key="statusBar"/> <nil key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/> <simulatedOrientationMetrics key="orientation"/>
Expand Down
Binary file added SwitchCameraIcon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a13c8e

Please sign in to comment.