Changeset 99de425 in orbit for iOS


Ignore:
Timestamp:
12/31/13 13:09:53 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
f05ba79
Parents:
c770747
Message:
  • Reset button hidden from view
Location:
iOS/Orbit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.h

    rf45b70a r99de425  
    5151@property (nonatomic, retain) IBOutlet UISwitch *switchTiltSensorControlThrottle; 
    5252 
     53- (void) resetValues:(id)button; 
    5354- (IBAction) resetButtonPressed:(id)button; 
    5455 
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.m

    rf45b70a r99de425  
    5252} 
    5353 
    54 - (IBAction) resetButtonPressed:(id)button 
     54- (void) resetValues:(id) sender 
    5555{ 
    5656   pitch.value = defaultControlPitch; 
     
    6464} 
    6565 
     66- (IBAction) resetButtonPressed:(id) button 
     67{ 
     68   [self resetValues:(button)]; 
     69} 
     70 
    6671- (IBAction) pitchChanged:(id) sender 
    6772{ 
     
    113118 
    114119- (IBAction) hoverButtonPressed:(id)sender { 
    115    [self resetButtonPressed:(sender)]; 
     120   [self resetValues:(sender)]; 
    116121    
    117122} 
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    rb094d6c r99de425  
    174174                                <items> 
    175175                                    <navigationItem title="Advanced" id="5si-2Z-XrP"> 
    176                                         <barButtonItem key="rightBarButtonItem" title="Reset" id="gTs-AS-CLK"> 
     176                                        <barButtonItem key="rightBarButtonItem" enabled="NO" id="gTs-AS-CLK"> 
    177177                                            <connections> 
    178178                                                <action selector="resetButtonPressed:" destination="GcO-3J-amz" id="BNP-eK-aEX"/> 
Note: See TracChangeset for help on using the changeset viewer.