[Eas-dev-commit] ocmng/EAS/forms eas.xpm, NONE, 1.1 form.prg, 1.1, 1.2 form.xml, 1.1, 1.2 form_menu.prg, 1.1, 1.2 form_menu.xml, 1.1, 1.2

[Andrey C. <sku...@us...>]

Update of /cvsroot/eas-dev/ocmng/EAS/forms
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2772/EAS/forms

Modified Files:
	form.prg form.xml form_menu.prg form_menu.xml 
Added Files:
	eas.xpm 
Log Message:
Add new components. Fix log policy for forms.

--- NEW FILE: eas.xpm ---
/* XPM */
static char *eas[]={
"16 16 167 2",
".g c None",
"aJ c None",
"ag c None",
".q c None",
"#4 c None",
".h c None",
"aK c None",
".i c None",
".# c None",
"Qt c None",
"ah c #afafb0",
".j c #afb6be",
".a c #aeb6be",
"#S c #adadad",
"aC c #acacac",
"#i c #abb4be",
"#v c #1a4165",
"#X c #1a4267",
".6 c #1a456b",
"#t c #1b4360",
"#Y c #1b456d",
"#W c #1c466d",
"#u c #1e4667",
".3 c #1e4c70",
"#Z c #1e5182",
"#P c #1f323f",
"#y c #1f3f55",
".5 c #1f496c",
".4 c #1f4a6c",
"#l c #205077",
"#1 c #213648",
"#G c #222b30",
"#s c #224d6c",
"#w c #225580",
"#o c #232e33",
"#g c #233c4e",
"#V c #23598d",
"#M c #255987",
"#0 c #255e94",
"a# c #2563a2",
"#D c #265e8d",
".7 c #265e8e",
".W c #265f91",
"a. c #2666a6",
"#m c #276091",
"aa c #2767a7",
"ab c #28639f",
".2 c #2a608b",
"#9 c #2a6fb5",
".K c #2c73b6",
"#U c #2c74b8",
"#z c #2e2f2f",
"ac c #2f3e4e",
"am c #2f79c4",
"#8 c #2f7cca",
".y c #2f80d1",
"an c #305b86",
"al c #307ece",
".z c #3080d0",
"ak c #3080d1",
"#7 c #3182d5",
".t c #3184d7",
"#Q c #323333",
".x c #3282cf",
"aj c #3283d5",
"#6 c #3283d6",
".m c #3284d7",
".L c #3381c8",
".w c #3382cf",
".n c #3383d5",
".v c #3384d2",
".u c #3385d5",
".0 c #3486d5",
"aw c #356799",
".P c #3584d5",
".D c #3585d5",
"av c #366ea6",
"#a c #3687d1",
".E c #3688d4",
".l c #3785d4",
"ax c #385675",
"#. c #394043",
"#h c #3d3e3e",
".Z c #3d87d2",
".s c #3e87d2",
"ao c #3f4347",
"au c #3f6e9e",
"ay c #444a51",
"ad c #464646",
".V c #4996bf",
"#L c #4d9ac3",
"#H c #4e4e4e",
"#J c #538dc8",
"ai c #5585b5",
".d c #558ec7",
"#K c #55addd",
"#p c #565656",
"az c #585858",
"#e c #58aed9",
".Y c #5a9fbf",
"ap c #5c5c5c",
".o c #5c86b1",
".9 c #5cb6e0",
"#n c #5cb7e2",
"#O c #5cb8e2",
"#k c #5db6df",
"#C c #5db6e1",
"#F c #5db7e0",
"#N c #5db9e3",
"#x c #5dbae3",
"#B c #5e92c7",
"#E c #5eb9e3",
"#f c #5ebae4",
".J c #5ebae5",
".Q c #5ebbe7",
".F c #5ebbe8",
"#T c #5f90c2",
".M c #5fbae3",
"#2 c #616161",
".T c #61c0e9",
".R c #61c0ea",
".S c #61c1ea",
".c c #6294c6",
"#d c #62c0e8",
".U c #62c0e9",
".G c #62c0ea",
".H c #62c1ea",
".I c #62c1eb",
".8 c #63c3ef",
".X c #63c4ee",
".1 c #63c5f0",
"#b c #63c6f0",
"at c #64798e",
".e c #6492c0",
"#r c #64c5f0",
"## c #6596c8",
".A c #667d8f",
".k c #6797c8",
"ae c #696969",
"#j c #69cffb",
"#c c #6ad0fc",
"aF c #6c6c6c",
".N c #6d93a4",
"aG c #707070",
"aA c #737373",
"#A c #757575",
"#R c #767676",
"#q c #7ea0c3",
"aH c #7f7f7f",
"aq c #818181",
".b c #82a1c2",
".C c #83a3c4",
"#5 c #869db4",
"aE c #888888",
".f c #8ea0b3",
"aB c #929292",
".r c #92aac1",
"#I c #959595",
".O c #95abc1",
"af c #989898",
".B c #9ca1a4",
"#3 c #9e9e9e",
"as c #a0a0a1",
"ar c #a1a1a1",
"aD c #a2a2a2",
".p c #a3a3a4",
"aI c #a5a5a5",
"QtQtQtQtQtQt.#.a.b.c.d.e.f.g.h.i",
"QtQtQtQtQt.j.k.l.m.m.m.m.n.o.p.q",
"QtQtQt.#.r.s.t.u.v.w.w.x.y.z.A.B",
"QtQt.#.C.D.t.E.F.G.H.I.J.K.L.M.N",
"QtQt.O.P.t.E.Q.R.S.T.U.V.W.J.X.Y",
"Qt.j.Z.m.0.F.1.2.3.4.5.6.7.8.9#.",
".i##.m.t#a#b#c.I.T#d#e.W#f.8#g#h",
"#i.D.m.0.Q#j.I.T.U#k#l#m.8#n#o#p",
"#q.m.t#a#b#r#s#t#u#v#w#x.8#y#z#A",
"#B.m.0.Q#c#c.I.T#C#D#E#j#F#G#H#I",
"#J.m.v#K.R.G.G.G#L#M#N#O#P#Q#R#S",
"#T.m.y#U#V#W#v#X#Y#Z#0#1#z#2#3#4",
"#5#6#7#8#9a.a#a#aaabacadaeafagQt",
"ahaiaj#7akalalamanaoapaqarag.#Qt",
"#4asatauavawaxayazaAaBaC.h.#QtQt",
".iagaDaEaAaFaGaHaBaIaJaKQtQtQtQt"};

