diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-01 19:53:03 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-04-01 19:53:03 +0000 |
| commit | 065049be70c9d4f676153fd891bb180176ea337e (patch) | |
| tree | 0da9683864223765bcff835a49c5b9d3a73dcffa | |
| parent | 25ff93c64915ec22fdd7a9d5881e42057efad578 (diff) | |
| download | pcsxr-065049be70c9d4f676153fd891bb180176ea337e.tar.gz | |
OS X: Improvements.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89774 e17a0e51-4ae3-4d35-97c3-1a29b211df97
7 files changed, 62 insertions, 65 deletions
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index c9b6edfe..eda66ad7 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -460,7 +460,6 @@ 551A74BF17868BEA0052D185 /* cfg.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; }; 551A74C017868BEA0052D185 /* PluginConfigController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; }; 551A74C117868BEA0052D185 /* PluginConfigController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = "<group>"; }; - 551A74C217868BEA0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; }; 551A750A17868BEB0052D185 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; 551A750E17868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 551A751017868BEB0052D185 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; @@ -622,9 +621,6 @@ 551A766B1786901F0052D185 /* pad.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pad.c; sourceTree = "<group>"; }; 551A766C1786901F0052D185 /* pad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = pad.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 551A766D1786901F0052D185 /* sdljoy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sdljoy.c; sourceTree = "<group>"; }; - 551A766E1786901F0052D185 /* util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = util.c; sourceTree = "<group>"; }; - 551A766F1786901F0052D185 /* util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; }; - 551A76701786901F0052D185 /* xkb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = xkb.c; sourceTree = "<group>"; }; 551A767A178690500052D185 /* DFCdrom.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFCdrom.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 551A7684178691170052D185 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 551A768E1786919F0052D185 /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -677,6 +673,7 @@ 553FED0618DF5B0200C7B007 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PCSXR.strings; sourceTree = "<group>"; }; 553FED0718DF5B0500C7B007 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/PCSXR.strings; sourceTree = "<group>"; }; 554572F217CBC69600FB7D19 /* SPUShared-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SPUShared-info.plist"; sourceTree = "<group>"; }; + 554B391418EB4C66000ADF68 /* DFInput.exp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.exports; name = DFInput.exp; path = Resources/DFInput.exp; sourceTree = "<group>"; }; 554FD70817C6A13E0056CF66 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; }; 5550D2711683C923006C56B5 /* RecentItemsMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecentItemsMenu.h; sourceTree = "<group>"; }; 5550D2721683C923006C56B5 /* RecentItemsMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecentItemsMenu.m; sourceTree = "<group>"; usesTabs = 1; }; @@ -1410,7 +1407,6 @@ 551A74B817868BEA0052D185 /* InfoPlist.strings */, 551A74BA17868BEA0052D185 /* Localizable.strings */, 551A74BC17868BEA0052D185 /* Info.plist */, - 551A74C217868BEA0052D185 /* version.plist */, ); name = Resources; sourceTree = "<group>"; @@ -1594,9 +1590,6 @@ 551A766B1786901F0052D185 /* pad.c */, 551A766C1786901F0052D185 /* pad.h */, 551A766D1786901F0052D185 /* sdljoy.c */, - 551A766E1786901F0052D185 /* util.c */, - 551A766F1786901F0052D185 /* util.h */, - 551A76701786901F0052D185 /* xkb.c */, ); name = src; path = ../../../plugins/dfinput; @@ -1605,6 +1598,7 @@ 551A7671178690280052D185 /* Resources */ = { isa = PBXGroup; children = ( + 554B391418EB4C66000ADF68 /* DFInput.exp */, 551A751D17868BEB0052D185 /* Credits.rtf */, 551A751F17868BEB0052D185 /* InfoPlist.strings */, 551A752117868BEB0052D185 /* Localizable.strings */, @@ -3019,6 +3013,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; @@ -3042,6 +3037,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3473,6 +3469,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_WARN_EMPTY_BODY = YES; + EXPORTED_SYMBOLS_FILE = plugins/DFInput/Resources/DFInput.exp; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib index f0fdc522..83b3d538 100644 --- a/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.xib +++ b/macosx/plugins/Bladesio1/Base.lproj/Bladesio1PluginConfig.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="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment defaultVersion="1080" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="Bladesio1PluginConfigController"> @@ -17,7 +17,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application"/> - <window title="BladeSIO1 Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> + <window title="BladeSIO1 Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="131" y="362" width="315" height="203"/> @@ -28,7 +28,7 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7"> - <rect key="frame" x="160" y="13" width="82" height="32"/> + <rect key="frame" x="137" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="186"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -42,7 +42,7 @@ Gw </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8"> - <rect key="frame" x="242" y="13" width="59" height="32"/> + <rect key="frame" x="219" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="187"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -106,13 +106,9 @@ DQ <rect key="frame" x="105" y="14" width="156" height="22"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="207"> - <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="220"> - <real key="roundingIncrement" value="0.0"/> + <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" localizesFormat="NO" usesGroupingSeparator="NO" paddingCharacter="*" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="220"> <real key="minimum" value="0.0"/> <integer key="maximum" value="65535"/> - <metadata> - <bool key="localizesFormat" value="NO"/> - </metadata> </numberFormatter> <font key="font" metaFont="system"/> <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> @@ -197,6 +193,7 @@ DQ <constraint firstAttribute="bottom" secondItem="8" secondAttribute="bottom" constant="20" symbolic="YES" id="253"/> <constraint firstItem="7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="221" secondAttribute="trailing" constant="12" symbolic="YES" id="KnE-pJ-PbU"/> <constraint firstItem="8" firstAttribute="baseline" secondItem="221" secondAttribute="baseline" id="iGD-Hx-cif"/> + <constraint firstItem="7" firstAttribute="width" secondItem="8" secondAttribute="width" id="l37-tZ-gsX"/> <constraint firstItem="8" firstAttribute="baseline" secondItem="7" secondAttribute="baseline" id="q6S-UG-37H"/> </constraints> </view> @@ -205,4 +202,4 @@ DQ </connections> </window> </objects> -</document>
\ No newline at end of file +</document> diff --git a/macosx/plugins/Bladesio1/version.plist b/macosx/plugins/Bladesio1/version.plist deleted file mode 100644 index a9c51a62..00000000 --- a/macosx/plugins/Bladesio1/version.plist +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>BuildVersion</key> - <string>38</string> - <key>CFBundleShortVersionString</key> - <string>1.0</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>ProjectName</key> - <string>DFCdrom</string> - <key>SourceVersion</key> - <string>2350000</string> -</dict> -</plist> diff --git a/macosx/plugins/DFInput/Resources/DFInput.exp b/macosx/plugins/DFInput/Resources/DFInput.exp new file mode 100644 index 00000000..c6af9109 --- /dev/null +++ b/macosx/plugins/DFInput/Resources/DFInput.exp @@ -0,0 +1,23 @@ +# DFInput.exp +# Pcsxr +# +# Created by C.W. Betts on 4/1/14. +# + +_PSEgetLibType +_PSEgetLibName +_PSEgetLibVersion +_PADsetMode +_PADinit +_PADshutdown +_PADopen +_PADclose +_PADstartPoll +_PADpoll +_PADreadPort1 +_PADreadPort2 +_PADquery +_PADconfigure +_PADtest +_PADabout +_PADregisterVibration diff --git a/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib index e0e6e90b..bef135f9 100644 --- a/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.xib +++ b/macosx/plugins/DFSound/Resorces/Shared/Base.lproj/NetSfPeopsSpuPluginMain.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="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment defaultVersion="1080" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="SPUPluginController"> @@ -19,7 +19,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application"/> - <window title="SPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="6" userLabel="Configuration"> + <window title="SPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="6" userLabel="Configuration"> <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="128" y="348" width="466" height="316"/> @@ -255,7 +255,7 @@ <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="162"> - <rect key="frame" x="393" y="13" width="59" height="32"/> + <rect key="frame" x="370" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="163"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -269,7 +269,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="166"> - <rect key="frame" x="311" y="13" width="82" height="32"/> + <rect key="frame" x="288" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="167"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -308,6 +308,7 @@ Gw <constraint firstAttribute="centerX" secondItem="9" secondAttribute="centerX" id="4Be-LX-Uyc"/> <constraint firstItem="19" firstAttribute="trailing" secondItem="9" secondAttribute="trailing" id="6hC-pI-ZsP"/> <constraint firstItem="24" firstAttribute="bottom" secondItem="19" secondAttribute="bottom" id="Piu-cZ-ar8"/> + <constraint firstItem="162" firstAttribute="width" secondItem="166" secondAttribute="width" id="VAk-YO-yge"/> <constraint firstItem="171" firstAttribute="top" secondItem="24" secondAttribute="bottom" constant="20" symbolic="YES" id="ZcK-sY-WDH"/> <constraint firstItem="24" firstAttribute="leading" secondItem="9" secondAttribute="leading" id="mbJ-pa-40c"/> <constraint firstItem="162" firstAttribute="baseline" secondItem="171" secondAttribute="baseline" id="qDt-F5-FPQ"/> @@ -319,4 +320,4 @@ Gw </connections> </window> </objects> -</document>
\ No newline at end of file +</document> diff --git a/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib index dc82cb21..131b7ff9 100644 --- a/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.xib +++ b/macosx/plugins/DFXVideo/Base.lproj/NetSfPeopsSoftGPUConfig.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="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment defaultVersion="1080" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsSoftGPUPluginConfigController"> @@ -29,7 +29,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application"/> - <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> + <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="411" y="163" width="480" height="583"/> @@ -421,7 +421,7 @@ Hold the mouse over a checkbox to get more information about it.</string> <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="371"> - <rect key="frame" x="407" y="13" width="59" height="32"/> + <rect key="frame" x="384" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="372"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -435,7 +435,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="375"> - <rect key="frame" x="325" y="13" width="82" height="32"/> + <rect key="frame" x="302" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="376"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -480,6 +480,7 @@ Gw <constraint firstItem="381" firstAttribute="top" secondItem="179" secondAttribute="bottom" constant="20" symbolic="YES" id="adH-hd-tGe"/> <constraint firstItem="375" firstAttribute="baseline" secondItem="371" secondAttribute="baseline" id="af1-DM-A7k"/> <constraint firstItem="107" firstAttribute="trailing" secondItem="179" secondAttribute="trailing" id="xme-dA-euI"/> + <constraint firstItem="375" firstAttribute="width" secondItem="371" secondAttribute="width" id="zFG-vu-8pj"/> <constraint firstItem="375" firstAttribute="baseline" secondItem="381" secondAttribute="baseline" id="zZT-Ts-UqV"/> </constraints> </view> @@ -489,4 +490,4 @@ Gw </connections> </window> </objects> -</document>
\ No newline at end of file +</document> diff --git a/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib b/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib index e76147b6..9785eb41 100644 --- a/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.xib +++ b/macosx/plugins/PeopsXgl/Base.lproj/NetSfPeopsOpenGLConfig.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="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> <deployment defaultVersion="1080" identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="NetSfPeopsOpenGLPluginConfigController"> @@ -39,7 +39,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application"/> - <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> + <window title="GPU Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window"> <windowStyleMask key="styleMask" titled="YES" miniaturizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="2" y="373" width="611" height="499"/> @@ -173,23 +173,15 @@ <cells> <column> <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="justified" title="Width:" id="914"> - <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="916"> - <real key="roundingIncrement" value="0.0"/> + <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" paddingCharacter="*" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="916"> <integer key="minimum" value="0"/> - <metadata> - <bool key="localizesFormat" value="YES"/> - </metadata> </numberFormatter> <font key="font" metaFont="system"/> <font key="titleFont" metaFont="system"/> </formCell> <formCell scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="justified" tag="1" title="Height:" id="913"> - <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" minimumFractionDigits="0" maximumFractionDigits="0" id="917"> - <real key="roundingIncrement" value="0.0"/> + <numberFormatter key="formatter" formatterBehavior="default10_4" positiveFormat="#" negativeFormat="#" usesGroupingSeparator="NO" paddingCharacter="*" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" decimalSeparator="." groupingSeparator="," currencyDecimalSeparator="." plusSign="+" minusSign="-" notANumberSymbol="NaN" perMillSymbol="‰" percentSymbol="%" exponentSymbol="E" positivePrefix="" positiveSuffix="" negativePrefix="-" negativeSuffix="" id="917"> <integer key="minimum" value="0"/> - <metadata> - <bool key="localizesFormat" value="YES"/> - </metadata> </numberFormatter> <font key="font" metaFont="system"/> <font key="titleFont" metaFont="system"/> @@ -537,7 +529,7 @@ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="670"> - <rect key="frame" x="538" y="13" width="59" height="32"/> + <rect key="frame" x="515" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="671"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -551,7 +543,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="674"> - <rect key="frame" x="456" y="13" width="82" height="32"/> + <rect key="frame" x="433" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="675"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -579,6 +571,7 @@ Gw <constraint firstItem="674" firstAttribute="top" secondItem="107" secondAttribute="bottom" constant="20" symbolic="YES" id="Iw3-oE-kXe"/> <constraint firstItem="674" firstAttribute="baseline" secondItem="665" secondAttribute="baseline" id="WHu-Oa-tPr"/> <constraint firstItem="107" firstAttribute="trailing" secondItem="89" secondAttribute="trailing" id="XDw-KH-rtQ"/> + <constraint firstItem="670" firstAttribute="width" secondItem="674" secondAttribute="width" id="zqC-yW-8jc"/> </constraints> </view> <connections> @@ -724,7 +717,7 @@ Hold the mouse over a checkbox to get more information about it.</string> </connections> </button> <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="501"> - <rect key="frame" x="427" y="13" width="59" height="32"/> + <rect key="frame" x="404" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="502"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -738,7 +731,7 @@ DQ </connections> </button> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="503"> - <rect key="frame" x="345" y="13" width="82" height="32"/> + <rect key="frame" x="322" y="13" width="82" height="32"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="504"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -762,6 +755,7 @@ Gw <constraint firstItem="476" firstAttribute="top" secondItem="473" secondAttribute="top" constant="20" symbolic="YES" id="660"/> <constraint firstAttribute="trailing" secondItem="501" secondAttribute="trailing" constant="20" symbolic="YES" id="661"/> <constraint firstItem="503" firstAttribute="baseline" secondItem="501" secondAttribute="baseline" id="QkN-xP-GgJ"/> + <constraint firstItem="501" firstAttribute="width" secondItem="503" secondAttribute="width" id="XBS-B9-2ld"/> <constraint firstAttribute="centerX" secondItem="475" secondAttribute="centerX" id="h7b-lg-buU"/> <constraint firstAttribute="centerX" secondItem="476" secondAttribute="centerX" id="lmY-oG-JbI"/> <constraint firstAttribute="centerX" secondItem="474" secondAttribute="centerX" id="mBv-KE-F3g"/> @@ -770,4 +764,4 @@ Gw </view> </window> </objects> -</document>
\ No newline at end of file +</document> |
