Navigation

← Previous Changeset
Next Changeset →

Changeset 37

Timestamp:

07/18/06 11:43:38 (2 years ago)

Author:

mike

Message:

[new] fullscreen guest/windowcycling
[new] hotkey support for guest/windowcycling
[new] animation when switch to monitor and back (ctrl-alt-1..9)
[new] new Guest Assistant launched when double-clicking a empty table row
[new] qcontrol Makefile added "install" target
[fix] shutdown of paused guests
[fix] edit of not hilited guests
[fix] editPC file-selector remembers last position
[fix] file formats editPC and guest: qcow, raw, cow, vmdk, cloop, img, iso, dsk, dmg, cdr, toast, flp, fs
[fix] qcontrol Makefile added rm -rf for "app" target

Files:

trunk/changelog.txt (modified) (1 diff)
trunk/host-cocoa/cocoaQemu.h (modified) (1 diff)
trunk/host-cocoa/cocoaQemu.m (modified) (8 diffs)
trunk/host-cocoa/cocoaQemuWindow.m (modified) (1 diff)
trunk/qcontrol/Makefile (modified) (2 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/classes.nib (modified) (2 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/info.nib (modified) (2 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/keyedobjects.nib (modified) (117 diffs)
trunk/qcontrol/cocoaControlController.h (modified) (2 diffs)
trunk/qcontrol/cocoaControlController.m (modified) (8 diffs)
trunk/qcontrol/cocoaControlDOServer.h (modified) (3 diffs)
trunk/qcontrol/cocoaControlDOServer.m (modified) (3 diffs)
trunk/qcontrol/cocoaControlEditPC.m (modified) (5 diffs)

Legend:

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

trunk/changelog.txt

r36	r37
	1	Q-0.8.1d37
	2	[new] fullscreen guest/windowcycling
	3	[new] hotkey support for guest/windowcycling
	4	[new] animation when switch to monitor and back (ctrl-alt-1..9)
	5	[new] new Guest Assistant launched when double-clicking a empty table row
	6	[new] qcontrol Makefile added "install" target
	7	[fix] shutdown of paused guests
	8	[fix] edit of not hilited guests
	9	[fix] editPC file-selector remembers last position
	10	[fix] file formats editPC and guest: qcow, raw, cow, vmdk, cloop, img, iso, dsk, dmg, cdr, toast, flp, fs
	11	[fix] qcontrol Makefile added rm -rf for "app" target
	12
1	13	Q-0.8.1d36
2	14	[new] microicon to stop a crashed guest

trunk/host-cocoa/cocoaQemu.h

r5 r37

89 89 - (NSString *) pcWindowName;
90 90 - (NSString *) smbPath;
91 - (id) qdoserver;
91 92 - (int) modifierAtIndex:(int)index;
92 93 - (BOOL) fullscreen;

trunk/host-cocoa/cocoaQemu.m

r36	r37
31	31	#import "cocoaQemuQuickDrawView.h"
32	32
	33	#import "CGSPrivate.h"
	34
33	35	/* Pasteboard //
34	36	#include "sdl_keysym.h"
…	…
91	93	if ((self = [super init])) {
92	94	/* set allowed filetypes */
93		fileTypes = [[NSArray arrayWithObjects:@"~~img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",@"toast",~~nil] retain];
	95	fileTypes = [[NSArray arrayWithObjects:@"qcow", @"raw", @"cow", @"vmdk", @"cloop", @"img", @"iso", @"dsk", @"dmg", @"cdr", @"toast", @"flp", @"fs", nil] retain];
94	96
95	97	/* pc */
…	…
210	212
211	213	return smbPath;
	214	}
	215
	216	- (id) qdoserver
	217	{
	218	// NSLog(@"cocoaQemu: qdoserver");
	219
	220	return qdoserver;
212	221	}
213	222
…	…
757	766	// NSLog(@"cocoaQemu: shutdownPC");
758	767
	768	/* exit fullscreen */
	769	if (fullscreen)
	770	[contentView toggleFullScreen];
	771
759	772	if (!pcDialogs) {
760	773	pcStatus = @"shutdown";
…	…
801	814	pcStatus = @"shutdown";
802	815	qemu_system_shutdown_request();
	816	vm_start();
803	817	}
804	818	}
…	…
819	833	pcStatus = @"shutdown";
820	834	qemu_system_shutdown_request();
	835	vm_start();
821	836	}
822	837	}
…	…
1169	1184	// [pc setFullscreen:[[pc contentView] toggleFullScreen]];
1170	1185	// return;
	1186
	1187	/* window switch */
	1188	case 50: /* backquote key */
	1189	if ([[pc qdoserver] guestSwitch:[pc pcName] fullscreen:[pc fullscreen] nextGuestName:nil])
	1190	return;
	1191	else
	1192	break;
