summaryrefslogtreecommitdiff
path: root/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-03-03 19:22:10 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-03-03 19:22:10 +0000
commit95d8573be44b40a827f244d920b57d75ecff2a5c (patch)
treee0bc3ffaa4ad4a628965aca16b8551b33c78c46c /macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
parent655115f51bf9a30a3950f44196f32bde40743e94 (diff)
downloadpcsxr-95d8573be44b40a827f244d920b57d75ecff2a5c.tar.gz
OS X: Check for an RTFD credits in the plug-ins.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89252 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m')
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m42
1 files changed, 36 insertions, 6 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 2b24a512..29a2b269 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -57,6 +57,9 @@ void AboutDlgProc()
// Get Credits.rtf
NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
NSAttributedString *credits;
+ if (!path) {
+ path = [bundle pathForResource:@"Credits" ofType:@"rtfd"];
+ }
if (path) {
credits = [[NSAttributedString alloc] initWithPath:path documentAttributes:NULL];
} else {
@@ -70,11 +73,11 @@ void AboutDlgProc()
NSDictionary *infoPaneDict =
@{@"ApplicationName": [bundle objectForInfoDictionaryKey:@"CFBundleName"],
- @"ApplicationIcon": icon,
- @"ApplicationVersion": [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
- @"Version": [bundle objectForInfoDictionaryKey:@"CFBundleVersion"],
- @"Copyright": [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"],
- @"Credits": credits};
+ @"ApplicationIcon": icon,
+ @"ApplicationVersion": [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
+ @"Version": [bundle objectForInfoDictionaryKey:@"CFBundleVersion"],
+ @"Copyright": [bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"],
+ @"Credits": credits};
dispatch_async(dispatch_get_main_queue(), ^{
[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
});
@@ -287,6 +290,33 @@ void ReadConfig(void)
}
@implementation NetSfPeopsOpenGLPluginConfigController
+@synthesize autoFullScreen;
+@synthesize ditherMode;
+@synthesize fpsCounter;
+@synthesize frameSkipping;
+@synthesize vSync;
+@synthesize proportionalResize;
+@synthesize fullscreenSize;
+@synthesize windowWidth;
+@synthesize windowHeighth;
+@synthesize offscreenDrawing;
+@synthesize texColorDepth;
+@synthesize texFiltering;
+@synthesize texEnhancment;
+@synthesize frameBufferEffects;
+@synthesize drawScanlines;
+@synthesize advancedBlending;
+@synthesize opaquePass;
+@synthesize zMaskClipping;
+@synthesize wireframeOnly;
+@synthesize blurEffect;
+@synthesize mjpegDecoder;
+@synthesize mjpegDecoder15bit;
+@synthesize gteAccuracy;
+@synthesize scanlineColorWell;
+@synthesize hacksMatrix;
+@synthesize hackEnable;
+@synthesize hacksWindow;
@synthesize keyValues;
@@ -299,7 +329,7 @@ void ReadConfig(void)
{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
+ NSMutableDictionary *writeDic = [keyValues mutableCopy];
writeDic[kFPSCounter] = ([fpsCounter integerValue] ? @YES : @NO);
writeDic[@"Scanline Color"] = [NSArchiver archivedDataWithRootObject:[scanlineColorWell color]];
writeDic[kFrameSkipping] = ([frameSkipping integerValue] ? @YES : @NO);