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

ios: Move wiimote connection widget into settings menu.

This commit is contained in:
meancoot 2013-02-27 00:45:28 -05:00
parent fd52e8c537
commit b89208f7fb
8 changed files with 82 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
ios/RetroArch/PauseView.xib
View File

@ -42,7 +42,7 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{160, 237}, {120, 44}}</string> <string key="NSFrame">{{160, 237}, {120, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/> <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string> <string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -77,7 +77,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 20}, {260, 44}}</string> <string key="NSFrame">{{20, 20}, {260, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1033465661"/> <reference key="NSNextKeyView" ref="1033465661"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -100,7 +99,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 237}, {120, 44}}</string> <string key="NSFrame">{{20, 237}, {120, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="61755535"/> <reference key="NSNextKeyView" ref="61755535"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -123,7 +121,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 186}, {120, 44}}</string> <string key="NSFrame">{{20, 186}, {120, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="58186559"/> <reference key="NSNextKeyView" ref="58186559"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -146,7 +143,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{160, 186}, {120, 44}}</string> <string key="NSFrame">{{160, 186}, {120, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="721040644"/> <reference key="NSNextKeyView" ref="721040644"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -169,7 +165,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 135}, {260, 44}}</string> <string key="NSFrame">{{20, 135}, {260, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="694263183"/> <reference key="NSNextKeyView" ref="694263183"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -243,7 +238,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 71}, {260, 44}}</string> <string key="NSFrame">{{20, 71}, {260, 44}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="562513162"/> <reference key="NSNextKeyView" ref="562513162"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -251,7 +245,7 @@
<int key="IBUIContentHorizontalAlignment">0</int> <int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int> <int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int> <int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Connect WiiMotes</string> <string key="IBUINormalTitle">Settings</string>
<reference key="IBUIHighlightedTitleColor" ref="428922964"/> <reference key="IBUIHighlightedTitleColor" ref="428922964"/>
<object class="NSColor" key="IBUINormalTitleColor"> <object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int> <int key="NSColorSpace">1</int>
@ -264,7 +258,6 @@
</array> </array>
<string key="NSFrame">{{0, 20}, {300, 300}}</string> <string key="NSFrame">{{0, 20}, {300, 300}}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="38801877"/> <reference key="NSNextKeyView" ref="38801877"/>
<object class="NSColor" key="IBUIBackgroundColor"> <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int> <int key="NSColorSpace">3</int>
@ -343,12 +336,12 @@
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection"> <object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">conntectWiimotes:</string> <string key="label">showSettings</string>
<reference key="source" ref="1033465661"/> <reference key="source" ref="1033465661"/>
<reference key="destination" ref="372490531"/> <reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int> <int key="IBEventType">7</int>
</object> </object>
<int key="connectionID">147</int> <int key="connectionID">148</int>
</object> </object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
@ -944,72 +937,9 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">147</int> <int key="maxID">148</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">RetroArch_iOS</string>
<string key="superclassName">UIResponder</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="chooseState:">id</string>
<string key="closeGamePressed:">id</string>
<string key="closePauseMenu:">id</string>
<string key="conntectWiimotes:">id</string>
<string key="loadState:">id</string>
<string key="resetGame:">id</string>
<string key="saveState:">id</string>
<string key="showPauseMenu:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="chooseState:">
<string key="name">chooseState:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="closeGamePressed:">
<string key="name">closeGamePressed:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="closePauseMenu:">
<string key="name">closePauseMenu:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="conntectWiimotes:">
<string key="name">conntectWiimotes:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="loadState:">
<string key="name">loadState:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="resetGame:">
<string key="name">resetGame:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="saveState:">
<string key="name">saveState:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showPauseMenu:">
<string key="name">showPauseMenu:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/RetroArch_iOS.h</string>
</object>
</object>
</array>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

1
ios/RetroArch/RAModuleInfoList.m
View File

@ -19,6 +19,7 @@
RAModuleInfo* new = [RAModuleInfo new]; RAModuleInfo* new = [RAModuleInfo new];
new.path = thePath; new.path = thePath;
new.configPath = [NSString stringWithFormat:@"%@/%@.cfg", [RetroArch_iOS get].system_directory, [[thePath lastPathComponent] stringByDeletingPathExtension]];
new.data = theData; new.data = theData;
return new; return new;
} }

2
ios/RetroArch/RAModuleList.m
View File

