From 71835b87de5c293fe980ecd9b28a497bfce5949f Mon Sep 17 00:00:00 2001 From: Daniel Higginbotham Date: Fri, 24 Aug 2012 07:53:29 -0400 Subject: [PATCH] further setting up the nib --- WorkMode.xcodeproj/project.pbxproj | 12 +++++----- WorkMode/AppGroupView.h | 24 -------------------- WorkMode/AppGroupView.m | 27 ---------------------- WorkMode/AppGroupView.xib | 36 +++++++++++++++++++++--------- WorkMode/AppGroupViewNode.h | 21 +++++++++++++++++ WorkMode/AppGroupViewNode.m | 19 ++++++++++++++++ 6 files changed, 72 insertions(+), 67 deletions(-) delete mode 100644 WorkMode/AppGroupView.h delete mode 100644 WorkMode/AppGroupView.m create mode 100644 WorkMode/AppGroupViewNode.h create mode 100644 WorkMode/AppGroupViewNode.m diff --git a/WorkMode.xcodeproj/project.pbxproj b/WorkMode.xcodeproj/project.pbxproj index d4f777c..d452e0f 100644 --- a/WorkMode.xcodeproj/project.pbxproj +++ b/WorkMode.xcodeproj/project.pbxproj @@ -18,7 +18,7 @@ 6517C11815E149BE00135B11 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6517C11615E149BE00135B11 /* InfoPlist.strings */; }; 6517C11B15E149BE00135B11 /* WorkModeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6517C11A15E149BE00135B11 /* WorkModeTests.m */; }; 6517C12E15E1563E00135B11 /* DragReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 6517C12D15E1563E00135B11 /* DragReceiver.m */; }; - 651CDD8815E7939C00461C13 /* AppGroupView.m in Sources */ = {isa = PBXBuildFile; fileRef = 651CDD8715E7939C00461C13 /* AppGroupView.m */; }; + 651CDD8815E7939C00461C13 /* AppGroupViewNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 651CDD8715E7939C00461C13 /* AppGroupViewNode.m */; }; 651CDD8A15E7943200461C13 /* AppGroupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 651CDD8915E7943200461C13 /* AppGroupView.xib */; }; 65D663AD15E5A4FD00C41FEA /* AppGroupController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D663AC15E5A4FD00C41FEA /* AppGroupController.m */; }; 65D663B115E5A61800C41FEA /* IconListView.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D663B015E5A61800C41FEA /* IconListView.m */; }; @@ -56,8 +56,8 @@ 6517C11A15E149BE00135B11 /* WorkModeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WorkModeTests.m; sourceTree = ""; }; 6517C12C15E1563E00135B11 /* DragReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragReceiver.h; sourceTree = ""; }; 6517C12D15E1563E00135B11 /* DragReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DragReceiver.m; sourceTree = ""; }; - 651CDD8615E7939C00461C13 /* AppGroupView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppGroupView.h; sourceTree = ""; }; - 651CDD8715E7939C00461C13 /* AppGroupView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppGroupView.m; sourceTree = ""; }; + 651CDD8615E7939C00461C13 /* AppGroupViewNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppGroupViewNode.h; sourceTree = ""; }; + 651CDD8715E7939C00461C13 /* AppGroupViewNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppGroupViewNode.m; sourceTree = ""; }; 651CDD8915E7943200461C13 /* AppGroupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AppGroupView.xib; sourceTree = ""; }; 65D663AB15E5A4FD00C41FEA /* AppGroupController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppGroupController.h; sourceTree = ""; }; 65D663AC15E5A4FD00C41FEA /* AppGroupController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppGroupController.m; sourceTree = ""; }; @@ -177,8 +177,8 @@ 6517C12D15E1563E00135B11 /* DragReceiver.m */, 65D663AF15E5A61800C41FEA /* IconListView.h */, 65D663B015E5A61800C41FEA /* IconListView.m */, - 651CDD8615E7939C00461C13 /* AppGroupView.h */, - 651CDD8715E7939C00461C13 /* AppGroupView.m */, + 651CDD8615E7939C00461C13 /* AppGroupViewNode.h */, + 651CDD8715E7939C00461C13 /* AppGroupViewNode.m */, ); name = views; sourceTree = ""; @@ -306,7 +306,7 @@ 6517C12E15E1563E00135B11 /* DragReceiver.m in Sources */, 65D663AD15E5A4FD00C41FEA /* AppGroupController.m in Sources */, 65D663B115E5A61800C41FEA /* IconListView.m in Sources */, - 651CDD8815E7939C00461C13 /* AppGroupView.m in Sources */, + 651CDD8815E7939C00461C13 /* AppGroupViewNode.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WorkMode/AppGroupView.h b/WorkMode/AppGroupView.h deleted file mode 100644 index f85afc1..0000000 --- a/WorkMode/AppGroupView.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// AppGroupView.h -// WorkMode -// -// Created by Daniel Higginbotham on 8/24/12. -// Copyright (c) 2012 Daniel Higginbotham. All rights reserved. -// - -#import - -@class DragReceiver; -@class IconListView; -@class AppGroupController; - -@interface AppGroupView : NSView -{ - IBOutlet NSView* rootView; -} - -@property (assign) AppGroupController* controller; -@property (assign) IBOutlet DragReceiver* dragReceiver; -@property (assign) IBOutlet IconListView* iconListView; - -@end diff --git a/WorkMode/AppGroupView.m b/WorkMode/AppGroupView.m deleted file mode 100644 index a584a55..0000000 --- a/WorkMode/AppGroupView.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// AppGroupView.m -// WorkMode -// -// Created by Daniel Higginbotham on 8/24/12. -// Copyright (c) 2012 Daniel Higginbotham. All rights reserved. -// - -#import "AppGroupView.h" -#import "IconListView.h" -#import "DragReceiver.h" - -@implementation AppGroupView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [NSBundle loadNibNamed:@"AppGroupView" owner:self]; - self.dragReceiver.appListController = self.controller; - self.iconListView.appListController = self.controller; - } - - return self; -} - -@end diff --git a/WorkMode/AppGroupView.xib b/WorkMode/AppGroupView.xib index 993f02e..ffe9509 100644 --- a/WorkMode/AppGroupView.xib +++ b/WorkMode/AppGroupView.xib @@ -25,7 +25,7 @@ - AppGroupView + AppGroupViewNode FirstResponder @@ -44,7 +44,6 @@ {{207, 0}, {400, 50}} - _NS:9 IconListView @@ -110,6 +109,9 @@ NSView + + AppGroupController + @@ -123,19 +125,27 @@ - dragReceiver + controller + + + 23 + + + + dragReceiver + - 18 + 21 iconListView - + - 19 + 22 @@ -199,6 +209,11 @@ + + 20 + + + @@ -207,6 +222,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -215,7 +231,7 @@ - 19 + 23 @@ -242,8 +258,8 @@ - AppGroupView - NSView + AppGroupViewNode + NSObject DragReceiver IconListView @@ -265,7 +281,7 @@ IBProjectSource - ./Classes/AppGroupView.h + ./Classes/AppGroupViewNode.h diff --git a/WorkMode/AppGroupViewNode.h b/WorkMode/AppGroupViewNode.h new file mode 100644 index 0000000..baf10ae --- /dev/null +++ b/WorkMode/AppGroupViewNode.h @@ -0,0 +1,21 @@ +// +// AppGroupView.h +// WorkMode +// +// Created by Daniel Higginbotham on 8/24/12. +// Copyright (c) 2012 Daniel Higginbotham. All rights reserved. +// + +#import + +@class DragReceiver; + +@interface AppGroupViewNode : NSObject +{ + IBOutlet NSView* rootView; + IBOutlet AppGroupController* controller; +} + +-(void)loadUIFromNib; + +@end diff --git a/WorkMode/AppGroupViewNode.m b/WorkMode/AppGroupViewNode.m new file mode 100644 index 0000000..1051140 --- /dev/null +++ b/WorkMode/AppGroupViewNode.m @@ -0,0 +1,19 @@ +// +// AppGroupView.m +// WorkMode +// +// Created by Daniel Higginbotham on 8/24/12. +// Copyright (c) 2012 Daniel Higginbotham. All rights reserved. +// + +#import "AppGroupViewNode.h" + + +@implementation AppGroupViewNode + +- (void)loadUIFromNib +{ + [NSBundle loadNibNamed:@"AppGroupView" owner:self]; +} + +@end