xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moving most of the OS X preferences to auto layout, and all to 10.7.

Browse Source 
Changing some lists of independent checkbox buttons to matrices.
Fix a discrepancy between SDL versions 1.2 and 2.0 APIs in OS X's input preferences.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86849 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2013-08-22 23:53:37 +00:00
parent 9628a36753
commit 531ad373b2
25 changed files with 10536 additions and 4001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
macosx/Pcsxr.xcodeproj/project.pbxproj
View File

@ -2551,7 +2551,6 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;
};
name = Debug;
@ -2567,7 +2566,6 @@
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;
};
name = Release;
@ -2899,6 +2897,7 @@
../libpcsxcore,
../macosx,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Instrument;
};
@ -2921,7 +2920,6 @@
INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
INFOPLIST_PREPROCESS = YES;
LD_NO_PIE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = (
"-funroll-loops",
"$(inherited)",
@ -3089,7 +3087,6 @@
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
MACOSX_DEPLOYMENT_TARGET = 10.7;
WRAPPER_EXTENSION = psxplugin;
};
name = Instrument;
@ -3135,7 +3132,6 @@
INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
INFOPLIST_PREPROCESS = YES;
LD_NO_PIE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "$(inherited)";
PRODUCT_NAME = PCSXR;
WRAPPER_EXTENSION = app;
@ -3161,7 +3157,6 @@
INFOPLIST_PREFIX_HEADER = "$(TARGET_BUILD_DIR)/SVNRevision.h";
INFOPLIST_PREPROCESS = YES;
LD_NO_PIE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = (
"-funroll-loops",
"-fomit-frame-pointer",
@ -3191,6 +3186,7 @@
../libpcsxcore,
../macosx,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Debug;
};
@ -3213,6 +3209,7 @@
../libpcsxcore,
../macosx,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
};
name = Release;
};

1027
macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.xib
View File

File diff suppressed because it is too large Load Diff

33
macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
View File

@ -26,6 +26,15 @@
#define APP_ID @"net.pcsxr.DFCdrom"
#define PrefsKey APP_ID @" Settings"
static inline void RunOnMainThreadSync(dispatch_block_t block)
{
if ([NSThread isMainThread]) {
block();
} else {
dispatch_sync(dispatch_get_main_queue(), block);
}
}
static PluginConfigController *windowController = nil;
void AboutDlgProc()
@ -68,17 +77,19 @@ void AboutDlgProc()
void ConfDlgProc()
{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"];
}
window = [windowController window];
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
RunOnMainThreadSync(^{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFCdromPluginConfig"];
}
window = [windowController window];
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
});
}
void ReadConfig()

1077
macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
View File

File diff suppressed because it is too large Load Diff

4
macosx/plugins/DFInput/macsrc/ControllerList.m
View File

@ -29,7 +29,9 @@ static int currentController;
- (id)initWithConfig
{
if (!(self = [super init])) return nil;
if (self = [super init]) {
}
return self;
}

51
macosx/plugins/DFInput/macsrc/PadController.m
View File

@ -24,12 +24,22 @@
#include "pad.h"
#import "ARCBridge.h"
static inline void RunOnMainThreadSync(dispatch_block_t block)
{
if ([NSThread isMainThread]) {
block();
} else {
dispatch_sync(dispatch_get_main_queue(), block);
}
}
static NSWindow *padWindow = nil;
static PadController *padController = nil;
#define APP_ID @"net.pcsxr.DFInputPlugin"
void DoAbout() {
void DoAbout()
{
// Get parent application instance
NSApplication *app = [NSApplication sharedApplication];
NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
@ -65,19 +75,26 @@ void DoAbout() {
RELEASEOBJ(infoPaneDict);
}
long DoConfiguration() {
SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE);
LoadPADConfig();
if (padWindow == nil) {
if (padController == nil) {
padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
long DoConfiguration()
{
RunOnMainThreadSync(^{
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_InitSubSystem(SDL_INIT_JOYSTICK);
#else
SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_NOPARACHUTE);
#endif
LoadPADConfig();
if (padWindow == nil) {
if (padController == nil) {
padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
}
padWindow = [padController window];
}
padWindow = [padController window];
}
[padWindow center];
[padWindow makeKeyAndOrderFront:nil];
[padWindow center];
[padWindow makeKeyAndOrderFront:nil];
});
return 0;
}
@ -86,14 +103,22 @@ long DoConfiguration() {
- (IBAction)cancel:(id)sender
{
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
#else
SDL_Quit();
#endif
[self close];
}
- (IBAction)ok:(id)sender
{
SavePADConfig();
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
#else
SDL_Quit();
#endif
[self close];
}

9
macosx/plugins/DFInput/macsrc/PadView.m
View File

@ -70,7 +70,14 @@
[deviceMenu addItemWithTitle:@"(Keyboard only)"];
for (i = 0; i < SDL_NumJoysticks(); i++) {
NSMenuItem * joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""];
NSMenuItem *joystickItem = nil;
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_Joystick *tmpJoy = SDL_JoystickOpen(i);
joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(tmpJoy)) action:NULL keyEquivalent:@""];
SDL_JoystickClose(tmpJoy);
#else
joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""];
#endif
[joystickItem setTag:i + 1];
[[deviceMenu menu] addItem:joystickItem];
RELEASEOBJ(joystickItem);