@ -59,7 +59,7 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{ {
RAModuleInfo* info = (RAModuleInfo*)[_modules objectAtIndex:indexPath.row]; RAModuleInfo* info = (RAModuleInfo*)[_modules objectAtIndex:indexPath.row];
[RetroArch_iOS get].module_path = info.path; [RetroArch_iOS get].moduleInfo = info;
[[RetroArch_iOS get] pushViewController:[RADirectoryList directoryListOrGridWithPath:nil] isGame:NO]; [[RetroArch_iOS get] pushViewController:[RADirectoryList directoryListOrGridWithPath:nil] isGame:NO];
} }

2
ios/RetroArch/RetroArch-Prefix.pch
View File

@ -26,6 +26,6 @@
#ifdef __OBJC__ #ifdef __OBJC__
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "RetroArch_iOS.h"
#import "views.h" #import "views.h"
#import "RetroArch_iOS.h"
#endif #endif

4
ios/RetroArch/RetroArch_iOS.h
View File

@ -25,11 +25,9 @@
- (void)pushViewController:(UIViewController*)theView isGame:(BOOL)game; - (void)pushViewController:(UIViewController*)theView isGame:(BOOL)game;
- (UIViewController*)popViewController; - (UIViewController*)popViewController;
- (NSString*)configFilePath; @property (strong, nonatomic) RAModuleInfo* moduleInfo;
@property (strong, nonatomic) NSString* system_directory; @property (strong, nonatomic) NSString* system_directory;
@property (strong, nonatomic) NSString* module_path;
@property (strong, nonatomic) UIImage* file_icon; @property (strong, nonatomic) UIImage* file_icon;
@property (strong, nonatomic) UIImage* folder_icon; @property (strong, nonatomic) UIImage* folder_icon;
@property (strong, nonatomic) UIBarButtonItem* settings_button; @property (strong, nonatomic) UIBarButtonItem* settings_button;

26
ios/RetroArch/RetroArch_iOS.m
View File