Index: form.prg
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/EAS/forms/form.prg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- form.prg	3 Nov 2006 16:31:58 -0000	1.1
+++ form.prg	15 Nov 2006 11:16:18 -0000	1.2
@@ -45,8 +45,9 @@
 
 local cContent:=''
 local oErr, i, err:='', view
+static componentName:='form'
 
-eDebug(12, "FORM method:", cMethod)
+eDebug( 29, componentName + " method:", cMethod )
 oErr := ErrorBlock({|e| break(e) })
 begin sequence
 
@@ -58,7 +59,7 @@
 		return NIL
 	endif
 
-	eDebug(15, "FORM args:", params)
+	eDebug( 29, componentName + " args:", params )
 	
 	// Check if form exist in database and return it
 	if (cContent:=get_StoredForm(params)) != NIL
@@ -78,7 +79,7 @@
 		if params:name == 'main'
 			cContent := get_MainForm(params)
 		else
-			eDebug(5, "FORM: Unknown file:", params:name) // TODO: dialog box for unknown form
+			eDebug( 9, componentName + ": Unknown file:", params:name ) // TODO: dialog box for unknown form
 			cContent := NIL
 		endif
 	endif
@@ -87,10 +88,10 @@
   // GETVIEW()
   elseif lower(cMethod) == 'getview'
   	view := get_View(params)
-  	eDebug( 17, "FORM.getView:", view:data )
+  	eDebug( 39, componentName + " getView() returns:", view:data )
   	return view
   else
-	eDebug(3, "FORM has not method '"+cMethod+"'") 	
+	eDebug( 9, componentName + " has not method '"+cMethod+"'" ) 	
   endif
 recover using oErr
 	i := 1
@@ -100,7 +101,7 @@
 		i++
 	end
 
-	eDebug(5, "FORM component internal error:", errorMessage(oErr))
+	eDebug( 19, componentName + " internal error:", errorMessage(oErr) )
 	return NIL
 end sequence
 
@@ -151,7 +152,7 @@
 				endif
 				i++
 			enddo
-			eDebug(12, 'FORM', dep, ':', len(l), 'class(es)' )
+			eDebug( 29, componentName, dep, ':', len(l), 'class(es)' )
 			if len(l) == 0
 				loop
 			endif
