mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) Rearrange some more settings in Cocoa menu

Browse Source
This commit is contained in:
Twinaphex 2014-07-27 06:56:37 +02:00
parent 1818f638c9
commit 4d5e5d9a13
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apple/iOS/menu.m
View File

@ -526,15 +526,9 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
- (void)willReloadData - (void)willReloadData
{ {
NSMutableArray* settings;
RAMainMenu* __weak weakSelf = self; RAMainMenu* __weak weakSelf = self;
self.sections = [NSMutableArray array]; self.sections = [NSMutableArray array];
settings = [NSMutableArray arrayWithObjects:BOXSTRING("Settings"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Configurations")
action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }],
nil];
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Content"), [self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("Content"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Core") [RAMenuItemBasic itemWithDescription:BOXSTRING("Core")
action:^{ [weakSelf chooseCoreWithPath:nil]; } action:^{ [weakSelf chooseCoreWithPath:nil]; }
@ -553,6 +547,17 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
[RAMenuItemBasic itemWithDescription:BOXSTRING("Core Options") [RAMenuItemBasic itemWithDescription:BOXSTRING("Core Options")
action:^{ [weakSelf.navigationController pushViewController:[RACoreOptionsMenu new] animated:YES]; }], action:^{ [weakSelf.navigationController pushViewController:[RACoreOptionsMenu new] animated:YES]; }],
nil]]; nil]];
[self.sections addObject:[NSMutableArray arrayWithObjects:BOXSTRING("Settings"),
[RAMenuItemBasic itemWithDescription:BOXSTRING("Settings")
action:^{
char config_name[PATH_MAX];
fill_pathname_base(config_name, g_settings.libretro, sizeof(config_name));
[weakSelf.navigationController pushViewController:[[RACoreSettingsMenu alloc] initWithCore:BOXSTRING(config_name)] animated:YES];
}],
[RAMenuItemBasic itemWithDescription:BOXSTRING("Configurations")
action:^{ [weakSelf.navigationController pushViewController:[RAFrontendSettingsMenu new] animated:YES]; }],
nil]];
if (g_extern.main_is_init) if (g_extern.main_is_init)
{ {
[self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"), [self.sections addObject:[NSArray arrayWithObjects:BOXSTRING("States"),
@ -564,18 +569,8 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
[RAMenuItemBasic itemWithDescription:BOXSTRING("Restart 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]];
[settings addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("Settings")
action:^{
char config_name[PATH_MAX];
fill_pathname_base(config_name, g_settings.libretro, sizeof(config_name));
[weakSelf.navigationController pushViewController:[[RACoreSettingsMenu alloc] initWithCore:BOXSTRING(config_name)] animated:YES];
}]];
} }
[self.sections addObject:settings];
if (g_extern.main_is_init) if (g_extern.main_is_init)
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:BOXSTRING("Resume") style:UIBarButtonItemStyleBordered target:[RetroArch_iOS get] action:@selector(showGameView)]; self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:BOXSTRING("Resume") style:UIBarButtonItemStyleBordered target:[RetroArch_iOS get] action:@selector(showGameView)];
else else