F499E8901B5D4E7F00189029 /* HMPortNotifyCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F499E88F1B5D4E7F00189029 /* HMPortNotifyCommand.m */; };
F49AABC71DF70BAE00E0B24F /* HMMainTabVIewItemViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F49AABC61DF70BAE00E0B24F /* HMMainTabVIewItemViewController.m */; };
F49AABE61DFC48F300E0B24F /* MainTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F49AABE51DFC48F300E0B24F /* MainTouchBar.xib */; };
+ F49AABE81DFD33FB00E0B24F /* HistoryWindowTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F49AABE71DFD33FB00E0B24F /* HistoryWindowTouchBar.xib */; };
F4A2AF521A074DCF0024BD9E /* HMScreenshotListWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A2AF501A074DCF0024BD9E /* HMScreenshotListWindowController.m */; };
F4A2AF581A0930160024BD9E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4A2AF571A0930160024BD9E /* Quartz.framework */; };
F4A2AF5B1A0F9B490024BD9E /* HMScreenshotInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A2AF5A1A0F9B490024BD9E /* HMScreenshotInformation.m */; };
F49AABC51DF70BAE00E0B24F /* HMMainTabVIewItemViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMainTabVIewItemViewController.h; sourceTree = "<group>"; };
F49AABC61DF70BAE00E0B24F /* HMMainTabVIewItemViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMainTabVIewItemViewController.m; sourceTree = "<group>"; };
F49AABE51DFC48F300E0B24F /* MainTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainTouchBar.xib; sourceTree = "<group>"; };
+ F49AABE71DFD33FB00E0B24F /* HistoryWindowTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HistoryWindowTouchBar.xib; sourceTree = "<group>"; };
F4A2AF4F1A074DCF0024BD9E /* HMScreenshotListWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMScreenshotListWindowController.h; sourceTree = "<group>"; };
F4A2AF501A074DCF0024BD9E /* HMScreenshotListWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMScreenshotListWindowController.m; sourceTree = "<group>"; };
F4A2AF571A0930160024BD9E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
F4D2CBBF18ACE7D7000EBC59 /* Command */,
F4BEEEA918D890660006F70C /* UI */,
F4BEEEA818D88FF30006F70C /* CoreData */,
- F4BDEB5E187252F30069D0CE /* Images.xcassets */,
F4BDEB4D187252F30069D0CE /* Supporting Files */,
);
path = KCD;
F40ADA011CE6317500AE29B0 /* HMIgnoreCommand.plist */,
F4A9B8D51B99D5B7005786C2 /* Taihi.txt */,
F4A9B8D81BA40ED1005786C2 /* LICENSE */,
+ F4BDEB5E187252F30069D0CE /* Images.xcassets */,
);
name = "Supporting Files";
sourceTree = "<group>";
F421850E1DF4518000256590 /* BroswerTouchBar.xib */,
F42185101DF461A600256590 /* HMScreenshotTouchBar.xib */,
F49AABE51DFC48F300E0B24F /* MainTouchBar.xib */,
+ F49AABE71DFD33FB00E0B24F /* HistoryWindowTouchBar.xib */,
);
name = TestAndDebug;
path = KCD;
F4666C6B1B29E974001840DB /* EquipmentStrengthen.plist in Resources */,
F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */,
F4C6685D1C54515C00601AFB /* HMBrowserContentAdjuster.xib in Resources */,
+ F49AABE81DFD33FB00E0B24F /* HistoryWindowTouchBar.xib in Resources */,
F4C668721C54525300601AFB /* HMCombileViewController.xib in Resources */,
F4C5A23E1C380E0400533FB6 /* HMEnhancementListItem.plist in Resources */,
);
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2659" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="HMHistoryWindowController">
<rect key="frame" x="17" y="8" width="638" height="426"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="fQm-u6-BcB">
- <rect key="frame" x="1" y="17" width="636" height="408"/>
+ <rect key="frame" x="1" y="0.0" width="636" height="425"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="reverseSequential" alternatingRowBackgroundColors="YES" autosaveName="kaihatuHistory" rowSizeStyle="automatic" headerView="S87-OC-vhS" viewBased="YES" id="aCA-Gg-AUV">
</connections>
</tableView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Vfq-5M-tgG">
<rect key="frame" x="1" y="438" width="636" height="16"/>
<rect key="frame" x="17" y="8" width="638" height="426"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="pnS-lB-JNx">
- <rect key="frame" x="1" y="17" width="636" height="408"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <rect key="frame" x="1" y="0.0" width="636" height="425"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="reverseSequential" alternatingRowBackgroundColors="YES" autosaveName="kenzoHistory" rowSizeStyle="automatic" headerView="11L-S0-22L" viewBased="YES" id="Wyj-Am-Fha">
<rect key="frame" x="0.0" y="0.0" width="636" height="408"/>
</connections>
</tableView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="D5A-az-4EU">
<rect key="frame" x="1" y="438" width="636" height="16"/>
<rect key="frame" x="17" y="8" width="638" height="426"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="egd-t1-HqM">
- <rect key="frame" x="1" y="17" width="636" height="408"/>
+ <rect key="frame" x="1" y="0.0" width="636" height="425"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential" alternatingRowBackgroundColors="YES" autosaveName="drophistory" rowSizeStyle="automatic" headerView="GLB-Em-NKT" viewBased="YES" id="VIc-m5-S1Y">
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
+ <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont13" id="Q3a-dJ-8WA"/>
<binding destination="eS2-cp-erZ" name="displayPatternValue1" keyPath="objectValue.mapArea" id="SeI-xA-Dvb">
<dictionary key="options">
<string key="NSDisplayPattern">%{value1}@-%{value2}@</string>
<string key="NSDisplayPattern">%{value1}@-%{value2}@</string>
</dictionary>
</binding>
- <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont13" id="Q3a-dJ-8WA"/>
</connections>
</textField>
</subviews>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="mapAreaName" id="zhT-Pt-fhX">
- <rect key="frame" x="234" y="1" width="81" height="17"/>
+ <rect key="frame" x="234" y="1" width="80.5" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="2Fj-d3-l4h">
- <rect key="frame" x="0.0" y="0.0" width="81" height="17"/>
+ <rect key="frame" x="0.0" y="0.0" width="80.5" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Table View Cell" id="UDn-ez-Nj9">
<font key="font" metaFont="system"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="mapInfoName" id="1tQ-Ie-SRJ">
- <rect key="frame" x="318" y="1" width="141" height="17"/>
+ <rect key="frame" x="317.5" y="1" width="141" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="0Jh-At-Nua">
</binding>
</connections>
</tableColumn>
- <tableColumn identifier="date" width="172" minWidth="10" maxWidth="3.4028234663852886e+38" id="g2X-bk-atQ">
+ <tableColumn identifier="date" width="172.5" minWidth="10" maxWidth="3.4028234663852886e+38" id="g2X-bk-atQ">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="日付">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="date" id="Q70-Uk-Ff9">
- <rect key="frame" x="462" y="1" width="172" height="17"/>
+ <rect key="frame" x="461.5" y="1" width="172.5" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="b8z-UU-fXa">
- <rect key="frame" x="0.0" y="0.0" width="172" height="17"/>
+ <rect key="frame" x="0.0" y="0.0" width="172.5" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Table View Cell" id="JWc-Nh-Ejr">
<dateFormatter key="formatter" dateStyle="short" timeStyle="short" doesRelativeDateFormatting="YES" id="IRe-cs-RHF"/>
</connections>
</tableView>
</subviews>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="X8L-gi-Dxc">
<rect key="frame" x="1" y="409" width="636" height="16"/>
@property (nonatomic, weak) IBOutlet NSSearchField *searchField;
+@property (nonatomic, strong) IBOutlet NSTouchBar *myTouchBar;
+@property (nonatomic, weak) IBOutlet NSButton *searchButton;
+
@end
@implementation HMHistoryWindowController
return self;
}
-- (void)awakeFromNib
+- (void)windowDidLoad
{
+ [super windowDidLoad];
+
NSString *predicateFormat = @"";
NSArrayController *target = nil;
switch (self.selectedTabIndex) {
[store saveAction:nil];
}
+- (IBAction)selectSearchField:(id)sender
+{
+ [self.window makeFirstResponder:self.searchField];
+}
+
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
{
SEL action = menuItem.action;
return YES;
}
+- (NSTouchBar *)touchBar
+{
+ if(NSClassFromString(@"NSTouchBar") == Nil) return nil;
+
+ if(self.myTouchBar) return self.myTouchBar;
+
+ NSArray *toplevel = nil;
+ NSBundle *mainBundle = [NSBundle mainBundle];
+ [mainBundle loadNibNamed:@"HistoryWindowTouchBar"
+ owner:self
+ topLevelObjects:&toplevel];
+
+ return self.myTouchBar;
+}
+
#pragma mark - NSTableViewDelegate & NSTableViewDataSource
- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2659" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaDFRPlugin" version="7104"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ <capability name="the Touch Bar" message="Use a version of macOS with Touch Bar support." minToolsVersion="8.1" minSystemVersion="10.12.1" requiredIntegratedClassName="NSTouchBar"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HMHistoryWindowController">
+ <connections>
+ <outlet property="myTouchBar" destination="6zi-UH-Fiy" id="0fR-6K-oG1"/>
+ <outlet property="searchButton" destination="zwm-UM-SpA" id="ips-An-Ehr"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <touchBar id="6zi-UH-Fiy">
+ <touchBarItems>
+ <touchBarItem id="j7q-km-9xd">
+ <viewController key="viewController" id="Kuk-0j-Ob6">
+ <segmentedControl key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n7V-dp-sAJ">
+ <rect key="frame" x="0.0" y="0.0" width="269" height="30"/>
+ <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="uPP-QN-23U">
+ <font key="font" metaFont="system"/>
+ <segments>
+ <segment label="開発履歴" width="87"/>
+ <segment label="建造履歴" width="87" selected="YES" tag="1"/>
+ <segment label="ドロップ履歴" width="87"/>
+ </segments>
+ </segmentedCell>
+ <connections>
+ <binding destination="-2" name="selectedIndex" keyPath="selectedTabIndex" id="0ve-VN-WmF"/>
+ </connections>
+ </segmentedControl>
+ </viewController>
+ <size key="designTimeSize" width="269" height="30"/>
+ </touchBarItem>
+ <touchBarItem id="X83-Wd-05k">
+ <viewController key="viewController" id="Lek-zg-1B1">
+ <button key="view" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zwm-UM-SpA">
+ <rect key="frame" x="0.0" y="0.0" width="144" height="30"/>
+ <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSTouchBarSearchTemplate" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="uOd-QH-aXS">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="selectSearchField:" target="-2" id="92A-dN-pkO"/>
+ </connections>
+ </button>
+ </viewController>
+ </touchBarItem>
+ </touchBarItems>
+ <point key="canvasLocation" x="104" y="262"/>
+ </touchBar>
+ <touchBarItem id="hCw-Xd-2LG">
+ <viewController key="viewController" id="J3c-sk-1H3">
+ <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZwL-ek-v5p">
+ <rect key="frame" x="0.0" y="0.0" width="76" height="30"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" image="search" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="BQn-ci-5dz">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ </button>
+ </viewController>
+ <size key="designTimeSize" width="76" height="30"/>
+ </touchBarItem>
+ <touchBarItem id="EUH-3v-F6X">
+ <viewController key="viewController" id="uWQ-IC-kA8">
+ <button key="view" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ejy-QB-1X3">
+ <rect key="frame" x="0.0" y="0.0" width="72" height="30"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" image="Search" imagePosition="only" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="c0P-G4-0iY">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="selectSearchField:" target="-2" id="Z1r-E2-pV3"/>
+ </connections>
+ </button>
+ </viewController>
+ </touchBarItem>
+ </objects>
+ <resources>
+ <image name="NSTouchBarSearchTemplate" width="128" height="128"/>
+ <image name="Search" width="512" height="512"/>
+ <image name="search" width="512" height="512"/>
+ </resources>
+</document>
OSDN Git Service
