SameBoy | Accurate GB/GBC emulator |
| download: https://git.y1.nz/archives/sameboy.tar.gz | |
| README | Files | Log | Refs | LICENSE |
commit f21761338cd765b2f4e6061623eedd3c58b94c9b parent 41af62d79309da60ccd426cd92cde1bb31da641c Author: Lior Halphon <LIJI32@gmail.com> Date: Sat, 9 Nov 2024 17:04:10 +0200 Allow the Cocoa frontend to pick a monospace font Diffstat:
| M | Cocoa/Document.h | 1 | + |
| M | Cocoa/Document.m | 86 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- |
| M | Cocoa/Document.xib | 24 | ++++++++++++------------ |
| M | Cocoa/GBApp.m | 8 | ++++++++ |
| M | Cocoa/GBObjectView.m | 10 | ++++++++++ |
| M | Cocoa/GBObjectViewItem.xib | 4 | ++-- |
| M | Cocoa/GBPaletteView.m | 2 | ++ |
| M | Cocoa/GBPaletteViewRow.xib | 4 | ++-- |
| M | Cocoa/GBPreferencesWindow.h | 4 | ++++ |
| M | Cocoa/GBPreferencesWindow.m | 57 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | Cocoa/GBTitledPopUpButton.h | 5 | +++++ |
| A | Cocoa/GBTitledPopUpButton.m | 22 | ++++++++++++++++++++++ |
| M | Cocoa/Preferences.xib | 144 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- |
13 files changed, 306 insertions(+), 65 deletions(-)
diff --git a/Cocoa/Document.h b/Cocoa/Document.h @@ -89,5 +89,6 @@ enum model { - (void) connectLinkCable:(NSMenuItem *)sender; - (int)loadStateFile:(const char *)path noErrorOnNotFound:(bool)noErrorOnFileNotFound; - (NSString *)captureOutputForBlock: (void (^)())block; +- (NSFont *)debuggerFontOfSize:(unsigned)size; @end diff --git a/Cocoa/Document.m b/Cocoa/Document.m @@ -337,6 +337,14 @@ static void debuggerReloadCallback(GB_gameboy_t *gb) [self observeStandardDefaultsKey:@"GBRumbleMode" withBlock:^(NSNumber *value) { GB_set_rumble_mode(gb, value.unsignedIntValue); }]; + + [self observeStandardDefaultsKey:@"GBDebuggerFont" withBlock:^(NSString *value) { + [self updateFonts]; + }]; + + [self observeStandardDefaultsKey:@"GBDebuggerFontSize" withBlock:^(NSString *value) { + [self updateFonts]; + }]; } - (void)updateMinSize @@ -766,6 +774,65 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency) } } +- (NSFont *)debuggerFontOfSize:(unsigned)size +{ + if (!size) { + size = [[NSUserDefaults standardUserDefaults] integerForKey:@"GBDebuggerFontSize"]; + } + + bool retry = false; + +again:; + NSString *selectedFont = [[NSUserDefaults standardUserDefaults] stringForKey:@"GBDebuggerFont"]; + if (@available(macOS 10.15, *)) { + if ([selectedFont isEqual:@"SF Mono"]) { + return [NSFont monospacedSystemFontOfSize:size weight:NSFontWeightRegular]; + } + } + + NSFont *ret = [NSFont fontWithName:selectedFont size:size]; + if (ret) return ret; + + if (retry) { + return [NSFont userFixedPitchFontOfSize:size]; + } + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBDebuggerFont"]; + retry = true; + goto again; +} + + +- (void)updateFonts +{ + _hexController.font = [self debuggerFontOfSize:12]; + [self.paletteView reloadData:self]; + [self.objectView reloadData:self]; + + NSFont *newFont = [self debuggerFontOfSize:0]; + NSFont *newBoldFont = [[NSFontManager sharedFontManager] convertFont:newFont toHaveTrait:NSBoldFontMask]; + self.debuggerSideViewInput.font = newFont; + for (NSTextView *view in @[_debuggerSideView, _consoleOutput]) { + NSMutableAttributedString *newString = view.attributedString.mutableCopy; + [view.attributedString enumerateAttribute:NSFontAttributeName + inRange:NSMakeRange(0, view.attributedString.length) + options:0 + usingBlock:^(NSFont *value, NSRange range, BOOL *stop) { + if ([[NSFontManager sharedFontManager] fontNamed:value.fontName hasTraits:NSBoldFontMask]) { + [newString addAttributes:@{ + NSFontAttributeName: newBoldFont + } range:range]; + } + else { + [newString addAttributes:@{ + NSFontAttributeName: newFont + } range:range]; + } + }]; + [view.textStorage setAttributedString:newString]; + } + [_consoleOutput scrollToEndOfDocument:nil]; +} + - (void)windowControllerDidLoadNib:(NSWindowController *)aController { [super windowControllerDidLoadNib:aController]; @@ -781,7 +848,7 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency) NSMutableParagraphStyle *paragraph_style = [[NSMutableParagraphStyle alloc] init]; [paragraph_style setLineSpacing:2]; - self.debuggerSideViewInput.font = [NSFont userFixedPitchFontOfSize:12]; + self.debuggerSideViewInput.font = [self debuggerFontOfSize:0]; self.debuggerSideViewInput.textColor = [NSColor whiteColor]; self.debuggerSideViewInput.defaultParagraphStyle = paragraph_style; [self.debuggerSideViewInput setString:@"registers\nbacktrace\n"]; @@ -907,9 +974,10 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency) } } -- (void) initMemoryView +- (void)initMemoryView { _hexController = [[HFController alloc] init]; + _hexController.font = [self debuggerFontOfSize:12]; [_hexController setBytesPerColumn:1]; [_hexController setEditMode:HFOverwriteMode]; @@ -953,6 +1021,16 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency) [self.memoryView addSubview:layoutView]; self.memoryView = layoutView; + CGSize contentSize = _memoryWindow.contentView.frame.size; + while (_hexController.bytesPerLine < 16) { + contentSize.width += 4; + [_memoryWindow setContentSize:contentSize]; + } + while (_hexController.bytesPerLine > 16) { + contentSize.width -= 4; + [_memoryWindow setContentSize:contentSize]; + } + self.memoryBankItem.enabled = false; } @@ -1456,7 +1534,7 @@ enum GBWindowResizeAction [_consoleOutputLock unlock]; } -- (void) log: (const char *) string withAttributes: (GB_log_attributes) attributes +- (void)log:(const char *)string withAttributes:(GB_log_attributes)attributes { NSString *nsstring = @(string); // For ref-counting if (_capturedOutput) { @@ -1465,7 +1543,7 @@ enum GBWindowResizeAction } - NSFont *font = [NSFont userFixedPitchFontOfSize:12]; + NSFont *font = [self debuggerFontOfSize:0]; NSUnderlineStyle underline = NSUnderlineStyleNone; if (attributes & GB_LOG_BOLD) { font = [[NSFontManager sharedFontManager] convertFont:font toHaveTrait:NSBoldFontMask]; diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib @@ -241,18 +241,18 @@ <autoresizingMask key="autoresizingMask"/> <subviews> <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="V9U-Ua-F4z"> - <rect key="frame" x="0.0" y="354" width="329" height="47"/> + <rect key="frame" x="0.0" y="338" width="329" height="63"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="YHx-TM-zIC"> - <rect key="frame" x="0.0" y="0.0" width="329" height="47"/> + <rect key="frame" x="0.0" y="0.0" width="329" height="63"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textView drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" allowsUndo="YES" allowsNonContiguousLayout="YES" textCompletion="NO" spellingCorrection="YES" id="w0g-eK-jM4"> - <rect key="frame" x="0.0" y="0.0" width="329" height="47"/> + <rect key="frame" x="0.0" y="0.0" width="329" height="63"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> - <size key="minSize" width="329" height="47"/> + <size key="minSize" width="329" height="63"/> <size key="maxSize" width="463" height="10000000"/> <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <allowedInputSourceLocales> @@ -266,27 +266,27 @@ <autoresizingMask key="autoresizingMask"/> </scroller> <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="qgN-F8-fdB"> - <rect key="frame" x="313" y="0.0" width="16" height="47"/> + <rect key="frame" x="313" y="0.0" width="16" height="63"/> <autoresizingMask key="autoresizingMask"/> </scroller> </scrollView> <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="5qI-qZ-nkh"> - <rect key="frame" x="0.0" y="352" width="329" height="5"/> + <rect key="frame" x="0.0" y="336" width="329" height="5"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> </box> <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vts-CC-ZjQ"> - <rect key="frame" x="0.0" y="0.0" width="329" height="354"/> + <rect key="frame" x="0.0" y="0.0" width="329" height="338"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="Cs9-3x-ATg"> - <rect key="frame" x="0.0" y="0.0" width="329" height="354"/> + <rect key="frame" x="0.0" y="0.0" width="329" height="338"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" baseWritingDirection="leftToRight" findStyle="bar" allowsNonContiguousLayout="YES" spellingCorrection="YES" id="JgV-7E-iwp"> - <rect key="frame" x="0.0" y="0.0" width="329" height="354"/> + <rect key="frame" x="0.0" y="0.0" width="329" height="338"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" red="0.14901960780000001" green="0.14901960780000001" blue="0.14901960780000001" alpha="1" colorSpace="calibratedRGB"/> - <size key="minSize" width="329" height="354"/> + <size key="minSize" width="329" height="338"/> <size key="maxSize" width="1160" height="10000000"/> <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <allowedInputSourceLocales> @@ -301,7 +301,7 @@ <autoresizingMask key="autoresizingMask"/> </scroller> <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="4jm-Gm-D2R"> - <rect key="frame" x="313" y="0.0" width="16" height="354"/> + <rect key="frame" x="313" y="0.0" width="16" height="338"/> <autoresizingMask key="autoresizingMask"/> </scroller> </scrollView> @@ -746,7 +746,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" id="mzf-yu-RID"> <rect key="frame" x="1" y="1" width="604" height="257"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <autoresizingMask key="autoresizingMask"/> <subviews> <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="24" headerView="pvX-uJ-qK5" id="tA3-8T-bxb"> <rect key="frame" x="0.0" y="0.0" width="604" height="240"/> diff --git a/Cocoa/GBApp.m b/Cocoa/GBApp.m @@ -48,6 +48,11 @@ static uint32_t color_to_int(NSColor *color) [defaults removeObjectForKey:button_to_preference_name(i, 0)]; } } + + bool hasSFMono = false; + if (@available(macOS 10.15, *)) { + hasSFMono = [[NSFont monospacedSystemFontOfSize:12 weight:NSFontWeightRegular].displayName containsString:@"SF"]; + } [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"GBRight": @(kVK_RightArrow), @"GBLeft": @(kVK_LeftArrow), @@ -85,6 +90,9 @@ static uint32_t color_to_int(NSColor *color) @"GBEmulatedModel": @(MODEL_AUTO), + @"GBDebuggerFont": hasSFMono? @"SF Mono" : @"Menlo", + @"GBDebuggerFontSize": @12, + // Default themes @"GBThemes": @{ @"Canyon": @{ diff --git a/Cocoa/GBObjectView.m b/Cocoa/GBObjectView.m @@ -57,6 +57,9 @@ uint8_t length = document.oamCount; bool cgb = GB_is_cgb(document.gb); uint8_t height = document.oamHeight; + NSFont *font = [document debuggerFontOfSize:11]; + NSFont *boldFont = [[NSFontManager sharedFontManager] convertFont:font toHaveTrait:NSBoldFontMask]; + for (unsigned i = 0; i < 40; i++) { GBObjectViewItem *item = _items[i]; if (i >= length) { @@ -64,6 +67,13 @@ } else { item.view.hidden = false; + + item.oamAddress.font = boldFont; + item.position.font = font; + item.attributes.font = font; + item.tile.font = font; + item.tileAddress.font = font; + item.oamAddress.stringValue = [NSString stringWithFormat:@"$%04X", info[i].oam_addr]; item.position.stringValue = [NSString stringWithFormat:@"(%d, %d)", ((signed)(unsigned)info[i].x) - 8, diff --git a/Cocoa/GBObjectViewItem.xib b/Cocoa/GBObjectViewItem.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> diff --git a/Cocoa/GBPaletteView.m b/Cocoa/GBPaletteView.m @@ -43,6 +43,7 @@ GB_gameboy_t *gb = document.gb; uint8_t *bg = GB_get_direct_access(gb, GB_DIRECT_ACCESS_BGP, NULL, NULL); uint8_t *obj = GB_get_direct_access(gb, GB_DIRECT_ACCESS_OBP, NULL, NULL); + NSFont *font = [document debuggerFontOfSize:13]; for (unsigned i = 0; i < 4 * 8 * 2; i++) { uint8_t index = i % (4 * 8); @@ -58,6 +59,7 @@ field.stringValue = [NSString stringWithFormat:@"$%04X", color]; field.textColor = r * 3 + g * 4 + b * 2 > 120? [NSColor blackColor] : [NSColor whiteColor]; field.toolTip = [NSString stringWithFormat:@"Red: %d, Green: %d, Blue: %d", r, g, b]; + field.font = font; field.backgroundColor = [NSColor colorWithRed:(nativeColor & 0xFF) / 255.0 green:((nativeColor >> 8) & 0xFF) / 255.0 blue:((nativeColor >> 16) & 0xFF) / 255.0 diff --git a/Cocoa/GBPaletteViewRow.xib b/Cocoa/GBPaletteViewRow.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> diff --git a/Cocoa/GBPreferencesWindow.h b/Cocoa/GBPreferencesWindow.h @@ -1,6 +1,7 @@ #import <Cocoa/Cocoa.h> #import <JoyKit/JoyKit.h> #import "GBPaletteEditorController.h" +#import "GBTitledPopUpButton.h" @interface GBPreferencesWindow : NSWindow <NSTableViewDelegate, NSTableViewDataSource, JOYListener> @property IBOutlet NSTableView *controlsTableView; @@ -18,4 +19,7 @@ @property IBOutlet NSPopUpButton *colorPalettePopupButton; @property IBOutlet NSPopUpButton *hotkey1PopupButton; @property IBOutlet NSPopUpButton *hotkey2PopupButton; + +@property IBOutlet GBTitledPopUpButton *fontPopupButton; +@property IBOutlet NSStepper *fontSizeStepper; @end diff --git a/Cocoa/GBPreferencesWindow.m b/Cocoa/GBPreferencesWindow.m @@ -339,6 +339,63 @@ static inline NSString *keyEquivalentString(NSMenuItem *item) else { [_colorPalettePopupButton selectItemWithTitle:[[NSUserDefaults standardUserDefaults] stringForKey:@"GBCurrentTheme"] ?: @""]; } + + _fontSizeStepper.intValue = [[NSUserDefaults standardUserDefaults] integerForKey:@"GBDebuggerFontSize"]; + [self updateFonts]; +} + +- (IBAction)fontSizeChanged:(id)sender +{ + NSString *selectedFont = [[NSUserDefaults standardUserDefaults] stringForKey:@"GBDebuggerFont"]; + [[NSUserDefaults standardUserDefaults] setInteger:[sender intValue] forKey:@"GBDebuggerFontSize"]; + [_fontPopupButton setDisplayTitle:[NSString stringWithFormat:@"%@ %upt", selectedFont, (unsigned)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBDebuggerFontSize"]]]; +} + +- (IBAction)fontChanged:(id)sender +{ + NSString *selectedFont = _fontPopupButton.selectedItem.title; + [[NSUserDefaults standardUserDefaults] setObject:selectedFont forKey:@"GBDebuggerFont"]; + [_fontPopupButton setDisplayTitle:[NSString stringWithFormat:@"%@ %upt", selectedFont, (unsigned)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBDebuggerFontSize"]]]; + +} + +- (void)updateFonts +{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSFontManager *fontManager = [NSFontManager sharedFontManager]; + NSArray *allFamilies = [fontManager availableFontFamilies]; + NSMutableSet *families = [NSMutableSet set]; + for (NSString *family in allFamilies) { + if ([fontManager fontNamed:family hasTraits:NSFixedPitchFontMask]) { + [families addObject:family]; + } + } + + bool hasSFMono = false; + if (@available(macOS 10.15, *)) { + hasSFMono = [[NSFont monospacedSystemFontOfSize:12 weight:NSFontWeightRegular].displayName containsString:@"SF"]; + } + + if (hasSFMono) { + [families addObject:@"SF Mono"]; + } + + NSArray *sortedFamilies = [[families allObjects] sortedArrayUsingSelector:@selector(compare:)]; + + dispatch_async(dispatch_get_main_queue(), ^{ + if (![families containsObject:[[NSUserDefaults standardUserDefaults] stringForKey:@"GBDebuggerFont"]]) { + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"GBDebuggerFont"]; + } + + [_fontPopupButton.menu removeAllItems]; + for (NSString *family in sortedFamilies) { + [_fontPopupButton addItemWithTitle:family]; + } + NSString *selectedFont = [[NSUserDefaults standardUserDefaults] stringForKey:@"GBDebuggerFont"]; + [_fontPopupButton selectItemWithTitle:selectedFont]; + [_fontPopupButton setDisplayTitle:[NSString stringWithFormat:@"%@ %upt", selectedFont, (unsigned)[[NSUserDefaults standardUserDefaults] integerForKey:@"GBDebuggerFontSize"]]]; + }); + }); } - (void)dealloc diff --git a/Cocoa/GBTitledPopUpButton.h b/Cocoa/GBTitledPopUpButton.h @@ -0,0 +1,5 @@ +#import <Cocoa/Cocoa.h> + +@interface GBTitledPopUpButton : NSPopUpButton +@property NSString *displayTitle; +@end diff --git a/Cocoa/GBTitledPopUpButton.m b/Cocoa/GBTitledPopUpButton.m @@ -0,0 +1,22 @@ +#import "GBTitledPopUpButton.h" + +@implementation GBTitledPopUpButton + +- (void)setDisplayTitle:(NSString *)displayTitle +{ + if (!displayTitle) { + ((NSPopUpButtonCell *)self.cell).usesItemFromMenu = true; + ((NSPopUpButtonCell *)self.cell).menuItem = nil; + return; + } + ((NSPopUpButtonCell *)self.cell).usesItemFromMenu = false; + ((NSPopUpButtonCell *)self.cell).menuItem = [[NSMenuItem alloc] initWithTitle:displayTitle action:nil keyEquivalent:@""]; +} + + +- (NSString *)displayTitle +{ + return ((NSPopUpButtonCell *)self.cell).menuItem.title; +} + +@end diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <dependencies> <deployment identifier="macosx"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -24,7 +24,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES"/> <windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/> <rect key="contentRect" x="196" y="240" width="320" height="224"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/> <view key="contentView" id="EiT-Mj-1SZ"> <rect key="frame" x="0.0" y="0.0" width="320" height="224"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -32,26 +32,36 @@ <toolbar key="toolbar" implicitIdentifier="689472FF-3BCD-4B1F-98F8-989CCB01AE27" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconAndLabel" sizeMode="regular" id="pYZ-Pe-8hq"> <allowedToolbarItems> <toolbarItem implicitItemIdentifier="4E86DC78-64E2-4ABB-ACB7-7CC8B34DC3F1" label="Emulation" paletteLabel="Emulation" image="CPU" autovalidates="NO" selectable="YES" id="zdp-Z7-yZM"> + <size key="minSize" width="22" height="22"/> + <size key="maxSize" width="22" height="22"/> <connections> <action selector="switchPreferencesTab:" target="-2" id="AK1-Qj-JOU"/> </connections> </toolbarItem> <toolbarItem implicitItemIdentifier="279C2F03-535F-4760-8E10-08B3CD1C717F" label="Video" paletteLabel="Video" tag="1" image="Display" autovalidates="NO" selectable="YES" id="fCd-4a-SKR"> + <size key="minSize" width="22" height="22"/> + <size key="maxSize" width="22" height="22"/> <connections> <action selector="switchPreferencesTab:" target="-2" id="wck-Sv-EsJ"/> </connections> </toolbarItem> <toolbarItem implicitItemIdentifier="FB9201F6-0B4D-46BA-8826-66E0C4C99A19" label="Audio" paletteLabel="Audio" tag="2" image="Speaker" autovalidates="NO" selectable="YES" id="EMp-g1-eKu"> + <size key="minSize" width="22" height="22"/> + <size key="maxSize" width="22" height="22"/> <connections> <action selector="switchPreferencesTab:" target="-2" id="UrT-PP-tQV"/> </connections> </toolbarItem> <toolbarItem implicitItemIdentifier="D997D835-98C7-4A25-8C40-5416D974F3B9" label="Controls" paletteLabel="Controls" tag="3" image="Joypad" autovalidates="NO" selectable="YES" id="uNZ-j1-Dfx"> + <size key="minSize" width="22" height="22"/> + <size key="maxSize" width="22" height="22"/> <connections> <action selector="switchPreferencesTab:" target="-2" id="Tio-D7-PaA"/> </connections> </toolbarItem> <toolbarItem implicitItemIdentifier="EB7AB5BC-57B0-4639-A037-E28226866C80" label="Updates" paletteLabel="Updates" tag="4" image="Updates" autovalidates="NO" selectable="YES" id="lMV-68-ntz"> + <size key="minSize" width="22" height="22"/> + <size key="maxSize" width="22" height="22"/> <connections> <action selector="switchPreferencesTab:" target="-2" id="bfU-hc-FnN"/> </connections> @@ -73,6 +83,8 @@ <outlet property="configureJoypadButton" destination="Qa7-Z7-yfO" id="RaX-P3-oCX"/> <outlet property="controlsTableView" destination="UDd-IJ-fxX" id="a1D-Md-yXv"/> <outlet property="delegate" destination="-2" id="ASc-vN-Zbq"/> + <outlet property="fontPopupButton" destination="dYY-fo-BfM" id="gdI-HM-meM"/> + <outlet property="fontSizeStepper" destination="O9O-Eq-PZb" id="lvr-fl-OZc"/> <outlet property="highpassFilterPopupButton" destination="T69-6N-dhT" id="B5V-sQ-JmR"/> <outlet property="hotkey1PopupButton" destination="qsH-w5-Rja" id="TFr-p8-IYo"/> <outlet property="hotkey2PopupButton" destination="Ryk-mD-c0y" id="m2J-O5-dng"/> @@ -86,20 +98,20 @@ <point key="canvasLocation" x="183" y="354"/> </window> <customView id="sRK-wO-K6R"> - <rect key="frame" x="0.0" y="0.0" width="320" height="429"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="545"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <subviews> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T91-rh-rRp"> - <rect key="frame" x="18" y="392" width="280" height="17"/> + <rect key="frame" x="18" y="508" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Graphics filter:" id="pXg-WY-8Q5"> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Scaling filter:" id="pXg-WY-8Q5"> <font key="font" metaFont="system"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6pP-kK-EEC" customClass="GBPreferencePopUpButton"> - <rect key="frame" x="30" y="359" width="262" height="26"/> + <rect key="frame" x="30" y="475" width="262" height="26"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="Nearest neighbor (Pixelated)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="neN-eo-LA7" id="I1w-05-lGl"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -193,9 +205,9 @@ </userDefinedRuntimeAttributes> </popUpButton> <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="spQ-Md-OFi" customClass="GBPreferenceButton"> - <rect key="frame" x="32" y="338" width="259" height="18"/> + <rect key="frame" x="18" y="400" width="276" height="18"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> - <buttonCell key="cell" type="check" title="Apply filter to screenshots" bezelStyle="regularSquare" imagePosition="left" inset="2" id="JbP-bE-w8A"> + <buttonCell key="cell" type="check" title="Apply filters to screenshots" bezelStyle="regularSquare" imagePosition="left" inset="2" id="JbP-bE-w8A"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <font key="font" metaFont="system"/> </buttonCell> @@ -204,7 +216,7 @@ </userDefinedRuntimeAttributes> </button> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wc3-2K-6CD"> - <rect key="frame" x="18" y="315" width="280" height="17"/> + <rect key="frame" x="18" y="351" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Color correction:" id="5Si-hz-EK3"> <font key="font" metaFont="system"/> @@ -213,7 +225,7 @@ </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VEz-N4-uP6" customClass="GBPreferencePopUpButton"> - <rect key="frame" x="30" y="282" width="229" height="26"/> + <rect key="frame" x="30" y="318" width="229" height="26"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="Disabled" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="D2J-wV-1vu" id="fNJ-Fi-yOm"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -239,7 +251,7 @@ </userDefinedRuntimeAttributes> </popUpButton> <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-mL-AJZ" customClass="GBPreferencesSlider"> - <rect key="frame" x="32" y="226" width="259" height="28"/> + <rect key="frame" x="32" y="262" width="259" height="28"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="-256" maxValue="256" tickMarkPosition="below" numberOfTickMarks="3" sliderType="linear" id="KX7-G9-k0O"/> <userDefinedRuntimeAttributes> @@ -250,7 +262,7 @@ </userDefinedRuntimeAttributes> </slider> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cCm-Oa-FbN"> - <rect key="frame" x="18" y="260" width="280" height="17"/> + <rect key="frame" x="18" y="296" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Ambient light temperature:" id="Lso-GQ-pBl"> <font key="font" metaFont="system"/> @@ -259,7 +271,7 @@ </textFieldCell> </textField> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MLC-Rx-FgO"> - <rect key="frame" x="18" y="202" width="280" height="17"/> + <rect key="frame" x="18" y="454" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Frame blending:" id="UCa-EO-tzh"> <font key="font" metaFont="system"/> @@ -268,7 +280,7 @@ </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lxk-db-Sxv" customClass="GBPreferencePopUpButton"> - <rect key="frame" x="30" y="169" width="262" height="26"/> + <rect key="frame" x="30" y="421" width="262" height="26"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="Disabled" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="iHP-Yz-fiH" id="aQ6-HN-7Aj"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -288,7 +300,7 @@ </userDefinedRuntimeAttributes> </popUpButton> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8fG-zm-hpr"> - <rect key="frame" x="18" y="147" width="280" height="17"/> + <rect key="frame" x="18" y="243" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Color palette for monochrome models:" id="LAN-8Y-T7H"> <font key="font" metaFont="system"/> @@ -297,7 +309,7 @@ </textFieldCell> </textField> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Iwr-eI-SD1"> - <rect key="frame" x="30" y="114" width="262" height="26"/> + <rect key="frame" x="30" y="210" width="262" height="26"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="Greyscale" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Ajr-5r-iIk" id="rEU-jh-m3j"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -318,7 +330,7 @@ </connections> </popUpButton> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3Kz-cf-5X6"> - <rect key="frame" x="18" y="92" width="280" height="17"/> + <rect key="frame" x="18" y="172" width="280" height="17"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Display border:" id="HZd-qi-yyk"> <font key="font" metaFont="system"/> @@ -326,8 +338,17 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iy3-wn-KIz"> + <rect key="frame" x="18" y="49" width="280" height="17"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Monospace font:" id="kwA-BU-mBC"> + <font key="font" metaFont="system"/> + <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="R9D-FV-bpd" customClass="GBPreferencePopUpButton"> - <rect key="frame" x="30" y="59" width="262" height="26"/> + <rect key="frame" x="30" y="139" width="262" height="26"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <popUpButtonCell key="cell" type="push" title="Never" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="heL-AV-0az" id="DY9-2D-h1L"> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> @@ -346,8 +367,26 @@ <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBBorderMode"/> </userDefinedRuntimeAttributes> </popUpButton> + <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dYY-fo-BfM" customClass="GBTitledPopUpButton"> + <rect key="frame" x="30" y="16" width="242" height="26"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + <popUpButtonCell key="cell" type="push" title="SF Mono 12pt" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="nKR-aK-yMd" id="wDA-Sg-O1l"> + <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="menu"/> + <menu key="menu" id="Hhw-EU-o9x"> + <items> + <menuItem title="SF Mono 12pt" state="on" id="nKR-aK-yMd"> + <modifierMask key="keyEquivalentModifierMask"/> + </menuItem> + </items> + </menu> + </popUpButtonCell> + <connections> + <action selector="fontChanged:" target="QvC-M9-y7g" id="TAe-kZ-Jza"/> + </connections> + </popUpButton> <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vfj-tg-7OP" customClass="GBPreferenceButton"> - <rect key="frame" x="18" y="38" width="286" height="18"/> + <rect key="frame" x="18" y="118" width="286" height="18"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="check" title="Keep aspect ratio" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="lsj-rC-Eo6"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> @@ -359,7 +398,7 @@ </userDefinedRuntimeAttributes> </button> <button horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qCy-Se-vsG"> - <rect key="frame" x="266" y="281" width="25" height="25"/> + <rect key="frame" x="266" y="319" width="25" height="25"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="tAH-Lp-v24"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -370,7 +409,7 @@ </connections> </button> <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="quK-gY-Z6h" customClass="GBPreferenceButton"> - <rect key="frame" x="18" y="18" width="286" height="18"/> + <rect key="frame" x="18" y="98" width="286" height="18"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="check" title="On-screen display" bezelStyle="regularSquare" imagePosition="left" inset="2" id="oeT-cD-YRw"> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> @@ -380,8 +419,29 @@ <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBOSDEnabled"/> </userDefinedRuntimeAttributes> </button> + <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="EC8-82-Xxo"> + <rect key="frame" x="11" y="382" width="296" height="5"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + </box> + <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="eYo-73-EkT"> + <rect key="frame" x="8" y="195" width="296" height="5"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + </box> + <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Snt-cX-yDv"> + <rect key="frame" x="8" y="80" width="296" height="5"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> + </box> + <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="O9O-Eq-PZb"> + <rect key="frame" x="273" y="15" width="17" height="28"/> + <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> + <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="8" maxValue="64" doubleValue="12" id="E76-1u-cJx"> + <connections> + <action selector="fontSizeChanged:" target="QvC-M9-y7g" id="4nn-a7-CvS"/> + </connections> + </stepperCell> + </stepper> </subviews> - <point key="canvasLocation" x="-501" y="231.5"/> + <point key="canvasLocation" x="-501" y="175.5"/> </customView> <customView id="ymk-46-SX7"> <rect key="frame" x="0.0" y="0.0" width="320" height="434"/> @@ -677,7 +737,7 @@ </userDefinedRuntimeAttributes> </slider> <button horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Ub-0B-W2H"> - <rect key="frame" x="266" y="74" width="25" height="25"/> + <rect key="frame" x="266" y="75" width="25" height="25"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="OUS-fa-Mkv"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> @@ -1006,7 +1066,6 @@ <tableColumns> <tableColumn identifier="keyName" width="116" minWidth="40" maxWidth="1000" id="73A-gb-pzd"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> @@ -1017,9 +1076,8 @@ </textFieldCell> <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/> </tableColumn> - <tableColumn width="138" minWidth="40" maxWidth="1000" id="5VG-zV-WM6"> + <tableColumn width="100" minWidth="40" maxWidth="1000" id="5VG-zV-WM6"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> @@ -1112,7 +1170,7 @@ <window title="Palette Editor" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="g32-xe-7al"> <windowStyleMask key="styleMask" titled="YES" closable="YES"/> <rect key="contentRect" x="283" y="305" width="467" height="341"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/> <view key="contentView" id="uMa-Yg-exg"> <rect key="frame" x="0.0" y="0.0" width="467" height="341"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -1120,20 +1178,19 @@ <scrollView focusRingType="none" fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DPL-nH-GVw"> <rect key="frame" x="-1" y="24" width="160" height="318"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/> - <clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="5Al-aC-tq8"> + <clipView key="contentView" drawsBackground="NO" id="5Al-aC-tq8"> <rect key="frame" x="1" y="1" width="158" height="316"/> - <autoresizingMask key="autoresizingMask"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" id="ZVn-bk-duk"> + <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" id="ZVn-bk-duk"> <rect key="frame" x="0.0" y="0.0" width="158" height="316"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/> <tableColumns> - <tableColumn width="155" minWidth="40" maxWidth="1000" id="qZn-U2-gsp"> + <tableColumn width="126" minWidth="40" maxWidth="1000" id="qZn-U2-gsp"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> @@ -1358,7 +1415,7 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="283" y="305" width="521" height="322"/> - <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/> + <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/> <view key="contentView" id="waz-WG-RYg"> <rect key="frame" x="0.0" y="0.0" width="521" height="322"/> <autoresizingMask key="autoresizingMask"/> @@ -1411,15 +1468,15 @@ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <scrollView focusRingType="none" fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="38" horizontalPageScroll="10" verticalLineScroll="38" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9m1-mD-ctP"> + <scrollView focusRingType="none" fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9m1-mD-ctP"> <rect key="frame" x="20" y="55" width="481" height="205"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <clipView key="contentView" ambiguous="YES" id="4U7-cB-J7O"> + <clipView key="contentView" id="4U7-cB-J7O"> <rect key="frame" x="1" y="1" width="479" height="203"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="36" rowSizeStyle="large" id="XQa-0K-gl3"> - <rect key="frame" x="0.0" y="0.0" width="479" height="203"/> + <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="24" rowSizeStyle="large" id="XQa-0K-gl3"> + <rect key="frame" x="0.0" y="0.0" width="488" height="203"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -1427,7 +1484,6 @@ <tableColumns> <tableColumn width="40" minWidth="40" maxWidth="40" id="GX5-ka-beq"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> @@ -1436,7 +1492,6 @@ </tableColumn> <tableColumn width="250" minWidth="40" maxWidth="1000" id="YhU-Z2-p6i"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> </tableHeaderCell> @@ -1451,7 +1506,6 @@ Test</string> </tableColumn> <tableColumn width="180" minWidth="180" maxWidth="180" id="9fC-GK-Fzn"> <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left"> - <font key="font" metaFont="smallSystem"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </tableHeaderCell> @@ -1476,8 +1530,8 @@ Test</string> </tableView> </subviews> </clipView> - <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="QaD-xE-QPs"> - <rect key="frame" x="1" y="188" width="476" height="16"/> + <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="QaD-xE-QPs"> + <rect key="frame" x="1" y="188" width="479" height="16"/> <autoresizingMask key="autoresizingMask"/> </scroller> <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Plj-YY-6jm"> @@ -1499,8 +1553,8 @@ Test</string> <image name="CPU" width="32" height="32"/> <image name="Display" width="32" height="32"/> <image name="Joypad" width="32" height="32"/> - <image name="NSAddTemplate" width="11" height="11"/> - <image name="NSRemoveTemplate" width="11" height="11"/> + <image name="NSAddTemplate" width="14" height="13"/> + <image name="NSRemoveTemplate" width="14" height="4"/> <image name="Speaker" width="32" height="32"/> <image name="Updates" width="32" height="32"/> </resources>
This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.