1171	1193	}
1172	1194	}
…	…
1177	1199	/* toggle Monitor */
1178	1200	case 0x02 ... 0x0a: /* '1' to '9' keys */
1179		console_select(keycode - 0x02);
1180		break;
	1201	{
	1202	/* setup transition */
	1203	CGSConnection cid = _CGSDefaultConnection();
	1204	int transitionHandle = -1;
	1205	CGSTransitionSpec transitionSpecifications;
	1206
	1207	transitionSpecifications.type = 9; //transition;
	1208	if (keycode - 0x02 == 0)
	1209	transitionSpecifications.option = 1; //option;
	1210	else
	1211	transitionSpecifications.option = 2; //option;
	1212	transitionSpecifications.wid = [[pc pcWindow] windowNumber]; //wid
	1213	transitionSpecifications.backColour = 0; //background color
	1214
	1215	/* freeze desktop: OSStatus CGSNewTransition(const CGSConnection cid, const CGSTransitionSpec* transitionSpecifications, int transitionHandle) /
	1216	CGSNewTransition(cid, &transitionSpecifications, &transitionHandle);
	1217
	1218	/* change monitor */
	1219	console_select(keycode - 0x02);
	1220	vga_hw_update();
	1221
	1222	/* wait */
	1223	usleep(10000);
	1224
	1225	/* run transition: OSStatus CGSInvokeTransition(const CGSConnection cid, int transitionHandle, float duration) */
	1226	CGSInvokeTransition(cid, transitionHandle, 1.0);
	1227
	1228	break;
	1229	}
	1230	// console_select(keycode - 0x02);
	1231	// break;
1181	1232	/* toggle Fullscreen */
1182	1233	case 0x21: /* 'f' key */

trunk/host-cocoa/cocoaQemuWindow.m

r35	r37
408	408
409	409
410		if ([pc fullscreen] && [self windowIsVisible])
411		[pc setFullscreen:[[pc contentView] toggleFullScreen]];
	410	if ([pc fullscreen] && [self windowIsVisible]) {
	411	// [pc setFullscreen:[[pc contentView] toggleFullScreen]];
	412
	413	/* setup transition */
	414	CGSConnection cid = _CGSDefaultConnection();
	415	int transitionHandle = -1;
	416	CGSTransitionSpec transitionSpecifications;
	417
	418	transitionSpecifications.type = 7; //transition;
	419	transitionSpecifications.option = 0; //option;
	420	transitionSpecifications.wid = 0; //wid
	421	transitionSpecifications.backColour = 0; //background color
	422
	423	/* freeze desktop: OSStatus CGSNewTransition(const CGSConnection cid, const CGSTransitionSpec* transitionSpecifications, int transitionHandle) /
	424	CGSNewTransition(cid, &transitionSpecifications, &transitionHandle);
	425
	426	/* change monitor */
	427	[NSApp hide:self];
	428
	429	/* wait */
	430	usleep(10000);
	431
	432	/* run transition: OSStatus CGSInvokeTransition(const CGSConnection cid, int transitionHandle, float duration) */
	433	CGSInvokeTransition(cid, transitionHandle, 1.0);
	434	}
