From 34593e58c7d69b4ae51e8cab001323360cf14593 Mon Sep 17 00:00:00 2001 From: masakih Date: Fri, 23 Dec 2016 22:26:36 +0900 Subject: [PATCH] =?utf8?q?HMBrowserContentAdjuster=E3=82=92Swift=E3=81=AB?= =?utf8?q?=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 10 ++++------ KCD/HMAppDelegate.m | 2 -- KCD/HMBrowserContentAdjuster.h | 13 ------------- KCD/HMBrowserContentAdjuster.m | 34 ---------------------------------- KCD/HMBrowserContentAdjuster.swift | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 55 deletions(-) delete mode 100644 KCD/HMBrowserContentAdjuster.h delete mode 100644 KCD/HMBrowserContentAdjuster.m create mode 100644 KCD/HMBrowserContentAdjuster.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index b80cc21c..f9a6456b 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -77,7 +77,6 @@ F4649FCE1DBC52600097AEBF /* HMScreenshotDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4649FD01DBC52600097AEBF /* HMScreenshotDetailViewController.xib */; }; F4649FD31DBC52A50097AEBF /* HMScreenshotEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4649FD51DBC52A50097AEBF /* HMScreenshotEditorViewController.xib */; }; F4666C4D1B1B3113001840DB /* HMBookmarkListTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C4C1B1B3113001840DB /* HMBookmarkListTableView.m */; }; - F4666C511B1CB2CE001840DB /* HMBrowserContentAdjuster.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */; }; F4666C5A1B2067CF001840DB /* HMSourceListColoredView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C591B2067CF001840DB /* HMSourceListColoredView.m */; }; F4666C5E1B242124001840DB /* HMQuestProgressTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C5D1B242124001840DB /* HMQuestProgressTransformer.m */; }; F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C631B25CA3E001840DB /* HMKCQuest+Extensions.m */; }; @@ -241,6 +240,7 @@ F4D05BC81E0C0DA100688D66 /* HMAirBaseWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BC71E0C0DA100688D66 /* HMAirBaseWindowController.swift */; }; F4D05BCA1E0CADA100688D66 /* HMExternalBrowserWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BC91E0CADA100688D66 /* HMExternalBrowserWindowController.swift */; }; F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCB1E0D274100688D66 /* HMBookmarkEditorViewController.swift */; }; + F4D05BCE1E0D50D300688D66 /* HMBrowserContentAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCD1E0D50D300688D66 /* HMBrowserContentAdjuster.swift */; }; F4D2CBC218AD0E1A000EBC59 /* HMMasterSTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */; }; F4D2CBC518AE2AE2000EBC59 /* HMCompositCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC418AE2AE2000EBC59 /* HMCompositCommand.m */; }; F4D2CBC818B0555A000EBC59 /* HMKCManagedObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC718B0555A000EBC59 /* HMKCManagedObject.m */; }; @@ -457,8 +457,6 @@ F4649FDB1DBC543A0097AEBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HMScreenshotEditorViewController.xib; sourceTree = ""; }; F4666C4B1B1B3113001840DB /* HMBookmarkListTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBookmarkListTableView.h; sourceTree = ""; }; F4666C4C1B1B3113001840DB /* HMBookmarkListTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBookmarkListTableView.m; sourceTree = ""; }; - F4666C4E1B1CB2CE001840DB /* HMBrowserContentAdjuster.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBrowserContentAdjuster.h; sourceTree = ""; }; - F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBrowserContentAdjuster.m; sourceTree = ""; }; F4666C581B2067CF001840DB /* HMSourceListColoredView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSourceListColoredView.h; sourceTree = ""; }; F4666C591B2067CF001840DB /* HMSourceListColoredView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSourceListColoredView.m; sourceTree = ""; }; F4666C5C1B242124001840DB /* HMQuestProgressTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMQuestProgressTransformer.h; sourceTree = ""; }; @@ -711,6 +709,7 @@ F4D05BC71E0C0DA100688D66 /* HMAirBaseWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMAirBaseWindowController.swift; sourceTree = ""; }; F4D05BC91E0CADA100688D66 /* HMExternalBrowserWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMExternalBrowserWindowController.swift; sourceTree = ""; }; F4D05BCB1E0D274100688D66 /* HMBookmarkEditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBookmarkEditorViewController.swift; sourceTree = ""; }; + F4D05BCD1E0D50D300688D66 /* HMBrowserContentAdjuster.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBrowserContentAdjuster.swift; sourceTree = ""; }; F4D2CBC018AD0E1A000EBC59 /* HMMasterSTypeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSTypeCommand.h; sourceTree = ""; }; F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSTypeCommand.m; sourceTree = ""; }; F4D2CBC318AE2AE2000EBC59 /* HMCompositCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCompositCommand.h; sourceTree = ""; }; @@ -1093,8 +1092,7 @@ F4666C591B2067CF001840DB /* HMSourceListColoredView.m */, F4666C4B1B1B3113001840DB /* HMBookmarkListTableView.h */, F4666C4C1B1B3113001840DB /* HMBookmarkListTableView.m */, - F4666C4E1B1CB2CE001840DB /* HMBrowserContentAdjuster.h */, - F4666C4F1B1CB2CE001840DB /* HMBrowserContentAdjuster.m */, + F4D05BCD1E0D50D300688D66 /* HMBrowserContentAdjuster.swift */, F4C6685F1C54515C00601AFB /* HMBrowserContentAdjuster.xib */, F4D05BCB1E0D274100688D66 /* HMBookmarkEditorViewController.swift */, F4C6685C1C54510E00601AFB /* HMBookmarkEditorViewController.xib */, @@ -1887,7 +1885,6 @@ F4D6BCBA1AA32BEA00742FEB /* HMFleetViewController.m in Sources */, F48A70631DE58C54005DFC0B /* HMAirBaseViewController.m in Sources */, F49546311B18991300E0D8D0 /* HMBookmarkDataStore.m in Sources */, - F4666C511B1CB2CE001840DB /* HMBrowserContentAdjuster.m in Sources */, F4F479261C074E9900D0BF69 /* HMCombinedCommand.m in Sources */, F4E7802E18DC3AF00011BC4C /* LocalData.xcdatamodeld in Sources */, F4D6BCAD1AA2A60900742FEB /* HMSokuTransformer.m in Sources */, @@ -1978,6 +1975,7 @@ F4C5A2231C3533E800533FB6 /* HMEnhancementListItem.m in Sources */, F4ECA36F1C6102FC0098AB6A /* HMMillisecondTransformer.m in Sources */, F43769E71AE7D22700DE6204 /* HMKCQuest.m in Sources */, + F4D05BCE1E0D50D300688D66 /* HMBrowserContentAdjuster.swift in Sources */, F43769E41AE7D01D00DE6204 /* HMUpdateQuestListCommand.m in Sources */, F4C1190818A746EB005D5B25 /* HMJSONTracker.m in Sources */, F4B3DC4718EEEB920011B4FC /* HMStart2Command.m in Sources */, diff --git a/KCD/HMAppDelegate.m b/KCD/HMAppDelegate.m index b9b4838d..154a4840 100644 --- a/KCD/HMAppDelegate.m +++ b/KCD/HMAppDelegate.m @@ -16,8 +16,6 @@ #import "HMShipMasterDetailWindowController.h" -#import "HMBrowserContentAdjuster.h" - #import "HMFleetManager.h" #import "HMPeriodicNotifier.h" diff --git a/KCD/HMBrowserContentAdjuster.h b/KCD/HMBrowserContentAdjuster.h deleted file mode 100644 index d6b5ae4b..00000000 --- a/KCD/HMBrowserContentAdjuster.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMBrowserContentAdjuster.h -// KCD -// -// Created by Hori,Masaki on 2015/06/02. -// Copyright (c) 2015年 Hori,Masaki. All rights reserved. -// - -#import - -@interface HMBrowserContentAdjuster : NSWindowController - -@end diff --git a/KCD/HMBrowserContentAdjuster.m b/KCD/HMBrowserContentAdjuster.m deleted file mode 100644 index 684305c1..00000000 --- a/KCD/HMBrowserContentAdjuster.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// HMBrowserContentAdjuster.m -// KCD -// -// Created by Hori,Masaki on 2015/06/02. -// Copyright (c) 2015年 Hori,Masaki. All rights reserved. -// - -#import "HMBrowserContentAdjuster.h" - -#import "KCD-Swift.h" - -@interface HMBrowserContentAdjuster () - -@end - -@implementation HMBrowserContentAdjuster - -- (instancetype)init -{ - self = [super initWithWindowNibName:NSStringFromClass([self class])]; - return self; -} - -- (HMExternalBrowserWindowController *)mainExternalWindowController -{ - NSWindow *mainWindow = [[NSApplication sharedApplication] mainWindow]; - id controller = mainWindow.windowController; - if([controller isKindOfClass:[HMExternalBrowserWindowController class]]) { - return controller; - } - return nil; -} -@end diff --git a/KCD/HMBrowserContentAdjuster.swift b/KCD/HMBrowserContentAdjuster.swift new file mode 100644 index 00000000..27362fd0 --- /dev/null +++ b/KCD/HMBrowserContentAdjuster.swift @@ -0,0 +1,15 @@ +// +// HMBrowserContentAdjuster.swift +// KCD +// +// Created by Hori,Masaki on 2016/12/23. +// Copyright © 2016年 Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMBrowserContentAdjuster: NSWindowController { + override var windowNibName: String! { + return "HMBrowserContentAdjuster" + } +} -- 2.11.0