diff options
Diffstat (limited to 'macosx/Resources')
| -rw-r--r-- | macosx/Resources/Base.lproj/AddPluginSheet.xib | 21 | ||||
| -rw-r--r-- | macosx/Resources/Base.lproj/CheatWindow.xib | 79 | ||||
| -rw-r--r-- | macosx/Resources/Base.lproj/Configuration.xib | 116 | ||||
| -rw-r--r-- | macosx/Resources/Base.lproj/PCSXR.xib | 5 | ||||
| -rw-r--r-- | macosx/Resources/Base.lproj/PcsxrMemCard.xib | 20 |
5 files changed, 122 insertions, 119 deletions
diff --git a/macosx/Resources/Base.lproj/AddPluginSheet.xib b/macosx/Resources/Base.lproj/AddPluginSheet.xib index 3b80c3cb..93b3562d 100644 --- a/macosx/Resources/Base.lproj/AddPluginSheet.xib +++ b/macosx/Resources/Base.lproj/AddPluginSheet.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="PcsxrPluginHandler"> @@ -15,16 +16,15 @@ <window title="Install Plug-in" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" id="10" userLabel="Plugin Install" customClass="NSPanel"> <windowStyleMask key="styleMask" titled="YES"/> <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES"/> - <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> - <rect key="contentRect" x="177" y="439" width="420" height="138"/> - <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/> + <rect key="contentRect" x="177" y="439" width="420" height="152"/> + <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/> <value key="minSize" type="size" width="94" height="7"/> <view key="contentView" id="7"> - <rect key="frame" x="0.0" y="0.0" width="420" height="138"/> + <rect key="frame" x="0.0" y="0.0" width="420" height="152"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView translatesAutoresizingMaskIntoConstraints="NO" id="29"> - <rect key="frame" x="20" y="54" width="64" height="64"/> + <rect key="frame" x="20" y="68" width="64" height="64"/> <constraints> <constraint firstAttribute="height" constant="64" id="81"/> <constraint firstAttribute="width" constant="64" id="123"/> @@ -32,7 +32,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="psxplugin" id="57"/> </imageView> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="43"> - <rect key="frame" x="90" y="101" width="127" height="17"/> + <rect key="frame" x="90" y="115" width="122" height="17"/> <textFieldCell key="cell" alignment="left" title="Plugin Installation" id="58"> <font key="font" metaFont="systemBold"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> @@ -40,7 +40,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="44"> - <rect key="frame" x="90" y="79" width="247" height="14"/> + <rect key="frame" x="90" y="79" width="204" height="28"/> <textFieldCell key="cell" selectable="YES" alignment="left" title="Do you want to install this plugin into PCSXR?" id="59"> <font key="font" metaFont="smallSystem"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> @@ -69,7 +69,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="116"> - <rect key="frame" x="286" y="13" width="58" height="32"/> + <rect key="frame" x="282" y="13" width="62" height="32"/> <buttonCell key="cell" type="push" title="No" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="117"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -90,6 +90,7 @@ Gw <constraint firstAttribute="trailing" secondItem="47" secondAttribute="trailing" constant="20" symbolic="YES" id="121"/> <constraint firstAttribute="trailing" secondItem="112" secondAttribute="trailing" constant="20" symbolic="YES" id="125"/> <constraint firstItem="112" firstAttribute="leading" secondItem="116" secondAttribute="trailing" constant="12" symbolic="YES" id="126"/> + <constraint firstItem="116" firstAttribute="width" secondItem="112" secondAttribute="width" id="9Rw-lF-JeX"/> <constraint firstItem="43" firstAttribute="leading" secondItem="47" secondAttribute="leading" id="G0m-uo-WmB"/> <constraint firstItem="43" firstAttribute="leading" secondItem="44" secondAttribute="leading" id="fb2-Jc-MtO"/> <constraint firstItem="47" firstAttribute="top" secondItem="44" secondAttribute="bottom" constant="8" symbolic="YES" id="nEW-ZE-1vH"/> diff --git a/macosx/Resources/Base.lproj/CheatWindow.xib b/macosx/Resources/Base.lproj/CheatWindow.xib index db805d39..d716846d 100644 --- a/macosx/Resources/Base.lproj/CheatWindow.xib +++ b/macosx/Resources/Base.lproj/CheatWindow.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="CheatController"> @@ -18,15 +19,14 @@ <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="Cheats" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="documentWindow" id="1"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> - <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="196" y="153" width="698" height="357"/> - <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="698" height="357"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4"> - <rect key="frame" x="144" y="13" width="128" height="32"/> + <rect key="frame" x="146" y="13" width="132" height="32"/> <buttonCell key="cell" type="push" title="Save Cheats…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -36,7 +36,7 @@ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6"> - <rect key="frame" x="14" y="13" width="130" height="32"/> + <rect key="frame" x="14" y="13" width="132" height="32"/> <buttonCell key="cell" type="push" title="Load Cheats…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -47,7 +47,7 @@ </button> <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="23"> <rect key="frame" x="20" y="61" width="658" height="276"/> - <clipView key="contentView" id="6pF-og-es3"> + <clipView key="contentView" misplaced="YES" id="6pF-og-es3"> <rect key="frame" x="1" y="17" width="656" height="258"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -115,7 +115,7 @@ <rect key="frame" x="1" y="249" width="607" height="15"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="24"> + <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="24"> <rect key="frame" x="224" y="17" width="15" height="102"/> <autoresizingMask key="autoresizingMask"/> </scroller> @@ -125,7 +125,7 @@ </tableHeaderView> </scrollView> <button toolTip="Clear all cheats" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="78"> - <rect key="frame" x="530" y="13" width="73" height="32"/> + <rect key="frame" x="545" y="13" width="73" height="32"/> <buttonCell key="cell" type="push" title="Clear" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="79"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -135,7 +135,7 @@ </connections> </button> <button toolTip="Apply Cheats" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="256"> - <rect key="frame" x="454" y="13" width="76" height="32"/> + <rect key="frame" x="469" y="13" width="76" height="32"/> <buttonCell key="cell" type="push" title="Apply" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="257"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -145,67 +145,67 @@ </connections> </button> <button toolTip="Add Cheat" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xfd-rR-U91"> - <rect key="frame" x="629" y="27" width="25" height="27"/> + <rect key="frame" x="620" y="32" width="20" height="22"/> <constraints> - <constraint firstAttribute="height" constant="25" id="5Sw-u5-HYP"/> - <constraint firstAttribute="width" constant="25" id="TzG-MJ-Gw5"/> + <constraint firstAttribute="height" constant="20" id="5Sw-u5-HYP"/> + <constraint firstAttribute="width" constant="20" id="TzG-MJ-Gw5"/> </constraints> - <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oPm-T9-TZo"> + <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="overlaps" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oPm-T9-TZo"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> <action selector="addCheat:" target="-2" id="bsH-Bq-b9L"/> </connections> </button> - <button toolTip="Remove Cheat" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DBF-Fx-sqP"> - <rect key="frame" x="653" y="27" width="25" height="27"/> + <button toolTip="Edit Cheat" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ORW-Vw-Xqo"> + <rect key="frame" x="658" y="32" width="20" height="22"/> <constraints> - <constraint firstAttribute="width" constant="25" id="C9G-EI-fyW"/> - <constraint firstAttribute="height" constant="25" id="l7b-a6-zzp"/> + <constraint firstAttribute="width" constant="20" id="e0J-6O-4Ih"/> + <constraint firstAttribute="height" constant="20" id="pQO-S9-udY"/> </constraints> - <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7QM-jz-tbx"> + <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSActionTemplate" imagePosition="overlaps" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iOw-6s-6s3"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> - <action selector="removeCheats:" target="-2" id="are-w2-Cx9"/> + <action selector="editCheat:" target="-2" id="8bd-ja-6Gx"/> </connections> </button> - <button toolTip="Edit Cheat" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ORW-Vw-Xqo"> - <rect key="frame" x="605" y="27" width="25" height="27"/> + <button toolTip="Remove Cheat" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DBF-Fx-sqP"> + <rect key="frame" x="639" y="32" width="20" height="22"/> <constraints> - <constraint firstAttribute="width" constant="25" id="e0J-6O-4Ih"/> - <constraint firstAttribute="height" constant="25" id="pQO-S9-udY"/> + <constraint firstAttribute="width" constant="20" id="C9G-EI-fyW"/> + <constraint firstAttribute="height" constant="20" id="l7b-a6-zzp"/> </constraints> - <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSActionTemplate" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="iOw-6s-6s3"> + <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="overlaps" alignment="center" controlSize="small" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7QM-jz-tbx"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> - <action selector="editCheat:" target="-2" id="8bd-ja-6Gx"/> + <action selector="removeCheats:" target="-2" id="are-w2-Cx9"/> </connections> </button> </subviews> <constraints> <constraint firstItem="78" firstAttribute="baseline" secondItem="4" secondAttribute="baseline" id="82n-9F-8bg"/> <constraint firstItem="4" firstAttribute="leading" secondItem="6" secondAttribute="trailing" constant="12" symbolic="YES" id="9lp-BB-TZI"/> + <constraint firstAttribute="trailing" secondItem="ORW-Vw-Xqo" secondAttribute="trailing" constant="20" symbolic="YES" id="AJy-ud-GTj"/> <constraint firstItem="6" firstAttribute="top" secondItem="23" secondAttribute="bottom" constant="20" symbolic="YES" id="E2i-TS-P4E"/> <constraint firstAttribute="trailing" secondItem="23" secondAttribute="trailing" constant="20" symbolic="YES" id="EiP-6U-3B3"/> - <constraint firstItem="xfd-rR-U91" firstAttribute="leading" secondItem="ORW-Vw-Xqo" secondAttribute="trailing" constant="-1" id="GvR-cn-We8"/> <constraint firstItem="23" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="JRi-3E-R7a"/> - <constraint firstItem="DBF-Fx-sqP" firstAttribute="leading" secondItem="xfd-rR-U91" secondAttribute="trailing" constant="-1" id="Liv-0d-lNG"/> + <constraint firstItem="xfd-rR-U91" firstAttribute="leading" secondItem="78" secondAttribute="trailing" constant="8" symbolic="YES" id="MoZ-yc-FFe"/> <constraint firstItem="DBF-Fx-sqP" firstAttribute="baseline" secondItem="ORW-Vw-Xqo" secondAttribute="baseline" id="O2e-SZ-KXh"/> <constraint firstItem="6" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="U1b-J8-Mn7"/> <constraint firstItem="23" firstAttribute="top" secondItem="2" secondAttribute="top" constant="20" symbolic="YES" id="Uzz-Lw-v8y"/> + <constraint firstItem="ORW-Vw-Xqo" firstAttribute="leading" secondItem="DBF-Fx-sqP" secondAttribute="trailing" constant="-1" id="d7V-sk-LYe"/> <constraint firstItem="DBF-Fx-sqP" firstAttribute="baseline" secondItem="xfd-rR-U91" secondAttribute="baseline" id="fPo-Kl-XqG"/> - <constraint firstItem="ORW-Vw-Xqo" firstAttribute="leading" secondItem="78" secondAttribute="trailing" constant="8" symbolic="YES" id="g3Z-Wu-0w1"/> + <constraint firstItem="DBF-Fx-sqP" firstAttribute="leading" secondItem="xfd-rR-U91" secondAttribute="trailing" constant="-1" id="fQh-TQ-YzN"/> <constraint firstItem="DBF-Fx-sqP" firstAttribute="top" secondItem="23" secondAttribute="bottom" constant="8" symbolic="YES" id="gcQ-KX-9BU"/> <constraint firstAttribute="bottom" secondItem="6" secondAttribute="bottom" constant="20" symbolic="YES" id="lF8-2f-uaL"/> <constraint firstItem="78" firstAttribute="leading" secondItem="256" secondAttribute="trailing" constant="12" symbolic="YES" id="pZV-X6-uam"/> <constraint firstItem="78" firstAttribute="baseline" secondItem="256" secondAttribute="baseline" id="r4R-02-9tu"/> <constraint firstItem="4" firstAttribute="baseline" secondItem="6" secondAttribute="baseline" id="rAO-NL-fo9"/> - <constraint firstAttribute="trailing" secondItem="DBF-Fx-sqP" secondAttribute="trailing" constant="20" symbolic="YES" id="xvQ-3b-NaW"/> </constraints> </view> <connections> @@ -216,14 +216,14 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="196" y="207" width="342" height="265"/> - <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="135"> <rect key="frame" x="0.0" y="0.0" width="342" height="265"/> <autoresizingMask key="autoresizingMask"/> <subviews> <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="136"> <rect key="frame" x="20" y="53" width="302" height="192"/> - <clipView key="contentView" id="COc-Cf-C5K"> + <clipView key="contentView" misplaced="YES" id="COc-Cf-C5K"> <rect key="frame" x="1" y="17" width="300" height="174"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> @@ -290,7 +290,7 @@ </tableHeaderView> </scrollView> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="152"> - <rect key="frame" x="269" y="13" width="59" height="32"/> + <rect key="frame" x="245" y="13" width="83" height="32"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="153"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -303,7 +303,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="156"> - <rect key="frame" x="187" y="13" width="82" height="32"/> + <rect key="frame" x="162" y="13" width="83" height="32"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="157"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -357,6 +357,7 @@ Gw <constraint firstItem="179" firstAttribute="top" secondItem="136" secondAttribute="bottom" constant="8" symbolic="YES" id="Ehy-91-5kl"/> <constraint firstItem="152" firstAttribute="baseline" secondItem="156" secondAttribute="baseline" id="G4C-ss-lMH"/> <constraint firstItem="175" firstAttribute="bottom" secondItem="179" secondAttribute="bottom" id="dA3-Bb-69x"/> + <constraint firstItem="152" firstAttribute="width" secondItem="156" secondAttribute="width" id="mdz-o3-9Ep"/> </constraints> </view> </window> @@ -373,7 +374,7 @@ Gw </objects> <resources> <image name="NSActionTemplate" width="14" height="14"/> - <image name="NSAddTemplate" width="8" height="8"/> - <image name="NSRemoveTemplate" width="8" height="8"/> + <image name="NSAddTemplate" width="11" height="11"/> + <image name="NSRemoveTemplate" width="11" height="11"/> </resources> </document> diff --git a/macosx/Resources/Base.lproj/Configuration.xib b/macosx/Resources/Base.lproj/Configuration.xib index e702a2ae..27e43c62 100644 --- a/macosx/Resources/Base.lproj/Configuration.xib +++ b/macosx/Resources/Base.lproj/Configuration.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6246" systemVersion="14A361p" 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> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6246"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="ConfigurationController"> @@ -36,10 +36,8 @@ <customObject id="-3" userLabel="Application" customClass="NSObject"/> <window title="PCSXR Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" visibleAtLaunch="NO" animationBehavior="documentWindow" id="21"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/> - <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> <rect key="contentRect" x="55" y="345" width="513" height="473"/> <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/> - <value key="minSize" type="size" width="552" height="473"/> <view key="contentView" id="2"> <rect key="frame" x="0.0" y="0.0" width="513" height="473"/> <autoresizingMask key="autoresizingMask"/> @@ -692,7 +690,7 @@ </connections> </button> <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="924"> - <rect key="frame" x="265" y="61" width="182" height="264"/> + <rect key="frame" x="265" y="46" width="182" height="279"/> <clipView key="contentView" id="Yf6-rO-8CR"> <rect key="frame" x="1" y="1" width="180" height="262"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -718,7 +716,7 @@ </scroller> </scrollView> <scrollView autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="925"> - <rect key="frame" x="20" y="61" width="182" height="264"/> + <rect key="frame" x="20" y="46" width="182" height="279"/> <clipView key="contentView" id="b4B-9c-LZA"> <rect key="frame" x="1" y="1" width="180" height="262"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -748,47 +746,47 @@ </scroller> </scrollView> <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="926"> - <rect key="frame" x="259" y="13" width="98" height="32"/> - <buttonCell key="cell" type="push" title="Format…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="945"> + <rect key="frame" x="260" y="14" width="75" height="28"/> + <buttonCell key="cell" type="push" title="Format…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="945"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> <action selector="formatCard:" target="955" id="1014"/> </connections> </button> <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="927"> - <rect key="frame" x="14" y="13" width="98" height="32"/> - <buttonCell key="cell" type="push" title="Format…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="944"> + <rect key="frame" x="15" y="14" width="75" height="28"/> + <buttonCell key="cell" type="push" title="Format…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="944"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> <action selector="formatCard:" target="955" id="1007"/> </connections> </button> - <button verticalHuggingPriority="750" misplaced="YES" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="928"> - <rect key="frame" x="114" y="13" width="94" height="32"/> - <buttonCell key="cell" type="push" title="Delete…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="943"> + <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="928"> + <rect key="frame" x="135" y="14" width="72" height="28"/> + <buttonCell key="cell" type="push" title="Delete…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="943"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> <action selector="deleteMemoryObject:" target="955" id="1006"/> </connections> </button> - <button verticalHuggingPriority="750" misplaced="YES" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="929"> - <rect key="frame" x="359" y="13" width="94" height="32"/> - <buttonCell key="cell" type="push" title="Delete…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="942"> + <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="929"> + <rect key="frame" x="380" y="14" width="72" height="28"/> + <buttonCell key="cell" type="push" title="Delete…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="942"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> + <font key="font" metaFont="smallSystem"/> </buttonCell> <connections> <action selector="deleteMemoryObject:" target="955" id="1013"/> </connections> </button> - <button verticalHuggingPriority="750" misplaced="YES" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="930"> - <rect key="frame" x="14" y="338" width="80" height="32"/> + <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="930"> + <rect key="frame" x="14" y="338" width="81" height="32"/> <buttonCell key="cell" type="push" title="New…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="941"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -797,8 +795,8 @@ <action selector="mcdNewClicked:" target="-2" id="XdX-Ob-zgs"/> </connections> </button> - <button verticalHuggingPriority="750" misplaced="YES" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="931"> - <rect key="frame" x="107" y="338" width="101" height="32"/> + <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="931"> + <rect key="frame" x="106" y="338" width="102" height="32"/> <buttonCell key="cell" type="push" title="Change…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="940"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -815,8 +813,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button verticalHuggingPriority="750" misplaced="YES" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="933"> - <rect key="frame" x="259" y="338" width="80" height="32"/> + <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="933"> + <rect key="frame" x="259" y="338" width="81" height="32"/> <buttonCell key="cell" type="push" title="New…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="938"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -825,8 +823,8 @@ <action selector="mcdNewClicked:" target="-2" id="2fL-p3-QJe"/> </connections> </button> - <button verticalHuggingPriority="750" misplaced="YES" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="934"> - <rect key="frame" x="352" y="338" width="101" height="32"/> + <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="934"> + <rect key="frame" x="351" y="338" width="102" height="32"/> <buttonCell key="cell" type="push" title="Change…" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="937"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -850,7 +848,7 @@ <constraint firstItem="932" firstAttribute="leading" secondItem="580" secondAttribute="leading" constant="20" symbolic="YES" id="3B6-rF-wUD"/> <constraint firstItem="935" firstAttribute="trailing" secondItem="924" secondAttribute="trailing" id="5l6-xO-gYd"/> <constraint firstItem="923" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="925" secondAttribute="trailing" constant="8" symbolic="YES" id="6Bi-wK-Y6V"/> - <constraint firstItem="927" firstAttribute="top" secondItem="925" secondAttribute="bottom" constant="20" symbolic="YES" id="6Wc-QN-eg7"/> + <constraint firstItem="927" firstAttribute="top" secondItem="925" secondAttribute="bottom" priority="750" constant="8" symbolic="YES" id="6Wc-QN-eg7"/> <constraint firstAttribute="bottom" secondItem="923" secondAttribute="bottom" constant="80" id="8eM-Sy-7pm"/> <constraint firstAttribute="trailing" secondItem="929" secondAttribute="trailing" constant="20" symbolic="YES" id="ABn-1v-gkx"/> <constraint firstItem="924" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="923" secondAttribute="trailing" constant="8" symbolic="YES" id="E7H-hA-kGT"/> @@ -881,7 +879,7 @@ <constraint firstItem="925" firstAttribute="height" secondItem="924" secondAttribute="height" id="lha-HW-Jq8"/> <constraint firstItem="927" firstAttribute="leading" secondItem="932" secondAttribute="leading" id="m42-us-Ukb"/> <constraint firstItem="925" firstAttribute="top" secondItem="930" secondAttribute="bottom" constant="20" symbolic="YES" id="mxU-gt-gcw"/> - <constraint firstItem="929" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="926" secondAttribute="trailing" constant="12" symbolic="YES" id="n8K-Dn-ntU"/> + <constraint firstItem="929" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="926" secondAttribute="trailing" priority="750" constant="8" symbolic="YES" id="n8K-Dn-ntU"/> <constraint firstItem="934" firstAttribute="baseline" secondItem="931" secondAttribute="baseline" id="oSO-zV-a8h"/> <constraint firstAttribute="trailing" secondItem="935" secondAttribute="trailing" constant="20" symbolic="YES" id="ohD-Gs-2sI"/> <constraint firstItem="935" firstAttribute="trailing" secondItem="934" secondAttribute="trailing" id="pKN-jf-ULY"/> @@ -891,7 +889,7 @@ <constraint firstItem="928" firstAttribute="baseline" secondItem="927" secondAttribute="baseline" id="vbr-3z-0DC"/> <constraint firstItem="928" firstAttribute="trailing" secondItem="931" secondAttribute="trailing" id="vcf-a4-QlX"/> <constraint firstItem="926" firstAttribute="baseline" secondItem="928" secondAttribute="baseline" id="yYM-0H-88y"/> - <constraint firstItem="928" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="927" secondAttribute="trailing" constant="12" symbolic="YES" id="zXf-Vf-U2w"/> + <constraint firstItem="928" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="927" secondAttribute="trailing" priority="750" constant="8" symbolic="YES" id="zXf-Vf-U2w"/> <constraint firstItem="924" firstAttribute="width" secondItem="925" secondAttribute="width" id="zui-tY-2Zg"/> </constraints> </view> @@ -901,8 +899,8 @@ <rect key="frame" x="10" y="33" width="467" height="411"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <button identifier="FastForward" verticalHuggingPriority="750" misplaced="YES" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="769"> - <rect key="frame" x="14" y="363" width="128" height="32"/> + <button identifier="FastForward" verticalHuggingPriority="750" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="769"> + <rect key="frame" x="14" y="363" width="130" height="32"/> <buttonCell key="cell" type="push" title="Fast Forward" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="770"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -911,16 +909,16 @@ <action selector="hotkeySet:" target="656" id="784"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="771"> - <rect key="frame" x="144" y="370" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="771"> + <rect key="frame" x="146" y="370" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="772"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button identifier="FrameLimit" verticalHuggingPriority="750" misplaced="YES" tag="101" translatesAutoresizingMaskIntoConstraints="NO" id="896"> - <rect key="frame" x="14" y="330" width="128" height="32"/> + <button identifier="FrameLimit" verticalHuggingPriority="750" tag="101" translatesAutoresizingMaskIntoConstraints="NO" id="896"> + <rect key="frame" x="14" y="330" width="130" height="32"/> <buttonCell key="cell" type="push" title="Frame Limit" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="899"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -929,16 +927,16 @@ <action selector="hotkeySet:" target="656" id="900"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="897"> - <rect key="frame" x="144" y="337" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="897"> + <rect key="frame" x="146" y="337" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="898"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button identifier="SaveState" verticalHuggingPriority="750" misplaced="YES" tag="102" translatesAutoresizingMaskIntoConstraints="NO" id="850"> - <rect key="frame" x="14" y="297" width="128" height="32"/> + <button identifier="SaveState" verticalHuggingPriority="750" tag="102" translatesAutoresizingMaskIntoConstraints="NO" id="850"> + <rect key="frame" x="14" y="297" width="130" height="32"/> <buttonCell key="cell" type="push" title="Save State" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="853"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -947,16 +945,16 @@ <action selector="hotkeySet:" target="656" id="854"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="851"> - <rect key="frame" x="144" y="304" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="851"> + <rect key="frame" x="146" y="304" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="852"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button identifier="LoadState" verticalHuggingPriority="750" misplaced="YES" tag="103" translatesAutoresizingMaskIntoConstraints="NO" id="855"> - <rect key="frame" x="14" y="264" width="128" height="32"/> + <button identifier="LoadState" verticalHuggingPriority="750" tag="103" translatesAutoresizingMaskIntoConstraints="NO" id="855"> + <rect key="frame" x="14" y="264" width="130" height="32"/> <buttonCell key="cell" type="push" title="Load State" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="856"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -965,16 +963,16 @@ <action selector="hotkeySet:" target="656" id="857"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="870"> - <rect key="frame" x="144" y="271" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="870"> + <rect key="frame" x="146" y="271" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="871"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button identifier="NextState" verticalHuggingPriority="750" misplaced="YES" tag="104" translatesAutoresizingMaskIntoConstraints="NO" id="861"> - <rect key="frame" x="14" y="231" width="128" height="32"/> + <button identifier="NextState" verticalHuggingPriority="750" tag="104" translatesAutoresizingMaskIntoConstraints="NO" id="861"> + <rect key="frame" x="14" y="231" width="130" height="32"/> <buttonCell key="cell" type="push" title="Next State" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="862"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -983,16 +981,16 @@ <action selector="hotkeySet:" target="656" id="863"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="872"> - <rect key="frame" x="144" y="238" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="872"> + <rect key="frame" x="146" y="238" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="873"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <button identifier="PrevState" verticalHuggingPriority="750" misplaced="YES" tag="105" translatesAutoresizingMaskIntoConstraints="NO" id="867"> - <rect key="frame" x="14" y="198" width="128" height="32"/> + <button identifier="PrevState" verticalHuggingPriority="750" tag="105" translatesAutoresizingMaskIntoConstraints="NO" id="867"> + <rect key="frame" x="14" y="198" width="130" height="32"/> <buttonCell key="cell" type="push" title="Previous State" bezelStyle="rounded" alignment="center" borderStyle="border" tag="100" imageScaling="proportionallyDown" inset="2" id="868"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> @@ -1001,8 +999,8 @@ <action selector="hotkeySet:" target="656" id="869"/> </connections> </button> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="874"> - <rect key="frame" x="144" y="205" width="303" height="22"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="874"> + <rect key="frame" x="146" y="205" width="301" height="22"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="None..." bezelStyle="round" id="875"> <font key="font" metaFont="system"/> <color key="textColor" red="0.17409648289999999" green="0.32782434649999997" blue="0.65737516979999999" alpha="1" colorSpace="calibratedRGB"/> @@ -1018,16 +1016,16 @@ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> <font key="titleFont" metaFont="system"/> </box> - <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="885"> - <rect key="frame" x="18" y="146" width="120" height="17"/> + <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="885"> + <rect key="frame" x="18" y="146" width="122" height="17"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="GPU Key Modifier" id="886"> <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> - <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="887"> - <rect key="frame" x="142" y="140" width="127" height="26"/> + <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="887"> + <rect key="frame" x="144" y="140" width="122" height="26"/> <string key="toolTip">Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to.</string> <popUpButtonCell key="cell" type="push" title="Control ⌃" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="890" id="888"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> diff --git a/macosx/Resources/Base.lproj/PCSXR.xib b/macosx/Resources/Base.lproj/PCSXR.xib index 42f4212a..f1caf4b3 100644 --- a/macosx/Resources/Base.lproj/PCSXR.xib +++ b/macosx/Resources/Base.lproj/PCSXR.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="NSApplication"> diff --git a/macosx/Resources/Base.lproj/PcsxrMemCard.xib b/macosx/Resources/Base.lproj/PcsxrMemCard.xib index 7c9c6b27..2e273b71 100644 --- a/macosx/Resources/Base.lproj/PcsxrMemCard.xib +++ b/macosx/Resources/Base.lproj/PcsxrMemCard.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="PcsxrMemCardHandler"> @@ -14,9 +15,8 @@ <window title="Memory Card" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" id="5" userLabel="Window"> <windowStyleMask key="styleMask" titled="YES"/> <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES"/> - <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="133" y="235" width="420" height="160"/> - <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"/> <value key="minSize" type="size" width="420" height="160"/> <value key="maxSize" type="size" width="420" height="160"/> <view key="contentView" id="6"> @@ -32,7 +32,7 @@ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="pcsxrmemcard" id="100030"/> </imageView> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="100024"> - <rect key="frame" x="90" y="122" width="160" height="17"/> + <rect key="frame" x="90" y="122" width="158" height="17"/> <textFieldCell key="cell" alignment="left" title="Memory Card Selection" id="100029"> <font key="font" metaFont="systemBold"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> @@ -56,7 +56,7 @@ </textFieldCell> </textField> <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="100126"> - <rect key="frame" x="330" y="13" width="76" height="32"/> + <rect key="frame" x="323" y="13" width="83" height="32"/> <buttonCell key="cell" type="push" title="Slot 2" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="100127"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -66,7 +66,7 @@ </connections> </button> <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="100130"> - <rect key="frame" x="254" y="13" width="76" height="32"/> + <rect key="frame" x="240" y="13" width="83" height="32"/> <buttonCell key="cell" type="push" title="Slot 1" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="100131"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -79,7 +79,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100134"> - <rect key="frame" x="14" y="13" width="82" height="32"/> + <rect key="frame" x="14" y="13" width="83" height="32"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="100135"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> @@ -107,8 +107,10 @@ Gw <constraint firstItem="100034" firstAttribute="leading" secondItem="100024" secondAttribute="leading" id="cns-wR-hZz"/> <constraint firstAttribute="trailing" secondItem="100034" secondAttribute="trailing" constant="20" symbolic="YES" id="eWZ-wr-Bub"/> <constraint firstItem="100130" firstAttribute="baseline" secondItem="100126" secondAttribute="baseline" id="fiF-w1-dU1"/> + <constraint firstItem="100130" firstAttribute="width" secondItem="100134" secondAttribute="width" id="j2g-lH-4Rc"/> <constraint firstItem="100034" firstAttribute="leading" secondItem="100025" secondAttribute="leading" id="qEH-aA-8nT"/> - <constraint firstItem="100130" firstAttribute="top" secondItem="100025" secondAttribute="bottom" constant="8" symbolic="YES" id="qor-pU-drx"/> + <constraint firstItem="100130" firstAttribute="top" secondItem="100025" secondAttribute="bottom" constant="20" symbolic="YES" id="qor-pU-drx"/> + <constraint firstItem="100130" firstAttribute="width" secondItem="100126" secondAttribute="width" id="sEz-7V-Zzu"/> <constraint firstItem="100024" firstAttribute="top" secondItem="100023" secondAttribute="top" id="u6d-xx-QEZ"/> </constraints> </view> |
