Navigation

← Previous Changeset
Next Changeset →

Changeset 398

Timestamp:

04/14/07 22:31:48 (1 year ago)

Author:

kcathey2

Message:

Added DKBox. Switched FlashInspector over to DarkKit.

Files:

trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj (modified) (3 diffs)
trunk/LaserTools/FlashInspector/AppDelegate.h (modified) (2 diffs)
trunk/LaserTools/FlashInspector/AppDelegate.m (modified) (1 diff)
trunk/LaserTools/FlashInspector/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
trunk/LaserTools/FlashInspector/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
trunk/LaserTools/FlashInspector/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
trunk/LaserTools/FlashInspector/FlashInspector.xcodeproj/project.pbxproj (modified) (13 diffs)
trunk/LaserTools/LaserTools.xcodeproj/kev.mode1 (added)
trunk/LaserTools/LaserTools.xcodeproj/kev.pbxuser (added)
trunk/UI_Elements/DarkKitApp/DarkKitApp.xcodeproj/project.pbxproj (modified) (6 diffs)
trunk/UI_Elements/DarkKitApp/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
trunk/UI_Elements/DarkKitApp/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
trunk/UI_Elements/DarkKitApp/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
trunk/UI_Elements/DarkKitApp/src/Views/DKBox.h (added)
trunk/UI_Elements/DarkKitApp/src/Views/DKBox.m (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/LaserLine_2.0/LaserLine_2.0.xcodeproj/project.pbxproj

r389	r398
87	87	/* End PBXBuildFile section */
88	88
	89	/* Begin PBXBuildStyle section */
	90	DED5D2DD0BD1C9980021BC21 /* Development */ = {
	91	isa = PBXBuildStyle;
	92	buildSettings = {
	93	COPY_PHASE_STRIP = NO;
	94	};
	95	name = Development;
	96	};
	97	DED5D2DE0BD1C9980021BC21 /* Deployment */ = {
	98	isa = PBXBuildStyle;
	99	buildSettings = {
	100	COPY_PHASE_STRIP = YES;
	101	};
	102	name = Deployment;
	103	};
	104	/* End PBXBuildStyle section */
	105
89	106	/* Begin PBXContainerItemProxy section */
90	107	F808BBDC0B9A5156001283DF /* PBXContainerItemProxy */ = {
…	…
171	188	32CA4F630368D1EE00C91783 /* LaserLine_2.0_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaserLine_2.0_Prefix.pch; sourceTree = "<group>"; };
172	189	8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
173		8D1107320486CEB800E47090 /* LaserLine.app */ = {isa = PBXFileReference; ~~explicitFileType = wrapper.application; includeInIndex = 0~~; path = LaserLine.app; sourceTree = BUILT_PRODUCTS_DIR; };
	190	8D1107320486CEB800E47090 /* LaserLine.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = LaserLine.app; sourceTree = BUILT_PRODUCTS_DIR; };
174	191	A804670E0BA3B12100CADE97 /* LZAudioOutputDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LZAudioOutputDevice.h; sourceTree = "<group>"; };
175	192	A804670F0BA3B12100CADE97 /* LZAudioOutputDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LZAudioOutputDevice.m; sourceTree = "<group>"; };
…	…
576	593	isa = PBXProject;
577	594	buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "LaserLine_2.0" */;
	595	buildSettings = {
	596	};
	597	buildStyles = (
	598	DED5D2DD0BD1C9980021BC21 /* Development */,
	599	DED5D2DE0BD1C9980021BC21 /* Deployment */,
	600	);
578	601	hasScannedForEncodings = 1;
579	602	mainGroup = 29B97314FDCFA39411CA2CEA /* LaserLine_2.0 */;

trunk/LaserTools/FlashInspector/AppDelegate.h

r380	r398
9	9	#import <Cocoa/Cocoa.h>
10	10	#import <LaserTools/LaserTools.h>
11		~~//#import <LaserTools.h>~~
12	11	#import "LTRenderedContextView.h"
	12	#import <DarkKit/DarkKit.h>
13	13
14	14	@interface AppDelegate : NSObject
…	…
16	16	IBOutlet NSWindow *mainWindow;
17	17	IBOutlet LTRenderedContextView *renderedView;
	18	IBOutlet NSBox *box;
18	19
19	20	unsigned int _currentFrameIndex;

trunk/LaserTools/FlashInspector/AppDelegate.m

r287	r398
42	42	- (void)awakeFromNib
43	43	{
	44	/DKSlider slider = [[DKSlider alloc] initWithFrame:NSMakeRect(0.0F, 0.0F, 300.0F, 20.0F)];
	45	[slider setAutoresizingMask:(NSViewWidthSizable\|NSViewHeightSizable)];
	46	[box setContentView:slider];*/
44	47	}
45	48

trunk/LaserTools/FlashInspector/English.lproj/MainMenu.nib/classes.nib

r190	r398
5	5	CLASS = AppDelegate;
6	6	LANGUAGE = ObjC;
7		OUTLETS = {mainWindow = NSWindow; renderedView = LTRenderedContextView; };
	7	OUTLETS = {box = NSBox; mainWindow = NSWindow; renderedView = LTRenderedContextView; };
8	8	SUPERCLASS = NSObject;
9	9	},
	10	{CLASS = DKBox; LANGUAGE = ObjC; SUPERCLASS = NSBox; },
	11	{CLASS = DKSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },
	12	{CLASS = DKWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; },
10	13	{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
11	14	{CLASS = LTRenderedContextView; LANGUAGE = ObjC; SUPERCLASS = NSView; }

trunk/LaserTools/FlashInspector/English.lproj/MainMenu.nib/info.nib

r287	r398
4	4	<dict>
5	5	<key>IBDocumentLocation</key>
6		<string>~~508 158 356 240 0 0 1680 102~~8 </string>
	6	<string>402 234 356 240 0 0 1920 1178 </string>
7	7	<key>IBEditorPositions</key>
8	8	<dict>
9	9	<key>29</key>
10		<string>1~~32 352 394 44 0 0 1680 102~~8 </string>
	10	<string>157 406 394 44 0 0 1920 1178 </string>
11	11	</dict>
12	12	<key>IBFramework Version</key>
…	…
14	14	<key>IBOpenObjects</key>
15	15	<array>
16		~~<integer>241</integer>~~
17	16	<integer>21</integer>
18	17	<integer>29</integer>
19	18	</array>
20	19	<key>IBSystem Version</key>
21		<string>8~~L2127~~</string>
	20	<string>8P135</string>
22	21	</dict>
23	22	</plist>

trunk/LaserTools/FlashInspector/FlashInspector.xcodeproj/project.pbxproj

r394	r398
15	15	DE3F3CCC0B98D48800B45C6B /* LTRenderedContextView.m in Sources / = {isa = PBXBuildFile; fileRef = DE3F3CCB0B98D48800B45C6B / LTRenderedContextView.m */; };
16	16	DEB2C5DF0B9143D10031CE9B /* AppDelegate.m in Sources / = {isa = PBXBuildFile; fileRef = DEB2C5DE0B9143D10031CE9B / AppDelegate.m */; };
	17	DED5D2420BD1BF930021BC21 /* DarkKit.framework in Frameworks / = {isa = PBXBuildFile; fileRef = DED5D2410BD1BF930021BC21 / DarkKit.framework */; };
