[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier/tools/data/windowTypes/out

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/tools/data/windowTypes/outlinerFile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14075

Modified Files:
	saveAs 
Log Message:
set flHaveWindow to true at the end of handling an odb outline

Index: saveAs
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/tools/data/windowTypes/outlinerFile/saveAs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** saveAs	26 Mar 2005 19:42:52 -0000	1.1.1.1
--- saveAs	13 Jun 2005 22:34:40 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.Frontier.tools.data.windowTypes.outlinerFile.saveAs
  
! on saveAs (adr, adradrwindow=nil) {
	ÇHandle the Save As command for outliner files.
	ÇChanges:
		Ç8/14/01; 8:36:22 PM by JES
			ÇDon't doubly append the .opml extension onto the default filename.
	
	on getFilePathFromUser (adrPath, defaultExtension) {
		local (f, folder, fname);
		folder = file.folderFromPath (adrPath^);
		fname = file.fileFromPath (adrPath^);
		bundle { //fix the default path
			if (fname contains '.') and ((string.lower (fname) endsWith defaultExtension)) {
				fname = string.popSuffix (fname)};
			if system.environment.isMac {
				local (maxchars = 31 - sizeOf (defaultExtension));
				if sizeOf (fname) > maxchars {
					fname = string.mid (fname, 1, maxchars)}};
			fname = fname + defaultExtension};
		f = folder + fname;
		if not (file.putFileDialog ("Save as", @f)) { //get a place to save this document
			return (false)};
		if not (string.lower (f) endsWith defaultExtension) {
			f = f + defaultExtension};
		adrPath^ = f;
		return (true)};
	on setPosition (adrOrigWindow, adrNewWindow) {
		local (horiz, vert, width, height);
		window.getPosition (adrOrigWindow, @horiz, @vert);
		window.getSize (adrOrigWindow, @width, @height);
		window.setSize (adrNewWindow, width, height);
		window.setPosition (adrNewWindow, horiz + 15, vert + 15)};
	
	local (type, adrNewWindow, flHaveWindow = false);
	if window.attributes.getOne ("type", @type, adr) { //if it's a file-based outline file, clone it as a new outlinerFile
		if type == "outlinerFile" {
			local (adrtype = parentOf (this^));
			local (f);
			if not window.attributes.getOne ("f", @f, adr) { //call the save script
				return (adrtype^.save (adr, adradrwindow))};
			
			local (atts);
			window.attributes.getAll (@atts, adr);
			
			local (defaultExtension = ".opml");
			if defined (atts.flOutlineDocument) { //it might be raw XML -- use .xml suffix
				if not atts.flOutlineDocument {
					defaultExtension = ".xml";
					if defined (atts.f) {
						local (fname = file.fileFromPath (atts.f));
						if fname contains '.' {
							defaultExtension = "." + string.nthField (fname, '.', string.countFields (fname, '.'))}}}};
			if not (getFilePathFromUser (@atts.f, ".opml")) {
				return (false)};
			atts.title = file.fileFromPath (atts.f);
			Frontier.tools.windowTypes.commands.new (true, atts.title, @adrNewWindow);
			adrNewWindow^ = adr^;
			window.attributes.addGroup (@atts, adrNewWindow);
			edit (adrNewWindow, atts.title);
			setPosition (adr, adrNewWindow);
			flHaveWindow = true}};
	
	if not flHaveWindow { //maybe it's an odb outline
		if typeOf (adr^) == outlineType { //it's an odb outline, so create a new opml file based on its contents
			local (f = window.getTitle (adr));
			bundle { //if the title is an odb address, use the name of the object
				if string.lower (f) == string.lower (string.popFileFromAddress (adr)) {
					f = nameOf (adr^)}};
			if not (getFilePathFromUser (@f, ".opml")) {
				return (false)};
			
			bundle { //create a new outline document with data and a file path
				local (title = file.fileFromPath (f));
				Frontier.tools.windowTypes.commands.new (true, title, @adrNewWindow);
				window.attributes.setOne ("f", f, adrNewWindow);
				adrNewWindow^ = adr^;
				edit (adrNewWindow, title);
				setPosition (adr, adrNewWindow)}}};
	
	if not flHaveWindow { //couldn't create the new file -- return false: command not handled
		return (false)};
	
	if not Frontier.tools.windowTypes.commands.save (adrNewWindow) { //save the file
		return (false)};
	
	if adradrwindow != nil { //tell the caller how to find the window
		adradrwindow^ = adrNewWindow};
	
	return (true)}; //command handled

bundle { //testing
	saveAs (window.frontmost ())}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.Frontier.tools.data.windowTypes.outlinerFile.saveAs
  
! on saveAs (adr, adradrwindow=nil) {
	ÇHandle the Save As command for outliner files.
		ÇChanges
			Ç11/28/04; 9:03:46 AM by TAC
				Çset flHaveWindow to true at the end of handling an odb outline
			Ç8/14/01; 8:36:22 PM by JES
				ÇDon't doubly append the .opml extension onto the default filename.
	
	on getFilePathFromUser (adrPath, defaultExtension) {
		local (f, folder, fname);
		folder = file.folderFromPath (adrPath^);
		fname = file.fileFromPath (adrPath^);
		bundle { //fix the default path
			if (fname contains '.') and ((string.lower (fname) endsWith defaultExtension)) {
				fname = string.popSuffix (fname)};
			if system.environment.isMac {
				local (maxchars = 31 - sizeOf (defaultExtension));
				if sizeOf (fname) > maxchars {
					fname = string.mid (fname, 1, maxchars)}};
			fname = fname + defaultExtension};
		f = folder + fname;
		if not (file.putFileDialog ("Save as", @f)) { //get a place to save this document
			return (false)};
		if not (string.lower (f) endsWith defaultExtension) {
			f = f + defaultExtension};
		adrPath^ = f;
		return (true)};
	on setPosition (adrOrigWindow, adrNewWindow) {
		local (horiz, vert, width, height);
		window.getPosition (adrOrigWindow, @horiz, @vert);
		window.getSize (adrOrigWindow, @width, @height);
		window.setSize (adrNewWindow, width, height);
		window.setPosition (adrNewWindow, horiz + 15, vert + 15)};
	
	local (type, adrNewWindow, flHaveWindow = false);
	if window.attributes.getOne ("type", @type, adr) { //if it's a file-based outline file, clone it as a new outlinerFile
		if type == "outlinerFile" {
			local (adrtype = parentOf (this^));
			local (f);
			if not window.attributes.getOne ("f", @f, adr) { //call the save script
				return (adrtype^.save (adr, adradrwindow))};
			
			local (atts);
			window.attributes.getAll (@atts, adr);
			
			local (defaultExtension = ".opml");
			if defined (atts.flOutlineDocument) { //it might be raw XML -- use .xml suffix
				if not atts.flOutlineDocument {
					defaultExtension = ".xml";
					if defined (atts.f) {
						local (fname = file.fileFromPath (atts.f));
						if fname contains '.' {
							defaultExtension = "." + string.nthField (fname, '.', string.countFields (fname, '.'))}}}};
			if not (getFilePathFromUser (@atts.f, ".opml")) {
				return (false)};
			atts.title = file.fileFromPath (atts.f);
			Frontier.tools.windowTypes.commands.new (true, atts.title, @adrNewWindow);
			adrNewWindow^ = adr^;
			window.attributes.addGroup (@atts, adrNewWindow);
			edit (adrNewWindow, atts.title);
			setPosition (adr, adrNewWindow);
			flHaveWindow = true}};
	
	if not flHaveWindow { //maybe it's an odb outline
		if typeOf (adr^) == outlineType { //it's an odb outline, so create a new opml file based on its contents
			local (f = window.getTitle (adr));
			bundle { //if the title is an odb address, use the name of the object
				if string.lower (f) == string.lower (string.popFileFromAddress (adr)) {
					f = nameOf (adr^)}};
			if not (getFilePathFromUser (@f, ".opml")) {
				return (false)};
			
			bundle { //create a new outline document with data and a file path
				local (title = file.fileFromPath (f));
				Frontier.tools.windowTypes.commands.new (true, title, @adrNewWindow);
				window.attributes.setOne ("f", f, adrNewWindow);
				adrNewWindow^ = adr^;
				edit (adrNewWindow, title);
				setPosition (adr, adrNewWindow);
				flHaveWindow = true}}}; // 11/28/04; 9:01:17 AM by TAC - odb outline has been set up as outlinerFile, proceed normally
	
	if not flHaveWindow { //couldn't create the new file -- return false: command not handled
		return (false)};
	
	if not Frontier.tools.windowTypes.commands.save (adrNewWindow) { //save the file
		return (false)};
	
	if adradrwindow != nil { //tell the caller how to find the window
		adradrwindow^ = adrNewWindow};
	
	return (true)}; //command handled

Çbundle //testing
	ÇsaveAs (window.frontmost ())
\ No newline at end of file

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier/tools/data/windowTypes/out

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier/tools/data/windowTypes/outlinerFile saveAs,1.1.1.1,1.2