[Numexp-checkins] CVS: gnumexp/src/xygraph numexp-xygraph.in,NONE,1.1 Bonobo_Sample_Hello.xml,1.1,1.2 Makefile.am,1.4,1.5 Numexp_XYGraph-ui.xml,1.1,1.2 numexp-xygraph,1.3,NONE

[Gustavo J. A. M. C. <gu...@us...>]

Update of /cvsroot/numexp/gnumexp/src/xygraph
In directory usw-pr-cvs1:/tmp/cvs-serv3410

Modified Files:
	Bonobo_Sample_Hello.xml Makefile.am Numexp_XYGraph-ui.xml 
Added Files:
	numexp-xygraph.in 
Removed Files:
	numexp-xygraph 
Log Message:
Some UI-related fixes.


--- NEW FILE ---
#! /usr/bin/env python

import bonobo.activation
import bonobo
import bonobo.ui, Bonobo, Numexp
from Numexp_XYGraph import *


EXECUTABLE_NAME = 'numexp-xygraph'
VERSION = '0.0.1'
FACTORY_IID = 'OAFIID:Numexp_XYGraphFactory'
CONTROL_IID = 'OAFIID:Numexp_XYGraph'
UIDIR = '@prefix@/share/gnome-2.0/ui/'

def create_function(generic_factory, iid):
    print "create_function: iid=" + iid + "\n\n"
    if iid == CONTROL_IID:
	xy = XYGraphControl()
	return xy


## At the time of this writing, the bonobo python bindings were
## incomplete, so this didn't work.
#bonobo.bonobo_generic_factory_main(FACTORY_IID, create_function)


factory = bonobo.GenericFactory(FACTORY_IID, create_function)
bonobo.running_context_auto_exit_unref(factory)



class XYGraphControl(bonobo.ui.Control):
    def __init__(self):
	self.xygraph = xygraph = XYGraphView()
	lineattr = LineAttr(color=Color(0, 0, 0), thickness=.2, mode=Linemode.SOLID)
	func = Function(lineattr, "Test function", "sin(x)+4", 'x')
	func2 = Function(lineattr, "Test function", "cos(x)+4", 'x')
	xygraph.plot_area.add_plot_object(func)
	xygraph.plot_area.add_plot_object(func2)
	bonobo.ui.Control.__init__(self, xygraph.get_toplevel_widget())
	self.connect('set-frame', self.sample_merge_bonobo_items_cb)
	#self.sample_merge_bonobo_items_cb(self, None)
	
    def sample_merge_bonobo_items_cb(self, foo):

	self.set_automerge(1)
	ui_component = bonobo.ui.Component('xygraph')
	ui_component.set_container(self.get_remote_ui_container())
	bonobo.ui.util_set_ui(ui_component, '',
			      UIDIR + '/Numexp_XYGraph-ui.xml',
			      'numexp-xygraph')
	self.set_ui_component(ui_component)
	verbs = [ ('AddObject', self.add_object_callback) ]
	ui_component.add_verb_list(verbs)


    def add_object_callback(self, *args):
	# TODO: this is would be where an AddObject dialog would popup
	lineattr = LineAttr(color=Color(0, 0, 0), thickness=.2, mode=Linemode.SOLID)
	func = Function(lineattr, "Test function", "sin(x)^2+4", 'x')
	self.xygraph.plot_area.add_plot_object(func)

	    

bonobo.main()



Index: Bonobo_Sample_Hello.xml
===================================================================
RCS file: /cvsroot/numexp/gnumexp/src/xygraph/Bonobo_Sample_Hello.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -U4 -r1.1 -r1.2
--- Bonobo_Sample_Hello.xml	14 Apr 2002 17:36:33 -0000	1.1
+++ Bonobo_Sample_Hello.xml	20 Apr 2002 15:59:23 -0000	1.2
@@ -47,8 +47,11 @@
 
     <submenu name="Help" stockid="gtk-help">
       <menuitem name="HelpAbout" verb=""/>
     </submenu>
+
+    <placeholder/>
+
   </menu>
 
   <dockitem name="Toolbar" relief="none" homogeneous="1"
             behavior="exclusive" look="text">

Index: Makefile.am
===================================================================
RCS file: /cvsroot/numexp/gnumexp/src/xygraph/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U4 -r1.4 -r1.5
--- Makefile.am	7 Apr 2002 16:50:42 -0000	1.4
+++ Makefile.am	20 Apr 2002 15:59:23 -0000	1.5
@@ -1,15 +1,28 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = nxpruler Numexp_XYGraph
 
+CLEANFILES=
+
 serverdir   = $(libdir)/bonobo/servers
 server_DATA = Numexp_XYGraph.server
 
 idldir   = $(datadir)/idl
 idl_DATA = Numexp_XYGraph.idl
 
+
+uidir   = $(datadir)/gnome-2.0/ui/
+ui_DATA = Numexp_XYGraph-ui.xml
+
+script_dot_in=numexp-xygraph
+
+$(script_dot_in): $(script_dot_in).in
+	sed -e "s|\@prefix\@|$(prefix)|" $< > $@
+
 bin_SCRIPTS = numexp-xygraph
+CLEANFILES += numexp-xygraph
+
 
-EXTRA_DIST = $(server_DATA) $(idl_DATA)
+EXTRA_DIST = $(server_DATA) $(idl_DATA) $(script_dot_in) $(ui_DATA)
 
 

Index: Numexp_XYGraph-ui.xml
===================================================================
RCS file: /cvsroot/numexp/gnumexp/src/xygraph/Numexp_XYGraph-ui.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -U4 -r1.1 -r1.2
--- Numexp_XYGraph-ui.xml	15 Apr 2002 20:49:49 -0000	1.1
+++ Numexp_XYGraph-ui.xml	20 Apr 2002 15:59:23 -0000	1.2
@@ -6,9 +6,8 @@
   <menu>
     <submenu name="XYGraph" label="_XYGraph">
       <menuitem name="AddObject" verb=""/>
     </submenu>
-
   </menu>
 
   <dockitem name="Toolbar">
     <toolitem name="AddObject" verb=""/>

--- numexp-xygraph DELETED ---