Navigation

← Previous Changeset
Next Changeset →

Changeset 45

Timestamp:

07/27/06 12:58:41 (2 years ago)

Author:

mike

Message:

[new] fullscreen toolbarIcon
[new] toolbarIcon defaults
[new] backwards guest/windowcycling (cmd + >)

Files:

trunk/changelog.txt (modified) (2 diffs)
trunk/host-cocoa/Resources/English.lproj/Localizable.strings (modified) (1 diff)
trunk/host-cocoa/Resources/q_tb_fullscreen.tiff (added)
trunk/host-cocoa/cocoaQemu.m (modified) (1 diff)
trunk/host-cocoa/cocoaQemuWindow.h (modified) (1 diff)
trunk/host-cocoa/cocoaQemuWindow.m (modified) (4 diffs)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/classes.nib (modified) (1 diff)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/info.nib (modified) (1 diff)
trunk/qcontrol/Resources/English.lproj/cocoaControl.nib/keyedobjects.nib (modified) (105 diffs)
trunk/qcontrol/cocoaControlController.h (modified) (1 diff)
trunk/qcontrol/cocoaControlController.m (modified) (1 diff)
trunk/qcontrol/cocoaControlDOServer.h (modified) (2 diffs)
trunk/qcontrol/cocoaControlDOServer.m (modified) (4 diffs)

Legend:

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

trunk/changelog.txt

r44	r45
	1	Q-0.8.1d45
	2	[new] fullscreen toolbarIcon
	3	[new] toolbarIcon defaults
	4	[new] backwards guest/windowcycling (cmd + >)
	5
1	6	Q-0.8.1d44
2	7	[new] editPC network tab
…	…
15	20	Q-0.8.1d37
16	21	[new] fullscreen guest/windowcycling
17		[new] hotkey support for guest/windowcycling
	22	[new] hotkey support for guest/windowcycling (cmd + <)
18	23	[new] animation when switch to monitor and back (ctrl-alt-1..9)
19	24	[new] new Guest Assistant launched when double-clicking a empty table row

trunk/host-cocoa/Resources/English.lproj/Localizable.strings

r5	r45
70	70	"toolbar:paletteLabel:ctrlAltDel" = "Send ctrl-alt-del";
71	71	"toolbar:toolTip:ctrlAltDel" = "Send ctrl-alt-del";
	72	"toolbar:label:fullscreen" = "Fullscreen";
	73	"toolbar:paletteLabel:fullscreen" = "Fullscreen";
	74	"toolbar:toolTip:fullscreen" = "Switch to fullscreen";

trunk/host-cocoa/cocoaQemu.m

r37	r45
1187	1187	/* window switch */
1188	1188	case 50: /* backquote key */
1189		if ([[pc qdoserver] guestSwitch:[pc pcName] fullscreen:[pc fullscreen] nextGuestName:nil])
1190		return;
1191		else
1192		break;
	1189	if ([event modifierFlags] & NSShiftKeyMask) { /* previous Window */
	1190	if ([[pc qdoserver] guestSwitch:[pc pcName] fullscreen:[pc fullscreen] previousGuestName:nil])
	1191	return;
	1192	else
	1193	break;
	1194	} else { /* next Window */
	1195	if ([[pc qdoserver] guestSwitch:[pc pcName] fullscreen:[pc fullscreen] nextGuestName:nil])
	1196	return;
	1197	else
	1198	break;
	1199	}
1193	1200	}
1194	1201	}

trunk/host-cocoa/cocoaQemuWindow.h

r34 r45

36 36 - (void) setupToolbar;
37 37 - (void) setMyContentView:(id)aContentView;
38 - (void) setFullscreen:(id)sender;
38 39 @end

trunk/host-cocoa/cocoaQemuWindow.m