@@ -167,7 +168,7 @@
 			f += '&\t</widget>&\n'
 		
 		next
-		eDebug(12, 'FORM: finish append classes' )
+		eDebug( 29, componentName + ': finish append classes' )
 				
 		f += '		<widget class="menuSeparator"/>&\n' + ;
 		'			<widget class="menuItem" label="&amp;Exit" name="Menu.Quit">&\n' + ;
@@ -193,6 +194,7 @@
     '<style>&\n' + ;
     '        <property widget="mainWindow" name="geometry" value="600,450,35,15" />&\n' + ;
     '        <property widget="mainWindow" name="position" value="center" />&\n' + ;
+    '        <property widget="mainWindow" name="icon" value="eas.xpm" />&\n' + ;
     '        <property widget="mainWindow" name="MDI" value="true" />&\n' + ;
     '</style>&\n&\n'
 
@@ -210,7 +212,7 @@
 	
         f += '</actions>&\n' + ;
 	'</form>&\n'
-	eDebug(15, "FORM getMainForm:", len(f))
+	eDebug( 29, componentName + " getMainForm:", len(f), "byte(s)" )
 return f
 
 // Generate form with list of all class object
@@ -337,7 +339,7 @@
 	r := lquery(params, q)
 	if valtype(r) == 'A' .and. len(r) > 0
 		c := r[1][1]
-		eDebug(15, "FORM:",fName,len(c))
+		eDebug( 29, componentName + ":", fName, len(c), "byte(s)" )
 	endif
 return c
 
@@ -375,14 +377,14 @@
 	f += '<interface>&\n'
 
 	f += '<widget class="document" name="__form" label="'+pclass[2]+'">&\n'+ ;
-    '<widget name="title" class="label" label="'+pclass[2]+'"/>&\n'
+    '<widget name=".title" class="label" label="'+pclass[2]+'"/>&\n'
 	
 	// Get fields list
     attr := lquery(params, 'describe '+pclass[2])
 	if valtype(attr) != 'A'
 		attr := array(0)
 	endif
-//	eDebug(5, "ATTR:",var2log(attr,3,.T.))
+//	eDebug( 39, componentName + " ATTR:",var2log(attr,3,.T.) )
 
 	if len(attr) > 0
 		f += '<widget class="grid">&\n'+ ;
@@ -427,9 +429,9 @@
 	
 	// Bottom bar
 	f += '<widget class="buttonBar">&\n'+ ;
-    '	<widget class="button" label="&amp;Ok" name="save" />&\n'
-    '	<widget class="button" label="&amp;Print" name="print" />&\n'+ ;
-    f += '	<widget class="button" label="&amp;Close" name="close" />&\n'+ ;
+    '	<widget class="button" label="&amp;Ok" name=".save" />&\n'
+    '	<widget class="button" label="&amp;Print" name=".print" />&\n'+ ;
+    f += '	<widget class="button" label="&amp;Close" name=".close" />&\n'+ ;
 	'</widget>&\n'+ ;
 	'</widget>&\n'
 	
@@ -438,21 +440,21 @@
 	f += '<!-- Widget properties -->&\n'+ ;
     '<style>&\n'+ ;
     '        <property widget="__form" name="spacing" value="2"/>&\n'+ ;
-    '        <property widget="title" name="font.style" value="BOLD"/>&\n'+ ;
-    '        <property widget="title" name="font.size" value="+2"/>&\n'+ ;
+    '        <property widget=".title" name="font.style" value="BOLD"/>&\n'+ ;
+    '        <property widget=".title" name="font.size" value="+2"/>&\n'+ ;
 	'</style>&\n'
 
 	f += '<!-- Actions -->&\n'+ ;
     '<actions>&\n'+ ;
 	'	<rule label="&amp;OK">&\n'+ ;
-	'		<event widget="save" signal="clicked"/>&\n'+ ;
+	'		<event widget=".save" signal="clicked"/>&\n'+ ;
 	'		<action>&\n'+ ;
 	'			<call method="saveForm"><param><property widget="__form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ;
 	'			<call widget="__form" method="close"/>&\n'+ ;
 	'		</action>&\n'+ ;
 	'	</rule>&\n'+ ;
 	'	<rule label="-&amp;Close">&\n'+ ;
