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

Cocoa Port: 

- Replace layer control options in the Tools > View Layers menu to using a panel (Tools > Show GPU Layers).
- Move Tools > Show Game Data Folder in Finder menu option to File > Reveal Game Data Folder in Finder.
- Add File > Reveal ROM in Finder menu option.
- In the ROM Info panel, allow the text fields to be selectable.
- In DeSmuME Preferences, split the Emulation settings into two tabs.
- In DeSmuME Preferences, remove hyperlink to the R4 cheats database (since the link is now broken).
This commit is contained in:
rogerman 2013-04-22 07:18:49 +00:00
parent 5596351d8b
commit 763d65ad3e
8 changed files with 3000 additions and 1988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desmume/src/cocoa/cocoa_GPU.h
View File

@ -23,29 +23,28 @@
@interface CocoaDSGPU : NSObject
{
UInt32 gpuStateFlags;
OSSpinLock spinlockGpuState;
BOOL gpuStateMainGPU;
BOOL gpuStateMainBG0;
BOOL gpuStateMainBG1;
BOOL gpuStateMainBG2;
BOOL gpuStateMainBG3;
BOOL gpuStateMainOBJ;
BOOL gpuStateSubGPU;
BOOL gpuStateSubBG0;
BOOL gpuStateSubBG1;
BOOL gpuStateSubBG2;
BOOL gpuStateSubBG3;
BOOL gpuStateSubOBJ;
BOOL isCPUCoreCountAuto;
OSSpinLock spinlockGpuState;
pthread_mutex_t *mutexProducer;
}
@property (assign) UInt32 gpuStateFlags;
@property (assign) pthread_mutex_t *mutexProducer;
@property (assign) BOOL layerMainGPU;
@property (assign) BOOL layerMainBG0;
@property (assign) BOOL layerMainBG1;
@property (assign) BOOL layerMainBG2;
@property (assign) BOOL layerMainBG3;
@property (assign) BOOL layerMainOBJ;
@property (assign) BOOL layerSubGPU;
@property (assign) BOOL layerSubBG0;
@property (assign) BOOL layerSubBG1;
@property (assign) BOOL layerSubBG2;
@property (assign) BOOL layerSubBG3;
@property (assign) BOOL layerSubOBJ;
@property (assign) NSInteger render3DRenderingEngine;
@property (assign) BOOL render3DHighPrecisionColorInterpolation;
@property (assign) BOOL render3DEdgeMarking;

463
desmume/src/cocoa/cocoa_GPU.mm
View File