17	18	/* End PBXBuildFile section */
18	19
…	…
46	47	containerPortal = D45A5EA80BCCA05600368A33 /* LaserTools.xcodeproj */;
47	48	proxyType = 1;
48		remoteGlobalIDString = 8DC2EF4F0486A6940098B216 ~~/* LaserTools */~~;
	49	remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
49	50	remoteInfo = LaserTools;
	51	};
	52	DED5D23C0BD1BF6D0021BC21 /* PBXContainerItemProxy */ = {
	53	isa = PBXContainerItemProxy;
	54	containerPortal = DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */;
	55	proxyType = 2;
	56	remoteGlobalIDString = C4971DA70B9A2C3C00E57A56 /* DarkKit.framework */;
	57	remoteInfo = DarkKit;
	58	};
	59	DED5D23E0BD1BF6D0021BC21 /* PBXContainerItemProxy */ = {
	60	isa = PBXContainerItemProxy;
	61	containerPortal = DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */;
	62	proxyType = 2;
	63	remoteGlobalIDString = 8D1107320486CEB800E47090 /* DarkKitApp.app */;
	64	remoteInfo = DarkKitApp;
	65	};
	66	DED5D2550BD1BFAA0021BC21 /* PBXContainerItemProxy */ = {
	67	isa = PBXContainerItemProxy;
	68	containerPortal = DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */;
	69	proxyType = 1;
	70	remoteGlobalIDString = C4971DA60B9A2C3C00E57A56 /* DarkKit */;
	71	remoteInfo = DarkKit;
50	72	};
51	73	/* End PBXContainerItemProxy section */
…	…
80	102	DEB2C5DD0B9143D10031CE9B /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
81	103	DEB2C5DE0B9143D10031CE9B /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
	104	DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DarkKitApp.xcodeproj; path = ../../UI_Elements/DarkKitApp/DarkKitApp.xcodeproj; sourceTree = SOURCE_ROOT; };
	105	DED5D2410BD1BF930021BC21 /* DarkKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DarkKit.framework; path = ../../Build/Debug/DarkKit.framework; sourceTree = SOURCE_ROOT; };
82	106	/* End PBXFileReference section */
83	107
…	…
89	113	D45A5EB40BCCA0F900368A33 /* LaserTools.framework in Frameworks */,
90	114	8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
	115	DED5D2420BD1BF930021BC21 /* DarkKit.framework in Frameworks */,
