mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) Rearrange settings in Cocoa menu

Browse Source
This commit is contained in:
Twinaphex 2014-07-27 06:51:00 +02:00
parent 81c046fd94
commit 1818f638c9
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
apple/iOS/menu.m
View File

@ -531,51 +531,47 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
self.sections = [NSMutableArray array]; self.sections = [NSMutableArray array];
settings = [NSMutableArray arrayWithObjects:BOXSTRING("Settings"), settings = [NSMutableArray arrayWithObjects:BOXSTRING("Settings"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Frontend") [RAMenuItemBasic itemWithDescription:BOXSTRING("Configurations")
action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }], action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }],
nil]; nil];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Content"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("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 (History)") action:^{ [weakSelf loadHistory]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load Content") action:^{ [weakSelf loadGame]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Core Options")
action:^{ [weakSelf.navigationController pushViewController:[RACoreOptionsMenu new] animated:YES]; }],
nil]];
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"),
[RAMenuItemStateSelect new],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:RARCH_CMD_SAVE_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:RARCH_CMD_LOAD_STATE]; }],
nil]];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Actions"), [self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Actions"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Reset Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_RESET]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Restart Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_RESET]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_QUIT]; }], [RAMenuItemBasic itemWithDescription:BOXSTRING("Close Content") action:^{ [weakSelf performBasicAction:RARCH_CMD_QUIT]; }],
nil]]; nil]];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"), [settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Settings")
[RAMenuItemStateSelect new],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Load State") action:^{ [weakSelf performBasicAction:RARCH_CMD_LOAD_STATE]; }],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Save State") action:^{ [weakSelf performBasicAction:RARCH_CMD_SAVE_STATE]; }],
nil]];
[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")
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];
@ -860,7 +856,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if ((self = [super initWithGroup:frontend_setting_data])) if ((self = [super initWithGroup:frontend_setting_data]))
{ {
self.title = BOXSTRING("Frontend Settings"); self.title = BOXSTRING("Settings");
_coreConfigOptions = [NSMutableArray array]; _coreConfigOptions = [NSMutableArray array];
[self.sections addObject:_coreConfigOptions]; [self.sections addObject:_coreConfigOptions];