Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-12-27 06:29:19 +00:00
Code Issues Projects Releases Wiki Activity

ToolBar properly at bottom

Browse Source
This commit is contained in:
jvernet 2015-12-24 23:21:30 +01:00 committed by Aaron Culliney
parent bf341731f0
commit 4522fa98ac
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
View File

@ -124,6 +124,7 @@
4AFC17181AAE9CC000B215FA /* testvm1.nib.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4AFC17101AAE9CC000B215FA /* testvm1.nib.gz */; }; 4AFC17181AAE9CC000B215FA /* testvm1.nib.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4AFC17101AAE9CC000B215FA /* testvm1.nib.gz */; };
4E1733E31C2C5F7600CDF9DF /* iosPrefControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E4E62A01C2C5B56002E324F /* iosPrefControllerViewController.m */; }; 4E1733E31C2C5F7600CDF9DF /* iosPrefControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E4E62A01C2C5B56002E324F /* iosPrefControllerViewController.m */; };
4E1733E41C2C5F7A00CDF9DF /* AppleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E1733DD1C2C5E5D00CDF9DF /* AppleViewController.m */; }; 4E1733E41C2C5F7A00CDF9DF /* AppleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E1733DD1C2C5E5D00CDF9DF /* AppleViewController.m */; };
4E1733EA1C2CA71100CDF9DF /* speedtest.dsk.gz in Resources */ = {isa = PBXBuildFile; fileRef = 4ADC523519E8D3F600186B36 /* speedtest.dsk.gz */; };
773B3D101956885A0085CE5F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 773B3D0F1956885A0085CE5F /* Cocoa.framework */; }; 773B3D101956885A0085CE5F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 773B3D0F1956885A0085CE5F /* Cocoa.framework */; };
773B3D1A1956885A0085CE5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D181956885A0085CE5F /* InfoPlist.strings */; }; 773B3D1A1956885A0085CE5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D181956885A0085CE5F /* InfoPlist.strings */; };
773B3D201956885A0085CE5F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D1E1956885A0085CE5F /* Credits.rtf */; }; 773B3D201956885A0085CE5F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D1E1956885A0085CE5F /* Credits.rtf */; };
@ -1233,6 +1234,7 @@
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
4E1733EA1C2CA71100CDF9DF /* speedtest.dsk.gz in Resources */,
935C55371C12BA5F0013166D /* Assets.xcassets in Resources */, 935C55371C12BA5F0013166D /* Assets.xcassets in Resources */,
935C55431C12BCFD0013166D /* Apple2iOS-Info.plist in Resources */, 935C55431C12BCFD0013166D /* Apple2iOS-Info.plist in Resources */,
935C55461C12BE110013166D /* LaunchScreen.xib in Resources */, 935C55461C12BE110013166D /* LaunchScreen.xib in Resources */,

3
Apple2Mac/Apple2Mac/AppleViewController.h
View File

@ -9,6 +9,9 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface AppleViewController : UIViewController @interface AppleViewController : UIViewController
@property (assign) IBOutlet UIToolbar *mainToolBar;
-(IBAction)rebootItem:(id)sender; -(IBAction)rebootItem:(id)sender;
-(IBAction)prefsItem:(id)sender; -(IBAction)prefsItem:(id)sender;

1
Apple2Mac/Apple2Mac/AppleViewController.m
View File

@ -18,6 +18,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// [self mainToolBar ];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
} }

16
Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard
View File

@ -16,8 +16,11 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="redraw" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MKz-35-wcI"> <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="center" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MKz-35-wcI">
<rect key="frame" x="66" y="278" width="468" height="44"/> <rect key="frame" x="0.0" y="568" width="600" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="FMY-Nk-ouC"/>
</constraints>
<items> <items>
<barButtonItem title="Reboot" id="pwr-c0-7tW"> <barButtonItem title="Reboot" id="pwr-c0-7tW">
<connections> <connections>
@ -31,12 +34,21 @@
</barButtonItem> </barButtonItem>
<barButtonItem title="Prefs" id="80q-oc-naJ"/> <barButtonItem title="Prefs" id="80q-oc-naJ"/>
</items> </items>
<variation key="heightClass=compact-widthClass=regular" ambiguous="YES" misplaced="YES">
<rect key="frame" x="0.0" y="356" width="600" height="44"/>
</variation>
</toolbar> </toolbar>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<gestureRecognizers/> <gestureRecognizers/>
<constraints>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="MKz-35-wcI" secondAttribute="bottom" id="tkd-uI-DwA"/>
</constraints>
</view> </view>
<simulatedOrientationMetrics key="simulatedOrientationMetrics"/> <simulatedOrientationMetrics key="simulatedOrientationMetrics"/>
<connections>
<outlet property="mainToolBar" destination="MKz-35-wcI" id="PNp-tB-sJH"/>
</connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects> </objects>