91	116	);
92	117	runOnlyForDeploymentPostprocessing = 0;
…	…
136	161	isa = PBXGroup;
137	162	children = (
	163	DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */,
138	164	D45A5EA80BCCA05600368A33 /* LaserTools.xcodeproj */,
139	165	080E96DDFE201D6D7F000001 /* Classes */,
…	…
168	194	isa = PBXGroup;
169	195	children = (
	196	DED5D2410BD1BF930021BC21 /* DarkKit.framework */,
170	197	1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
171	198	1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
…	…
178	205	children = (
179	206	D45A5EAD0BCCA05600368A33 /* LaserTools.framework */,
	207	);
	208	name = Products;
	209	sourceTree = "<group>";
	210	};
	211	DED5D2380BD1BF6D0021BC21 /* Products */ = {
	212	isa = PBXGroup;
	213	children = (
	214	DED5D23D0BD1BF6D0021BC21 /* DarkKit.framework */,
	215	DED5D23F0BD1BF6D0021BC21 /* DarkKitApp.app */,
180	216	);
181	217	name = Products;
…	…
198	234	dependencies = (
199	235	DEBB6C200BD186B2004DAE1B /* PBXTargetDependency */,
	236	DED5D2560BD1BFAA0021BC21 /* PBXTargetDependency */,
200	237	);
201	238	name = FlashInspector;
…	…
221	258	projectDirPath = "";
222	259	projectReferences = (
	260	{
	261	ProductGroup = DED5D2380BD1BF6D0021BC21 /* Products */;
	262	ProjectRef = DED5D2370BD1BF6D0021BC21 /* DarkKitApp.xcodeproj */;
	263	},
223	264	{
224	265	ProductGroup = D45A5EA90BCCA05600368A33 /* Products */;
…	…
238	279	path = LaserTools.framework;
239	280	remoteRef = D45A5EAC0BCCA05600368A33 /* PBXContainerItemProxy */;
	281	sourceTree = BUILT_PRODUCTS_DIR;
	282	};
	283	DED5D23D0BD1BF6D0021BC21 /* DarkKit.framework */ = {
	284	isa = PBXReferenceProxy;
	285	fileType = wrapper.framework;
	286	path = DarkKit.framework;
	287	remoteRef = DED5D23C0BD1BF6D0021BC21 /* PBXContainerItemProxy */;
	288	sourceTree = BUILT_PRODUCTS_DIR;
	289	};
	290	DED5D23F0BD1BF6D0021BC21 /* DarkKitApp.app */ = {
	291	isa = PBXReferenceProxy;
	292	fileType = wrapper.application;
	293	path = DarkKitApp.app;
	294	remoteRef = DED5D23E0BD1BF6D0021BC21 /* PBXContainerItemProxy */;
240	295	sourceTree = BUILT_PRODUCTS_DIR;
241	296	};
…	…
273	328	targetProxy = DEBB6C1F0BD186B2004DAE1B /* PBXContainerItemProxy */;
274	329	};
	330	DED5D2560BD1BFAA0021BC21 /* PBXTargetDependency */ = {
	331	isa = PBXTargetDependency;
	332	name = DarkKit;
	333	targetProxy = DED5D2550BD1BFAA0021BC21 /* PBXContainerItemProxy */;
	334	};
275	335	/* End PBXTargetDependency section */
276	336
…	…
305	365	"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
306	366	"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
	367	"$(SYSTEM_DEVELOPER_DIR)/Projects/LaserLine/Build/Debug",
307	368	);
308	369	FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../Frameworks\"";
…	…
331	392	"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
332	393	"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
	394	"$(SYSTEM_DEVELOPER_DIR)/Projects/LaserLine/Build/Debug",
333	395	);
334	396	FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../Frameworks\"";

trunk/UI_Elements/DarkKitApp/DarkKitApp.xcodeproj/project.pbxproj

