ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(iOS) Cleanups

This commit is contained in:
Twinaphex 2014-07-21 04:56:04 +02:00
parent 95260e6b83
commit 65f78b6729
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
apple/iOS/menu.m
View File

@ -526,47 +526,47 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }], action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }],
nil]; nil];
if (!g_extern.main_is_init) if (g_extern.main_is_init)
{ {
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Content"), [self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Actions"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Choose Core")
action:^{ [weakSelf chooseCoreWithPath:nil]; }
detail:^{
const core_info_t *core = (const core_info_t*)core_info_list_get_by_id(weakSelf.core.UTF8String);
if (weakSelf.core)
{
return core ? BOXSTRING(core->display_name) : BOXSTRING(weakSelf.core.UTF8String);
}
else
return BOXSTRING("Auto Detect");
}],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load Content") action:^{ [weakSelf loadGame]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load Content (History)") action:^{ [weakSelf loadHistory]; }],
nil]];
}
else
{
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Actions"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Reset Content") action:^{ [weakSelf performBasicAction:RESET]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Reset Content") action:^{ [weakSelf performBasicAction:RESET]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:QUIT]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:QUIT]; }],
nil]]; nil]];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"), [self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"),
[RAMenuItemStateSelect new], [RAMenuItemStateSelect new],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:LOAD_STATE]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:LOAD_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:SAVE_STATE]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:SAVE_STATE]; }],
nil]]; nil]];
[settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Core") [settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Core")
action:^{ action:^{
char config_name[PATH_MAX]; char config_name[PATH_MAX];
fill_pathname_base(config_name, g_settings.libretro, sizeof(config_name)); fill_pathname_base(config_name, g_settings.libretro, sizeof(config_name));
[weakSelf.navigationController pushViewController:[[RACoreSettingsMenu alloc] initWithCore:BOXSTRING(config_name)] animated:YES]; [weakSelf.navigationController pushViewController:[[RACoreSettingsMenu alloc] initWithCore:BOXSTRING(config_name)] animated:YES];
}]]; }]];
[settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Core Options") [settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Core Options")
action:^{ [weakSelf.navigationController pushViewController:[RACoreOptionsMenu new] animated:YES]; }]]; action:^{ [weakSelf.navigationController pushViewController:[RACoreOptionsMenu new] animated:YES]; }]];
}
else
{
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Content"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Choose Core")
action:^{ [weakSelf chooseCoreWithPath:nil]; }
detail:^{
const core_info_t *core = (const core_info_t*)core_info_list_get_by_id(weakSelf.core.UTF8String);
if (weakSelf.core)
{
return core ? BOXSTRING(core->display_name) : BOXSTRING(weakSelf.core.UTF8String);
}
else
return BOXSTRING("Auto Detect");
}],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load Content") action:^{ [weakSelf loadGame]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load Content (History)") action:^{ [weakSelf loadHistory]; }],
nil]];
} }
[self.sections addObject:settings]; [self.sections addObject:settings];