F4666C4D1B1B3113001840DB /* HMBookmarkListTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C4C1B1B3113001840DB /* HMBookmarkListTableView.m */; };
F4666C511B1CB2CE001840DB /* HMBrowserContentAdjuster.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */; };
F4666C521B1CB2CE001840DB /* HMBrowserContentAdjuster.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4666C501B1CB2CE001840DB /* HMBrowserContentAdjuster.xib */; };
+ F4666C561B1E0262001840DB /* HMBookmarkEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C541B1E0262001840DB /* HMBookmarkEditorViewController.m */; };
+ F4666C571B1E0262001840DB /* HMBookmarkEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4666C551B1E0262001840DB /* HMBookmarkEditorViewController.xib */; };
F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F103518A7CE310063E503 /* HMJSONViewCommand.m */; };
F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F104018A9B85E0063E503 /* HMJSONNode.m */; };
F46F104518AA50730063E503 /* HMBroserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F104318AA50730063E503 /* HMBroserWindowController.m */; };
F4666C4E1B1CB2CE001840DB /* HMBrowserContentAdjuster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBrowserContentAdjuster.h; sourceTree = "<group>"; };
F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBrowserContentAdjuster.m; sourceTree = "<group>"; };
F4666C501B1CB2CE001840DB /* HMBrowserContentAdjuster.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMBrowserContentAdjuster.xib; sourceTree = "<group>"; };
+ F4666C531B1E0262001840DB /* HMBookmarkEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBookmarkEditorViewController.h; sourceTree = "<group>"; };
+ F4666C541B1E0262001840DB /* HMBookmarkEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBookmarkEditorViewController.m; sourceTree = "<group>"; };
+ F4666C551B1E0262001840DB /* HMBookmarkEditorViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMBookmarkEditorViewController.xib; sourceTree = "<group>"; };
F46F103418A7CE310063E503 /* HMJSONViewCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMJSONViewCommand.h; sourceTree = "<group>"; };
F46F103518A7CE310063E503 /* HMJSONViewCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMJSONViewCommand.m; sourceTree = "<group>"; };
F46F103F18A9B85E0063E503 /* HMJSONNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMJSONNode.h; sourceTree = "<group>"; };
F4666C4E1B1CB2CE001840DB /* HMBrowserContentAdjuster.h */,
F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */,
F4666C501B1CB2CE001840DB /* HMBrowserContentAdjuster.xib */,
+ F4666C531B1E0262001840DB /* HMBookmarkEditorViewController.h */,
+ F4666C541B1E0262001840DB /* HMBookmarkEditorViewController.m */,
+ F4666C551B1E0262001840DB /* HMBookmarkEditorViewController.xib */,
);
name = TestAndDebug;
path = KCD;
F43E67B918BE060E0087E5B6 /* LevelUpExp.plist in Resources */,
F4B3DC3018E5C81E0011B4FC /* HMHistoryWindowController.xib in Resources */,
F4B3DC3618E5C8650011B4FC /* HMShipWindowController.xib in Resources */,
+ F4666C571B1E0262001840DB /* HMBookmarkEditorViewController.xib in Resources */,
F4B3DC3C18E5C87D0011B4FC /* HMDocksViewController.xib in Resources */,
F4B2D02B18F83A2F00542742 /* HMScreenshotWindowController.xib in Resources */,
F4B3DC3918E5C8700011B4FC /* HMJSONViewWindowController.xib in Resources */,
F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */,
F4B3DC1E18DEB8C70011B4FC /* HMKenzoHistory.m in Sources */,
F4A2AF5B1A0F9B490024BD9E /* HMScreenshotInformation.m in Sources */,
+ F4666C561B1E0262001840DB /* HMBookmarkEditorViewController.m in Sources */,
F43769DE1AE1248800DE6204 /* HMAirBattleCommand.m in Sources */,
F4B3DC5218F150CD0011B4FC /* HMScreenshotWindowController.m in Sources */,
F426802E194D0FFD00B2C27F /* HMMemberShip3Command.m in Sources */,
--- /dev/null
+//
+// HMBookmarkEditorViewController.h
+// KCD
+//
+// Created by Hori,Masaki on 2015/06/03.
+// Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface HMBookmarkEditorViewController : NSViewController
+
+@end
--- /dev/null
+//
+// HMBookmarkEditorViewController.m
+// KCD
+//
+// Created by Hori,Masaki on 2015/06/03.
+// Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import "HMBookmarkEditorViewController.h"
+
+@interface HMBookmarkEditorViewController ()
+
+@end
+
+@implementation HMBookmarkEditorViewController
+
+- (instancetype)init
+{
+ self = [super initWithNibName:NSStringFromClass([self class])
+ bundle:nil];
+ return self;
+}
+
+@end
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HMBookmarkEditorViewController">
+ <connections>
+ <outlet property="view" destination="pcv-Hv-bXe" id="mJN-BV-ldx"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <customView id="pcv-Hv-bXe">
+ <rect key="frame" x="0.0" y="0.0" width="318" height="66"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IRo-IB-n0X">
+ <rect key="frame" x="9" y="10" width="82" height="20"/>
+ <buttonCell key="cell" type="check" title="Scroll Lock" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="okS-ci-exe">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ </buttonCell>
+ <connections>
+ <binding destination="I4C-W6-dUG" name="value" keyPath="selection.canScroll" id="4Wc-n6-vfR">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </button>
+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="p5V-yH-J1x">
+ <rect key="frame" x="94" y="10" width="86" height="20"/>
+ <buttonCell key="cell" type="check" title="Resize Lock" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="kjp-el-vjI">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="smallSystem"/>
+ </buttonCell>
+ <connections>
+ <binding destination="I4C-W6-dUG" name="value" keyPath="selection.canResize" id="a4z-Rf-d6z">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Vh-AS-ZaB">
+ <rect key="frame" x="12" y="35" width="294" height="19"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="tH0-kx-rHf">
+ <font key="font" metaFont="smallSystem"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="I4C-W6-dUG" name="value" keyPath="selection.name" id="8Mv-a1-VCI"/>
+ </connections>
+ </textField>
+ <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="o8R-zQ-BDE">
+ <rect key="frame" x="214" y="11" width="92" height="17"/>
+ <sliderCell key="cell" controlSize="small" state="on" alignment="left" maxValue="3" doubleValue="3" tickMarkPosition="above" sliderType="linear" id="G0v-GD-pZ6"/>
+ <connections>
+ <binding destination="I4C-W6-dUG" name="value" keyPath="selection.scrollDelayValue" id="XTc-ic-kne"/>
+ </connections>
+ </slider>
+ </subviews>
+ <point key="canvasLocation" x="323" y="365"/>
+ </customView>
+ <objectController objectClassName="HMBookmarkItem" id="I4C-W6-dUG">
+ <connections>
+ <binding destination="-2" name="contentObject" keyPath="representedObject" id="WSR-7y-dcX"/>
+ </connections>
+ </objectController>
+ </objects>
+</document>
#import "HMBookmarkListViewController.h"
#import "HMBookmarkManager.h"
+#import "HMBookmarkEditorViewController.h"
const NSInteger kEditMenuItemTag = 1000;
@property (weak) IBOutlet NSMenu *contextMenu;
@property (weak) IBOutlet NSPopover *popover;
+@property (strong) HMBookmarkEditorViewController *editorController;
- (IBAction)editBookmark:(id)sender;
- (IBAction)deleteBookmark:(id)sender;
bundle:nil];
return self;
}
+- (void)awakeFromNib
+{
+ self.editorController = [HMBookmarkEditorViewController new];
+ self.popover.contentViewController = self.editorController;
+}
- (NSManagedObjectContext *)managedObjectContext
{
NSNumber *rowValue = [sender representedObject];
NSInteger row = rowValue.integerValue;
if(row == -1) return;
+ if(row < [self.bookmarkController.arrangedObjects count]) {
+ self.editorController.representedObject = [self.bookmarkController.arrangedObjects objectAtIndex:row];
+ }
NSRect itemRect = [self.tableView rectOfRow:row];
<binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="vDA-YV-JVF"/>
</connections>
</arrayController>
- <viewController id="i4C-pG-Gvk" userLabel="Popover View Controller">
- <connections>
- <outlet property="view" destination="Huh-Pi-Oa3" id="MVf-g0-4Jp"/>
- </connections>
- </viewController>
- <popover behavior="t" id="mDW-wJ-wBK">
- <connections>
- <outlet property="contentViewController" destination="i4C-pG-Gvk" id="Iw8-kz-8wd"/>
- </connections>
- </popover>
+ <popover behavior="t" id="mDW-wJ-wBK"/>
<customView id="Huh-Pi-Oa3">
<rect key="frame" x="0.0" y="0.0" width="358" height="199"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<window title="微調整" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" animationBehavior="default" id="F0z-JX-Cv5" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="196" y="240" width="168" height="159"/>
+ <rect key="contentRect" x="196" y="240" width="159" height="159"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
<view key="contentView" id="se5-gp-TjO">
- <rect key="frame" x="0.0" y="1" width="168" height="159"/>
+ <rect key="frame" x="0.0" y="1" width="159" height="159"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vro-Jz-4Gc">
- <rect key="frame" x="89" y="124" width="34" height="28"/>
+ <rect key="frame" x="86" y="120" width="34" height="28"/>
<buttonCell key="cell" type="push" title="↑" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="voT-h9-w9g">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ss-Jo-HPT">
- <rect key="frame" x="89" y="88" width="34" height="28"/>
+ <rect key="frame" x="86" y="84" width="34" height="28"/>
<buttonCell key="cell" type="push" title="↓" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Xqj-ed-8Je">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8RM-Gi-Cvy">
- <rect key="frame" x="57" y="107" width="34" height="28"/>
+ <rect key="frame" x="54" y="103" width="34" height="28"/>
<buttonCell key="cell" type="push" title="←" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Cvq-pW-Ubj">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fFf-NN-K5E">
- <rect key="frame" x="121" y="107" width="34" height="28"/>
+ <rect key="frame" x="118" y="103" width="34" height="28"/>
<buttonCell key="cell" type="push" title="→" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="u1v-GM-X5e">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yeA-CN-52I">
- <rect key="frame" x="89" y="43" width="34" height="28"/>
+ <rect key="frame" x="86" y="41" width="34" height="28"/>
<buttonCell key="cell" type="push" title="↑" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mqU-QZ-T4b">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ypD-NI-fd9">
- <rect key="frame" x="89" y="7" width="34" height="28"/>
+ <rect key="frame" x="86" y="5" width="34" height="28"/>
<buttonCell key="cell" type="push" title="↓" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cnB-XS-4lI">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vok-0B-bWJ">
- <rect key="frame" x="57" y="26" width="34" height="28"/>
+ <rect key="frame" x="54" y="24" width="34" height="28"/>
<buttonCell key="cell" type="push" title="←" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="h7G-dA-ZOV">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3W5-Xw-XfZ">
- <rect key="frame" x="121" y="26" width="34" height="28"/>
+ <rect key="frame" x="118" y="24" width="34" height="28"/>
<buttonCell key="cell" type="push" title="→" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="gTl-Tq-Cci">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2PG-nQ-Lu8">
- <rect key="frame" x="13" y="115" width="38" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Scroll" id="Chf-WE-4Pr">
- <font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EMa-g8-D2D">
- <rect key="frame" x="13" y="34" width="39" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Resize" id="zMz-gP-QSI">
- <font key="font" metaFont="smallSystem"/>
+ <rect key="frame" x="5" y="138" width="59" height="14"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="スクロール" id="Chf-WE-4Pr">
+ <font key="font" size="11" name="HiraKakuProN-W3"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" fixedFrame="YES" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="Bla-GI-Xje">
- <rect key="frame" x="12" y="78" width="144" height="5"/>
+ <rect key="frame" x="12" y="79" width="135" height="5"/>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<font key="titleFont" metaFont="system"/>
</box>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EMa-g8-D2D">
+ <rect key="frame" x="5" y="60" width="37" height="14"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="サイズ" id="zMz-gP-QSI">
+ <font key="font" size="11" name="HiraKakuProN-W3"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
</subviews>
</view>
<connections>
<outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
</connections>
- <point key="canvasLocation" x="174" y="186.5"/>
+ <point key="canvasLocation" x="168.5" y="182.5"/>
</window>
</objects>
</document>