r395	r398
91	91	D2F8CE830BA193C000C463D4 /* Build.xcconfig in Resources / = {isa = PBXBuildFile; fileRef = D2F8CE820BA193C000C463D4 / Build.xcconfig */; };
92	92	DED5D1A50BD1B8120021BC21 /* MainController.m in Sources / = {isa = PBXBuildFile; fileRef = DED5D1A40BD1B8120021BC21 / MainController.m */; };
	93	DED5D3FE0BD1D09C0021BC21 /* DKBox.h in Headers / = {isa = PBXBuildFile; fileRef = DED5D3FC0BD1D09C0021BC21 / DKBox.h */; settings = {ATTRIBUTES = (Public, ); }; };
	94	DED5D3FF0BD1D09C0021BC21 /* DKBox.m in Sources / = {isa = PBXBuildFile; fileRef = DED5D3FD0BD1D09C0021BC21 / DKBox.m */; };
	95	DED5D4150BD1D28C0021BC21 /* DKBox.m in Sources / = {isa = PBXBuildFile; fileRef = DED5D3FD0BD1D09C0021BC21 / DKBox.m */; };
93	96	/* End PBXBuildFile section */
94	97
…	…
182	185	DED5D1A30BD1B8120021BC21 /* MainController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MainController.h; sourceTree = "<group>"; };
183	186	DED5D1A40BD1B8120021BC21 /* MainController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MainController.m; sourceTree = "<group>"; };
	187	DED5D3FC0BD1D09C0021BC21 /* DKBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DKBox.h; sourceTree = "<group>"; };
	188	DED5D3FD0BD1D09C0021BC21 /* DKBox.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DKBox.m; sourceTree = "<group>"; };
184	189	/* End PBXFileReference section */
185	190
…	…
331	336	isa = PBXGroup;
332	337	children = (
	338	DED5D3FC0BD1D09C0021BC21 /* DKBox.h */,
	339	DED5D3FD0BD1D09C0021BC21 /* DKBox.m */,
333	340	C4C021CB0BA1856200B17D07 /* DKThemeFrame.h */,
334	341	C4C021CC0BA1856200B17D07 /* DKThemeFrame.m */,
…	…
387	394	C4C021EF0BA1856200B17D07 /* NSThemeFrame.h in Headers */,
388	395	C4C021F00BA1856200B17D07 /* NSTitledFrame.h in Headers */,
	396	DED5D3FE0BD1D09C0021BC21 /* DKBox.h in Headers */,
389	397	);
390	398	runOnlyForDeploymentPostprocessing = 0;
…	…
524	532	C4C021FE0BA1856200B17D07 /* DKWindow.m in Sources */,
525	533	DED5D1A50BD1B8120021BC21 /* MainController.m in Sources */,
	534	DED5D4150BD1D28C0021BC21 /* DKBox.m in Sources */,
526	535	);
527	536	runOnlyForDeploymentPostprocessing = 0;
…	…
544	553	C4C021EB0BA1856200B17D07 /* DKThemeFrame.m in Sources */,
545	554	C4C021ED0BA1856200B17D07 /* DKWindow.m in Sources */,
	555	DED5D3FF0BD1D09C0021BC21 /* DKBox.m in Sources */,
546	556	);
547	557	runOnlyForDeploymentPostprocessing = 0;

trunk/UI_Elements/DarkKitApp/English.lproj/MainMenu.nib/classes.nib

r395	r398
1	1	{
2	2	IBClasses = (
	3	{CLASS = DKBox; LANGUAGE = ObjC; SUPERCLASS = NSBox; },
3	4	{CLASS = DKSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },
4	5	{CLASS = DKSliderCell; LANGUAGE = ObjC; SUPERCLASS = NSSliderCell; },

trunk/UI_Elements/DarkKitApp/English.lproj/MainMenu.nib/info.nib

r395	r398
8	8	<dict>
9	9	<key>226</key>
10		<string>4~~82 816~~ 318 185 0 0 1920 1178 </string>
	10	<string>419 825 318 185 0 0 1920 1178 </string>
11	11	<key>29</key>
12	12	<string>156 406 338 44 0 0 1920 1178 </string>
…	…
16	16	<key>IBOpenObjects</key>
17	17	<array>
18		<integer>21</integer>
	18	<integer>29</integer>
19	19	<integer>226</integer>
20		~~<integer>29</integer>~~
21	20	</array>
22	21	<key>IBSystem Version</key>

Navigation

Changeset 398

Legend:

Download in other formats: