Changeset d31bab4 in orbit
- Timestamp:
- 08/26/13 08:41:53 (9 years ago)
- Branches:
- master, Servo, Tab_Interface, pyramid
- Children:
- 48584e4
- Parents:
- ba2b6ff
- Location:
- iOS
- Files:
-
- 10 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
iOS/Orbit/Orbit/controllers/SupportViewController.m
rce0a7ee rd31bab4 30 30 - (void) loadSupportSite 31 31 { 32 [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString: @"http://puzzlebox.info/forums/forumdisplay.php?fid=4"]]]; 32 // [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString: @"http://puzzlebox.info/forums/forumdisplay.php?fid=4"]]]; 33 [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString: @"http://orbit.puzzlebox.info/contact"]]]; 33 34 } 34 35 -
iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard
rba2b6ff rd31bab4 46 46 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 47 47 </view> 48 <tabBarItem key="tabBarItem" title="Support" image=" help.png" id="cac-uP-cgJ"/>48 <tabBarItem key="tabBarItem" title="Support" image="tab_support-30x30.png" id="cac-uP-cgJ"/> 49 49 <connections> 50 50 <outlet property="retryButton" destination="ito-kx-zLv" id="yP6-IV-eHf"/> … … 201 201 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> 202 202 </view> 203 <tabBarItem key="tabBarItem" title="Advanced" image=" advanced.png" id="cd7-uP-s8P"/>203 <tabBarItem key="tabBarItem" title="Advanced" image="tab_advanced-30x30.png" id="cd7-uP-s8P"/> 204 204 <connections> 205 205 <outlet property="pitch" destination="pE4-wd-89x" id="Sbm-iD-GAE"/> … … 381 381 <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> 382 382 </view> 383 <tabBarItem key="tabBarItem" title="Flight" image=" plane.png" id="ysb-Df-cyR"/>383 <tabBarItem key="tabBarItem" title="Flight" image="tab_flight-30x30.png" id="ysb-Df-cyR"/> 384 384 <navigationItem key="navigationItem" id="iTN-dz-EXc"/> 385 385 <connections> … … 430 430 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 431 431 </view> 432 <tabBarItem key="tabBarItem" title="Welcome" image="t utorial.png" id="JJR-hA-hnf"/>432 <tabBarItem key="tabBarItem" title="Welcome" image="tab_welcome-30x30.png" id="JJR-hA-hnf"/> 433 433 <connections> 434 434 <outlet property="webView" destination="yFF-oy-BYh" id="UOH-dC-3Mk"/> … … 462 462 </scenes> 463 463 <resources> 464 <image name="advanced.png" width="20" height="20"/>465 <image name="help.png" width="20" height="20"/>466 <image name="plane.png" width="20" height="20"/>467 464 <image name="status_0.png" width="238" height="213"/> 468 <image name="tutorial.png" width="20" height="20"/> 465 <image name="tab_advanced-30x30.png" width="30" height="30"/> 466 <image name="tab_flight-30x30.png" width="30" height="30"/> 467 <image name="tab_support-30x30.png" width="30" height="30"/> 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> 470 523 <simulatedMetricsContainer key="defaultSimulatedMetrics"> 471 524 <simulatedStatusBarMetrics key="statusBar"/> -
iOS/Orbit/orbit.xcodeproj/project.pbxproj
rba2b6ff rd31bab4 45 45 289C7D19178D7A34005C08EC /* status_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 289C7D14178D7A34005C08EC /* status_0.png */; }; 46 46 28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; }; 47 28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; };48 47 28F901301799436F003FB5ED /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F9012F1799436F003FB5ED /* CoreBluetooth.framework */; }; 49 48 28F90133179973EC003FB5ED /* AudioGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F90132179973EC003FB5ED /* AudioGenerator.m */; }; 50 49 524B4A3D17AF6E72009076BA /* step05-4.html in Resources */ = {isa = PBXBuildFile; fileRef = 524B4A3C17AF6E72009076BA /* step05-4.html */; }; 50 5255A29017CAEA1C00AD4349 /* tab_welcome-30x30.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A28E17CAEA1C00AD4349 /* tab_welcome-30x30.png */; }; 51 5255A29117CAEA1C00AD4349 /* tab_welcome-60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A28F17CAEA1C00AD4349 /* tab_welcome-60x60.png */; }; 52 5255A29417CAEE4400AD4349 /* tab_puzzlebox-30x30.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29217CAEE4400AD4349 /* tab_puzzlebox-30x30.png */; }; 53 5255A29517CAEE4400AD4349 /* tab_puzzlebox-60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29317CAEE4400AD4349 /* tab_puzzlebox-60x60.png */; }; 54 5255A29817CAF65800AD4349 /* tab_flight-30x30.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29617CAF65800AD4349 /* tab_flight-30x30.png */; }; 55 5255A29917CAF65800AD4349 /* tab_flight-60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29717CAF65800AD4349 /* tab_flight-60x60.png */; }; 56 5255A29C17CB037300AD4349 /* tab_advanced-30x30.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29A17CB037300AD4349 /* tab_advanced-30x30.png */; }; 57 5255A29D17CB037300AD4349 /* tab_advanced-60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29B17CB037300AD4349 /* tab_advanced-60x60.png */; }; 58 5255A2A017CB070B00AD4349 /* tab_support-30x30.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29E17CB070B00AD4349 /* tab_support-30x30.png */; }; 59 5255A2A117CB070B00AD4349 /* tab_support-60x60.png in Resources */ = {isa = PBXBuildFile; fileRef = 5255A29F17CB070B00AD4349 /* tab_support-60x60.png */; }; 51 60 5286861517CAA8E800956FA9 /* step05-2.html in Resources */ = {isa = PBXBuildFile; fileRef = 5286861417CAA8E800956FA9 /* step05-2.html */; }; 52 61 5286861B17CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */; }; … … 153 162 289C7D14178D7A34005C08EC /* status_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_0.png; sourceTree = "<group>"; }; 154 163 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; }; 155 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; };156 164 28F9012F1799436F003FB5ED /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; }; 157 165 28F90131179973EC003FB5ED /* AudioGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioGenerator.h; sourceTree = "<group>"; }; 158 166 28F90132179973EC003FB5ED /* AudioGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioGenerator.m; sourceTree = "<group>"; }; 159 167 524B4A3C17AF6E72009076BA /* step05-4.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-4.html"; path = "tutorial/step05-4.html"; sourceTree = "<group>"; }; 168 5255A28E17CAEA1C00AD4349 /* tab_welcome-30x30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_welcome-30x30.png"; sourceTree = "<group>"; }; 169 5255A28F17CAEA1C00AD4349 /* tab_welcome-60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_welcome-60x60.png"; sourceTree = "<group>"; }; 170 5255A29217CAEE4400AD4349 /* tab_puzzlebox-30x30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_puzzlebox-30x30.png"; sourceTree = "<group>"; }; 171 5255A29317CAEE4400AD4349 /* tab_puzzlebox-60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_puzzlebox-60x60.png"; sourceTree = "<group>"; }; 172 5255A29617CAF65800AD4349 /* tab_flight-30x30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_flight-30x30.png"; sourceTree = "<group>"; }; 173 5255A29717CAF65800AD4349 /* tab_flight-60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_flight-60x60.png"; sourceTree = "<group>"; }; 174 5255A29A17CB037300AD4349 /* tab_advanced-30x30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_advanced-30x30.png"; sourceTree = "<group>"; }; 175 5255A29B17CB037300AD4349 /* tab_advanced-60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_advanced-60x60.png"; sourceTree = "<group>"; }; 176 5255A29E17CB070B00AD4349 /* tab_support-30x30.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_support-30x30.png"; sourceTree = "<group>"; }; 177 5255A29F17CB070B00AD4349 /* tab_support-60x60.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_support-60x60.png"; sourceTree = "<group>"; }; 160 178 5286861417CAA8E800956FA9 /* step05-2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "step05-2.html"; path = "tutorial/step05-2.html"; sourceTree = "<group>"; }; 161 179 5286861617CAB03100956FA9 /* tutorial-02-charging-usb-lit.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tutorial-02-charging-usb-lit.jpg"; sourceTree = "<group>"; }; … … 364 382 52FA364516899B69004C280A /* ic_launcher-114x114.png */, 365 383 52FA364316899B5D004C280A /* ic_launcher-57x57.png */, 366 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */,367 384 2815BC14167F496C00F7E6DA /* QuartzCore.framework */, 368 385 28174C66167F2EA900104752 /* Orbit */, … … 440 457 280D2ABB17A81714002D6863 /* plane@2x.png */, 441 458 280D2ABC17A81714002D6863 /* tutorial.png */, 459 5255A28E17CAEA1C00AD4349 /* tab_welcome-30x30.png */, 460 5255A28F17CAEA1C00AD4349 /* tab_welcome-60x60.png */, 461 5255A29217CAEE4400AD4349 /* tab_puzzlebox-30x30.png */, 462 5255A29E17CB070B00AD4349 /* tab_support-30x30.png */, 463 5255A29F17CB070B00AD4349 /* tab_support-60x60.png */, 464 5255A29A17CB037300AD4349 /* tab_advanced-30x30.png */, 465 5255A29B17CB037300AD4349 /* tab_advanced-60x60.png */, 466 5255A29317CAEE4400AD4349 /* tab_puzzlebox-60x60.png */, 467 5255A29617CAF65800AD4349 /* tab_flight-30x30.png */, 468 5255A29717CAF65800AD4349 /* tab_flight-60x60.png */, 442 469 280D2ABD17A81714002D6863 /* tutorial@2x.png */, 443 470 289C7D14178D7A34005C08EC /* status_0.png */, … … 622 649 28174C7A167F2EAA00104752 /* MainStoryboard.storyboard in Resources */, 623 650 28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */, 624 28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */,625 651 52FA364416899B5D004C280A /* ic_launcher-57x57.png in Resources */, 626 652 52FA364616899B69004C280A /* ic_launcher-114x114.png in Resources */, … … 692 718 5286861E17CAB03100956FA9 /* tutorial-09-flight-transmit-off.jpg in Resources */, 693 719 5286861F17CAB03100956FA9 /* tutorial-09-flight-transmit-on.jpg in Resources */, 720 5255A29017CAEA1C00AD4349 /* tab_welcome-30x30.png in Resources */, 721 5255A29117CAEA1C00AD4349 /* tab_welcome-60x60.png in Resources */, 722 5255A29417CAEE4400AD4349 /* tab_puzzlebox-30x30.png in Resources */, 723 5255A29517CAEE4400AD4349 /* tab_puzzlebox-60x60.png in Resources */, 724 5255A29817CAF65800AD4349 /* tab_flight-30x30.png in Resources */, 725 5255A29917CAF65800AD4349 /* tab_flight-60x60.png in Resources */, 726 5255A29C17CB037300AD4349 /* tab_advanced-30x30.png in Resources */, 727 5255A29D17CB037300AD4349 /* tab_advanced-60x60.png in Resources */, 728 5255A2A017CB070B00AD4349 /* tab_support-30x30.png in Resources */, 729 5255A2A117CB070B00AD4349 /* tab_support-60x60.png in Resources */, 694 730 ); 695 731 runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset
for help on using the changeset viewer.