412	435
413	436	if ([pc absolute_enabled]) {

trunk/qcontrol/Makefile

r36	r37
12	12	# generate OS X .app Packages
13	13	app:
	14	rm -rf "../$(prefix)/Q.app";
14	15	mkdir -p "../$(prefix)/Q.app/Contents/MacOS/";
15	16	mkdir -p "../$(prefix)/Q.app/Contents/Resources/English.lproj/Q Help/";
…	…
55	56	install -m 644 ../../tmp/qemu/pc-bios/linux_boot.bin "../$(prefix)/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
56	57	done
	58
	59	# generate OS X .app Packages and install it to /applications
	60	install:
	61	rm -rf "/Applications/Q.app";
	62	mkdir -p "/Applications/Q.app/Contents/MacOS/";
	63	mkdir -p "/Applications/Q.app/Contents/Resources/English.lproj/Q Help/";
	64	install -m 755 -s ../../tmp/qemu/qemu-img "/Applications/Q.app/Contents/MacOS/";
	65	install -m 755 -s qemu-control "/Applications/Q.app/Contents/MacOS/";
	66	sed 's/QEMU_VERSION/$(VERSION)/;s/QKJU_VERSION/$(QVERSION)/' Info.plist > "/Applications/Q.app/Contents/Info.plist";
	67	echo "APPLQKJU" > "/Applications/Q.app/Contents/PkgInfo";
	68	cp -R Resources/* "/Applications/Q.app/Contents/Resources/";
	69	install -m 644 ../../tmp/qemu/qemu-doc.html "/Applications/Q.app/Contents/Resources/English.lproj/Q Help/html/";
	70	install -m 644 ../../tmp/qemu/qemu-tech.html "/Applications/Q.app/Contents/Resources/English.lproj/Q Help/html/";
	71
	72	for d in $(TARGET_DIRS); do \
	73	mkdir -p "/Applications/Q.app/Contents/MacOS//"$$d".app/Contents/MacOS/"; \
	74	mkdir -p "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	75	cp -R ../../tmp/qemu/host-cocoa/Resources/* "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/"; \
	76	echo "APPLQEMU" > "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/PkgInfo"; \
	77	sed 's/QEMU_TARGET/'$$d'/;s/QEMU_VERSION/$(VERSION)/;s/QKJU_VERSION/$(QVERSION)/' ../../tmp/qemu/host-cocoa/Info.plist > "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Info.plist"; \
	78	case "$$d" in \
	79	i386-softmmu) \
	80	install -m 755 -s ../../tmp/qemu/$$d/qemu "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d \
	81	;; \
	82	x86_64-softmmu) \
	83	install -m 755 -s ../../tmp/qemu/$$d/qemu-system-x86_64 "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d \
	84	;; \
	85	ppc-softmmu) \
	86	install -m 755 -s ../../tmp/qemu/$$d/qemu-system-ppc "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d; \
	87	install -m 644 ../../tmp/qemu/pc-bios/ppc_rom.bin "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/" \
	88	;; \
	89	sparc-softmmu) \
	90	install -m 755 -s ../../tmp/qemu/$$d/qemu-system-sparc "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d \
	91	;; \
	92	mips-softmmu) \
	93	install -m 755 -s ../../tmp/qemu/$$d/qemu-system-mips "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d \
	94	;; \
	95	arm-softmmu) \
	96	install -m 755 -s ../../tmp/qemu/$$d/qemu-system-arm "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/MacOS/"$$d \
	97	;; \
	98	esac; \
	99	install -m 644 ../../tmp/qemu/pc-bios/bios.bin "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	100	install -m 644 ../../tmp/qemu/pc-bios/vgabios.bin "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	101	install -m 644 ../../tmp/qemu/pc-bios/vgabios-cirrus.bin "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	102	install -m 644 ../../tmp/qemu/pc-bios/video.x "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	103	install -m 644 ../../tmp/qemu/pc-bios/linux_boot.bin "/Applications/Q.app/Contents/MacOS/"$$d".app/Contents/Resources/qemu/"; \
	104	done

trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/classes.nib

r36	r37
11	11	{
12	12	ACTIONS = {
	13	activateApp = id;
13	14	addPC = id;
	15	addPCFromAssistant = id;
	16	cycleWindows = id;
14	17	deletePC = id;
15	18	editPC = id;
…	…
30	33	progressText = NSTextField;
31	34	progressTitle = NSTextField;
32		table = NSTableView;
	35	table = QControlTableView;
33	36	windowMenu = id;
34	37	};

trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/info.nib

r36	r37
8	8	<dict>
9	9	<key>453</key>
10		<string>333 834 286 44 0 0 1440 878 </string>
	10	<string>332 834 286 44 0 0 1440 878 </string>
11	11	</dict>
12	12	<key>IBFramework Version</key>
…	…
14	14	<key>IBOpenObjects</key>
15	15	<array>
	16	<integer>453</integer>
16	17	<integer>546</integer>
17		~~<integer>453</integer>~~
18	18	<integer>21</integer>
19	19	</array>

trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/keyedobjects.nib

r36	r37
12	12	<dict>
13	13	<key>CF$UID</key>
14		<integer>383</integer>
	14	<integer>390</integer>
15	15	</dict>
16	16	<key>NSAccessibilityConnectors</key>
17	17	<dict>
18	18	<key>CF$UID</key>
19		<integer>380</integer>
	19	<integer>387</integer>
20	20	</dict>
21	21	<key>NSAccessibilityOidsKeys</key>
22	22	<dict>
23	23	<key>CF$UID</key>
24		<integer>381</integer>
	24	<integer>388</integer>
25	25	</dict>
26	26	<key>NSAccessibilityOidsValues</key>
27	27	<dict>
28	28	<key>CF$UID</key>
29		<integer>382</integer>
	29	<integer>389</integer>
30	30	</dict>
31	31	<key>NSClassesKeys</key>
32	32	<dict>
33	33	<key>CF$UID</key>
34		<integer>~~297~~</integer>
	34	<integer>302</integer>
35	35	</dict>
36	36	<key>NSClassesValues</key>
37	37	<dict>
38	38	<key>CF$UID</key>
39		<integer>~~298~~</integer>
	39	<integer>303</integer>
40	40	</dict>
41	41	<key>NSConnections</key>
…	…
57	57	<dict>
58	58	<key>CF$UID</key>
59		<integer>281</integer>
	59	<integer>286</integer>
60	60	</dict>
61	61	<key>NSNamesValues</key>
62	62	<dict>
63	63	<key>CF$UID</key>
64		<integer>282</integer>
	64	<integer>287</integer>
65	65	</dict>
66	66	<key>NSNextOid</key>
67		<integer>564</integer>
	67	<integer>574</integer>
68	68	<key>NSObjectsKeys</key>
69	69	<dict>
70	70	<key>CF$UID</key>
71		<integer>241</integer>
	71	<integer>246</integer>
72	72	</dict>
73	73	<key>NSObjectsValues</key>
74	74	<dict>
75	75	<key>CF$UID</key>
76		<integer>280</integer>
	76	<integer>285</integer>
77	77	</dict>
78	78	<key>NSOidsKeys</key>
79	79	<dict>
80	80	<key>CF$UID</key>
81		<integer>~~299~~</integer>
	81	<integer>304</integer>
82	82	</dict>
83	83	<key>NSOidsValues</key>
84	84	<dict>
85	85	<key>CF$UID</key>
86		<integer>300</integer>
	86	<integer>305</integer>
87	87	</dict>
88	88	<key>NSRoot</key>
…	…
309	309	</dict>
310	310	<key>NSsFlags</key>
311		<integer>594</integer>
	311	<integer>530</integer>
312	312	<key>NSvFlags</key>
313	313	<integer>274</integer>
…	…
1006	1006	<integer>65</integer>
1007	1007	</dict>
1008		~~<key>NSEnabled</key>~~
1009		~~<true/>~~
1010	1008	<key>NSFrame</key>
1011	1009	<dict>
…	…
1033	1031	<integer>-2147483392</integer>
1034	1032	</dict>
1035		<string>{{-30, 1}, {15, 398}}</string>
	1033	<string>{{-30, 1}, {15, 384}}</string>
1036	1034	<string>_doScroller:</string>
1037	1035	<dict>
…	…
1215	1213	<dict>
1216	1214	<key>CF$UID</key>
1217		<integer>172</integer>
1218		</dict>
1219		<dict>
1220		<key>CF$UID</key>
1221		<integer>177</integer>
1222		</dict>
1223		<dict>
1224		<key>CF$UID</key>
1225		<integer>181</integer>
1226		</dict>
1227		<dict>
1228		<key>CF$UID</key>
1229		<integer>185</integer>
1230		</dict>
1231		<dict>
1232		<key>CF$UID</key>
1233		<integer>197</integer>
1234		</dict>
1235		<dict>
1236		<key>CF$UID</key>
1237		<integer>231</integer>
1238		</dict>
1239		<dict>
1240		<key>CF$UID</key>
1241		<integer>233</integer>
1242		</dict>
1243		<dict>
1244		<key>CF$UID</key>
1245		<integer>235</integer>
1246		</dict>
1247		<dict>
1248		<key>CF$UID</key>
1249		<integer>237</integer>
	1215	<integer>175</integer>
	1216	</dict>
	1217	<dict>
	1218	<key>CF$UID</key>
	1219	<integer>180</integer>
	1220	</dict>
	1221	<dict>
	1222	<key>CF$UID</key>
	1223	<integer>184</integer>
	1224	</dict>
	1225	<dict>
	1226	<key>CF$UID</key>
	1227	<integer>188</integer>
	1228	</dict>
	1229	<dict>
	1230	<key>CF$UID</key>
	1231	<integer>200</integer>
	1232	</dict>
	1233	<dict>
	1234	<key>CF$UID</key>
	1235	<integer>234</integer>
	1236	</dict>
	1237	<dict>
	1238	<key>CF$UID</key>
	1239	<integer>236</integer>
	1240	</dict>
	1241	<dict>
	1242	<key>CF$UID</key>
	1243	<integer>238</integer>
	1244	</dict>
	1245	<dict>
	1246	<key>CF$UID</key>
	1247	<integer>240</integer>
	1248	</dict>
	1249	<dict>
	1250	<key>CF$UID</key>
	1251	<integer>244</integer>
1250	1252	</dict>
1251	1253	</array>
…	…
1308	1310	<dict>
1309	1311	<key>CF$UID</key>
1310		<integer>170</integer>
	1312	<integer>173</integer>
1311	1313	</dict>
1312	1314	<key>NSMenuItems</key>
…	…
1318	1320	<dict>
1319	1321	<key>CF$UID</key>
1320		<integer>169</integer>
	1322	<integer>172</integer>
1321	1323	</dict>
1322	1324	<key>NSTitle</key>
…	…
1524	1526	<dict>
1525	1527	<key>CF$UID</key>
1526		<integer>170</integer>
	1528	<integer>173</integer>
1527	1529	</dict>
1528	1530	<key>NSMenuItems</key>
1529	1531	<dict>
1530	1532	<key>CF$UID</key>
1531		<integer>250</integer>
	1533	<integer>282</integer>
1532	1534	</dict>
1533	1535	<key>NSTitle</key>
1534	1536	<dict>
1535	1537	<key>CF$UID</key>
1536		<integer>248</integer>
	1538	<integer>280</integer>
1537	1539	</dict>
1538	1540	</dict>
…	…
1734	1736	<dict>
1735	1737	<key>CF$UID</key>
1736		<integer>170</integer>
	1738	<integer>173</integer>
1737	1739	</dict>
1738	1740	<key>NSMenuItems</key>
1739	1741	<dict>
1740	1742	<key>CF$UID</key>
1741		<integer>260</integer>
	1743	<integer>251</integer>
1742	1744	</dict>
1743	1745	<key>NSTitle</key>
1744	1746	<dict>
1745	1747	<key>CF$UID</key>
1746		<integer>259</integer>
	1748	<integer>249</integer>
1747	1749	</dict>
1748	1750	</dict>
…	…
1934	1936	<dict>
1935	1937	<key>CF$UID</key>
1936		<integer>170</integer>
	1938	<integer>173</integer>
1937	1939	</dict>
1938	1940	<key>NSMenuItems</key>
1939	1941	<dict>
1940	1942	<key>CF$UID</key>
1941		<integer>244</integer>
	1943	<integer>274</integer>
1942	1944	</dict>
1943	1945	<key>NSTitle</key>
1944	1946	<dict>
1945	1947	<key>CF$UID</key>
1946		<integer>243</integer>
	1948	<integer>272</integer>
1947	1949	</dict>
1948	1950	</dict>
…	…
2050	2052	<dict>
2051	2053	<key>CF$UID</key>
2052		<integer>170</integer>
	2054	<integer>173</integer>
2053	2055	</dict>
2054	2056	<key>NSMenuItems</key>
2055	2057	<dict>
2056	2058	<key>CF$UID</key>
2057		<integer>267</integer>
	2059	<integer>259</integer>
2058	2060	</dict>
2059	2061	<key>NSName</key>
2060	2062	<dict>
2061	2063	<key>CF$UID</key>
2062		<integer>273</integer>
	2064	<integer>270</integer>
2063	2065	</dict>
2064	2066	<key>NSTitle</key>
2065	2067	<dict>
2066	2068	<key>CF$UID</key>
2067		<integer>265</integer>
	2069	<integer>257</integer>
2068	2070	</dict>
2069	2071	</dict>
…	…
2325	2327	<dict>
2326	2328	<key>CF$UID</key>
2327		<integer>171</integer>
	2329	<integer>174</integer>
2328	2330	</dict>
2329	2331	<key>NSSource</key>
…	…
2366	2368	<integer>82</integer>
2367	2369	</dict>
	2370	<dict>
	2371	<key>CF$UID</key>
	2372	<integer>169</integer>
	2373	</dict>
2368	2374	</array>
2369	2375	</dict>
…	…
2374	2380	<integer>92</integer>
2375	2381	</dict>
2376		~~<key>NSIsDisabled</key>~~
2377		~~<true/>~~
2378	2382	<key>NSIsSeparator</key>
2379	2383	<true/>
…	…
2408	2412	</dict>
2409	2413	</dict>
	2414	<dict>
	2415	<key>$class</key>
	2416	<dict>
	2417	<key>CF$UID</key>
	2418	<integer>92</integer>
	2419	</dict>
	2420	<key>NSKeyEquiv</key>
	2421	<dict>
	2422	<key>CF$UID</key>
	2423	<integer>171</integer>
	2424	</dict>
	2425	<key>NSKeyEquivModMask</key>
	2426	<integer>1048576</integer>
	2427	<key>NSMenu</key>
	2428	<dict>
	2429	<key>CF$UID</key>
	2430	<integer>83</integer>
	2431	</dict>
	2432	<key>NSMixedImage</key>
	2433	<dict>
	2434	<key>CF$UID</key>
	2435	<integer>90</integer>
	2436	</dict>
	2437	<key>NSMnemonicLoc</key>
	2438	<integer>2147483647</integer>
	2439	<key>NSOnImage</key>
	2440	<dict>
	2441	<key>CF$UID</key>
	2442	<integer>86</integer>
	2443	</dict>
	2444	<key>NSTitle</key>
	2445	<dict>
	2446	<key>CF$UID</key>
	2447	<integer>170</integer>
	2448	</dict>
	2449	</dict>
	2450	<string>Cycle Windows</string>
	2451	<string><</string>
2410	2452	<string>_NSWindowsMenu</string>
2411	2453	<dict>
…	…
2433	2475	<dict>
2434	2476	<key>CF$UID</key>
	2477	<integer>179</integer>
	2478	</dict>
	2479	<key>NSSource</key>
	2480	<dict>
	2481	<key>CF$UID</key>
2435	2482	<integer>176</integer>
2436	2483	</dict>
2437		~~<key>NSSource</key>~~
2438		~~<dict>~~
2439		~~<key>CF$UID</key>~~
2440		~~<integer>173</integer>~~
2441		~~</dict>~~
2442	2484	</dict>
2443	2485	<dict>
…	…
2450	2492	<dict>
2451	2493	<key>CF$UID</key>
2452		<integer>175</integer>
	2494	<integer>178</integer>
2453	2495	</dict>
2454	2496	<key>NSKeyEquivModMask</key>
…	…
2474	2516	<dict>
2475	2517	<key>CF$UID</key>
2476		<integer>174</integer>
	2518	<integer>177</integer>
2477	2519	</dict>
2478	2520	</dict>
…	…
2494	2536	<dict>
2495	2537	&nb