From 86cd7142f9e08e2c27309dd36d23d607228fa34b Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Thu, 1 Dec 2016 23:53:38 +0900
Subject: [PATCH] =?utf8?q?=E4=BA=8C=E5=BA=A6=E7=9B=AE=E4=BB=A5=E9=99=8D?=
 =?utf8?q?=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=B3=E3=82=B7?=
 =?utf8?q?=E3=83=A7=E3=83=83=E3=83=88=E3=81=AE=E5=88=87=E3=82=8A=E6=8A=9C?=
 =?utf8?q?=E3=81=8D=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA?=
 =?utf8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

#36832
---
 KCD/Base.lproj/HMScreenshotEditorViewController.xib | 13 ++++++++-----
 KCD/HMScreenshotEditorViewController.m              | 12 +++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/KCD/Base.lproj/HMScreenshotEditorViewController.xib b/KCD/Base.lproj/HMScreenshotEditorViewController.xib
index 26296655..a96ea65f 100644
--- a/KCD/Base.lproj/HMScreenshotEditorViewController.xib
+++ b/KCD/Base.lproj/HMScreenshotEditorViewController.xib
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?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>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <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="HMScreenshotEditorViewController">
             <connections>
                 <outlet property="arrayController" destination="1VC-Yr-1PQ" id="BG1-LA-5PA"/>
+                <outlet property="doneButton" destination="iTK-y4-DQg" id="cdi-Rb-sYU"/>
                 <outlet property="tiledImageView" destination="lCg-sn-irn" id="87K-J6-oKX"/>
                 <outlet property="view" destination="c22-O7-iKe" id="h4x-1w-GfV"/>
             </connections>
@@ -81,8 +84,8 @@ DQ
                         </menu>
                     </popUpButtonCell>
                     <connections>
-                        <binding destination="S0t-qm-yVr" name="content" keyPath="arrangedObjects" id="TNR-KK-m7j"/>
                         <binding destination="S0t-qm-yVr" name="contentObjects" keyPath="arrangedObjects" previousBinding="TNR-KK-m7j" id="6l3-5F-6Rd"/>
+                        <binding destination="S0t-qm-yVr" name="content" keyPath="arrangedObjects" id="TNR-KK-m7j"/>
                         <binding destination="S0t-qm-yVr" name="contentValues" keyPath="arrangedObjects.name" previousBinding="6l3-5F-6Rd" id="DRF-2G-1DY"/>
                         <binding destination="-2" name="selectedIndex" keyPath="currentTrimInfoIndex" previousBinding="DRF-2G-1DY" id="T9O-Nz-3lk"/>
                     </connections>
@@ -107,7 +110,7 @@ DQ
                     </connections>
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ong-Wl-WvH">
-                    <rect key="frame" x="48" y="17" width="19" height="27"/>
+                    <rect key="frame" x="48" y="18" width="19" height="26"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="13" id="JWr-Ab-eUf"/>
                         <constraint firstAttribute="height" constant="22" id="jaG-AX-7rd"/>
diff --git a/KCD/HMScreenshotEditorViewController.m b/KCD/HMScreenshotEditorViewController.m
index 0ae6d117..88f8661f 100644
--- a/KCD/HMScreenshotEditorViewController.m
+++ b/KCD/HMScreenshotEditorViewController.m
@@ -41,6 +41,7 @@
 @property (strong) NSImage *editedImage;
 
 @property (nonatomic, weak) IBOutlet HMTiledImageView *tiledImageView;
+@property (nonatomic, weak) IBOutlet NSButton *doneButton;
 
 @property (copy) NSArray<HMScreenshotInformation *> *currentSelection;
 @property (strong) NSMutableArray<HMEditedImage *> *editedImages;
@@ -99,6 +100,11 @@
 	[self.arrayController removeObserver:self forKeyPath:NSSelectionIndexesBinding];
 }
 
+- (void)viewWillAppear
+{
+    [self.doneButton setAction:@selector(done:)];
+}
+
 - (void)setColumnCount:(NSInteger)columnCount
 {
 	self.tiledImageView.columnCount = columnCount;
@@ -258,9 +264,9 @@
 
 - (IBAction)done:(id)sender
 {
-	if([sender respondsToSelector:@selector(setAction:)]) {
-		[sender setAction:nil];
-	}
+//	if([sender respondsToSelector:@selector(setAction:)]) {
+//		[sender setAction:nil];
+//	}
 	
 	[NSApp sendAction:@selector(registerImage:) to:nil from:self];
 	
-- 
2.11.0