[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/webBrowser launch,1.1.1.1,1.2

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/webBrowser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29953

Modified Files:
	launch 
Log Message:
for Mac OS, added cases for Safari and Firefox; separated all cases; so that each will call its own apps Table item

Index: launch
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/webBrowser/launch,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** launch	26 Mar 2005 19:43:50 -0000	1.1.1.1
--- launch	11 Nov 2005 05:19:23 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.webBrowser.launch
  
! on launch () {
	ÇChanges:
		Ç1/9/02; 12:05:13 PM by PBS
			ÇMust use actual codes because on OS X the app IDs may be '    ' since apps are bundles (folders) sometimes.
	local (id);
	if webBrowser.isRunning () {
		return (user.webBrowser.currentid )}; // a supported browser is already running.
	id = webBrowser.getDefaultBrowser ();
	if id == false or id == 'NONE' {
		return (false)};
	case sys.os () {
		"MacOS" {
			if sys.appIsRunning (id) {
				return};
			case id {
				'MOSS';
				'MOZZ';
				Netscape.id {
					if app.start (@Netscape) {
						user.webBrowser.currentid = Netscape.id;
						webBrowser.bringToFront ();
						return (id)}};
				'MSIE';
				msExplorer.id {
					if app.start (@msExplorer) {
						user.webBrowser.currentid = msExplorer.id;
						webBrowser.bringToFront ();
						return (id)}}};
			scriptError ("Can't launch the web browser. Please check your preference with Internet Config.")};
		"Win95";
		"WinNT" {
			if sys.appIsRunning (file.fileFromPath (id)) {
				return (file.fileFromPath (id))};
			if launch.appWithDocument (id, "") {
				user.webBrowser.currentid = file.fileFromPath (id);
				clock.waitSeconds (2);
				return (file.fileFromPath (id))}}}}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.webBrowser.launch
  
! on launch () {
	ÇChanges
		Ç11/10/05; 8:43:11 PM by TAC
			Çfor Mac OS, added cases for Safari and Firefox; separated all cases; so that each will call its own apps Table item
		Ç1/9/02; 12:05:13 PM by PBS
			ÇMust use actual codes because on OS X the app IDs may be '    ' since apps are bundles (folders) sometimes.
	
	local (id);
	
	if webBrowser.isRunning () {
		return (user.webBrowser.currentid )}; // a supported browser is already running.
	
	id = webBrowser.getDefaultBrowser ();
	
	if id == false or id == 'NONE' {
		return (false)};
	
	case sys.os () {
		"MacOS" {
			if sys.appIsRunning (id) {
				return};
			case id {
				'MOZB' {
					if app.start (@Firefox) {
						user.webBrowser.currentid = Firefox.appInfo.id;
						webBrowser.bringToFront ();
						return (id)}};
				'MOZZ' {
					if app.start (@Mozilla) {
						user.webBrowser.currentid = Mozilla.appInfo.id;
						webBrowser.bringToFront ();
						return (id)}};
				'MOSS' {
					if app.start (@Netscape) {
						user.webBrowser.currentid = Netscape.appInfo.id;
						webBrowser.bringToFront ();
						return (id)}};
				'MSIE' {
					if app.start (@msExplorer) {
						user.webBrowser.currentid = msExplorer.appInfo.id;
						webBrowser.bringToFront ();
						return (id)}};
				'sfri' {
					if app.start (@Safari) {
						user.webBrowser.currentid = Safari.appInfo.id;
						webBrowser.bringToFront ();
						return (id)}}};
			scriptError ("Can't launch the web browser. Please check your preference with Internet Config.")};
		"Win95";
		"WinNT" {
			if sys.appIsRunning (file.fileFromPath (id)) {
				return (file.fileFromPath (id))};
			if launch.appWithDocument (id, "") {
				user.webBrowser.currentid = file.fileFromPath (id);
				clock.waitSeconds (2);
				return (file.fileFromPath (id))}}}};

Çbundle // testing
	Çlaunch ()
\ No newline at end of file