diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2015-01-27 18:54:11 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2015-01-27 18:54:11 +0000 |
| commit | 58cbcb27965a171e378cde14d02d430bbe48e752 (patch) | |
| tree | 4362bb62dee2dc6c433d673487173ccc82d56cd2 | |
| parent | 87961164328c33726614b307801fb2a0ba87b8dc (diff) | |
| download | pcsxr-58cbcb27965a171e378cde14d02d430bbe48e752.tar.gz | |
OS X: Have custom views use IB_DESIGNABLE.
Minor comment change.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@93285 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/Resources/Base.lproj/CheatWindow.xib | 20 | ||||
| -rw-r--r-- | macosx/Source/MemBadgeView.h | 1 | ||||
| -rw-r--r-- | macosx/Source/PcsxrHexadecimalFormatter.h | 3 | ||||
| -rw-r--r-- | macosx/Source/PcsxrMemoryObject.m | 5 |
4 files changed, 20 insertions, 9 deletions
diff --git a/macosx/Resources/Base.lproj/CheatWindow.xib b/macosx/Resources/Base.lproj/CheatWindow.xib index d716846d..aa22f51d 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="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="CheatController"> @@ -241,7 +241,13 @@ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/> </tableHeaderCell> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="144"> - <customFormatter key="formatter" id="271" customClass="PcsxrHexadecimalFormatter"/> + <customFormatter key="formatter" id="271" customClass="PcsxrHexadecimalFormatter"> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="hexPadding"> + <integer key="value" value="8"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </customFormatter> <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -258,7 +264,13 @@ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/> </tableHeaderCell> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="143"> - <customFormatter key="formatter" id="272" customClass="PcsxrHexadecimalFormatter"/> + <customFormatter key="formatter" id="272" customClass="PcsxrHexadecimalFormatter"> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="hexPadding"> + <integer key="value" value="4"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + </customFormatter> <font key="font" metaFont="system"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> diff --git a/macosx/Source/MemBadgeView.h b/macosx/Source/MemBadgeView.h index b28353bd..e64c8fbf 100644 --- a/macosx/Source/MemBadgeView.h +++ b/macosx/Source/MemBadgeView.h @@ -9,6 +9,7 @@ #import <Cocoa/Cocoa.h> //TODO: also include the memory count in the view as well. +IB_DESIGNABLE @interface MemBadgeView : NSView @end diff --git a/macosx/Source/PcsxrHexadecimalFormatter.h b/macosx/Source/PcsxrHexadecimalFormatter.h index 63a3da44..8ae8a247 100644 --- a/macosx/Source/PcsxrHexadecimalFormatter.h +++ b/macosx/Source/PcsxrHexadecimalFormatter.h @@ -8,7 +8,8 @@ #import <Foundation/Foundation.h> +IB_DESIGNABLE @interface PcsxrHexadecimalFormatter : NSFormatter -@property (nonatomic) char hexPadding; +@property (nonatomic) IBInspectable char hexPadding; @end diff --git a/macosx/Source/PcsxrMemoryObject.m b/macosx/Source/PcsxrMemoryObject.m index f19a460f..9860e7fa 100644 --- a/macosx/Source/PcsxrMemoryObject.m +++ b/macosx/Source/PcsxrMemoryObject.m @@ -265,10 +265,7 @@ static inline void SetupAttrStr(NSMutableAttributedString *mutStr, NSColor *txtc SetupAttrStr(tmpStr, [NSColor blueColor]); attribMemLabelEndLink = [tmpStr copy]; - //tmpStr = [[NSMutableAttributedString alloc] initWithString:@"Multi-save"]; - //SetupAttrStr(tmpStr, [NSColor blueColor]); - //attribMemLabelLink = [tmpStr copy]; - //RELEASEOBJ(tmpStr); + // Same as attribMemLabelEndLink on release builds attribMemLabelLink = attribMemLabelEndLink; //display nothing |