5
macosx/plugins/DFInput/macsrc/cfg.c
View File

@ -17,6 +17,7 @@
*/
#include "pad.h"
#include <sys/param.h>
GLOBALDATA g;
@ -114,7 +115,7 @@ static void SetDefaultConfig() {
void LoadPADConfig() {
FILE *fp;
char buf[256];
char buf[PATH_MAX];
int current, a, b, c;
SetDefaultConfig();
@ -276,7 +277,7 @@ void LoadPADConfig() {
void SavePADConfig() {
FILE *fp;
int i;
char buf[256];
char buf[PATH_MAX];
sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));

707
macosx/plugins/DFNet/English.lproj/DFNet.xib
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
@ -11,6 +11,7 @@
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
@ -40,7 +41,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 240}, {340, 151}}</string>
<string key="NSWindowRect">{{196, 240}, {340, 160}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Settings</string>
<string key="NSWindowClass">NSWindow</string>
@ -51,36 +52,10 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="199511368">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{230, 13}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="77267016">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Okay</string>
<object class="NSFont" key="NSSupport" id="638482190">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="199511368"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="898087221">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{126, 109}, {194, 22}}</string>
<string key="NSFrame">{{126, 118}, {194, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="578306678"/>
@ -89,7 +64,11 @@
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">127.0.0.1</string>
<reference key="NSSupport" ref="638482190"/>
<object class="NSFont" key="NSSupport" id="638482190">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="898087221"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor" id="14663110">
@ -113,33 +92,10 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="691737833">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{134, 13}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="199511368"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="124429728">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="638482190"/>
<reference key="NSControlView" ref="691737833"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="241801086">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{126, 79}, {194, 22}}</string>
<string key="NSFrame">{{126, 86}, {194, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="762877023"/>
@ -198,7 +154,7 @@
<object class="NSTextField" id="300903308">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 111}, {75, 17}}</string>
<string key="NSFrame">{{17, 120}, {75, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="898087221"/>
@ -230,7 +186,7 @@
<object class="NSTextField" id="578306678">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 81}, {38, 17}}</string>
<string key="NSFrame">{{17, 88}, {38, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="241801086"/>
@ -249,7 +205,7 @@
<object class="NSTextField" id="762877023">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 51}, {101, 17}}</string>
<string key="NSFrame">{{17, 56}, {101, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="975640728"/>
@ -268,10 +224,10 @@
<object class="NSTextField" id="975640728">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{126, 49}, {194, 22}}</string>
<string key="NSFrame">{{126, 54}, {194, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="691737833"/>
<reference key="NSNextKeyView" ref="12981668"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="123591098">
<int key="NSCellFlags">-1804599231</int>
@ -322,8 +278,58 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="982924147">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{267, 13}, {59, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="587230592">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
<reference key="NSSupport" ref="638482190"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="982924147"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="12981668">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{185, 13}, {82, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="982924147"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="822815376">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="638482190"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="12981668"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{340, 151}</string>
<string key="NSFrameSize">{340, 160}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="300903308"/>
@ -344,22 +350,6 @@
</object>
<int key="connectionID">3</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">ok:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="199511368"/>
</object>
<int key="connectionID">8</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">cancel:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="691737833"/>
</object>
<int key="connectionID">15</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">ipAddress</string>
@ -423,35 +413,326 @@
<int key="objectID">2</int>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
<reference ref="300903308"/>
<reference ref="762877023"/>
<reference ref="578306678"/>
<object class="IBNSLayoutConstraint" id="607530085">
<reference key="firstItem" ref="982924147"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="12981668"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">12</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="60268086">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="982924147"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="985329394">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="982924147"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="174744355">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="12981668"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="199902621">
<reference key="firstItem" ref="975640728"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="241801086"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">10</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="111964840">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="975640728"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="981157019">
<reference key="firstItem" ref="975640728"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="241801086"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="900117726">
<reference key="firstItem" ref="241801086"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="898087221"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">10</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="16050748">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="241801086"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="691459314">
<reference key="firstItem" ref="241801086"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="898087221"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="817333537">
<reference key="firstItem" ref="898087221"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="507420871">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="898087221"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="525649460">
<reference key="firstItem" ref="762877023"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="882355438">
<reference key="firstItem" ref="762877023"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="975640728"/>
<int key="secondAttribute">11</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="783618282">
<reference key="firstItem" ref="578306678"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="241801086"/>
<int key="secondAttribute">11</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="234850664">
<reference key="firstItem" ref="578306678"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="734377393">
<reference key="firstItem" ref="300903308"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="898087221"/>
<int key="secondAttribute">11</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="635544654">
<reference key="firstItem" ref="300903308"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="982924147"/>
<reference ref="12981668"/>
<reference ref="898087221"/>
<reference ref="300903308"/>
<reference ref="241801086"/>
<reference ref="578306678"/>
<reference ref="975640728"/>
<reference ref="691737833"/>
<reference ref="199511368"/>
<reference ref="762877023"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="199511368"/>
<array class="NSMutableArray" key="children">
<reference ref="77267016"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="77267016"/>
<reference key="parent" ref="199511368"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="898087221"/>
<array class="NSMutableArray" key="children">
<reference ref="642817145"/>
<object class="IBNSLayoutConstraint" id="532443336">
<reference key="firstItem" ref="898087221"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">194</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="898087221"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1006"/>
</object>
@ -460,19 +741,6 @@
<reference key="object" ref="642817145"/>
<reference key="parent" ref="898087221"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="691737833"/>
<array class="NSMutableArray" key="children">
<reference ref="124429728"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="124429728"/>
<reference key="parent" ref="691737833"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="241801086"/>
@ -507,6 +775,22 @@
<reference key="object" ref="578306678"/>
<array class="NSMutableArray" key="children">
<reference ref="820109644"/>
<object class="IBNSLayoutConstraint" id="734382180">
<reference key="firstItem" ref="578306678"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">32</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="578306678"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1006"/>
</object>
@ -554,6 +838,132 @@
<reference key="object" ref="630529634"/>
<reference key="parent" ref="123591098"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="734382180"/>
<reference key="parent" ref="578306678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">35</int>
<reference key="object" ref="981157019"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">46</int>
<reference key="object" ref="691459314"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">47</int>
<reference key="object" ref="234850664"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">48</int>
<reference key="object" ref="635544654"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">49</int>
<reference key="object" ref="16050748"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">52</int>
<reference key="object" ref="111964840"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">54</int>
<reference key="object" ref="982924147"/>
<array class="NSMutableArray" key="children">
<reference ref="587230592"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">55</int>
<reference key="object" ref="587230592"/>
<reference key="parent" ref="982924147"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">57</int>
<reference key="object" ref="985329394"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">58</int>
<reference key="object" ref="60268086"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">59</int>
<reference key="object" ref="12981668"/>
<array class="NSMutableArray" key="children">
<reference ref="822815376"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">60</int>
<reference key="object" ref="822815376"/>
<reference key="parent" ref="12981668"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">61</int>
<reference key="object" ref="174744355"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">63</int>
<reference key="object" ref="607530085"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">45</int>
<reference key="object" ref="507420871"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">31</int>
<reference key="object" ref="532443336"/>
<reference key="parent" ref="898087221"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">72</int>
<reference key="object" ref="817333537"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">74</int>
<reference key="object" ref="734377393"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">78</int>
<reference key="object" ref="900117726"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">79</int>
<reference key="object" ref="783618282"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">82</int>
<reference key="object" ref="199902621"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">83</int>
<reference key="object" ref="882355438"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">84</int>
<reference key="object" ref="525649460"/>
<reference key="parent" ref="1006"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -564,24 +974,44 @@
<string key="1.IBWindowTemplateEditedContentRect">{{577, 640}, {372, 270}}</string>
<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="17.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="19.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="2.IBUserGuides">
<object class="IBUserGuide">
<reference key="view" ref="1006"/>
<double key="location">126</double>
<int key="affinity">0</int>
</object>
<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
<reference ref="635544654"/>
<reference ref="734377393"/>
<reference ref="234850664"/>
<reference ref="783618282"/>
<reference ref="882355438"/>
<reference ref="525649460"/>
<reference ref="507420871"/>
<reference ref="817333537"/>
<reference ref="691459314"/>
<reference ref="16050748"/>
<reference ref="900117726"/>
<reference ref="981157019"/>
<reference ref="111964840"/>
<reference ref="199902621"/>
<reference ref="174744355"/>
<reference ref="985329394"/>
<reference ref="60268086"/>
<reference ref="607530085"/>
</array>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="2.IBUserGuides"/>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="21.IBNSViewMetadataConstraints">
<reference ref="734382180"/>
</array>
<boolean value="NO" key="21.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="24.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="26.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1041" key="29.IBNumberFormatterBehaviorMetadataKey"/>
@ -590,15 +1020,43 @@
<integer value="1041" key="30.IBNumberFormatterBehaviorMetadataKey"/>
<boolean value="NO" key="30.IBNumberFormatterLocalizesFormatMetadataKey"/>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="54.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="59.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="9.IBNSViewMetadataConstraints">
<reference ref="532443336"/>
</array>
<boolean value="NO" key="9.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">30</int>
<int key="maxID">84</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -610,15 +1068,24 @@
<string key="minorKey">./Classes/DFNetPlayPluginConfigController.h</string>
</object>
</object>
<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>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
<real value="1070" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

278
macosx/plugins/DFNet/English.lproj/SockDialog.xib
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
@ -11,6 +11,7 @@
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
@ -40,7 +41,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 371}, {380, 140}}</string>
<string key="NSWindowRect">{{196, 371}, {380, 124}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
@ -55,7 +56,7 @@
<object class="NSTextField" id="150785340">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{78, 103}, {225, 17}}</string>
<string key="NSFrame">{{78, 87}, {225, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="308883112"/>
@ -97,24 +98,26 @@
<string key="NSFrame">{{103, 60}, {174, 20}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="105187407"/>
<reference key="NSNextKeyView" ref="796798766"/>
<int key="NSpiFlags">24586</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSButton" id="105187407">
<object class="NSButton" id="796798766">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{142, 13}, {96, 32}}</string>
<string key="NSFrame">{{149, 13}, {82, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="857910789">
<object class="NSButtonCell" key="NSCell" id="1054752594">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="596705607"/>
<reference key="NSControlView" ref="105187407"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="796798766"/>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
@ -125,7 +128,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{380, 140}</string>
<string key="NSFrameSize">{380, 124}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="150785340"/>
@ -150,9 +153,17 @@
<object class="IBActionConnection" key="connection">
<string key="label">cancel:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="105187407"/>
<reference key="destination" ref="796798766"/>
</object>
<int key="connectionID">10</int>
<int key="connectionID">31</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">spinningBar</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="308883112"/>
</object>
<int key="connectionID">32</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@ -193,9 +204,105 @@
<int key="objectID">2</int>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
<reference ref="308883112"/>
<reference ref="105187407"/>
<object class="IBNSLayoutConstraint" id="715386164">
<reference key="firstItem" ref="796798766"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="308883112"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="134441829">
<reference key="firstItem" ref="1006"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="796798766"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="871977271">
<reference key="firstItem" ref="796798766"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="390852115">
<reference key="firstItem" ref="308883112"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="150785340"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="547332722">
<reference key="firstItem" ref="150785340"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="308883112"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="857063854">
<reference key="firstItem" ref="150785340"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1006"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">20</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1006"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="150785340"/>
<reference ref="308883112"/>
<reference ref="796798766"/>
</array>
<reference key="parent" ref="1005"/>
</object>
@ -204,6 +311,22 @@
<reference key="object" ref="150785340"/>
<array class="NSMutableArray" key="children">
<reference ref="993388181"/>
<object class="IBNSLayoutConstraint" id="164791579">
<reference key="firstItem" ref="150785340"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">219</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="150785340"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1006"/>
</object>
@ -215,20 +338,78 @@
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="308883112"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="105187407"/>
<array class="NSMutableArray" key="children">
<reference ref="857910789"/>
<object class="IBNSLayoutConstraint" id="339534934">
<reference key="firstItem" ref="308883112"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">174</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="308883112"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="857910789"/>
<reference key="parent" ref="105187407"/>
<int key="objectID">11</int>
<reference key="object" ref="164791579"/>
<reference key="parent" ref="150785340"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="857063854"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="547332722"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">19</int>
<reference key="object" ref="339534934"/>
<reference key="parent" ref="308883112"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="390852115"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">26</int>
<reference key="object" ref="796798766"/>
<array class="NSMutableArray" key="children">
<reference ref="1054752594"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">27</int>
<reference key="object" ref="1054752594"/>
<reference key="parent" ref="796798766"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object" ref="871977271"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">29</int>
<reference key="object" ref="134441829"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">30</int>
<reference key="object" ref="715386164"/>
<reference key="parent" ref="1006"/>
</object>
</array>
</object>
@ -239,21 +420,54 @@
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1.IBWindowTemplateEditedContentRect">{{322, 765}, {382, 139}}</string>
<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="2.IBNSViewMetadataConstraints">
<reference ref="857063854"/>
<reference ref="547332722"/>
<reference ref="390852115"/>
<reference ref="871977271"/>
<reference ref="134441829"/>
<reference ref="715386164"/>
</array>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="26.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="3.IBNSViewMetadataConstraints">
<reference ref="164791579"/>
</array>
<boolean value="NO" key="3.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="6.IBNSViewMetadataConstraints">
<reference ref="339534934"/>
</array>
<boolean value="NO" key="6.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">10</int>
<int key="maxID">32</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">SockDialog</string>
<string key="superclassName">NSWindowController</string>
@ -268,6 +482,17 @@
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">spinningBar</string>
<string key="NS.object.0">NSProgressIndicator</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">spinningBar</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">spinningBar</string>
<string key="candidateClassName">NSProgressIndicator</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/SockDialog.h</string>
@ -279,9 +504,10 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
<real value="1070" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

33
macosx/plugins/DFNet/macsrc/PluginConfigController.m
View File

@ -32,6 +32,15 @@
static PluginConfigController *windowController = nil;
static inline void RunOnMainThreadSync(dispatch_block_t block)
{
if ([NSThread isMainThread]) {
block();
} else {
dispatch_sync(dispatch_get_main_queue(), block);
}
}
void AboutDlgProc()
{
// Get parent application instance
@ -70,17 +79,19 @@ void AboutDlgProc()
void ConfDlgProc()
{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"];
}
window = [windowController window];
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
RunOnMainThreadSync(^{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"];
}
window = [windowController window];
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
});
}
void ReadConfig()

5
macosx/plugins/DFNet/macsrc/SockDialog.h
View File

@ -9,8 +9,9 @@
#import <Cocoa/Cocoa.h>
@interface SockDialog : NSWindowController {
@interface SockDialog : NSWindowController
{
IBOutlet NSProgressIndicator *spinningBar;
}
- (IBAction)cancel:(id)sender;
@end

1806
macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib
View File

File diff suppressed because it is too large Load Diff

40
macosx/plugins/DFSound/macsrc/PluginController.m
View File

@ -44,6 +44,15 @@ extern char* PLUGLOC(char* toloc);
static SPUPluginController *pluginController = nil;
static inline void RunOnMainThreadSync(dispatch_block_t block)
{
if ([NSThread isMainThread]) {
block();
} else {
dispatch_sync(dispatch_get_main_queue(), block);
}
}
void DoAbout()
{
// Get parent application instance
@ -81,18 +90,20 @@ void DoAbout()
long DoConfiguration()
{
NSWindow *window;
if (pluginController == nil) {
pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"];
}
window = [pluginController window];
/* load values */
[pluginController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
RunOnMainThreadSync(^{
NSWindow *window;
if (pluginController == nil) {
pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"];
}
window = [pluginController window];
/* load values */
[pluginController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
});
return 0;
}
@ -137,7 +148,7 @@ void ReadConfig(void)
{
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:self.keyValues];
[writeDic setObject:@((BOOL)[hiCompBox intValue]) forKey:@"High Compatibility Mode"];
[writeDic setObject:@((BOOL)[irqWaitBox intValue]) forKey:@"SPU IRQ Wait"];
[writeDic setObject:@((BOOL)[monoSoundBox intValue]) forKey:@"Mono Sound Output"];
@ -172,8 +183,7 @@ void ReadConfig(void)
ReadConfig();
/* load from preferences */
RELEASEOBJ(keyValues);
keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
self.keyValues = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]];
[hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] boolValue]];
[irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] boolValue]];

8
macosx/plugins/DFSound/macsrc/SPUPluginController.h
View File

@ -8,13 +8,14 @@
#import <Cocoa/Cocoa.h>
#import "NamedSlider.h"
#import "ARCBridge.h"
@interface SPUPluginController : NSWindowController
{
IBOutlet NSControl *hiCompBox;
IBOutlet NSCell *hiCompBox;
IBOutlet NamedSlider *interpolValue;
IBOutlet NSControl *irqWaitBox;
IBOutlet NSControl *monoSoundBox;
IBOutlet NSCell *irqWaitBox;
IBOutlet NSCell *monoSoundBox;
IBOutlet NamedSlider *reverbValue;
IBOutlet NSControl *xaEnableBox;
IBOutlet NSControl *xaSpeedBox;
@ -22,6 +23,7 @@
NSMutableDictionary *keyValues;
}
@property (readwrite, arcretain) NSMutableDictionary *keyValues;
- (IBAction)cancel:(id)sender;
- (IBAction)ok:(id)sender;
- (IBAction)reset:(id)sender;

18
macosx/plugins/DFSound/macsrc/SPUPluginController.m
View File

@ -8,9 +8,7 @@
#import "SPUPluginController.h"
@implementation SPUPluginController
static Class GetSPUBaseClass()
static inline Class GetSPUBaseClass()
{
static Class spuBaseClass;
if (!spuBaseClass) {
@ -19,7 +17,7 @@ static Class GetSPUBaseClass()
return spuBaseClass;
}
static inline void FuncNotAvailable(id sel, id sender, SEL theCmd)
static void FuncNotAvailable(id sel, id sender, SEL theCmd)
{
#ifdef DEBUG
NSString *selString = NSStringFromSelector(theCmd);
@ -39,6 +37,9 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd)
#define NotAvailableWarn(sender) FuncNotAvailable(self, sender, _cmd)
@implementation SPUPluginController
@synthesize keyValues;
- (IBAction)cancel:(id)sender
{
NotAvailableWarn(sender);
@ -59,4 +60,13 @@ static inline void FuncNotAvailable(id sel, id sender, SEL theCmd)
NotAvailableWarn(nil);
}
#if !__has_feature(objc_arc)
- (void)dealloc
{
self.keyValues = nil;
[super dealloc];
}
#endif
@end

2761
macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
View File

File diff suppressed because it is too large Load Diff

133
macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.xib
View File

@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1938</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSWindowTemplate</string>
<string>NSView</string>
<string>NSOpenGLView</string>
<string>IBNSLayoutConstraint</string>
<string>NSCustomObject</string>
<string>NSOpenGLView</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -66,7 +67,7 @@
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1024, 746}}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{213, 129}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
@ -133,6 +134,70 @@
<reference key="object" ref="421016096"/>
<array class="NSMutableArray" key="children">
<reference ref="169050778"/>
<object class="IBNSLayoutConstraint" id="1014403038">
<reference key="firstItem" ref="169050778"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="421016096"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="421016096"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="1599615">
<reference key="firstItem" ref="169050778"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="421016096"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">4</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="421016096"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="1047065543">
<reference key="firstItem" ref="421016096"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="169050778"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">4</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="421016096"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="574511182">
<reference key="firstItem" ref="169050778"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="421016096"/>
<int key="secondAttribute">9</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="421016096"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
</array>
<reference key="parent" ref="663103883"/>
</object>
@ -147,6 +212,26 @@
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="574511182"/>
<reference key="parent" ref="421016096"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">19</int>
<reference key="object" ref="1047065543"/>
<reference key="parent" ref="421016096"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">20</int>
<reference key="object" ref="1599615"/>
<reference key="parent" ref="421016096"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="1014403038"/>
<reference key="parent" ref="421016096"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -154,18 +239,37 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="15.CustomClassName">NetSfPeopsSoftGPUPluginGLView</string>
<boolean value="NO" key="15.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="6.IBNSViewMetadataConstraints">
<reference ref="574511182"/>
<reference ref="1047065543"/>
<reference ref="1599615"/>
<reference ref="1014403038"/>
</array>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">17</int>
<int key="maxID">21</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">NetSfPeopsSoftGPUPluginWindow</string>
<string key="superclassName">NSWindow</string>
@ -188,13 +292,10 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
<real value="1070" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

6
macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
View File

@ -3,6 +3,7 @@
#define PluginConfigController NetSfPeopsSoftGPUPluginConfigController
#import <Cocoa/Cocoa.h>
#import "ARCBridge.h"
@interface NetSfPeopsSoftGPUPluginConfigController : NSWindowController
{
@ -12,6 +13,7 @@
IBOutlet NSControl *frameSkipping;
IBOutlet NSControl *hackEnable;
IBOutlet NSView *hacksView;
IBOutlet NSMatrix *hacksMatrix;
IBOutlet NSControl *vSync;
IBOutlet NSControl *shaders;
IBOutlet NSTextField *vertexShaderViewablePath;
@ -27,8 +29,8 @@
NSMutableDictionary *keyValues;
}
@property (retain) NSURL *vertexPath;
@property (retain) NSURL *fragmentPath;
@property (arcretain) NSURL *vertexPath;
@property (arcretain) NSURL *fragmentPath;
- (IBAction)cancel:(id)sender;
- (IBAction)ok:(id)sender;

64
macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
View File

@ -5,6 +5,7 @@
#include "externals.h"
#import "SGPUPreferences.h"
#import "ARCBridge.h"
#import "PluginGLView.h"
#ifdef ENABLE_NLS
#include <libintl.h>
@ -81,18 +82,20 @@ void AboutDlgProc()
void SoftDlgProc()
{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
}
window = [windowController window];
/* load values */
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
RunOnMainThreadSync(^{
NSWindow *window;
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsSoftGPUConfig"];
}
window = [windowController window];
/* load values */
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
});
}
BOOL isShaderEnabled()
@ -211,11 +214,8 @@ void ReadConfig(void)
[writeDic setObject:@([ditherMode indexOfSelectedItem]) forKey:@"Dither Mode"];
unsigned int hackValues = 0;
NSArray *views = [hacksView subviews];
for (NSView *control in views) {
if ([control isKindOfClass:[NSButton class]]) {
hackValues |= [(NSControl *)control intValue] << ([control tag] - 1);
}
for (NSCell *control in [hacksMatrix cells]) {
hackValues |= [control intValue] << ([control tag] - 1);
}
[writeDic setObject:@(hackValues) forKey:@"Hacks"];
@ -243,10 +243,13 @@ void ReadConfig(void)
- (IBAction)hackToggle:(id)sender
{
BOOL enable = [sender intValue] ? YES : NO;
NSArray *views = [hacksView subviews];
NSArray *views = [[[hacksView subviews] objectAtIndex:0] subviews];
for (NSView *control in views) {
if ([control isKindOfClass:[NSButton class]]) {
if ([control isKindOfClass:[NSControl class]]) {
if ([control isKindOfClass:[NSTextField class]]) {
[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
}
[(NSControl *)control setEnabled:enable];
}
}
@ -254,10 +257,15 @@ void ReadConfig(void)
- (IBAction)toggleShader:(id)sender {
BOOL enable = [sender intValue] ? YES : NO;
NSArray *views = [shadersView subviews];
NSArray *views = [[[shadersView subviews] objectAtIndex:0] subviews];
for (NSView *control in views) {
[(NSControl *)control setEnabled:enable];
if ([control isKindOfClass:[NSControl class]]) {
if ([control isKindOfClass:[NSTextField class]]) {
[(NSTextField*)control setTextColor:enable ? [NSColor controlTextColor] : [NSColor disabledControlTextColor] ];
}
[(NSControl *)control setEnabled:enable];
}
}
}
@ -334,24 +342,14 @@ void ReadConfig(void)
unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
NSArray *views = [hacksView subviews];
for (NSView *control in views) {
if ([control isKindOfClass:[NSButton class]]) {
[(NSControl *)control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
}
for (NSCell *control in [hacksMatrix cells]) {
[control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
}
[self hackToggle:hackEnable];
[self toggleShader:shaders];
}
- (void)awakeFromNib
{
//I don't know why we need to do this...
hacksView = [[hacksView subviews] objectAtIndex:0];
shadersView = [[shadersView subviews] objectAtIndex:0];
}
#if !__has_feature(objc_arc)
- (void)dealloc
{

5
macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
View File

@ -6,14 +6,9 @@
//
//
#ifndef PeopsSoftGPU_SGPUPreferences_h
#define PeopsSoftGPU_SGPUPreferences_h
#import <Cocoa/Cocoa.h>
BOOL isShaderEnabled();
NSURL *PSXFragmentShader();
NSURL *PSXVertexShader();
float PSXShaderQuality();
#endif

6358
macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib
View File

File diff suppressed because it is too large Load Diff

43
macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.xib
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1938</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSWindowTemplate</string>
<string>NSView</string>
<string>NSOpenGLView</string>
<string>NSCustomObject</string>
<string>NSOpenGLView</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -166,6 +166,14 @@
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">NetSfPeopsOpenGLGPUPluginGLView</string>
<string key="superclassName">NSOpenGLView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NetSfPeopsOpenGLGPUPluginGLView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NetSfPeopsOpenGLGPUPluginWindow</string>
<string key="superclassName">NSWindow</string>
@ -177,6 +185,17 @@
<object class="IBPartialClassDescription">
<string key="className">NetSfPeopsSoftGPUPluginWindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">glView</string>
<string key="NS.object.0">NSOpenGLView</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">glView</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">glView</string>
<string key="candidateClassName">NSOpenGLView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NetSfPeopsSoftGPUPluginWindowController.h</string>
@ -188,11 +207,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
<real value="1070" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>

26
macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
View File

@ -14,11 +14,11 @@
// uses bindings to magically set user defaults.
// But you can look at their grandness if you like:
IBOutlet NSControl *autoFullScreen;
IBOutlet NSCell *autoFullScreen;
IBOutlet NSPopUpButton *ditherMode;
IBOutlet NSControl *fpsCounter;
IBOutlet NSControl *frameSkipping;
IBOutlet NSControl *vSync;
IBOutlet NSCell *fpsCounter;
IBOutlet NSCell *frameSkipping;
IBOutlet NSCell *vSync;
IBOutlet NSControl *proportionalResize;
IBOutlet NSPopUpButton *fullscreenSize;
@ -32,15 +32,15 @@
IBOutlet NSPopUpButton *frameBufferEffects;
IBOutlet NSControl *drawScanlines;
IBOutlet NSControl *advancedBlending;
IBOutlet NSControl *opaquePass;
IBOutlet NSControl *zMaskClipping;
IBOutlet NSControl *wireframeOnly;
IBOutlet NSControl *blurEffect;
IBOutlet NSControl *mjpegDecoder;
IBOutlet NSControl *mjpegDecoder15bit;
IBOutlet NSControl *gteAccuracy;
IBOutlet NSCell *drawScanlines;
IBOutlet NSCell *advancedBlending;
IBOutlet NSCell *opaquePass;
IBOutlet NSCell *zMaskClipping;
IBOutlet NSCell *wireframeOnly;
IBOutlet NSCell *blurEffect;
IBOutlet NSCell *mjpegDecoder;
IBOutlet NSCell *mjpegDecoder15bit;
IBOutlet NSCell *gteAccuracy;
IBOutlet NSColorWell *scanlineColorWell;
IBOutlet NSMatrix *hacksMatrix;

31
macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
View File

@ -12,6 +12,7 @@
#include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
#include "externals.h"
#import "ARCBridge.h"
#import "PluginGLView.h"
#ifdef ENABLE_NLS
#include <libintl.h>
@ -85,20 +86,22 @@ void AboutDlgProc()
void DlgProc()
{
NSWindow *window;
PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
}
window = [windowController window];
/* load values */
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
RunOnMainThreadSync(^{
NSWindow *window;
PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
if (windowController == nil) {
windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
}
window = [windowController window];
/* load values */
[windowController loadValues];
[window center];
[window makeKeyAndOrderFront:nil];
});
}
#define kFPSCounter @"FPS Counter"