@ -45,6 +45,19 @@ GPU3DInterface *core3DList[] = {
@dynamic gpuStateFlags;
@synthesize mutexProducer;
@dynamic layerMainGPU;
@dynamic layerMainBG0;
@dynamic layerMainBG1;
@dynamic layerMainBG2;
@dynamic layerMainBG3;
@dynamic layerMainOBJ;
@dynamic layerSubGPU;
@dynamic layerSubBG0;
@dynamic layerSubBG1;
@dynamic layerSubBG2;
@dynamic layerSubBG3;
@dynamic layerSubOBJ;
@dynamic render3DRenderingEngine;
@dynamic render3DHighPrecisionColorInterpolation;
@dynamic render3DEdgeMarking;
@ -80,19 +93,6 @@ GPU3DInterface *core3DList[] = {
GPUSTATE_SUB_BG3_MASK |
GPUSTATE_SUB_OBJ_MASK;
gpuStateMainGPU = YES;
gpuStateMainBG0 = YES;
gpuStateMainBG1 = YES;
gpuStateMainBG2 = YES;
gpuStateMainBG3 = YES;
gpuStateMainOBJ = YES;
gpuStateSubGPU = YES;
gpuStateSubBG0 = YES;
gpuStateSubBG1 = YES;
gpuStateSubBG2 = YES;
gpuStateSubBG3 = YES;
gpuStateSubOBJ = YES;
isCPUCoreCountAuto = NO;
SetOpenGLRendererFunctions(&OSXOpenGLRendererInit,
@ -115,141 +115,19 @@ GPU3DInterface *core3DList[] = {
gpuStateFlags = flags;
OSSpinLockUnlock(&spinlockGpuState);
pthread_mutex_lock(self.mutexProducer);
[self setLayerMainGPU:((flags & GPUSTATE_MAIN_GPU_MASK) != 0)];
[self setLayerMainBG0:((flags & GPUSTATE_MAIN_BG0_MASK) != 0)];
[self setLayerMainBG1:((flags & GPUSTATE_MAIN_BG1_MASK) != 0)];
[self setLayerMainBG2:((flags & GPUSTATE_MAIN_BG2_MASK) != 0)];
[self setLayerMainBG3:((flags & GPUSTATE_MAIN_BG3_MASK) != 0)];
[self setLayerMainOBJ:((flags & GPUSTATE_MAIN_OBJ_MASK) != 0)];
if (flags & GPUSTATE_MAIN_GPU_MASK)
{
SetGPUDisplayState(DS_GPU_TYPE_MAIN, true);
gpuStateMainGPU = YES;
}
else
{
SetGPUDisplayState(DS_GPU_TYPE_MAIN, false);
gpuStateMainGPU = NO;
}
if (flags & GPUSTATE_MAIN_BG0_MASK)
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 0, true);
gpuStateMainBG0 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 0, false);
gpuStateMainBG0 = NO;
}
if (flags & GPUSTATE_MAIN_BG1_MASK)
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 1, true);
gpuStateMainBG1 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 1, false);
gpuStateMainBG1 = NO;
}
if (flags & GPUSTATE_MAIN_BG2_MASK)
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 2, true);
gpuStateMainBG2 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 2, false);
gpuStateMainBG2 = NO;
}
if (flags & GPUSTATE_MAIN_BG3_MASK)
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 3, true);
gpuStateMainBG3 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 3, false);
gpuStateMainBG3 = NO;
}
if (flags & GPUSTATE_MAIN_OBJ_MASK)
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 4, true);
gpuStateMainOBJ = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_MAIN, 4, false);
gpuStateMainOBJ = NO;
}
if (flags & GPUSTATE_SUB_GPU_MASK)
{
SetGPUDisplayState(DS_GPU_TYPE_SUB, true);
gpuStateSubGPU = YES;
}
else
{
SetGPUDisplayState(DS_GPU_TYPE_SUB, false);
gpuStateSubGPU = NO;
}
if (flags & GPUSTATE_SUB_BG0_MASK)
{
SetGPULayerState(DS_GPU_TYPE_SUB, 0, true);
gpuStateSubBG0 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_SUB, 0, false);
gpuStateSubBG0 = NO;
}
if (flags & GPUSTATE_SUB_BG1_MASK)
{
SetGPULayerState(DS_GPU_TYPE_SUB, 1, true);
gpuStateSubBG1 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_SUB, 1, false);
gpuStateSubBG1 = NO;
}
if (flags & GPUSTATE_SUB_BG2_MASK)
{
SetGPULayerState(DS_GPU_TYPE_SUB, 2, true);
gpuStateSubBG2 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_SUB, 2, false);
gpuStateSubBG2 = NO;
}
if (flags & GPUSTATE_SUB_BG3_MASK)
{
SetGPULayerState(DS_GPU_TYPE_SUB, 3, true);
gpuStateSubBG3 = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_SUB, 3, false);
gpuStateSubBG3 = NO;
}
if (flags & GPUSTATE_SUB_OBJ_MASK)
{
SetGPULayerState(DS_GPU_TYPE_SUB, 4, true);
gpuStateSubOBJ = YES;
}
else
{
SetGPULayerState(DS_GPU_TYPE_SUB, 4, false);
gpuStateSubOBJ = NO;
}
pthread_mutex_unlock(self.mutexProducer);
[self setLayerSubGPU:((flags & GPUSTATE_SUB_GPU_MASK) != 0)];
[self setLayerSubBG0:((flags & GPUSTATE_SUB_BG0_MASK) != 0)];
[self setLayerSubBG1:((flags & GPUSTATE_SUB_BG1_MASK) != 0)];
[self setLayerSubBG2:((flags & GPUSTATE_SUB_BG2_MASK) != 0)];
[self setLayerSubBG3:((flags & GPUSTATE_SUB_BG3_MASK) != 0)];
[self setLayerSubOBJ:((flags & GPUSTATE_SUB_OBJ_MASK) != 0)];
}
- (UInt32) gpuStateFlags
@ -387,18 +265,15 @@ GPU3DInterface *core3DList[] = {
numberCores = numberThreads;
}
NSInteger renderingEngineID = [self render3DRenderingEngine];
const NSInteger renderingEngineID = [self render3DRenderingEngine];
pthread_mutex_lock(self.mutexProducer);
CommonSettings.num_cores = numberCores;
if (renderingEngineID == CORE3DLIST_SWRASTERIZE)
if (renderingEngineID == CORE3DLIST_SWRASTERIZE || renderingEngineID == CORE3DLIST_OPENGL)
{
NDS_3D_ChangeCore(CORE3DLIST_SWRASTERIZE);
}
else if (renderingEngineID == CORE3DLIST_OPENGL)
{
NDS_3D_ChangeCore(CORE3DLIST_OPENGL);
NDS_3D_ChangeCore(renderingEngineID);
}
pthread_mutex_unlock(self.mutexProducer);
@ -445,15 +320,255 @@ GPU3DInterface *core3DList[] = {
return state;
}
- (void) setLayerMainGPU:(BOOL)gpuState
{
pthread_mutex_lock(self.mutexProducer);
SetGPUDisplayState(DS_GPU_TYPE_MAIN, (gpuState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (gpuState) ? (gpuStateFlags | GPUSTATE_MAIN_GPU_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_GPU_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainGPU
{
pthread_mutex_lock(self.mutexProducer);
const BOOL gpuState = GetGPUDisplayState(DS_GPU_TYPE_MAIN) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return gpuState;
}
- (void) setLayerMainBG0:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_MAIN, 0, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_MAIN_BG0_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_BG0_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainBG0
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_MAIN, 0) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerMainBG1:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_MAIN, 1, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_MAIN_BG1_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_BG1_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainBG1
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_MAIN, 1) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerMainBG2:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_MAIN, 2, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_MAIN_BG2_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_BG2_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainBG2
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_MAIN, 2) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerMainBG3:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_MAIN, 3, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_MAIN_BG3_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_BG3_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainBG3
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_MAIN, 3) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerMainOBJ:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_MAIN, 4, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_MAIN_OBJ_MASK) : (gpuStateFlags & ~GPUSTATE_MAIN_OBJ_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerMainOBJ
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_MAIN, 4) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerSubGPU:(BOOL)gpuState
{
pthread_mutex_lock(self.mutexProducer);
SetGPUDisplayState(DS_GPU_TYPE_SUB, (gpuState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (gpuState) ? (gpuStateFlags | GPUSTATE_SUB_GPU_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_GPU_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubGPU
{
pthread_mutex_lock(self.mutexProducer);
const BOOL gpuState = GetGPUDisplayState(DS_GPU_TYPE_SUB) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return gpuState;
}
- (void) setLayerSubBG0:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_SUB, 0, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_SUB_BG0_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_BG0_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubBG0
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_SUB, 0) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerSubBG1:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_SUB, 1, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_SUB_BG1_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_BG1_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubBG1
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_SUB, 1) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerSubBG2:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_SUB, 2, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_SUB_BG2_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_BG2_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubBG2
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_SUB, 2) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerSubBG3:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_SUB, 3, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_SUB_BG3_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_BG3_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubBG3
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_SUB, 3) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (void) setLayerSubOBJ:(BOOL)layerState
{
pthread_mutex_lock(self.mutexProducer);
SetGPULayerState(DS_GPU_TYPE_SUB, 4, (layerState) ? true : false);
pthread_mutex_unlock(self.mutexProducer);
OSSpinLockLock(&spinlockGpuState);
gpuStateFlags = (layerState) ? (gpuStateFlags | GPUSTATE_SUB_OBJ_MASK) : (gpuStateFlags & ~GPUSTATE_SUB_OBJ_MASK);
OSSpinLockUnlock(&spinlockGpuState);
}
- (BOOL) layerSubOBJ
{
pthread_mutex_lock(self.mutexProducer);
const BOOL layerState = GetGPULayerState(DS_GPU_TYPE_SUB, 4) ? YES : NO;
pthread_mutex_unlock(self.mutexProducer);
return layerState;
}
- (BOOL) gpuStateByBit:(const UInt32)stateBit
{
return (self.gpuStateFlags & (1 << stateBit)) ? YES : NO;
return ([self gpuStateFlags] & (1 << stateBit)) ? YES : NO;
}
- (BOOL) isGPUTypeDisplayed:(const NSInteger)theGpuType
{
BOOL result = NO;
const UInt32 flags = self.gpuStateFlags;
const UInt32 flags = [self gpuStateFlags];
switch (theGpuType)
{
@ -487,7 +602,7 @@ GPU3DInterface *core3DList[] = {
- (void) hideGPUType:(const NSInteger)theGpuType
{
UInt32 flags = self.gpuStateFlags;
UInt32 flags = [self gpuStateFlags];
switch (theGpuType)
{
@ -508,12 +623,12 @@ GPU3DInterface *core3DList[] = {
break;
}
self.gpuStateFlags = flags;
[self setGpuStateFlags:flags];
}
- (void) showGPUType:(const NSInteger)theGpuType
{
UInt32 flags = self.gpuStateFlags;
UInt32 flags = [self gpuStateFlags];
switch (theGpuType)
{
@ -534,7 +649,7 @@ GPU3DInterface *core3DList[] = {
break;
}
self.gpuStateFlags = flags;
[self setGpuStateFlags:flags];
}
@end
@ -583,34 +698,34 @@ void SetGPULayerState(const int gpuType, const unsigned int i, const bool state)
bool GetGPULayerState(const int gpuType, const unsigned int i)
{
bool result = false;
bool theState = false;
// Check bounds on the layer index.
if(i > 4)
{
return result;
return theState;
}
switch (gpuType)
{
case DS_GPU_TYPE_SUB:
if (SubScreen.gpu != nil)
if (SubScreen.gpu != NULL)
{
result = CommonSettings.dispLayers[SubScreen.gpu->core][i];
theState = CommonSettings.dispLayers[SubScreen.gpu->core][i];
}
break;
case DS_GPU_TYPE_MAIN:
if (MainScreen.gpu != nil)
if (MainScreen.gpu != NULL)
{
result = CommonSettings.dispLayers[MainScreen.gpu->core][i];
theState = CommonSettings.dispLayers[MainScreen.gpu->core][i];
}
break;
case DS_GPU_TYPE_COMBO:
if (SubScreen.gpu != nil && MainScreen.gpu != nil)
if (SubScreen.gpu != NULL && MainScreen.gpu != NULL)
{
result = (CommonSettings.dispLayers[SubScreen.gpu->core][i] && CommonSettings.dispLayers[MainScreen.gpu->core][i]);
theState = (CommonSettings.dispLayers[SubScreen.gpu->core][i] && CommonSettings.dispLayers[MainScreen.gpu->core][i]);
}
break;
@ -618,7 +733,7 @@ bool GetGPULayerState(const int gpuType, const unsigned int i)
break;
}
return result;
return theState;
}
void SetGPUDisplayState(const int gpuType, const bool state)
@ -645,27 +760,27 @@ void SetGPUDisplayState(const int gpuType, const bool state)
bool GetGPUDisplayState(const int gpuType)
{
bool result = false;
bool theState = false;
switch (gpuType)
{
case DS_GPU_TYPE_SUB:
result = CommonSettings.showGpu.sub;
theState = CommonSettings.showGpu.sub;
break;
case DS_GPU_TYPE_MAIN:
result = CommonSettings.showGpu.main;
theState = CommonSettings.showGpu.main;
break;
case DS_GPU_TYPE_COMBO:
result = (CommonSettings.showGpu.sub && CommonSettings.showGpu.main);
theState = (CommonSettings.showGpu.sub && CommonSettings.showGpu.main);
break;
default:
break;
}
return result;
return theState;
}
CGLContextObj OSXOpenGLRendererContext = NULL;

BIN
desmume/src/cocoa/translations/English.lproj/MainMenu.strings
View File

Binary file not shown.

4442
desmume/src/cocoa/translations/English.lproj/MainMenu.xib
View File

File diff suppressed because it is too large Load Diff

2
desmume/src/cocoa/userinterface/EmuControllerDelegate.h
View File

@ -147,6 +147,8 @@ class AudioSampleBlockGenerator;
- (IBAction) loadRecentRom:(id)sender;
- (IBAction) closeWindow:(id)sender;
- (IBAction) closeRom:(id)sender;
- (IBAction) revealRomInFinder:(id)sender;
- (IBAction) revealGameDataFolderInFinder:(id)sender;
- (IBAction) openEmuSaveState:(id)sender;
- (IBAction) saveEmuSaveState:(id)sender;
- (IBAction) saveEmuSaveStateAs:(id)sender;

23
desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
View File

@ -501,6 +501,22 @@
[self handleUnloadRom:REASONFORCLOSE_NORMAL romToLoad:nil];
}
- (IBAction) revealRomInFinder:(id)sender
{
NSURL *romURL = [[self currentRom] fileURL];
if (romURL != nil)
{
[[NSWorkspace sharedWorkspace] selectFile:[romURL path] inFileViewerRootedAtPath:@""];
}
}
- (IBAction) revealGameDataFolderInFinder:(id)sender
{
NSURL *folderURL = [CocoaDSFile userAppSupportURL:nil version:nil];
[[NSWorkspace sharedWorkspace] selectFile:[folderURL path] inFileViewerRootedAtPath:@""];
}
- (IBAction) openEmuSaveState:(id)sender
{
NSURL *selectedFile = nil;
@ -2000,6 +2016,13 @@
enable = NO;
}
}
else if (theAction == @selector(revealRomInFinder:))
{
if ([self currentRom] == nil || [self isRomLoading])
{
enable = NO;
}
}
else if (theAction == @selector(loadEmuSaveStateSlot:))
{
if ([self currentRom] == nil || [self isShowingSaveStateDialog] || ![CocoaDSFile saveStateExistsForSlot:[[self currentRom] fileURL] slotNumber:[theItem tag] + 1])

8
desmume/src/cocoa/userinterface/appDelegate.h
View File

@ -86,14 +86,6 @@
@property (assign) BOOL isAppRunningOnIntel;
// Emulation Menu
// View Menu
// Tools Menu
- (IBAction) showSupportFolderInFinder:(id)sender;
// Help Menu
- (IBAction) launchWebsite:(id)sender;
- (IBAction) launchForums:(id)sender;
- (IBAction) supportRequest:(id)sender;

21
desmume/src/cocoa/userinterface/appDelegate.mm
View File

@ -164,11 +164,6 @@
// colors manually here because you can't change them in Interface Builder. Boo!!!
[self setRomInfoPanelBoxTitleColors];
// Set up all the object controllers according to our default windows.
[romInfoPanelController setContent:[CocoaDSRom romNotLoadedBindings]];
[prefWindowController setContent:[prefWindowDelegate bindings]];
[cheatWindowController setContent:[cheatWindowDelegate bindings]];
// Set the preferences window to the general view by default.
[prefWindowDelegate switchContentView:prefGeneralView];
@ -178,9 +173,8 @@
// Init the DS emulation core.
CocoaDSCore *newCore = [[[CocoaDSCore alloc] init] autorelease];
[cdsCoreController setContent:newCore];
// Init the DS controller and microphone.
// Init the DS controller.
CocoaDSController *newController = [[[CocoaDSController alloc] init] autorelease];
[newCore setCdsController:newController];
@ -207,6 +201,12 @@
[NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
}
// Set up all the object controllers.
[cdsCoreController setContent:newCore];
[romInfoPanelController setContent:[CocoaDSRom romNotLoadedBindings]];
[prefWindowController setContent:[prefWindowDelegate bindings]];
[cheatWindowController setContent:[cheatWindowDelegate bindings]];
// Setup the applications settings from the user defaults file.
[self setupUserDefaults];
@ -310,13 +310,6 @@
[cdsCoreController setContent:nil];
}
- (IBAction) showSupportFolderInFinder:(id)sender
{
NSURL *folderURL = [CocoaDSFile userAppSupportBaseURL];
[[NSWorkspace sharedWorkspace] openFile:[folderURL path] withApplication:@"Finder"];
}
- (IBAction) launchWebsite:(id)sender
{
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@STRING_DESMUME_WEBSITE]];