Macintosh-Tools/minivmac4ios
1
0
Fork 0
mirror of https://github.com/zydeco/minivmac4ios.git synced 2024-11-29 05:49:21 +00:00
Code Issues Projects Releases Wiki Activity

support disk image creation on iOS 7

Browse Source
This commit is contained in:
Jesús A. Álvarez 2016-06-06 18:25:30 +02:00
parent f46483c0b0
commit 5649cb5015
3 changed files with 94 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mini vMac/AppDelegate.m
View File

@ -128,6 +128,9 @@ static NSObject<Emulator> *sharedEmulator = nil;
UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; UIAlertController *alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]]; [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
UIViewController *controller = self.window.rootViewController; UIViewController *controller = self.window.rootViewController;
while (controller.presentedViewController) {
controller = controller.presentedViewController;
}
[controller presentViewController:alert animated:YES completion:nil]; [controller presentViewController:alert animated:YES completion:nil];
} else { } else {
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil]; UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];

131
Mini vMac/InsertDiskViewController.m
View File

@ -31,6 +31,7 @@
NSString *basePath; NSString *basePath;
NSArray<NSString*> *diskImages, *otherFiles; NSArray<NSString*> *diskImages, *otherFiles;
UIAlertController *createDiskImageController; UIAlertController *createDiskImageController;
UIAlertView *createDiskImageAlert;
__block __weak UITextField *sizeTextField; __block __weak UITextField *sizeTextField;
__block __weak UITextField *nameTextField; __block __weak UITextField *nameTextField;
NSString *fileToRename; NSString *fileToRename;
@ -116,7 +117,7 @@
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
switch (section) { switch (section) {
case 0: return diskImages.count + (self.editing && [UIAlertController class] ? 1 : 0); case 0: return diskImages.count + (self.editing ? 1 : 0);
case 1: return otherFiles.count; case 1: return otherFiles.count;
default: return 0; default: return 0;
} }
@ -308,49 +309,66 @@
#pragma mark - Disk Image Creation #pragma mark - Disk Image Creation
- (void)createDiskImage { - (void)createDiskImage {
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Create Disk Image", nil) message:nil preferredStyle:UIAlertControllerStyleAlert]; if ([UIAlertController class]) {
[alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) { UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Create Disk Image", nil) message:nil preferredStyle:UIAlertControllerStyleAlert];
textField.placeholder = NSLocalizedString(@"name", nil); [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
[textField addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventAllEditingEvents]; textField.placeholder = NSLocalizedString(@"name", nil);
}]; [textField addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventAllEditingEvents];
[alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
textField.placeholder = NSLocalizedString(@"size", nil);
textField.keyboardType = UIKeyboardTypeDecimalPad;
UILabel *unitLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 60.0, 32.0)];
textField.rightViewMode = UITextFieldViewModeAlways;
textField.rightView = unitLabel;
unitLabel.textAlignment = NSTextAlignmentRight;
UISegmentedControl *unitsControl = [[UISegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 80.0, 16.0)];
NSArray *units = @[NSLocalizedString(@"KB", nil), NSLocalizedString(@"MB", nil)];
[units enumerateObjectsUsingBlock:^(NSString *title, NSUInteger idx, BOOL * _Nonnull stop) {
[unitsControl insertSegmentWithTitle:title atIndex:idx animated:NO];
}]; }];
unitsControl.selectedSegmentIndex = 0;
textField.rightView = unitsControl; [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
sizeTextField = textField; [self _configureNewDiskSizeField:textField];
textField.delegate = self; }];
[textField addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventAllEditingEvents];
[unitsControl addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventValueChanged]; [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil]];
unitLabel.text = [unitsControl titleForSegmentAtIndex:unitsControl.selectedSegmentIndex]; UIAlertAction *createAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Create", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
NSString *name = [self _newDiskImageName];
off_t size = [self _newDiskImageSize];
createDiskImageController = nil;
[self createDiskImageWithName:name size:size];
}];
[alertController addAction:createAction];
createAction.enabled = NO;
[self presentViewController:alertController animated:YES completion:nil];
createDiskImageController = alertController;
} else {
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Create Disk Image", nil) message:nil delegate:self cancelButtonTitle:NSLocalizedString(@"Cancel", nil) otherButtonTitles:NSLocalizedString(@"Create", nil), nil];
alertView.alertViewStyle = UIAlertViewStyleLoginAndPasswordInput;
nameTextField = [alertView textFieldAtIndex:0];
nameTextField.delegate = self;
nameTextField.placeholder = NSLocalizedString(@"name", nil);
[nameTextField addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventAllEditingEvents];
[self _configureNewDiskSizeField:[alertView textFieldAtIndex:1]];
createDiskImageAlert = alertView;
[alertView show];
}
}
- (void)_configureNewDiskSizeField:(UITextField*)textField {
textField.secureTextEntry = NO;
textField.placeholder = NSLocalizedString(@"size", nil);
textField.keyboardType = UIKeyboardTypeDecimalPad;
UILabel *unitLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 60.0, 32.0)];
textField.rightViewMode = UITextFieldViewModeAlways;
textField.rightView = unitLabel;
unitLabel.textAlignment = NSTextAlignmentRight;
UISegmentedControl *unitsControl = [[UISegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 80.0, 16.0)];
NSArray *units = @[NSLocalizedString(@"KB", nil), NSLocalizedString(@"MB", nil)];
[units enumerateObjectsUsingBlock:^(NSString *title, NSUInteger idx, BOOL * _Nonnull stop) {
[unitsControl insertSegmentWithTitle:title atIndex:idx animated:NO];
}]; }];
unitsControl.selectedSegmentIndex = 0;
[alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil]]; textField.rightView = unitsControl;
UIAlertAction *createAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Create", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { sizeTextField = textField;
NSString *name = [self _newDiskImageName]; textField.delegate = self;
off_t size = [self _newDiskImageSize]; [textField addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventAllEditingEvents];
createDiskImageController = nil; [unitsControl addTarget:self action:@selector(validateCreateDiskImageInput:) forControlEvents:UIControlEventValueChanged];
[self createDiskImageWithName:name size:size]; unitLabel.text = [unitsControl titleForSegmentAtIndex:unitsControl.selectedSegmentIndex];
}];
[alertController addAction:createAction];
createAction.enabled = NO;
[self presentViewController:alertController animated:YES completion:nil];
createDiskImageController = alertController;
} }
- (BOOL)validateCreateDiskImageInput:(id)sender { - (BOOL)validateCreateDiskImageInput:(id)sender {
BOOL valid = NO; BOOL valid = NO;
if (self.presentedViewController == createDiskImageController) { if (self.presentedViewController == createDiskImageController || createDiskImageAlert.visible) {
NSString *name = [self _newDiskImageName]; NSString *name = [self _newDiskImageName];
BOOL nameIsValid = (name.length > 0) && ![name hasPrefix:@"."] && ![name containsString:@"/"] && ![name containsString:@"*"]; BOOL nameIsValid = (name.length > 0) && ![name hasPrefix:@"."] && ![name containsString:@"/"] && ![name containsString:@"*"];
@ -358,23 +376,34 @@
BOOL sizeIsValid = (size >= 400 * 1024) && (size <= 2LL * 1024 * 1024 * 1024); BOOL sizeIsValid = (size >= 400 * 1024) && (size <= 2LL * 1024 * 1024 * 1024);
valid = nameIsValid && sizeIsValid; valid = nameIsValid && sizeIsValid;
UIAlertAction *createAction = createDiskImageController.actions[1]; if (createDiskImageController != nil) {
createAction.enabled = valid; UIAlertAction *createAction = createDiskImageController.actions[1];
createAction.enabled = valid;
} else if (sender == sizeTextField.rightView) {
// fake edit event to call alertViewShouldEnableFirstOtherButton
[sizeTextField sendActionsForControlEvents:UIControlEventEditingChanged];
}
} }
return valid; return valid;
} }
- (NSString*)_newDiskImageName { - (NSString*)_newDiskImageName {
return createDiskImageController ? createDiskImageController.textFields[0].text : nil; if (createDiskImageController != nil) {
return createDiskImageController.textFields[0].text;
} else if (createDiskImageAlert.visible) {
return nameTextField.text;
} else {
return nil;
}
} }
- (off_t)_newDiskImageSize { - (off_t)_newDiskImageSize {
if (createDiskImageController == nil) { if (createDiskImageController == nil && !createDiskImageAlert.visible) {
return 0; return 0;
} }
UISegmentedControl *unitsControl = (UISegmentedControl*)createDiskImageController.textFields[1].rightView; UISegmentedControl *unitsControl = (UISegmentedControl*)sizeTextField.rightView;
off_t unitsMultiplier = (unitsControl.selectedSegmentIndex == 0) ? 1024 : 1024 * 1024; off_t unitsMultiplier = (unitsControl.selectedSegmentIndex == 0) ? 1024 : 1024 * 1024;
off_t size = createDiskImageController.textFields[1].text.floatValue * unitsMultiplier; off_t size = sizeTextField.text.floatValue * unitsMultiplier;
return size; return size;
} }
@ -452,13 +481,25 @@
#pragma mark - Alert Delegate #pragma mark - Alert Delegate
- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex { - (void)alertView:(UIAlertView *)alertView willDismissWithButtonIndex:(NSInteger)buttonIndex {
if (fileToRename && buttonIndex == alertView.firstOtherButtonIndex) { if (fileToRename && buttonIndex == alertView.firstOtherButtonIndex) {
[self renameFile:fileToRename toName:nameTextField.text]; [self renameFile:fileToRename toName:nameTextField.text];
fileToRename = nil; fileToRename = nil;
} else if (createDiskImageAlert != nil) {
NSString *name = [self _newDiskImageName];
off_t size = [self _newDiskImageSize];
createDiskImageAlert = nil;
[self createDiskImageWithName:name size:size];
} }
} }
- (BOOL)alertViewShouldEnableFirstOtherButton:(UIAlertView *)alertView {
if (alertView == createDiskImageAlert) {
return [self validateCreateDiskImageInput:alertView];
}
return YES;
}
@end @end
@implementation FileTableViewCell @implementation FileTableViewCell

5
Mini vMac/MYOSGLUE.m
View File

@ -1555,6 +1555,8 @@ LOCALPROC MacMsgDisplayOn() {
} else { } else {
// fallback for iOS 7 // fallback for iOS 7
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil]; UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title message:message delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil];
alertView.delegate = sharedEmulator;
SpeedStopped = trueblnr;
[alertView show]; [alertView show];
} }
SavedBriefMsg = nullpr; SavedBriefMsg = nullpr;
@ -1907,6 +1909,9 @@ static dispatch_once_t onceToken;
} }
[self didMakeNewDisk:fileName size:vSonyNewDiskSize]; [self didMakeNewDisk:fileName size:vSonyNewDiskSize];
} }
if (SpeedStopped) {
SpeedStopped = falseblnr;
}
} }
#pragma mark - Keyboard #pragma mark - Keyboard