r37	r45
214	214	[toolbarItem setTarget: pc];
215	215	[toolbarItem setAction: @selector( ctrlAltDel: )];
	216	} else if ([itemIdent isEqual: @"fullscreenIdentifier"]) {
	217	[toolbarItem setLabel: NSLocalizedStringFromTable(@"toolbar:label:fullscreen", @"Localizable", @"cocoaQemuWindow")];
	218	[toolbarItem setPaletteLabel: NSLocalizedStringFromTable(@"toolbar:paletteLabel:fullscreen", @"Localizable", @"cocoaQemuWindow")];
	219	[toolbarItem setToolTip: NSLocalizedStringFromTable(@"toolbar:toolTip:fullscreen", @"Localizable", @"cocoaQemuWindow")];
	220	[toolbarItem setImage: [NSImage imageNamed: @"q_tb_fullscreen.tiff"]];
	221	[toolbarItem setTarget: self];
	222	[toolbarItem setAction: @selector( setFullscreen: )];
216	223	} else {
217	224	toolbarItem = nil;
…	…
233	240	@"pausePlayIdentifier",
234	241	@"ctrlAltDelIdentifier",
	242	@"fullscreenIdentifier",
235	243	NSToolbarCustomizeToolbarItemIdentifier,
236	244	NSToolbarFlexibleSpaceItemIdentifier,
…	…
243	251	{
244	252	return [NSArray arrayWithObjects:
245		~~@"fdaChangeIdentifier",~~
246	253	@"cdromChangeIdentifier",
	254	@"fullscreenIdentifier",
247	255	@"screenshotIdentifier",
248	256	NSToolbarFlexibleSpaceItemIdentifier,
…	…
461	469	}
462	470
	471	- (void) setFullscreen:(id)sender;
	472	{
	473	// NSLog(@"cocoaQemuWindow: setFullscreen");
	474	[pc setFullscreen:[[pc contentView] toggleFullScreen]];
	475	}
463	476
464	477	@end

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

r37	r45
15	15	addPCFromAssistant = id;
16	16	cycleWindows = id;
	17	cycleWindowsBack = id;
17	18	deletePC = id;
18	19	editPC = id;

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

r37	r45
14	14	<key>IBOpenObjects</key>
15	15	<array>
	16	<integer>21</integer>
16	17	<integer>453</integer>
17	18	<integer>546</integer>
18		~~<integer>21</integer>~~
19	19	</array>
20	20	<key>IBSystem Version</key>

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

r37	r45
12	12	<dict>
13	13	<key>CF$UID</key>
14		<integer>390</integer>
	14	<integer>397</integer>
15	15	</dict>
16	16	<key>NSAccessibilityConnectors</key>
17	17	<dict>
18	18	<key>CF$UID</key>
19		<integer>387</integer>
	19	<integer>394</integer>
20	20	</dict>
21	21	<key>NSAccessibilityOidsKeys</key>
22	22	<dict>
23	23	<key>CF$UID</key>
24		<integer>388</integer>
	24	<integer>395</integer>
25	25	</dict>
26	26	<key>NSAccessibilityOidsValues</key>
27	27	<dict>
28	28	<key>CF$UID</key>
29		<integer>389</integer>
	29	<integer>396</integer>
30	30	</dict>
31	31	<key>NSClassesKeys</key>
32	32	<dict>
33	33	<key>CF$UID</key>
34		<integer>302</integer>
	34	<integer>307</integer>
35	35	</dict>
36	36	<key>NSClassesValues</key>
37	37	<dict>
38	38	<key>CF$UID</key>
39		<integer>303</integer>
	39	<integer>308</integer>
40	40	</dict>
41	41	<key>NSConnections</key>
…	…
57	57	<dict>
58	58	<key>CF$UID</key>
59		<integer>286</integer>
	59	<integer>291</integer>
60	60	</dict>
61	61	<key>NSNamesValues</key>
62	62	<dict>
63	63	<key>CF$UID</key>
64		<integer>287</integer>
	64	<integer>292</integer>
65	65	</dict>
66	66	<key>NSNextOid</key>
67		<integer>574</integer>
	67	<integer>576</integer>
68	68	<key>NSObjectsKeys</key>
69	69	<dict>
70	70	<key>CF$UID</key>
71		<integer>246</integer>
	71	<integer>251</integer>
72	72	</dict>
73	73	<key>NSObjectsValues</key>
74	74	<dict>
75	75	<key>CF$UID</key>
76		<integer>285</integer>
	76	<integer>290</integer>
77	77	</dict>
78	78	<key>NSOidsKeys</key>
79	79	<dict>
80	80	<key>CF$UID</key>
81		<integer>304</integer>
	81	<integer>309</integer>
82	82	</dict>
83	83	<key>NSOidsValues</key>
84	84	<dict>
85	85	<key>CF$UID</key>
86		<integer>305</integer>
	86	<integer>310</integer>
87	87	</dict>
88	88	<key>NSRoot</key>
…	…
1213	1213	<dict>
1214	1214	<key>CF$UID</key>
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>
	1215	<integer>178</integer>
	1216	</dict>
	1217	<dict>
	1218	<key>CF$UID</key>
	1219	<integer>183</integer>
	1220	</dict>
	1221	<dict>
	1222	<key>CF$UID</key>
	1223	<integer>187</integer>
	1224	</dict>
	1225	<dict>
	1226	<key>CF$UID</key>
	1227	<integer>191</integer>
	1228	</dict>
	1229	<dict>
	1230	<key>CF$UID</key>
	1231	<integer>203</integer>
	1232	</dict>
	1233	<dict>
	1234	<key>CF$UID</key>
	1235	<integer>237</integer>
	1236	</dict>
	1237	<dict>
	1238	<key>CF$UID</key>
	1239	<integer>239</integer>
	1240	</dict>
	1241	<dict>
	1242	<key>CF$UID</key>
	1243	<integer>241</integer>
	1244	</dict>
	1245	<dict>
	1246	<key>CF$UID</key>
	1247	<integer>243</integer>
	1248	</dict>
	1249	<dict>
	1250	<key>CF$UID</key>
	1251	<integer>247</integer>
	1252	</dict>
	1253	<dict>
	1254	<key>CF$UID</key>
	1255	<integer>249</integer>
1252	1256	</dict>
1253	1257	</array>
…	…
1310	1314	<dict>
1311	1315	<key>CF$UID</key>
1312		<integer>173</integer>
	1316	<integer>176</integer>
1313	1317	</dict>
1314	1318	<key>NSMenuItems</key>
…	…
1320	1324	<dict>
1321	1325	<key>CF$UID</key>
1322		<integer>172</integer>
	1326	<integer>175</integer>
1323	1327	</dict>
1324	1328	<key>NSTitle</key>
…	…
1526	1530	<dict>
1527	1531	<key>CF$UID</key>
1528		<integer>173</integer>
	1532	<integer>176</integer>
1529	1533	</dict>
1530	1534	<key>NSMenuItems</key>
…	…
1736	1740	<dict>
1737	1741	<key>CF$UID</key>
1738		<integer>173</integer>
	1742	<integer>176</integer>
1739	1743	</dict>
1740	1744	<key>NSMenuItems</key>
1741	1745	<dict>
1742	1746	<key>CF$UID</key>
1743		<integer>251</integer>
	1747	<integer>256</integer>
1744	1748	</dict>
1745	1749	<key>NSTitle</key>
1746	1750	<dict>
1747	1751	<key>CF$UID</key>
1748		<integer>249</integer>
	1752	<integer>254</integer>
1749	1753	</dict>
1750	1754	</dict>
…	…
1936	1940	<dict>
1937	1941	<key>CF$UID</key>
1938		<integer>173</integer>
	1942	<integer>176</integer>
1939	1943	</dict>
1940	1944	<key>NSMenuItems</key>
1941	1945	<dict>
1942	1946	<key>CF$UID</key>
1943		<integer>274</integer>
	1947	<integer>261</integer>
1944	1948	</dict>
1945	1949	<key>NSTitle</key>
1946	1950	<dict>
1947	1951	<key>CF$UID</key>
1948		<integer>272</integer>
	1952	<integer>259</integer>
1949	1953	</dict>
1950	1954	</dict>
…	…
2052	2056	<dict>
2053	2057	<key>CF$UID</key>
2054		<integer>173</integer>
	2058	<integer>176</integer>
2055	2059	</dict>
2056	2060	<key>NSMenuItems</key>
2057	2061	<dict>
2058	2062	<key>CF$UID</key>
2059		<integer>259</integer>
	2063	<integer>264</integer>
2060	2064	</dict>
2061	2065	<key>NSName</key>
2062	2066	<dict>
2063	2067	<key>CF$UID</key>
2064		<integer>270</integer>
	2068	<integer>276</integer>
2065	2069	</dict>
2066	2070	<key>NSTitle</key>
2067	2071	<dict>
2068	2072	<key>CF$UID</key>
2069		<integer>257</integer>
	2073	<integer>263</integer>
2070	2074	</dict>
2071	2075	</dict>
…	…
2327	2331	<dict>
2328	2332	<key>CF$UID</key>
2329		<integer>174</integer>
	2333	<integer>177</integer>
2330	2334	</dict>
2331	2335	<key>NSSource</key>
…	…
2371	2375	<key>CF$UID</key>
2372	2376	<integer>169</integer>
	2377	</dict>
	2378	<dict>
	2379	<key>CF$UID</key>
	2380	<integer>172</integer>
2373	2381	</dict>
2374	2382	</array>
…	…
2448	2456	</dict>
2449	2457	</dict>
2450		<string>~~Cycle Windows~~</string>
	2458	<string>Next Window</string>
2451	2459	<string><</string>
	2460	<dict>
	2461	<key>$class</key>
	2462	<dict>
	2463	<key>CF$UID</key>
	2464	<integer>92</integer>
	2465	</dict>
	2466	<key>NSKeyEquiv</key>
	2467	<dict>
	2468	<key>CF$UID</key>
	2469	<integer>174</integer>
	2470	</dict>
	2471	<key>NSKeyEquivModMask</key>
	2472	<integer>1048576</integer>
	2473	<key>NSMenu</key>
	2474	<dict>
	2475	<key>CF$UID</key>
	2476	<integer>83</integer>
	2477	</dict>
	2478	<key>NSMixedImage</key>
	2479	<dict>
	2480	<key>CF$UID</key>
	2481	<integer>90</integer>
	2482	</dict>
	2483	<key>NSMnemonicLoc</key>
	2484	<integer>2147483647</integer>
	2485	<key>NSOnImage</key>
	2486	<dict>
	2487	<key>CF$UID</key>
	2488	<integer>86</integer>
	2489	</dict>
	2490	<key>NSTitle</key>
	2491	<dict>
	2492	<key>CF$UID</key>
	2493	<integer>173</integer>
	2494	</dict>
	2495	</dict>
	2496	<string>Previous Window</string>
	2497	<string>></string>
2452	2498	<string>_NSWindowsMenu</string>
2453	2499	<dict>
…	…
2475	2521	<dict>
2476	2522	<key>CF$UID</key>
	2523	<integer>182</integer>
	2524	</dict>
	2525	<key>NSSource</key>
	2526	<dict>
	2527	<key>CF$UID</key>
2477	2528	<integer>179</integer>
2478	2529	</dict>
2479		~~<key>NSSource</key>~~
2480		~~<dict>~~
2481		~~<key>CF$UID</key>~~
2482		~~<integer>176</integer>~~
2483		~~</dict>~~
2484	2530	</dict>
2485	2531	<dict>
…	…
2492	2538	<dict>
2493	2539	<key>CF$UID</key>
2494		<integer>178</integer>
	2540	<integer>181</integer>
2495	2541	</dict>
2496	2542	<key>NSKeyEquivModMask</key>
…	…
2516	2562	<dict>
2517	2563	<key>CF$UID</key>
2518		<integer>177</integer>
	2564	<integer>180</integer>
2519	2565	</dict>
2520	2566	</dict>
…	…
2536	2582	<dict>
2537	2583	<key>CF$UID</key>
2538		<integer>183</integer>
	2584	<integer>186</integer>
2539	2585	</dict>
2540	2586	<key>NSSource</key>
2541	2587	<dict>
2542	2588	<key>CF$UID</key>
2543		<integer>181</integer>
	2589	<integer>184</integer>
2544	2590	</dict>
2545	2591	</dict>
…	…
2577	2623	<dict>
2578	2624	<key>CF$UID</key>
2579		<integer>182</integer>
	2625	<integer>185</integer>
2580	2626	</dict>
2581	2627	</dict>
…	…
2596	2642	<dict>
2597	2643	<key>CF$UID</key>
2598		<integer>187</integer>
	2644	<integer>190</integer>
2599	2645	</dict>
2600	2646	<key>NSSource</key>
2601	2647	<dict>
2602	2648	<key>CF$UID</key>
2603		<integer>185</integer>
	2649	<integer>188</integer>
2604	2650	</dict>
2605	2651	</dict>
…	…
2637	2683	<dict>
2638	2684	<key>CF$UID</key>
2639		<integer>186</integer>
	2685	<integer>189</integer>
2640	2686	</dict>
2641	2687	</dict>
…	…
2651	2697	<dict>
2652	2698	<key>CF$UID</key>
2653		<integer>189</integer>
	2699	<integer>192</integer>
2654	2700	</dict>
2655	2701	<key>NSLabel</key>
2656	2702	<dict>
2657	2703	<key>CF$UID</key>
2658		<integer>~~199~~</integer>
	2704	<integer>202</integer>
2659	2705	</dict>
2660	2706	<key>NSSource</key>
…	…
2668	2714	<dict>
2669	2715	<key>CF$UID</key>
2670		<integer>~~198~~</integer>
	2716	<integer>201</integer>
2671	2717	</dict>
2672	2718	<key>NSCell</key>
2673	2719	<dict>
2674	2720	<key>CF$UID</key>
2675		<integer>192</integer>
	2721	<integer>195</integer>
2676	2722	</dict>
2677	2723	<key>NSEnabled</key>
…	…
2680	2726	<dict>
2681	2727	<key>CF$UID</key>
2682		<integer>191</integer>
	2728	<integer>194</integer>
2683	2729	</dict>
2684	2730	<key>NSNextResponder</key>
2685	2731	<dict>
2686	2732	<key>CF$UID</key>
2687		<integer>190</integer>
	2733	<integer>193</integer>
2688	2734	</dict>
2689	2735	<key>NSSuperview</key>
2690	2736	<dict>
2691	2737	<key>CF$UID</key>
2692		<integer>190</integer>
	2738	<integer>193</integer>
2693	2739	</dict>
2694	2740	<key>NSvFlags</key>
…	…
2704	2750	<dict>
2705	2751	<key>CF$UID</key>
2706		<integer>228</integer>
	2752	<integer>231</integer>
2707	2753	</dict>
2708	2754	<key>NSNextResponder</key>
…	…
2714	2760	<dict>
2715	2761	<key>CF$UID</key>
2716		<integer>206</integer>
	2762	<integer>209</integer>
2717	2763	</dict>
2718	2764	</dict>
…	…
2727	2773	<dict>
2728	2774	<key>CF$UID</key>
2729		<integer>196</integer>
	2775	<integer>199</integer>
2730	2776	</dict>
2731	2777	<key>NSCellFlags</key>
…	…
2736	2782	<dict>
2737	2783	<key>CF$UID</key>
2738		<integer>193</integer>
	2784	<integer>196</integer>
2739	2785	</dict>
2740	2786	<key>NSControlView</key>
2741	2787	<dict>
2742	2788	<key>CF$UID</key>
2743		<integer>189</integer>
	2789	<integer>192</integer>
2744	2790	</dict>
2745	2791	<key>NSSupport</key>
2746	2792	<dict>
2747	2793	<key>CF$UID</key>
2748		<integer>194</integer>
	2794	<integer>197</integer>
2749	2795	</dict>
2750	2796	<key>NSTextColor</key>
…	…
2764	2810	<dict>
2765	2811	<key>CF$UID</key>
2766		<integer>195</integer>
	2812	<integer>198</integer>
2767	2813	</dict>
2768	2814	<key>NSSize</key>
…	…
2791	2837	<dict>
2792	2838	<key>CF$UID</key>
2793		<integer>~~197~~</integer>
	2839	<integer>200</integer>
2794	2840	</dict>
2795	2841	<key>NSColorSpace</key>
…	…
2820	2866	<dict>
2821	2867	<key>CF$UID</key>
2822		<integer>201</integer>
	2868	<integer>204</integer>
2823	2869	</dict>
2824	2870	<key>NSLabel</key>
2825	2871	<dict>
2826	2872	<key>CF$UID</key>
	2873	<integer>236</integer>
	2874	</dict>
	2875	<key>NSSource</key>
	2876	<dict>
	2877	<key>CF$UID</key>
	2878	&n