From 8e3198436b8aa8f48bf8022d1535c2a026fcc906 Mon Sep 17 00:00:00 2001 From: rogerman Date: Fri, 31 Jan 2014 03:28:37 +0000 Subject: [PATCH] Cocoa Port: - Update status text when the autohold state changes. --- desmume/src/cocoa/cocoa_globals.h | 3 +++ desmume/src/cocoa/userinterface/EmuControllerDelegate.mm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/desmume/src/cocoa/cocoa_globals.h b/desmume/src/cocoa/cocoa_globals.h index 288aa2f6b..b2e54790a 100644 --- a/desmume/src/cocoa/cocoa_globals.h +++ b/desmume/src/cocoa/cocoa_globals.h @@ -88,6 +88,9 @@ #define NSSTRING_STATUS_ROM_UNLOADED NSLocalizedString(@"ROM unloaded.", nil) #define NSSTRING_STATUS_EMULATOR_RESETTING NSLocalizedString(@"Emulator resetting...", nil) #define NSSTRING_STATUS_EMULATOR_RESET NSLocalizedString(@"Emulator reset.", nil) +#define NSSTRING_STATUS_AUTOHOLD_SET NSLocalizedString(@"Autohold set...", nil) +#define NSSTRING_STATUS_AUTOHOLD_SET_RELEASE NSLocalizedString(@"Autohold set released.", nil) +#define NSSTRING_STATUS_AUTOHOLD_CLEAR NSLocalizedString(@"Autohold cleared.", nil) #define NSSTRING_STATUS_CANNOT_GENERATE_SAVE_PATH NSLocalizedString(@"Cannot generate the save file path!", nil) #define NSSTRING_STATUS_CANNOT_CREATE_SAVE_DIRECTORY NSLocalizedString(@"Cannot create the save directory!", nil) diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm index cddabbe63..20f0408c8 100644 --- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm +++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm @@ -1101,6 +1101,7 @@ CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content]; [[cdsCore cdsController] setAutohold:theState]; + [self setStatusText:(theState) ? NSSTRING_STATUS_AUTOHOLD_SET : NSSTRING_STATUS_AUTOHOLD_SET_RELEASE]; } - (void) cmdAutoholdClear:(NSValue *)cmdAttrValue @@ -1115,6 +1116,7 @@ CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content]; [[cdsCore cdsController] clearAutohold]; + [self setStatusText:NSSTRING_STATUS_AUTOHOLD_CLEAR]; }