summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/English.lproj/Base.lproj/Configuration.xib18
-rwxr-xr-xmacosx/PcsxrMemCardController.m4
-rwxr-xr-xmacosx/plugins/Bladesio1/macsrc/PluginConfigController.m2
-rwxr-xr-xmacosx/plugins/DFXVideo/macsrc/PluginConfigController.m12
4 files changed, 18 insertions, 18 deletions
diff --git a/macosx/English.lproj/Base.lproj/Configuration.xib b/macosx/English.lproj/Base.lproj/Configuration.xib
index feffca10..0d81bf53 100644
--- a/macosx/English.lproj/Base.lproj/Configuration.xib
+++ b/macosx/English.lproj/Base.lproj/Configuration.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <deployment defaultVersion="1070" identifier="macosx"/>
+ <deployment defaultVersion="1090" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
</dependencies>
<objects>
@@ -290,7 +290,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="262">
- <rect key="frame" x="76.000000242143869" y="7" width="90" height="28"/>
+ <rect key="frame" x="76" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="600">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -354,7 +354,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="292">
- <rect key="frame" x="76.000000242143869" y="7" width="90" height="28"/>
+ <rect key="frame" x="76" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="603">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -414,7 +414,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="301">
- <rect key="frame" x="76.000000242143869" y="7" width="90" height="28"/>
+ <rect key="frame" x="76" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="605">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -473,8 +473,8 @@
<rect key="frame" x="2" y="2" width="174" height="74"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="297">
- <rect key="frame" x="75" y="7" width="90" height="28"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="297">
+ <rect key="frame" x="76" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="609">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -534,7 +534,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="625">
- <rect key="frame" x="76.000000242143869" y="7" width="90" height="28"/>
+ <rect key="frame" x="76" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="626">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -593,7 +593,7 @@
<rect key="frame" x="2" y="2" width="174" height="74"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="903">
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="903">
<rect key="frame" x="75" y="7" width="90" height="28"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
<buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="910">
@@ -616,7 +616,7 @@
</connections>
</button>
<popUpButton verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="905">
- <rect key="frame" x="11" y="36" width="153" height="26"/>
+ <rect key="frame" x="11" y="36" width="152.99999975785613" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingMiddle" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="906">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index b27f5826..ab3c0a2d 100755
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -42,7 +42,7 @@
fullPath = [[def URLForKey:@"Mcd1"] path];
fileName = [fm displayNameAtPath:fullPath];
- [memCard1Label setTitleWithMnemonic:fileName];
+ [[memCard1Label cell] setTitle:fileName];
[memCard1Label setToolTip:fullPath];
[self loadMemoryCardInfoForCard:1];
@@ -52,7 +52,7 @@
fullPath = [[def URLForKey:@"Mcd2"] path];
fileName = [fm displayNameAtPath:fullPath];
- [memCard2Label setTitleWithMnemonic:fileName];
+ [[memCard2Label cell] setTitle:fileName];
[memCard2Label setToolTip:fullPath];
[self loadMemoryCardInfoForCard:2];
diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index 90ad3b6c..8572289e 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -188,7 +188,7 @@ void ReadConfig()
keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
[enabledButton setState: [keyValues[kSioEnabled] boolValue] ? NSOnState : NSOffState];
- [ipAddressField setTitleWithMnemonic:keyValues[kSioIPAddress]];
+ [[ipAddressField cell] setTitle:keyValues[kSioIPAddress]];
[portField setIntValue:[keyValues[kSioPort] intValue]];
switch ([keyValues[kSioPlayer] integerValue]) {
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index f7982d36..baa118f8 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -135,8 +135,8 @@ void ReadConfig(void)
@"Enable Hacks": @NO,
@"Dither Mode": @1,
@"Hacks": @((unsigned int)0),
- @"VertexShader": [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slv"] bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil],
- @"FragmentShader": [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slf"] bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil],
+ @"VertexShader": [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slv"] bookmarkDataWithOptions:0 includingResourceValuesForKeys:nil relativeToURL:nil error:nil],
+ @"FragmentShader": [[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slf"] bookmarkDataWithOptions:0 includingResourceValuesForKeys:nil relativeToURL:nil error:nil],
@"UseShader": @NO,
@"ShaderQuality": @4,
kWindowSize: NSStringFromSize(NSMakeSize(640, 480))}}];
@@ -234,8 +234,8 @@ void ReadConfig(void)
writeDic[@"Hacks"] = @(hackValues);
- writeDic[@"VertexShader"] = [vertexPath bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil];
- writeDic[@"FragmentShader"] = [fragmentPath bookmarkDataWithOptions:NSURLBookmarkCreationPreferFileIDResolution includingResourceValuesForKeys:nil relativeToURL:nil error:nil];
+ writeDic[@"VertexShader"] = [vertexPath bookmarkDataWithOptions:0 includingResourceValuesForKeys:nil relativeToURL:nil error:nil];
+ writeDic[@"FragmentShader"] = [fragmentPath bookmarkDataWithOptions:0 includingResourceValuesForKeys:nil relativeToURL:nil error:nil];
writeDic[kWindowSize] = NSStringFromSize(NSMakeSize(self.displayWidth.integerValue, self.displayHeight.integerValue));
// write to defaults
@@ -288,7 +288,7 @@ void ReadConfig(void)
{
self.fragmentPath = _fragmentPath;
if (_fragmentPath) {
- [fragmentShaderViewablePath setTitleWithMnemonic:[fragmentPath lastPathComponent]];
+ [[fragmentShaderViewablePath cell] setTitle:[fragmentPath lastPathComponent]];
[fragmentShaderViewablePath setToolTip:[fragmentPath path]];
}
}
@@ -297,7 +297,7 @@ void ReadConfig(void)
{
self.vertexPath = _vertexPath;
if (_vertexPath) {
- [vertexShaderViewablePath setTitleWithMnemonic:[vertexPath lastPathComponent]];
+ [[vertexShaderViewablePath cell] setTitle:[vertexPath lastPathComponent]];
[vertexShaderViewablePath setToolTip:[vertexPath path]];
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-21 07:13:09 +0000