summaryrefslogtreecommitdiff
path: root/macosx/Resources
diff options
context:
space:
mode:
authoriCatButler <i.am.catbutler@gmail.com>2016-03-30 15:07:35 +0100
committeriCatButler <i.am.catbutler@gmail.com>2016-03-30 15:07:35 +0100
commit8b4350fee747708ffd376744ef5dc1e239a87ba6 (patch)
treea9ab6e2f25e06edc7c668353f8000856704f7fa3 /macosx/Resources
parente3df273095a5800e3dcdcb63bd66e269c0c2d3a8 (diff)
downloadpcsxr-8b4350fee747708ffd376744ef5dc1e239a87ba6.tar.gz
Bring up to date with PCSX-R master (97809)
Diffstat (limited to 'macosx/Resources')
-rw-r--r--macosx/Resources/Base.lproj/CheatWindow.xib14
1 files changed, 8 insertions, 6 deletions
diff --git a/macosx/Resources/Base.lproj/CheatWindow.xib b/macosx/Resources/Base.lproj/CheatWindow.xib
index aa22f51d..05eb74b8 100644
--- a/macosx/Resources/Base.lproj/CheatWindow.xib
+++ b/macosx/Resources/Base.lproj/CheatWindow.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="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="CheatController">
@@ -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" misplaced="YES" id="6pF-og-es3">
+ <clipView key="contentView" id="6pF-og-es3">
<rect key="frame" x="1" y="17" width="656" height="258"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -55,7 +55,7 @@
<rect key="frame" x="0.0" y="0.0" width="656" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="Enabled" width="48.40234375" minWidth="40" maxWidth="1000" id="29">
@@ -184,6 +184,7 @@
</buttonCell>
<connections>
<action selector="removeCheats:" target="-2" id="are-w2-Cx9"/>
+ <binding destination="237" name="enabled" keyPath="canRemove" id="3pC-QD-cnV"/>
</connections>
</button>
</subviews>
@@ -223,7 +224,7 @@
<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" misplaced="YES" id="COc-Cf-C5K">
+ <clipView key="contentView" id="COc-Cf-C5K">
<rect key="frame" x="1" y="17" width="300" height="174"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@@ -231,7 +232,7 @@
<rect key="frame" x="0.0" y="0.0" width="300" height="19"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="Address" width="150" minWidth="40" maxWidth="1000" id="141">
@@ -352,6 +353,7 @@ Gw
</buttonCell>
<connections>
<action selector="removeCheatValue:" target="-2" id="215"/>
+ <binding destination="219" name="enabled" keyPath="canRemove" id="0Ve-Bf-kaw"/>
</connections>
</button>
</subviews>