-	'		<event widget="close" signal="clicked"/>&\n'+ ;
+	'		<event widget=".close" signal="clicked"/>&\n'+ ;
 	'		<action>&\n'+ ;
 	'			<call method="dialogBoxConfirmClose"><param><property widget="__form" name="object"/></param><param value="'+class+'" /></call>&\n'+ ;
 	'		</action>&\n'+ ;

Index: form.xml
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/EAS/forms/form.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- form.xml	3 Nov 2006 16:31:58 -0000	1.1
+++ form.xml	15 Nov 2006 11:16:18 -0000	1.2
@@ -7,7 +7,7 @@
 	<description>Interface and print form support: get from database or generate</description>
 	<license>GNU/GPL</license> 
 	<created>2006-05-01</created> 
-	<modified>2006-10-18</modified> 
+	<modified>2006-11-13</modified> 
 	
 	<requires>
 		<dependence type="component">../../ocmng/component.xml</dependence>
@@ -81,6 +81,12 @@
 				<attr name="description">Delete icon</attr>
 				<attr name="content">delete.xpm</attr>
 			</object>
+			<object>
+				<attr name="name">eas.xpm</attr>
+				<attr name="type">image/x-xpm</attr>
+				<attr name="description">Window icon</attr>
+				<attr name="content">eas.xpm</attr>
+			</object>
 		</objects>
 		<objects depository="ETC0101" class="mng_command">
 			<object>

Index: form_menu.prg
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/EAS/forms/form_menu.prg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- form_menu.prg	3 Nov 2006 16:31:58 -0000	1.1
+++ form_menu.prg	15 Nov 2006 11:16:18 -0000	1.2
@@ -40,13 +40,13 @@
   /*=========================================================================*/
   // GENERATE()
   if lower(cMethod) == 'generate'
-	eDebug(15, componentName + " args:", params)
+	eDebug( 29, componentName + " args:", params )
   	
   	m := get_Menu( iif('CONTEXT' $ params, params:context, NIL ) )
-  	eDebug( 17, componentName + ".generate:", m )
+  	eDebug( 39, componentName + " generate():", m )
   	return m
   else
-	eDebug(3, componentName + " has not method '"+cMethod+"'") 	
+	eDebug( 9, componentName + " has not method '"+cMethod+"'" ) 	
   endif
 
 recover using oErr
@@ -57,7 +57,7 @@
 		i++
 	end
 
-	eDebug(5, componentName + " internal error:", errorMessage(oErr))
+	eDebug( 19, componentName + " internal error:", errorMessage(oErr) )
 	return NIL
 end sequence
 
@@ -90,7 +90,7 @@
 			endif
 		next
 	endif
-	//eDebug(15, "MENU:", name, s )
+	//eDebug(39, componentName + "menu:", name, s )
 return s
 
 /* Recursive process nodes in tree */
@@ -170,7 +170,7 @@
 		n:type   := left(res[i][3],1)
 		n:parent := res[i][4]
 		n:order  := 0+res[i][5]
-		eDebug( 25, componentName + ".add:", n:name, res[i][5], n:order )
+		eDebug( 39, componentName + " add():", n:name, res[i][5], n:order )
 		n:childs := array(0)
 		if n:parent == ''
 			// Add top level menu items
@@ -194,13 +194,13 @@
 	next
 	
 	// Write nodes
-	//eDebug( 15, 'TOP LEVEL NODES:', m )
+	//eDebug( 39, componentName + ' top level nodes:', m )
 	s := '<widget class="menuBar">&\n'
 	for j in asort( m, NIL, NIL, {|a,b| a:order < b:order } )
 		p := __processTree( j, @s, 'generate' ) 
 	next
 	s += '</widget>&\n'
 		
-	eDebug(22, componentName+".generate:", s)
+	eDebug( 39, componentName + " generate():", s )
 	
 return s

Index: form_menu.xml
===================================================================
RCS file: /cvsroot/eas-dev/ocmng/EAS/forms/form_menu.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- form_menu.xml	3 Nov 2006 16:31:58 -0000	1.1
+++ form_menu.xml	15 Nov 2006 11:16:18 -0000	1.2
@@ -7,7 +7,7 @@
 	<description>Menu generation</description>
 	<license>GNU/GPL</license> 
 	<created>2006-10-21</created> 
-	<modified>2006-10-26</modified> 
+	<modified>2006-11-13</modified> 
 	
 	<requires>
 		<dependence type="component">form.xml</dependence>