Ignore:
Timestamp:
12/25/12 16:52:35 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
Children:
ae32e69
Parents:
2aabdf3
Message:
  • Connect button added to interface
  • Variable volume level fixed
  • Enhanced display log output
File:
1 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    r66477ef rdaf54d5  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2843" systemVersion="11G56" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2"> 
     2<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2844" systemVersion="11G63b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2"> 
    33    <dependencies> 
    4         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1929"/> 
     4        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1930"/> 
    55    </dependencies> 
    66    <scenes> 
     
    1010                <viewController id="2" customClass="ViewController" sceneMemberID="viewController"> 
    1111                    <view key="view" contentMode="scaleToFill" id="3"> 
    12                         <rect key="frame" x="0.0" y="20" width="320" height="548"/> 
     12                        <rect key="frame" x="0.0" y="20" width="320" height="460"/> 
    1313                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
    1414                        <subviews> 
    1515                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" id="q4j-9c-MI9" userLabel="Log Text View"> 
    16                                 <rect key="frame" x="0.0" y="234" width="320" height="314"/> 
     16                                <rect key="frame" x="0.0" y="188" width="320" height="212"/> 
    1717                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> 
    1818                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> 
     
    7676                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
    7777                            </slider> 
    78                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="NqS-l7-hPF"> 
    79                                 <rect key="frame" x="245" y="183" width="66" height="44"/> 
     78                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="fp0-Gg-q1A" userLabel="Button - Connect"> 
     79                                <rect key="frame" x="20" y="408" width="133" height="44"/> 
     80                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
     81                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> 
     82                                <state key="normal" title="Connect"> 
     83                                    <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/> 
     84                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> 
     85                                </state> 
     86                                <state key="highlighted"> 
     87                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> 
     88                                </state> 
     89                                <connections> 
     90                                    <action selector="connectButtonPressed:" destination="2" eventType="touchUpInside" id="pGz-F3-mNK"/> 
     91                                </connections> 
     92                            </button> 
     93                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="pB6-m6-fSe"> 
     94                                <rect key="frame" x="167" y="408" width="133" height="44"/> 
    8095                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> 
    8196                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> 
     
    88103                                </state> 
    89104                                <connections> 
    90                                     <action selector="demoButtonPressed:" destination="2" eventType="touchUpInside" id="W6T-Md-YIV"/> 
     105                                    <action selector="demoButtonPressed:" destination="2" eventType="touchUpInside" id="jxf-Gy-SDH"/> 
    91106                                </connections> 
    92107                            </button> 
     
    97112                        <outlet property="attention" destination="JSd-wh-hXB" id="LDM-Zo-foy"/> 
    98113                        <outlet property="attentionThreshold" destination="bjQ-4R-D2B" id="Sn7-9G-IFD"/> 
    99                         <outlet property="demoButton" destination="NqS-l7-hPF" id="IQh-3V-RnW"/> 
     114                        <outlet property="connectButton" destination="fp0-Gg-q1A" id="En3-ov-AJe"/> 
     115                        <outlet property="demoButton" destination="pB6-m6-fSe" id="Y1w-Nm-UOz"/> 
    100116                        <outlet property="log" destination="q4j-9c-MI9" id="4qD-e1-XcH"/> 
    101117                        <outlet property="meditation" destination="ZTN-h8-tET" id="tE2-f1-8LM"/> 
     
    113129            <source key="sourceIdentifier" type="project" relativePath="./Classes/ViewController.h"/> 
    114130            <relationships> 
     131                <relationship kind="action" name="connectButtonPressed:"/> 
    115132                <relationship kind="action" name="demoButtonPressed:"/> 
    116133                <relationship kind="outlet" name="attention" candidateClass="UIProgressView"/> 
    117134                <relationship kind="outlet" name="attentionThreshold" candidateClass="UISlider"/> 
     135                <relationship kind="outlet" name="connectButton" candidateClass="UIButton"/> 
    118136                <relationship kind="outlet" name="demoButton" candidateClass="UIButton"/> 
    119137                <relationship kind="outlet" name="log" candidateClass="UITextView"/> 
     
    128146        <simulatedStatusBarMetrics key="statusBar"/> 
    129147        <simulatedOrientationMetrics key="orientation"/> 
    130         <simulatedScreenMetrics key="destination" type="retina4"/> 
     148        <simulatedScreenMetrics key="destination"/> 
    131149    </simulatedMetricsContainer> 
    132150</document> 
Note: See TracChangeset for help on using the changeset viewer.