@ -17,11 +17,6 @@
#include "rarch_wrapper.h" #include "rarch_wrapper.h"
#include "general.h" #include "general.h"
#ifdef WIIMOTE
#include "BTStack/wiimote.h"
#import "BTStack/WiiMoteHelper.h"
#endif
#define ALMOST_INVISIBLE .021f #define ALMOST_INVISIBLE .021f
@interface RANavigator : UINavigationController @interface RANavigator : UINavigationController
@ -94,14 +89,6 @@
return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate]; return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate];
} }
- (NSString*)configFilePath
{
if (self.module_path)
return [NSString stringWithFormat:@"%@/%@.cfg", self.system_directory, [[self.module_path lastPathComponent] stringByDeletingPathExtension]];
return nil;
}
- (void)applicationDidFinishLaunching:(UIApplication *)application - (void)applicationDidFinishLaunching:(UIApplication *)application
{ {
// TODO: Relocate this! // TODO: Relocate this!
@ -213,8 +200,8 @@
[RASettingsList refreshConfigFile]; [RASettingsList refreshConfigFile];
const char* const sd = [[RetroArch_iOS get].system_directory UTF8String]; const char* const sd = [[RetroArch_iOS get].system_directory UTF8String];
const char* const cf =[[RetroArch_iOS get].configFilePath UTF8String]; const char* const cf =[[RetroArch_iOS get].moduleInfo.configPath UTF8String];
const char* const libretro = [[RetroArch_iOS get].module_path UTF8String]; const char* const libretro = [[RetroArch_iOS get].moduleInfo.path UTF8String];
struct rarch_main_wrap main_wrapper = {[path UTF8String], sd, sd, cf, libretro}; struct rarch_main_wrap main_wrapper = {[path UTF8String], sd, sd, cf, libretro};
if (rarch_main_init_wrap(&main_wrapper) == 0) if (rarch_main_init_wrap(&main_wrapper) == 0)
@ -339,7 +326,7 @@
- (IBAction)closePauseMenu:(id)sender - (IBAction)closePauseMenu:(id)sender
{ {
if (_isPaused) if (_isPaused)
[UIView animateWithDuration:0.2 [UIView animateWithDuration:0.2
animations:^ animations:^
{ {
_pauseView.alpha = 0.0f; _pauseView.alpha = 0.0f;
@ -364,13 +351,6 @@
[self pushViewController:[RASettingsList new] isGame:NO]; [self pushViewController:[RASettingsList new] isGame:NO];
} }
- (IBAction)conntectWiimotes:(id)sender
{
#ifdef WIIMOTE
[WiiMoteHelper startwiimote:_navigator];
#endif
}
@end @end

76
ios/RetroArch/settings/RASettingsList.m
View File

@ -16,6 +16,11 @@
#import <objc/runtime.h> #import <objc/runtime.h>
#import "settings.h" #import "settings.h"
#ifdef WIIMOTE
#include "BTStack/wiimote.h"
#import "BTStack/WiiMoteHelper.h"
#endif
@implementation RASettingData @implementation RASettingData
@end @end
@ -83,9 +88,14 @@ static RASettingData* subpath_setting(RAConfig* config, NSString* name, NSString
} }
@implementation RASettingsList @implementation RASettingsList
+ (void)refreshConfigFile
{
[[[RASettingsList alloc] init] writeToDisk];
}
- (id)init - (id)init
{ {
RAConfig* config = [[RAConfig alloc] initWithPath:[RetroArch_iOS get].configFilePath]; RAConfig* config = [[RAConfig alloc] initWithPath:[RetroArch_iOS get].moduleInfo.configPath];
NSString* overlay_path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/overlays/"]; NSString* overlay_path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/overlays/"];
NSString* shader_path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/shaders/"]; NSString* shader_path = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/shaders/"];
@ -163,19 +173,69 @@ static RASettingData* subpath_setting(RAConfig* config, NSString* name, NSString
[self writeToDisk]; [self writeToDisk];
} }
+ (void)refreshConfigFile
{
[[[RASettingsList alloc] init] writeToDisk];
}
- (void)writeToDisk - (void)writeToDisk
{ {
RAConfig* config = [[RAConfig alloc] initWithPath:[RetroArch_iOS get].configFilePath]; RAConfig* config = [[RAConfig alloc] initWithPath:[RetroArch_iOS get].moduleInfo.configPath];
[config putStringNamed:@"system_directory" value:[RetroArch_iOS get].system_directory]; [config putStringNamed:@"system_directory" value:[RetroArch_iOS get].system_directory];
[self writeSettings:nil toConfig:config]; [self writeSettings:nil toConfig:config];
[config writeToFile:[RetroArch_iOS get].configFilePath]; [config writeToFile:[RetroArch_iOS get].moduleInfo.configPath];
}
// Override tableView methods to add General section at top.
- (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == 0)
{
if (indexPath.row == 0)
[[RetroArch_iOS get] pushViewController:[[RAModuleInfoList alloc] initWithModuleInfo:[RetroArch_iOS get].moduleInfo] isGame:NO];
#ifdef WIIMOTE
else if(indexPath.row == 1)
[WiiMoteHelper startwiimote:_navigator];
#endif
}
else
[super tableView:tableView didSelectRowAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:indexPath.section - 1]];
}
- (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == 0)
{
UITableViewCell* cell = [self.tableView dequeueReusableCellWithIdentifier:@"general"];
cell = cell ? cell : [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"general"];
cell.textLabel.text = (indexPath.row == 0) ? @"Module Info" : @"Connect WiiMotes";
return cell;
}
else
return [super tableView:tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:indexPath.row inSection:indexPath.section - 1]];
}
- (NSInteger)numberOfSectionsInTableView:(UITableView*)tableView
{
return [super numberOfSectionsInTableView:tableView] + 1;
}
- (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)section
{
if (section == 0)
#ifdef WIIMOTE
return 2;
#else
return 1;
#endif
return [super tableView:tableView numberOfRowsInSection:section - 1] ;
}
- (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSInteger)section
{
if (section == 0)
return @"General";
return [super tableView:tableView titleForHeaderInSection:section - 1];
} }
@end @end

1
ios/RetroArch/views.h
View File

@ -23,6 +23,7 @@
@interface RAModuleInfo : NSObject @interface RAModuleInfo : NSObject
@property (strong) NSString* path; @property (strong) NSString* path;
@property (strong) NSString* configPath;
@property (strong) RAConfig* data; @property (strong) RAConfig* data;
+ (RAModuleInfo*)moduleWithPath:(NSString*)thePath data:(RAConfig*)theData; + (RAModuleInfo*)moduleWithPath:(NSString*)thePath data:(RAConfig*)theData;