Changeset 4a56cfb in orbit
- Timestamp:
- 08/29/13 05:19:14 (9 years ago)
- Branches:
- master, Servo, Tab_Interface, pyramid
- Children:
- cef53d8
- Parents:
- bafff7e
- Location:
- iOS
- Files:
-
- 4 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
iOS/Orbit/Orbit/Orbit-Info.plist
ra9059a5 r4a56cfb 3 3 <plist version="1.0"> 4 4 <dict> 5 <key>UIAppFonts</key> 6 <array> 7 <string>DroidSans.ttf</string> 8 <string>DroidSans-Bold.ttf</string> 9 </array> 5 10 <key>CFBundleDevelopmentRegion</key> 6 11 <string>en</string> -
iOS/Orbit/Orbit/controllers/FlightViewController.m
rad80ed2 r4a56cfb 172 172 173 173 - (IBAction) testButtonPressed:(id) sender { 174 175 176 NSLog(@"Available fonts: %@", [UIFont familyNames]); 177 // Droid Sans 178 179 174 180 [signalConverter isAudioJackPlugged]; 175 181 if (signalConverter.running) { -
iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard
rd31bab4 r4a56cfb 468 468 <image name="tab_welcome-30x30.png" width="30" height="30"/> 469 469 </resources> 470 <classes>471 <class className="AdvancedViewController" superclassName="UIViewController">472 <source key="sourceIdentifier" type="project" relativePath="./Classes/AdvancedViewController.h"/>473 <relationships>474 <relationship kind="action" name="pitchChanged:"/>475 <relationship kind="action" name="resetButtonPressed:"/>476 <relationship kind="action" name="throttleChanged:"/>477 <relationship kind="action" name="yawChanged:"/>478 <relationship kind="outlet" name="pitch" candidateClass="UISlider"/>479 <relationship kind="outlet" name="pitchPercent" candidateClass="UILabel"/>480 <relationship kind="outlet" name="resetButton" candidateClass="UIBarButtonItem"/>481 <relationship kind="outlet" name="throttle" candidateClass="UISlider"/>482 <relationship kind="outlet" name="throttlePercent" candidateClass="UILabel"/>483 <relationship kind="outlet" name="yaw" candidateClass="UISlider"/>484 <relationship kind="outlet" name="yawPercent" candidateClass="UILabel"/>485 </relationships>486 </class>487 <class className="FlightViewController" superclassName="UIViewController">488 <source key="sourceIdentifier" type="project" relativePath="./Classes/FlightViewController.h"/>489 <relationships>490 <relationship kind="action" name="connectButtonPressed:"/>491 <relationship kind="action" name="testButtonPressed:"/>492 <relationship kind="outlet" name="attention" candidateClass="UIProgressView"/>493 <relationship kind="outlet" name="attentionPercent" candidateClass="UILabel"/>494 <relationship kind="outlet" name="attentionThreshold" candidateClass="UISlider"/>495 <relationship kind="outlet" name="connectButton" candidateClass="UIBarButtonItem"/>496 <relationship kind="outlet" name="meditation" candidateClass="UIProgressView"/>497 <relationship kind="outlet" name="meditationPercent" candidateClass="UILabel"/>498 <relationship kind="outlet" name="meditationThreshold" candidateClass="UISlider"/>499 <relationship kind="outlet" name="power" candidateClass="UIProgressView"/>500 <relationship kind="outlet" name="powerPercent" candidateClass="UILabel"/>501 <relationship kind="outlet" name="signal" candidateClass="UIProgressView"/>502 <relationship kind="outlet" name="signalPercent" candidateClass="UILabel"/>503 <relationship kind="outlet" name="statusImage" candidateClass="UIImageView"/>504 <relationship kind="outlet" name="testButton" candidateClass="UIBarButtonItem"/>505 </relationships>506 </class>507 <class className="SupportViewController" superclassName="UIViewController">508 <source key="sourceIdentifier" type="project" relativePath="./Classes/SupportViewController.h"/>509 <relationships>510 <relationship kind="action" name="retryButtonPressed:"/>511 <relationship kind="outlet" name="retryButton" candidateClass="UIButton"/>512 <relationship kind="outlet" name="status" candidateClass="UILabel"/>513 <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>514 </relationships>515 </class>516 <class className="TutorialViewController" superclassName="UIViewController">517 <source key="sourceIdentifier" type="project" relativePath="./Classes/TutorialViewController.h"/>518 <relationships>519 <relationship kind="outlet" name="webView" candidateClass="UIWebView"/>520 </relationships>521 </class>522 </classes>523 470 <simulatedMetricsContainer key="defaultSimulatedMetrics"> 524 471 <simulatedStatusBarMetrics key="statusBar"/> -
iOS/Orbit/orbit.xcodeproj/project.pbxproj
rbafff7e r4a56cfb 57 57 5270753017CE777300476875 /* step08-5.html in Resources */ = {isa = PBXBuildFile; fileRef = 5270752E17CE777300476875 /* step08-5.html */; }; 58 58 5270753217CEB76300476875 /* welcome-icons.png in Resources */ = {isa = PBXBuildFile; fileRef = 5270753117CEB76300476875 /* welcome-icons.png */; }; 59 5270753817CEC8CF00476875 /* Apache License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5270753517CEC8CF00476875 /* Apache License.txt */; }; 60 5270753917CEC8CF00476875 /* DroidSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */; }; 61 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5270753717CEC8CF00476875 /* DroidSans.ttf */; }; 59 62 5286861517CAA8E800956FA9 /* step05-2.html in Resources */ = {isa = PBXBuildFile; fileRef = 5286861417CAA8E800956FA9 /* step05-2.html */; }; 60 63 5286861B17CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */; }; … … 170 173 5270752E17CE777300476875 /* step08-5.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step08-5.html"; path = "tutorial/step08-5.html"; sourceTree = "<group>"; }; 171 174 5270753117CEB76300476875 /* welcome-icons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "welcome-icons.png"; path = "tutorial/images/welcome-icons.png"; sourceTree = "<group>"; }; 175 5270753517CEC8CF00476875 /* Apache License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Apache License.txt"; sourceTree = "<group>"; }; 176 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DroidSans-Bold.ttf"; sourceTree = "<group>"; }; 177 5270753717CEC8CF00476875 /* DroidSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = DroidSans.ttf; sourceTree = "<group>"; }; 172 178 5286861417CAA8E800956FA9 /* step05-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-2.html"; path = "tutorial/step05-2.html"; sourceTree = "<group>"; }; 173 179 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tutorial-02-charging-usb-lit.jpg"; sourceTree = "<group>"; }; … … 373 379 289C7D0F178D7A21005C08EC /* Images */, 374 380 52FA364716899C63004C280A /* Default-568h@2x.png */, 381 5270753317CEC8CF00476875 /* Fonts */, 375 382 52FA364516899B69004C280A /* ic_launcher-114x114.png */, 376 383 52FA364316899B5D004C280A /* ic_launcher-57x57.png */, … … 464 471 ); 465 472 name = Images; 473 sourceTree = "<group>"; 474 }; 475 5270753317CEC8CF00476875 /* Fonts */ = { 476 isa = PBXGroup; 477 children = ( 478 5270753417CEC8CF00476875 /* Droid-Sans */, 479 ); 480 name = Fonts; 481 path = fonts; 482 sourceTree = "<group>"; 483 }; 484 5270753417CEC8CF00476875 /* Droid-Sans */ = { 485 isa = PBXGroup; 486 children = ( 487 5270753517CEC8CF00476875 /* Apache License.txt */, 488 5270753617CEC8CF00476875 /* DroidSans-Bold.ttf */, 489 5270753717CEC8CF00476875 /* DroidSans.ttf */, 490 ); 491 path = "Droid-Sans"; 466 492 sourceTree = "<group>"; 467 493 }; … … 708 734 5270753017CE777300476875 /* step08-5.html in Resources */, 709 735 5270753217CEB76300476875 /* welcome-icons.png in Resources */, 736 5270753817CEC8CF00476875 /* Apache License.txt in Resources */, 737 5270753917CEC8CF00476875 /* DroidSans-Bold.ttf in Resources */, 738 5270753A17CEC8CF00476875 /* DroidSans.ttf in Resources */, 710 739 ); 711 740 runOnlyForDeploymentPostprocessing = 0; -
iOS/Orbit/tutorial/index.html
rbafff7e r4a56cfb 8 8 <body style="background-color: white;"> 9 9 10 <center >10 <center ="welcome"> 11 11 12 12 <img src="puzzlebox_logo.pdf" width="240"> … … 14 14 Welcome to Puzzlebox Orbit 15 15 16 <p><img src="welcome-icons.png" width="100%">< p>16 <p><img src="welcome-icons.png" width="100%"></p> 17 17 18 <p><img src="tutorial-08-meters-attention.gif" width="100%">< p>18 <p><img src="tutorial-08-meters-attention.gif" width="100%"></p> 19 19 20 <p >Press the arrow button to begin the tutorial</p>20 <p class="tutorial">Press the arrow button to begin the tutorial</p> 21 21 22 22 <a class="next button" onclick="parent.changePage('contents.html');"> → </a> -
iOS/Orbit/tutorial/step02-1.html
rf0e53f9 r4a56cfb 16 16 <tr> 17 17 <td colspan="2"> 18 <center >18 <center class="label"> 19 19 <img src="tutorial-02-charging-orbit-angle.jpg" height="128"> 20 20 Orbit … … 22 22 </td> 23 23 <td colspan="2"> 24 <center >24 <center class="label"> 25 25 <img src="tutorial-02-charging-infrared.jpg" width="128"> 26 26 Infrared 27 27 </center> 28 28 </td> … … 38 38 <td colspan="2"> 39 39 <center> 40 USB Cable40 <p class="label">USB Cable</p> 41 41 </center> 42 42 <ul> 43 <li >Off: Charging</li>44 <li >Red: Charged</li>43 <li class="label">Off: Charging</li> 44 <li class="label">Red: Charged</li> 45 45 </ul> 46 46 </td> -
iOS/Orbit/tutorial/step08-3.html
re0a64b6 r4a56cfb 9 9 10 10 <center> 11 <h2> Attention Recommendations</h2>11 <h2>Recomendations</h2> 12 12 </center> 13 13 -
iOS/Orbit/tutorial/style.css
rbafff7e r4a56cfb 1 1 .button { 2 font-family:default; 3 2 4 border: solid black 1px; 3 5 padding: 2px 5px; … … 11 13 12 14 .chapter { 15 16 font-family:default; 13 17 14 18 width: 114px; … … 67 71 border: 0px; 68 72 } 73 74 body { 75 font-family:ariel; 76 } 77 78 h2 { 79 font-family:"Droid Sans"; 80 } 81 82 h3 { 83 font-family:"Droid Sans"; 84 } 85 86 .welcome { 87 font-family:"Droid Sans"; 88 font-size: 1.0em; 89 } 90 91 .tutorial { 92 font-family:"Droid Sans"; 93 font-size: 0.8em; 94 } 95 96 .label { 97 font-family:"Droid Sans"; 98 font-size: 0.8em; 99 }
Note: See TracChangeset
for help on using the changeset viewer.