From 0bc2020828acaab665608b9d274ec5200af018a0 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Wed, 8 Oct 2014 16:50:14 +0000
Subject: OS X: DFNet improvements and fixes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91802 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/plugins/DFNet/Base.lproj/DFNet.xib      | 15 ++++++++-------
 macosx/plugins/DFNet/Base.lproj/SockDialog.xib | 22 ++++++++++------------
 macosx/plugins/DFNet/macsrc/SockDialog.h       |  5 ++---
 macosx/plugins/DFNet/macsrc/SockDialog.m       |  9 +++++++--
 4 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'macosx/plugins/DFNet')

diff --git a/macosx/plugins/DFNet/Base.lproj/DFNet.xib b/macosx/plugins/DFNet/Base.lproj/DFNet.xib
index b6b1658d..58ed0f08 100644
--- a/macosx/plugins/DFNet/Base.lproj/DFNet.xib
+++ b/macosx/plugins/DFNet/Base.lproj/DFNet.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DFNetPlayPluginConfigController">
@@ -14,10 +15,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Settings" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
-            <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/>
+        <window title="Settings" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" showsToolbarButton="NO" animationBehavior="default" id="1">
+            <windowStyleMask key="styleMask" titled="YES"/>
             <rect key="contentRect" x="196" y="240" width="340" height="155"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <view key="contentView" id="2">
                 <rect key="frame" x="0.0" y="0.0" width="340" height="155"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -82,7 +83,7 @@
                         </textFieldCell>
                     </textField>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="54">
-                        <rect key="frame" x="244" y="13" width="82" height="32"/>
+                        <rect key="frame" x="243" y="13" width="83" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="55">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -92,7 +93,7 @@ DQ
                         </buttonCell>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="59">
-                        <rect key="frame" x="162" y="13" width="82" height="32"/>
+                        <rect key="frame" x="160" y="13" width="83" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="60">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
diff --git a/macosx/plugins/DFNet/Base.lproj/SockDialog.xib b/macosx/plugins/DFNet/Base.lproj/SockDialog.xib
index dadcb16c..37c6a0d5 100644
--- a/macosx/plugins/DFNet/Base.lproj/SockDialog.xib
+++ b/macosx/plugins/DFNet/Base.lproj/SockDialog.xib
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="SockDialog">
@@ -15,28 +16,25 @@
         <window title="Connecting…" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" showsToolbarButton="NO" animationBehavior="alertPanel" id="1">
             <windowStyleMask key="styleMask" titled="YES" texturedBackground="YES"/>
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" transient="YES" ignoresCycle="YES"/>
-            <rect key="contentRect" x="196" y="371" width="206" height="124"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+            <rect key="contentRect" x="196" y="371" width="206" height="138"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="206" height="124"/>
+                <rect key="frame" x="0.0" y="0.0" width="206" height="138"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3">
-                        <rect key="frame" x="18" y="87" width="169" height="17"/>
+                        <rect key="frame" x="18" y="101" width="169" height="17"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Waiting for connections..." id="4">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <progressIndicator verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="6">
-                        <rect key="frame" x="16" y="60" width="174" height="20"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="174" id="19"/>
-                        </constraints>
+                    <progressIndicator horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="6">
+                        <rect key="frame" x="87" y="61" width="32" height="32"/>
                     </progressIndicator>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="26">
-                        <rect key="frame" x="62" y="13" width="82" height="32"/>
+                        <rect key="frame" x="62" y="13" width="83" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="27">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.h b/macosx/plugins/DFNet/macsrc/SockDialog.h
index 18f10bfd..85b888c3 100755
--- a/macosx/plugins/DFNet/macsrc/SockDialog.h
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.h
@@ -10,8 +10,7 @@
 
 
 @interface SockDialog : NSWindowController
-{
-	IBOutlet NSProgressIndicator *spinningBar;
-}
+@property (weak) IBOutlet NSProgressIndicator *spinningBar;
+
 - (IBAction)cancel:(id)sender;
 @end
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.m b/macosx/plugins/DFNet/macsrc/SockDialog.m
index 2795e17f..cbef65b5 100755
--- a/macosx/plugins/DFNet/macsrc/SockDialog.m
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.m
@@ -22,8 +22,7 @@ void SysMessage(const char *fmt, ...)
 	NSAlert *alert = [NSAlert alertWithMessageText:@"Error" defaultButton:@"Stop" alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", errString];
 	[alert setAlertStyle:NSCriticalAlertStyle];
 	NSInteger result = [alert runModal];
-	if (result == NSAlertDefaultReturn)
-	{
+	if (result == NSAlertDefaultReturn) {
 		Class theEmuClass = NSClassFromString(@"EmuThread");
 		if (theEmuClass) {
 			[theEmuClass stop];
@@ -81,6 +80,7 @@ void sockDestroyWaitDlg()
 }
 
 @implementation SockDialog
+@synthesize spinningBar;
 
 - (IBAction)cancel:(id)sender {
 	WaitCancel = 1;
@@ -91,4 +91,9 @@ void sockDestroyWaitDlg()
 	return self = [self initWithWindowNibName:@"SockDialog"];
 }
 
+- (void)awakeFromNib
+{
+	[spinningBar startAnimation:nil];
+}
+
 @end
-- 
cgit v1.2.3