summaryrefslogtreecommitdiff
path: root/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-12-17 19:26:23 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-12-17 19:26:23 +0000
commit1b6f49b0ef8f8dff2504ea8feabf1f104107e00f (patch)
treed19b4044e73ed31dc3de1175222097bdad7a3370 /macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
parent53eebd991f060e051581c1127c75080d23087dd6 (diff)
downloadpcsxr-1b6f49b0ef8f8dff2504ea8feabf1f104107e00f.tar.gz
Wow, I feel like an idiot: I didn’t realize there was a setStringValue: in NSTextField. Using that instead of setting the title via the cell.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88137 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/Bladesio1/macsrc/PluginConfigController.m')
-rwxr-xr-xmacosx/plugins/Bladesio1/macsrc/PluginConfigController.m23
1 files changed, 15 insertions, 8 deletions
diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index 8572289e..bce4a722 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -26,7 +26,7 @@
#define APP_ID @"net.pcsxr.Bladesio1"
#define PrefsKey APP_ID @" Settings"
-static PluginConfigController *windowController = nil;
+static PluginConfigController *windowController;
#define kSioEnabled @"SIO Enabled"
#define kSioPort @"Port"
@@ -42,7 +42,7 @@ void AboutDlgProc()
NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
NSAttributedString *credits;
if (path) {
- credits = [[NSAttributedString alloc] initWithPath: path
+ credits = [[NSAttributedString alloc] initWithPath:path
documentAttributes:NULL];
} else {
@@ -51,8 +51,7 @@ void AboutDlgProc()
// Get Application Icon
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
- NSSize size = NSMakeSize(64, 64);
- [icon setSize:size];
+ [icon setSize:NSMakeSize(64, 64)];
NSDictionary *infoPaneDict =
@{@"ApplicationName": [bundle objectForInfoDictionaryKey:@"CFBundleName"],
@@ -188,14 +187,22 @@ void ReadConfig()
keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
[enabledButton setState: [keyValues[kSioEnabled] boolValue] ? NSOnState : NSOffState];
- [[ipAddressField cell] setTitle:keyValues[kSioIPAddress]];
+ [ipAddressField setStringValue:keyValues[kSioIPAddress]];
[portField setIntValue:[keyValues[kSioPort] intValue]];
switch ([keyValues[kSioPlayer] integerValue]) {
default:
- case PLAYER_DISABLED: [playerMenu selectItemAtIndex:0]; break;
- case PLAYER_MASTER: [playerMenu selectItemAtIndex:1]; break;
- case PLAYER_SLAVE: [playerMenu selectItemAtIndex:2]; break;
+ case PLAYER_DISABLED:
+ [playerMenu selectItemAtIndex:0];
+ break;
+
+ case PLAYER_MASTER:
+ [playerMenu selectItemAtIndex:1];
+ break;
+
+ case PLAYER_SLAVE:
+ [playerMenu selectItemAtIndex:2];
+ break;
}
[self toggleEnabled:nil];