- Timestamp:
- 10/22/13 12:06:38 (9 years ago)
- Branches:
- master, Servo
- Children:
- e59da66
- Parents:
- 8f73bed
- Location:
- iOS/Orbit
- Files:
-
- 5 deleted
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard
r8f73bed r86f2f30 373 373 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 374 374 <subviews> 375 <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="status_ default.png" id="aa9-oz-0Qj">375 <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="status_0.png" id="aa9-oz-0Qj"> 376 376 <rect key="frame" x="5" y="32" width="300" height="66"/> 377 377 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> … … 469 469 </scenes> 470 470 <resources> 471 <image name="status_ default.png" width="1080" height="216"/>471 <image name="status_0.png" width="1080" height="216"/> 472 472 <image name="tab_advanced-30x30.png" width="30" height="30"/> 473 473 <image name="tab_flight-30x30.png" width="30" height="30"/> -
iOS/Orbit/orbit.xcodeproj/project.pbxproj
rdad7b78 r86f2f30 61 61 5270753917CEC8CF00476875 /* DroidSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */; }; 62 62 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753717CEC8CF00476875 /* DroidSans.ttf */; }; 63 527B4FFA1816612900081A44 /* status_1_connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF51816612900081A44 /* status_1_connecting.png */; };64 527B4FFB1816612900081A44 /* status_2_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF61816612900081A44 /* status_2_connected.png */; };65 527B4FFC1816612900081A44 /* status_3_processing.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF71816612900081A44 /* status_3_processing.png */; };66 527B4FFD1816612900081A44 /* status_4_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF81816612900081A44 /* status_4_active.png */; };67 527B4FFE1816612900081A44 /* status_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B4FF91816612900081A44 /* status_default.png */; };68 63 5286861517CAA8E800956FA9 /* step05-2.html in Resources */ = {isa = PBXBuildFile; fileRef = 5286861417CAA8E800956FA9 /* step05-2.html */; }; 69 64 5286861B17CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */; }; … … 183 178 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DroidSans-Bold.ttf"; sourceTree = "<group>"; }; 184 179 5270753717CEC8CF00476875 /* DroidSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = DroidSans.ttf; sourceTree = "<group>"; }; 185 527B4FF51816612900081A44 /* status_1_connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_1_connecting.png; sourceTree = "<group>"; };186 527B4FF61816612900081A44 /* status_2_connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_2_connected.png; sourceTree = "<group>"; };187 527B4FF71816612900081A44 /* status_3_processing.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_3_processing.png; sourceTree = "<group>"; };188 527B4FF81816612900081A44 /* status_4_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_4_active.png; sourceTree = "<group>"; };189 527B4FF91816612900081A44 /* status_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_default.png; sourceTree = "<group>"; };190 180 5286861417CAA8E800956FA9 /* step05-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-2.html"; path = "tutorial/step05-2.html"; sourceTree = "<group>"; }; 191 181 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tutorial-02-charging-usb-lit.jpg"; sourceTree = "<group>"; }; … … 463 453 isa = PBXGroup; 464 454 children = ( 465 527B4FF51816612900081A44 /* status_1_connecting.png */,466 527B4FF61816612900081A44 /* status_2_connected.png */,467 527B4FF71816612900081A44 /* status_3_processing.png */,468 527B4FF81816612900081A44 /* status_4_active.png */,469 527B4FF91816612900081A44 /* status_default.png */,470 455 5255A28E17CAEA1C00AD4349 /* tab_welcome-30x30.png */, 471 456 5255A28F17CAEA1C00AD4349 /* tab_welcome-60x60.png */, … … 691 676 2843FE8F1790205900C79D56 /* status_4.png in Resources */, 692 677 2843FE901790205900C79D56 /* status_4@2x.png in Resources */, 693 527B4FFC1816612900081A44 /* status_3_processing.png in Resources */,694 678 52E3302D17AE9A8B00671D06 /* tutorial-04-headset.jpg in Resources */, 695 679 52E3302E17AE9A8B00671D06 /* index.html in Resources */, … … 697 681 52E3303017AE9A8B00671D06 /* step04-1.html in Resources */, 698 682 52E3303117AE9A8B00671D06 /* step05-1.html in Resources */, 699 527B4FFD1816612900081A44 /* status_4_active.png in Resources */,700 683 52E3303217AE9A8B00671D06 /* step06-1.html in Resources */, 701 684 52E3303317AE9A8B00671D06 /* step07-1.html in Resources */, … … 738 721 5286861F17CAB03100956FA9 /* tutorial-09-flight-transmit-on.jpg in Resources */, 739 722 5255A29017CAEA1C00AD4349 /* tab_welcome-30x30.png in Resources */, 740 527B4FFA1816612900081A44 /* status_1_connecting.png in Resources */,741 723 5255A29117CAEA1C00AD4349 /* tab_welcome-60x60.png in Resources */, 742 724 5255A29817CAF65800AD4349 /* tab_flight-30x30.png in Resources */, … … 746 728 5255A2A017CB070B00AD4349 /* tab_support-30x30.png in Resources */, 747 729 5255A2A117CB070B00AD4349 /* tab_support-60x60.png in Resources */, 748 527B4FFE1816612900081A44 /* status_default.png in Resources */,749 730 5270752217CD7A7000476875 /* tutorial-07-acquiring_a_clean_signal.gif in Resources */, 750 731 5270752417CD7C9400476875 /* step07-2.html in Resources */, … … 760 741 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */, 761 742 5266D47117CEDCD900A31E0D /* support.html in Resources */, 762 527B4FFB1816612900081A44 /* status_2_connected.png in Resources */,763 743 ); 764 744 runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset
for help on using the changeset viewer.