[Python-gtkextra-commits] CVS: python-gtkextra2/examples testboxes.py,1.3,1.4 testbubbles.py,1.1.1.1
Status: Beta
Brought to you by:
treeves
From: <pyt...@li...> - 2003-01-02 22:01:38
|
Update of /cvsroot/python-gtkextra/python-gtkextra2/examples In directory sc8-pr-cvs1:/tmp/cvs-serv32495/examples Modified Files: testboxes.py testbubbles.py testcontour.py testflux.py testgtkfont.py testgtkplot.py testgtkplot3d.py testgtksheet.py testpixmap.py testpolar.py Log Message: lots Index: testboxes.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testboxes.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testboxes.py 22 Jul 2002 13:06:54 -0000 1.3 --- testboxes.py 2 Jan 2003 22:00:42 -0000 1.4 *************** *** 6,14 **** def __init__(self): - self.hack = [] gtk.Window.__init__(self) self.set_title("GtkPlotBox Demo") self.set_size_request(550, 360) - self.connect("destroy", self.quit) scrollwin = gtk.ScrolledWindow() --- 6,12 ---- *************** *** 55,65 **** data.set_line_attributes(gtkextra.PLOT_LINE_NONE, 0, 0, 1, red) data.set_legend("Boxes") - self.hack.append(data) #FIXME - - def quit(self, *args): - gtk.main_quit() if __name__ == '__main__': app = Application() gtk.main() --- 53,60 ---- data.set_line_attributes(gtkextra.PLOT_LINE_NONE, 0, 0, 1, red) data.set_legend("Boxes") if __name__ == '__main__': app = Application() + app.connect("destroy", lambda win : gtk.main_quit()) gtk.main() Index: testbubbles.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testbubbles.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** testbubbles.py 10 Jul 2002 19:06:52 -0000 1.1.1.1 --- testbubbles.py 2 Jan 2003 22:00:43 -0000 1.2 *************** *** 1,33 **** #!/usr/bin/env python ! from gtk import * ! from gtkextra import * ! class Application(GtkWindow): def __init__(self): ! GtkWindow.__init__(self, title="Bubbles Demo") ! self.set_usize(550, 650) ! self.connect("destroy", mainquit) colormap = self.get_colormap() ! blue = colormap.alloc("blue") ! scrollwin = GtkScrolledWindow() ! scrollwin.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC) self.add(scrollwin) ! canvas = GtkPlotCanvas(PLOT_LETTER_W, PLOT_LETTER_H) ! canvas.plot_canvas_set_flags(PLOT_CANVAS_DND_FLAGS) scrollwin.add_with_viewport(canvas) ! plot = GtkPlot(width=0.5, height=0.25) plot.legends_move(0.05, 0.05) plot.set_legends_border(0, 0) ! plot.axis_hide_title(PLOT_AXIS_TOP) ! plot.axis_show_ticks(PLOT_AXIS_BOTTOM, 15, 3) ! plot.axis_set_visible(PLOT_AXIS_TOP, TRUE) ! plot.axis_set_visible(PLOT_AXIS_RIGHT, TRUE) ! plot.grids_set_visible(TRUE, TRUE, TRUE, TRUE) canvas.add_plot(plot, 0.15, 0.06) --- 1,34 ---- #!/usr/bin/env python ! import gtk ! import gtkextra ! class Application(gtk.Window): def __init__(self): ! gtk.Window.__init__(self) ! self.set_title("Bubbles Demo") ! self.set_size_request(550, 650) ! self.connect("destroy", lambda win : gtk.main_quit()) colormap = self.get_colormap() ! blue = colormap.alloc_color("blue") ! scrollwin = gtk.ScrolledWindow() ! scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self.add(scrollwin) ! canvas = gtkextra.PlotCanvas(gtkextra.PLOT_LETTER_W, gtkextra.PLOT_LETTER_H) ! canvas.plot_canvas_set_flags(gtkextra.PLOT_CANVAS_DND_FLAGS) scrollwin.add_with_viewport(canvas) ! plot = gtkextra.Plot(width=0.5, height=0.25) plot.legends_move(0.05, 0.05) plot.set_legends_border(0, 0) ! plot.axis_hide_title(gtkextra.PLOT_AXIS_TOP) ! plot.axis_show_ticks(gtkextra.PLOT_AXIS_BOTTOM, 15, 3) ! plot.axis_set_visible(gtkextra.PLOT_AXIS_TOP, gtk.TRUE) ! plot.axis_set_visible(gtkextra.PLOT_AXIS_RIGHT, gtk.TRUE) ! plot.grids_set_visible(gtk.TRUE, gtk.TRUE, gtk.TRUE, gtk.TRUE) canvas.add_plot(plot, 0.15, 0.06) *************** *** 37,56 **** pda1 = [.132, .23, .432, .34, .46, .56, .785, .76, .86, .89] ! data = GtkPlotData() ! data.set_points(px1, py1) ! data.set_a(pa1) ! data.set_da(pda1) ! data.set_symbol(PLOT_SYMBOL_CIRCLE, PLOT_SYMBOL_OPAQUE, 10, 2, blue) ! data.set_line_attributes(PLOT_LINE_NONE, 1, blue) data.set_legend("Bubbles") ! data.gradient_set_visible(TRUE) plot.add_data(data) self.show_all() - def mainloop(self): - mainloop() - if __name__ == '__main__': app = Application() ! app.mainloop() --- 38,52 ---- pda1 = [.132, .23, .432, .34, .46, .56, .785, .76, .86, .89] ! data = gtkextra.PlotData() ! data.set_points(x=px1, y=py1, a=pa1, da=pda1) ! data.set_symbol(gtkextra.PLOT_SYMBOL_CIRCLE, gtkextra.PLOT_SYMBOL_OPAQUE, 10, 2, blue, blue) ! data.set_line_attributes(gtkextra.PLOT_LINE_NONE, 0, 0, 1, blue) data.set_legend("Bubbles") ! data.gradient_set_visible(gtk.TRUE) plot.add_data(data) self.show_all() if __name__ == '__main__': app = Application() ! gtk.main() Index: testcontour.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testcontour.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** testcontour.py 10 Jul 2002 19:06:52 -0000 1.1.1.1 --- testcontour.py 2 Jan 2003 22:00:45 -0000 1.2 *************** *** 1,51 **** #!/usr/bin/env python ! from gtk import * ! from gtkextra import * from math import cos ! class Application(GtkWindow): def __init__(self): ! GtkWindow.__init__(self, title="Contour Demo") ! self.set_usize(550, 600) ! self.connect("destroy", mainquit) ! scrollwin = GtkScrolledWindow() ! scrollwin.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC) self.add(scrollwin) ! canvas = GtkPlotCanvas(PLOT_LETTER_W, PLOT_LETTER_H) ! canvas.plot_canvas_set_flags(PLOT_CANVAS_DND_FLAGS) scrollwin.add_with_viewport(canvas) ! plot = GtkPlot3D(width=0.5, height=0.5) ! plot.axis_set_minor_ticks(PLOT_AXIS_X, 3) ! plot.axis_set_minor_ticks(PLOT_AXIS_Y, 3) ! plot.minor_grids_set_visible(FALSE, FALSE, FALSE) canvas.add_plot(plot, 0.16, 0.02) ! surface = GtkPlotCSurface(self.function) ! surface.set_xstep(0.025) ! surface.set_ystep(0.025) surface.set_legend("cos ((r-r\\s0\\N)\\S2\\N)") ! surface.set_gradient(0.2, 0.8, 6, 3) ! surface.set_lines_visible(FALSE) plot.add_data(surface) ! plot = GtkPlot(width=0.4, height=0.4) ! plot.axis_set_minor_ticks(PLOT_AXIS_X, 1) ! plot.axis_set_minor_ticks(PLOT_AXIS_Y, 1) canvas.add_plot(plot, 0.26, 0.56) ! surface = GtkPlotCSurface(self.function) ! surface.set_xstep(0.025) ! surface.set_ystep(0.025) surface.set_legend("cos ((r-r\\s0\\N)\\S2\\N)") ! surface.set_gradient(0.2, 0.8, 6, 0) ! surface.set_grid_visible(FALSE) ! surface.set_lines_only(TRUE) plot.add_data(surface) ! self.show_all() --- 1,56 ---- #!/usr/bin/env python ! import gtk ! import gtkextra from math import cos ! class Application(gtk.Window): def __init__(self): ! gtk.Window.__init__(self) ! self.set_title("Contour Demo") ! self.set_size_request(550, 600) ! scale = 1.0 ! scrollwin = gtk.ScrolledWindow() ! scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) self.add(scrollwin) ! canvas = gtkextra.PlotCanvas(gtkextra.PLOT_LETTER_W * scale, gtkextra.PLOT_LETTER_H * scale) ! canvas.plot_canvas_set_flags(gtkextra.PLOT_CANVAS_DND_FLAGS) scrollwin.add_with_viewport(canvas) ! plot = gtkextra.Plot3D(width=0.5, height=0.5) ! plot.axis_set_minor_ticks(gtkextra.PLOT_AXIS_X, 3) ! plot.axis_set_minor_ticks(gtkextra.PLOT_AXIS_Y, 3) ! plot.minor_grids_set_visible(gtk.FALSE, gtk.FALSE, gtk.FALSE) canvas.add_plot(plot, 0.16, 0.02) ! surface = gtkextra.PlotCSurface(self.function) ! surface.set_xstep(0.05) ! surface.set_ystep(0.05) surface.set_legend("cos ((r-r\\s0\\N)\\S2\\N)") ! surface.set_gradient(0.2, 0.8, 6, 1) ! surface.set_lines_visible(gtk.FALSE) ! surface.set_transparent(gtk.FALSE) plot.add_data(surface) ! plot = gtkextra.Plot(width=0.4, height=0.4) ! plot.axis_set_minor_ticks(gtkextra.PLOT_AXIS_X, 1) ! plot.axis_set_minor_ticks(gtkextra.PLOT_AXIS_Y, 1) canvas.add_plot(plot, 0.26, 0.56) ! surface = gtkextra.PlotCSurface(self.function) ! surface.set_xstep(0.10) ! surface.set_ystep(0.10) surface.set_legend("cos ((r-r\\s0\\N)\\S2\\N)") ! surface.set_gradient(0.2, 0.8, 6, 1) ! surface.set_grid_visible(gtk.FALSE) ! surface.set_transparent(gtk.FALSE) ! surface.set_projection(gtkextra.PLOT_PROJECT_FULL) plot.add_data(surface) ! ! canvas.export_ps("democsurface.ps", 0, 0, gtkextra.PLOT_LETTER) ! canvas.export_ps("democsurface.ps", 0, 0, gtkextra.PLOT_LETTER) self.show_all() *************** *** 54,61 **** / 3.0 + 0.5 - def mainloop(self): - mainloop() - if __name__ == '__main__': app = Application() ! app.mainloop() --- 59,64 ---- / 3.0 + 0.5 if __name__ == '__main__': app = Application() ! app.connect("destroy", lambda win : gtk.main_quit()) ! gtk.main() Index: testflux.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testflux.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testflux.py 16 Jul 2002 17:05:14 -0000 1.2 --- testflux.py 2 Jan 2003 22:00:46 -0000 1.3 *************** *** 6,14 **** def __init__(self): - self.hack = [] gtk.Window.__init__(self) self.set_title("GtkPlotFlux Demo") self.set_size_request(550, 340) - self.connect("destroy", self.quit) colormap = self.get_colormap() --- 6,12 ---- *************** *** 50,54 **** data.set_legend("Flux") plot.add_data(data) - self.hack.append(data) self.show_all() --- 48,51 ---- *************** *** 61,68 **** return gtk.TRUE - def quit(self, *args): - gtk.main_quit() - if __name__ == '__main__': app = Application() gtk.main() --- 58,63 ---- return gtk.TRUE if __name__ == '__main__': app = Application() + app.connect("destroy", lambda win : gtk.main_quit()) gtk.main() Index: testgtkfont.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkfont.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** testgtkfont.py 10 Jul 2002 19:06:52 -0000 1.1.1.1 --- testgtkfont.py 2 Jan 2003 22:00:47 -0000 1.2 *************** *** 1,22 **** #!/usr/bin/env python ! from gtk import * ! from gtkextra import * PREVIEW_TEXT = "ABCDEFGHI abcdefghi 0123456789" ! class Application(GtkWindow): def __init__(self): ! GtkWindow.__init__(self, title="GtkFontCombo Demo") ! self.connect("destroy", mainquit) ! vbox = GtkVBox() self.add(vbox) ! font_combo = GtkFontCombo() ! vbox.pack_start(font_combo, FALSE, FALSE) ! preview_entry = GtkEntry() preview_entry.set_text(PREVIEW_TEXT) vbox.pack_start(preview_entry) --- 1,22 ---- #!/usr/bin/env python ! import gtk ! import gtkextra PREVIEW_TEXT = "ABCDEFGHI abcdefghi 0123456789" ! class Application(gtk.Window): def __init__(self): ! gtk.Window.__init__(self) ! self.set_title("GtkFontCombo Demo") ! vbox = gtk.VBox() self.add(vbox) ! font_combo = gtkextra.FontCombo() ! vbox.pack_start(font_combo, gtk.FALSE, gtk.FALSE) ! preview_entry = gtk.Entry() preview_entry.set_text(PREVIEW_TEXT) vbox.pack_start(preview_entry) *************** *** 28,42 **** def new_font(self, font_combo, preview_entry, *args): ! style = preview_entry.get_style().copy() ! style.font = font_combo.font ! preview_entry.set_style(style) if not preview_entry.get_text(): preview_entry.set_text(PREVIEW_TEXT) preview_entry.set_position(0) - def mainloop(self): - mainloop() - if __name__ == '__main__': app = Application() ! app.mainloop() --- 28,46 ---- def new_font(self, font_combo, preview_entry, *args): ! if 0: ! # The C example is as follows: ! # But pygtk2 style does not allow setting font_desc. ! style = preview_entry.get_style().copy() ! style.font_desc = font_combo.get_font_description() ! preview_entry.set_style(style) ! else: ! #This works though. ! preview_entry.modify_font(font_combo.get_font_description()) if not preview_entry.get_text(): preview_entry.set_text(PREVIEW_TEXT) preview_entry.set_position(0) if __name__ == '__main__': app = Application() ! app.connect("destroy", lambda win : gtk.main_quit()) ! gtk.main() Index: testgtkplot.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkplot.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** testgtkplot.py 31 Dec 2002 18:04:18 -0000 1.7 --- testgtkplot.py 2 Jan 2003 22:00:47 -0000 1.8 *************** *** 21,25 **** self.set_title("GtkPlot Demo") self.set_size_request(550, 650) - self.connect("destroy", self.quit) scrollwin = gtk.ScrolledWindow() --- 21,24 ---- *************** *** 234,242 **** except: return None - def quit(self, *args): - gtk.main_quit() if __name__ == '__main__': app = Application() gtk.main() --- 233,240 ---- except: return None if __name__ == '__main__': app = Application() + app.connect("destroy", lambda win : gtk.main_quit()) gtk.main() Index: testgtkplot3d.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtkplot3d.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testgtkplot3d.py 31 Dec 2002 18:04:18 -0000 1.3 --- testgtkplot3d.py 2 Jan 2003 22:00:49 -0000 1.4 *************** *** 13,17 **** self.set_title=("GtkPlot3D Demo") self.set_size_request(550, 650) - self.connect("destroy", self.quit) scrollwin = gtk.ScrolledWindow() --- 13,16 ---- *************** *** 79,86 **** canvas.refresh() - def quit(self, *args): - gtk.main_quit() - if __name__ == '__main__': app = Application() gtk.main() --- 78,83 ---- canvas.refresh() if __name__ == '__main__': app = Application() + app.connect("destroy", lambda win : gtk.main_quit()) gtk.main() Index: testgtksheet.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testgtksheet.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** testgtksheet.py 10 Jul 2002 19:06:54 -0000 1.1.1.1 --- testgtksheet.py 2 Jan 2003 22:00:50 -0000 1.2 *************** *** 2,7 **** import string ! from gtk import * ! from gtkextra import * import pixmaps --- 2,7 ---- import string ! import gtk ! import gtkextra import pixmaps *************** *** 9,13 **** DEFAULT_SPACE = 8 ! class Example1(GtkSheet): xfont1 = "-bitstream-charter-bold-r-normal--28-280-72-72-p-0-iso8859-1" --- 9,13 ---- DEFAULT_SPACE = 8 ! class Example1(gtkextra.Sheet): xfont1 = "-bitstream-charter-bold-r-normal--28-280-72-72-p-0-iso8859-1" *************** *** 23,32 **** def __init__(self): ! GtkSheet.__init__(self, 1000, 26, "Example 1") colormap = self.get_colormap() ! self.set_background(colormap.alloc("light yellow")) ! self.set_grid(colormap.alloc("light blue")) for column in xrange(self.get_columns_count()): --- 23,32 ---- def __init__(self): ! gtkextra.Sheet.__init__(self, 1000, 26, "Example 1") colormap = self.get_colormap() ! self.set_background(colormap.alloc_color("light yellow")) ! self.set_grid(colormap.alloc_color("light blue")) for column in xrange(self.get_columns_count()): *************** *** 36,47 **** self.row_button_add_label(0, "This is\na multiline\nlabel") ! self.row_button_justify(0, JUSTIFY_RIGHT) ! range = GtkSheetRange(1, 1, 2, 3) ! self.clip_range(range) # As long as a GdkFont object is used a reference to it must be kept. ! self.font1 = load_font(self.xfont1) if not self.font1: print "Couldn't load", self.xfont1 --- 36,46 ---- self.row_button_add_label(0, "This is\na multiline\nlabel") ! self.row_button_justify(0, gtk.JUSTIFY_RIGHT) ! range = gtkextra.SheetRange(1, 1, 2, 3) self.clip_range(range) # As long as a GdkFont object is used a reference to it must be kept. ! self.font1 = gtk.load_font(self.xfont1) if not self.font1: print "Couldn't load", self.xfont1 *************** *** 49,55 **** self.range_set_font(range, self.font1) ! self.range_set_foreground(range, colormap.alloc("red")) ! self.set_cell(1, 2, JUSTIFY_CENTER, "Welcome to") range.row0 = 2 --- 48,54 ---- self.range_set_font(range, self.font1) ! self.range_set_foreground(range, colormap.alloc_color("red")) ! self.set_cell(1, 2, gtk.JUSTIFY_CENTER, "Welcome to") range.row0 = 2 *************** *** 61,73 **** self.range_set_font(range, self.font2) ! self.range_set_foreground(range, colormap.alloc("blue")) ! self.set_cell(2, 2, JUSTIFY_CENTER, "GtkSheet") range = GtkSheetRange(3, 0, 3, 4) ! self.range_set_background(range, colormap.alloc("dark gray")) ! self.range_set_foreground(range, colormap.alloc("green")) ! self.set_cell(3, 2, JUSTIFY_CENTER, "a Matrix widget for Gtk+") (pixmap, mask) = create_pixmap_from_xpm_d(colormap, None, --- 60,72 ---- self.range_set_font(range, self.font2) ! self.range_set_foreground(range, colormap.alloc_color("blue")) ! self.set_cell(2, 2, gtk.JUSTIFY_CENTER, "GtkSheet") range = GtkSheetRange(3, 0, 3, 4) ! self.range_set_background(range, colormap.alloc_color("dark gray")) ! self.range_set_foreground(range, colormap.alloc_color("green")) ! self.set_cell(3, 2, gtk.JUSTIFY_CENTER, "a Matrix widget for Gtk+") (pixmap, mask) = create_pixmap_from_xpm_d(colormap, None, *************** *** 79,83 **** bullet = GtkPixmap(pixmap, mask) self.attach(bullet, row, 0, .5, .5) ! self.set_cell(row, 1, JUSTIFY_LEFT, line) row = row + 1 --- 78,82 ---- bullet = GtkPixmap(pixmap, mask) self.attach(bullet, row, 0, .5, .5) ! self.set_cell(row, 1, gtk.JUSTIFY_LEFT, line) row = row + 1 *************** *** 96,100 **** show_button = GtkButton("Show me a plot") ! show_button.set_usize(100, 60) self.attach(show_button, 12, 2, .5, .5) show_button.connect("clicked", self.show_child) --- 95,99 ---- show_button = GtkButton("Show me a plot") ! show_button.set_size_request(100, 60) self.attach(show_button, 12, 2, .5, .5) show_button.connect("clicked", self.show_child) *************** *** 119,123 **** def alarm_traverse(self, widget, row, column, new_row, new_column, *args): print "TRAVERSE: %d %d %d %d" % (row, column, new_row, new_column) ! # You can return FALSE, TRUE or a 2-tuple. return (new_row, new_column) --- 118,122 ---- def alarm_traverse(self, widget, row, column, new_row, new_column, *args): print "TRAVERSE: %d %d %d %d" % (row, column, new_row, new_column) ! # You can return gtk.FALSE, gtk.TRUE or a 2-tuple. return (new_row, new_column) *************** *** 127,131 **** ! class Example2(GtkSheet): text = [ ("Click the right mouse button to display a popup", "blue"), --- 126,130 ---- ! class Example2(gtkextra.Sheet): text = [ ("Click the right mouse button to display a popup", "blue"), *************** *** 134,154 **** def __init__(self): ! GtkSheet.__init__(self, 1000, 26, "Example 2") ! self.sheet_unset_flags(SHEET_AUTO_SCROLL) ! self.set_selection_mode(SELECTION_SINGLE) colormap = self.get_colormap() ! range = GtkSheetRange(0, 0, 2, self.get_columns_count() - 1) ! self.range_set_editable(range, FALSE) ! self.range_set_background(range, colormap.alloc("light gray")) row = 0 for (line, colorname) in self.text: range.row0 = row ! self.range_set_foreground(range, colormap.alloc(colorname)) ! self.row_set_sensitivity(row, FALSE) ! self.set_cell(row, 2, JUSTIFY_CENTER, line) row = row + 1 self.set_active_cell(row, 0) --- 133,153 ---- def __init__(self): ! gtkextra.Sheet.__init__(self, 1000, 26, "Example 2") ! self.sheet_unset_flags(gtkextra.SHEET_AUTO_SCROLL) ! self.set_selection_mode(gtk.SELECTION_SINGLE) colormap = self.get_colormap() ! range = gtkextra.SheetRange(0, 0, 2, self.get_columns_count() - 1) ! self.range_set_editable(range, gtk.FALSE) ! self.range_set_background(range, colormap.alloc_color("light gray")) row = 0 for (line, colorname) in self.text: range.row0 = row ! self.range_set_foreground(range, colormap.alloc_color(colorname)) ! self.row_set_sensitivity(row, gtk.FALSE) ! self.set_cell(row, 2, gtk.JUSTIFY_CENTER, line) row = row + 1 self.set_active_cell(row, 0) *************** *** 179,183 **** self.range_clear(range) self.popup = None ! return TRUE def build_menu(self): --- 178,182 ---- self.range_clear(range) self.popup = None ! return gtk.TRUE def build_menu(self): *************** *** 187,191 **** i = 0 for label in items: ! item = GtkMenuItem(label) item.connect("activate", self.popup_activated, label) item.set_flags(SENSITIVE | CAN_FOCUS) --- 186,190 ---- i = 0 for label in items: ! item = gtk.MenuItem(label) item.connect("activate", self.popup_activated, label) item.set_flags(SENSITIVE | CAN_FOCUS) *************** *** 207,211 **** self.popup = self.build_menu() self.popup.popup(None, None, None, event.button, event.time) ! return TRUE def format_text(self, column, justification, text): --- 206,210 ---- self.popup = self.build_menu() self.popup.popup(None, None, None, event.button, event.time) ! return gtk.TRUE def format_text(self, column, justification, text): *************** *** 215,219 **** pass else: ! justification = JUSTIFY_RIGHT cell_width = self.get_column_width(column) char_width = gdk_char_width(self.get_style().font, "X") --- 214,218 ---- pass else: ! justification = gtk.JUSTIFY_RIGHT cell_width = self.get_column_width(column) char_width = gdk_char_width(self.get_style().font, "X") *************** *** 250,272 **** ! class Example3(GtkSheet): def __init__(self): ! GtkSheet.__init__(self, 1000, 26, "Example 3") ! self.show_grid(FALSE) colormap = self.get_colormap() ! range = GtkSheetRange(0, 0, 10, 6) ! self.range_set_background(range, colormap.alloc("orange")) ! self.range_set_foreground(range, colormap.alloc("violet")) range.row0 = 1 ! self.range_set_background(range, colormap.alloc("blue")) range.coli = 0 ! self.range_set_background(range, colormap.alloc("dark green")) range.row0 = 0 ! self.range_set_border_color(range, colormap.alloc("dark blue")) self.range_set_border(range, SHEET_RIGHT_BORDER, 4, GDK.LINE_ON_OFF_DASH) --- 249,271 ---- ! class Example3(gtkextra.Sheet): def __init__(self): ! gtkextra.Sheet.__init__(self, 1000, 26, "Example 3") ! self.show_grid(gtk.FALSE) colormap = self.get_colormap() ! range = gtkextra.SheetRange(0, 0, 10, 6) ! self.range_set_background(range, colormap.alloc_color("orange")) ! self.range_set_foreground(range, colormap.alloc_color("violet")) range.row0 = 1 ! self.range_set_background(range, colormap.alloc_color("blue")) range.coli = 0 ! self.range_set_background(range, colormap.alloc_color("dark green")) range.row0 = 0 ! self.range_set_border_color(range, colormap.alloc_color("dark blue")) self.range_set_border(range, SHEET_RIGHT_BORDER, 4, GDK.LINE_ON_OFF_DASH) *************** *** 274,278 **** range.rowi = 0 range.coli = 0 ! self.range_set_background(range, colormap.alloc("red")) self.range_set_border(range, SHEET_RIGHT_BORDER | SHEET_BOTTOM_BORDER, 4, GDK.LINE_SOLID) --- 273,277 ---- range.rowi = 0 range.coli = 0 ! self.range_set_background(range, colormap.alloc_color("red")) self.range_set_border(range, SHEET_RIGHT_BORDER | SHEET_BOTTOM_BORDER, 4, GDK.LINE_SOLID) *************** *** 280,284 **** range.rowi = 0 range.coli = 6 ! self.range_set_border_color(range, colormap.alloc("dark blue")) self.range_set_border(range, SHEET_BOTTOM_BORDER, 4, GDK.LINE_ON_OFF_DASH) --- 279,283 ---- range.rowi = 0 range.coli = 6 ! self.range_set_border_color(range, colormap.alloc_color("dark blue")) self.range_set_border(range, SHEET_BOTTOM_BORDER, 4, GDK.LINE_ON_OFF_DASH) *************** *** 292,325 **** def changeentry(self, widget, row, column, new_row, new_column, *args): if new_column == 0 and column != 0: ! self.change_entry(GtkCombo.get_type()) entry = self.get_entry() ! combo = entry.get_ancestor(GtkCombo.get_type()) combo.set_popdown_strings(["", "foo", "bar", "baz"]) if new_column == 1 and column != 1: ! self.change_entry(GtkEntry.get_type()) if new_column == 2 and column != 2: ! self.change_entry(GtkSpinButton.get_type()) if new_column >= 3 and column < 3: ! self.change_entry(GtkItemEntry.get_type()) ! return TRUE ! class PixmapButton(GtkToggleButton): def __init__(self, pixmap_data): ! GtkToggleButton.__init__(self) ! (pixmap, mask) = create_pixmap_from_xpm_d(self.get_colormap(), None, ! pixmap_data) ! self.pixmap = GtkPixmap(pixmap, mask) self.add(self.pixmap) ! class ColorCombo(GtkColorCombo): def __init__(self, pixmap_data, rectangle): ! GtkColorCombo.__init__(self) (pixmap, mask) = create_pixmap_from_xpm_d(self.get_colormap(), None, pixmap_data) ! self.pixmap = GtkPixmap(pixmap, mask) self.button.add(self.pixmap) self.rectangle = rectangle --- 291,325 ---- def changeentry(self, widget, row, column, new_row, new_column, *args): if new_column == 0 and column != 0: ! self.change_entry(gtk.Combo.get_type()) entry = self.get_entry() ! combo = entry.get_ancestor(gtk.Combo.get_type()) combo.set_popdown_strings(["", "foo", "bar", "baz"]) if new_column == 1 and column != 1: ! self.change_entry(gtk.Entry.get_type()) if new_column == 2 and column != 2: ! self.change_entry(gtk.SpinButton.get_type()) if new_column >= 3 and column < 3: ! self.change_entry(gtk.ItemEntry.get_type()) ! return gtk.TRUE ! class PixmapButton(gtk.ToggleButton): def __init__(self, pixmap_data): ! gtk.ToggleButton.__init__(self) ! (pixmap, mask) = gtk.gdk.pixmap_colormap_create_from_xpm_d(None, self.get_colormap(), ! None, pixmap_data) ! ! self.pixmap = gtk.Pixmap(pixmap, mask) self.add(self.pixmap) ! class ColorCombo(gtkextra.ColorCombo): def __init__(self, pixmap_data, rectangle): ! gtkextra.ColorCombo.__init__(self) (pixmap, mask) = create_pixmap_from_xpm_d(self.get_colormap(), None, pixmap_data) ! self.pixmap = gtk.Pixmap(pixmap, mask) self.button.add(self.pixmap) self.rectangle = rectangle *************** *** 327,355 **** def change_color(self, widget, i, colorname, *args): ! color = self.get_colormap().alloc(colorname) tmp_gc = self.get_window().new_gc() tmp_gc.foreground = color (pixmap, mask) = self.pixmap.get() (x, y, width, height) = self.rectangle ! draw_rectangle(pixmap, tmp_gc, TRUE, x, y, width, height) self.pixmap.queue_draw() ! class Application(GtkWindow): def __init__(self): ! GtkWindow.__init__(self, title="GtkSheet Demo") ! self.set_usize(900, 600) ! self.connect("destroy", mainquit) ! main_vbox = GtkVBox(spacing=1) main_vbox.set_border_width(0) self.add(main_vbox) ! show_hide_box = GtkHBox(spacing=1) ! hide_row_titles = GtkButton("Hide Row Titles") ! hide_column_titles = GtkButton("Hide Column Titles") ! show_row_titles = GtkButton("Show Row Titles") ! show_column_titles = GtkButton("Show Column Titles") show_hide_box.pack_start(hide_row_titles) --- 327,356 ---- def change_color(self, widget, i, colorname, *args): ! color = self.get_colormap().alloc_color(colorname) tmp_gc = self.get_window().new_gc() tmp_gc.foreground = color (pixmap, mask) = self.pixmap.get() (x, y, width, height) = self.rectangle ! draw_rectangle(pixmap, tmp_gc, gtk.TRUE, x, y, width, height) self.pixmap.queue_draw() ! class Application(gtk.Window): def __init__(self): ! gtk.Window.__init__(self) ! self.set_title("GtkSheet Demo") ! self.set_size_request(900, 600) ! self.connect("destroy", lambda win : gtk.main_quit()) ! main_vbox = gtk.VBox(spacing=1) main_vbox.set_border_width(0) self.add(main_vbox) ! show_hide_box = gtk.HBox(spacing=1) ! hide_row_titles = gtk.Button("Hide Row Titles") ! hide_column_titles = gtk.Button("Hide Column Titles") ! show_row_titles = gtk.Button("Show Row Titles") ! show_column_titles = gtk.Button("Show Column Titles") show_hide_box.pack_start(hide_row_titles) *************** *** 363,375 **** show_column_titles.connect("clicked", self.do_show_column_titles) ! main_vbox.pack_start(show_hide_box, FALSE) ! toolbar = GtkToolbar() toolbar.append_space() ! font_combo = GtkFontCombo() toolbar.append_widget(font_combo, "font", "font") ! font_combo.italic_button.set_usize(32, 32) ! font_combo.bold_button.set_usize(32, 32) font_combo.connect("changed", self.new_font) --- 364,376 ---- show_column_titles.connect("clicked", self.do_show_column_titles) ! main_vbox.pack_start(show_hide_box, gtk.FALSE) ! toolbar = gtk.Toolbar() toolbar.append_space() ! font_combo = gtkextra.FontCombo() toolbar.append_widget(font_combo, "font", "font") ! font_combo.italic_button.set_size_request(32, 32) ! font_combo.bold_button.set_size_request(32, 32) font_combo.connect("changed", self.new_font) *************** *** 392,446 **** toolbar.append_space() ! bordercombo = GtkBorderCombo() toolbar.append_widget(bordercombo, "border", "border") ! bordercombo.button.set_usize(32, 32) bordercombo.connect("changed", self.change_border) toolbar.append_space() ! fgcolorcombo = ColorCombo(pixmaps.font, (5, 20, 16, 4)) ! toolbar.append_widget(fgcolorcombo, "font color", "font color") ! fgcolorcombo.connect("changed", self.change_foreground) toolbar.append_space() ! bgcolorcombo = ColorCombo(pixmaps.paint, (4, 20, 18, 4)) ! toolbar.append_widget(bgcolorcombo, "background color", ! "background color") ! bgcolorcombo.connect("changed", self.change_background) toolbar.append_space() ! toggle_combo = GtkToggleCombo(5, 5) toolbar.append_widget(toggle_combo, "test", "test") ! toggle_combo.button.set_usize(32, 32) ! main_vbox.pack_start(toolbar, FALSE) ! status_box = GtkHBox(spacing=1) status_box.set_border_width(0) ! main_vbox.pack_start(status_box, FALSE) ! self.location = GtkLabel() (width, height) = self.location.size_request() ! self.location.set_usize(160, height) ! status_box.pack_start(self.location, FALSE) ! self.entry = GtkEntry() status_box.pack_start(self.entry) ! self.notebook = GtkNotebook() ! self.notebook.set_tab_pos(POS_BOTTOM) main_vbox.pack_start(self.notebook) ! self.sheets = [ Example1(), Example2(), Example3() ] scrolled_windows = [] n = 1 for sheet in self.sheets: ! scrolled_window = GtkScrolledWindow() scrolled_windows.append(scrolled_window) scrolled_window.add(sheet) ! label = GtkLabel("Folder %d" % n) self.notebook.append_page(scrolled_window, label) --- 393,450 ---- toolbar.append_space() ! bordercombo = gtkextra.BorderCombo() toolbar.append_widget(bordercombo, "border", "border") ! bordercombo.button.set_size_request(32, 32) bordercombo.connect("changed", self.change_border) toolbar.append_space() ! #fgcolorcombo = gtkextra.ColorCombo(pixmaps.font, (5, 20, 16, 4)) ! #toolbar.append_widget(fgcolorcombo, "font color", "font color") ! #fgcolorcombo.connect("changed", self.change_foreground) toolbar.append_space() ! #bgcolorcombo = gtkextra.ColorCombo(pixmaps.paint, (4, 20, 18, 4)) ! #toolbar.append_widget(bgcolorcombo, "background color", ! # "background color") ! #bgcolorcombo.connect("changed", self.change_background) toolbar.append_space() ! toggle_combo = gtkextra.ToggleCombo(5, 5) toolbar.append_widget(toggle_combo, "test", "test") ! toggle_combo.button.set_size_request(32, 32) ! main_vbox.pack_start(toolbar, gtk.FALSE) ! status_box = gtk.HBox(spacing=1) status_box.set_border_width(0) ! main_vbox.pack_start(status_box, gtk.FALSE) ! self.location = gtk.Label("") (width, height) = self.location.size_request() ! self.location.set_size_request(160, height) ! status_box.pack_start(self.location, gtk.FALSE) ! self.entry = gtk.Entry() status_box.pack_start(self.entry) ! self.notebook = gtk.Notebook() ! self.notebook.set_tab_pos(gtk.POS_BOTTOM) main_vbox.pack_start(self.notebook) ! #self.sheets = [ Example1(), Example2(), Example3() ] ! #self.sheets = [ Example1() ] ! self.sheets = [ ] ! scrolled_windows = [] n = 1 for sheet in self.sheets: ! scrolled_window = gtk.ScrolledWindow() scrolled_windows.append(scrolled_window) scrolled_window.add(sheet) ! label = gtk.Label("Folder %d" % n) self.notebook.append_page(scrolled_window, label) *************** *** 460,464 **** def show_sheet_entry(self, entry, *args): ! if not entry.flags(HAS_FOCUS): return sheet = self.get_active_sheet() --- 464,468 ---- def show_sheet_entry(self, entry, *args): ! if not entry.flags(gtk.HAS_FOCUS): return sheet = self.get_active_sheet() *************** *** 470,475 **** sheet = self.get_active_sheet() sheet_entry = sheet.get_entry() ! justification = JUSTIFY_LEFT ! if isinstance(sheet_entry, GtkItemEntry): justification = sheet_entry.get_justification() cell = sheet.get_active_cell() --- 474,479 ---- sheet = self.get_active_sheet() sheet_entry = sheet.get_entry() ! justification = gtk.JUSTIFY_LEFT ! if isinstance(sheet_entry, gtk.ItemEntry): justification = sheet_entry.get_justification() cell = sheet.get_active_cell() *************** *** 479,483 **** def show_entry(self, sheet_entry, *args): ! if not sheet_entry.flags(HAS_FOCUS): return text = sheet_entry.get_text() --- 483,487 ---- def show_entry(self, sheet_entry, *args): ! if not sheet_entry.flags(gtk.HAS_FOCUS): return text = sheet_entry.get_text() *************** *** 502,534 **** self.entry.set_editable(attributes.is_editable) ! if attributes.justification == JUSTIFY_CENTER: self.justify_center() ! elif attributes.justification == JUSTIFY_RIGHT: self.justify_right() else: self.justify_left() ! return TRUE def justify_left(self, *args): sheet = self.get_active_sheet() ! self.left_button.set_active(STATE_ACTIVE) ! self.center_button.set_active(STATE_NORMAL) ! self.right_button.set_active(STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), JUSTIFY_LEFT) def justify_center(self, *args): sheet = self.get_active_sheet() ! self.center_button.set_active(STATE_ACTIVE) ! self.left_button.set_active(STATE_NORMAL) ! self.right_button.set_active(STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), JUSTIFY_CENTER) def justify_right(self, *args): sheet = self.get_active_sheet() ! self.right_button.set_active(STATE_ACTIVE) ! self.left_button.set_active(STATE_NORMAL) ! self.center_button.set_active(STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), JUSTIFY_RIGHT) def change_border(self, widget, border, *args): --- 506,538 ---- self.entry.set_editable(attributes.is_editable) ! if attributes.justification == gtk.JUSTIFY_CENTER: self.justify_center() ! elif attributes.justification == gtk.JUSTIFY_RIGHT: self.justify_right() else: self.justify_left() ! return gtk.TRUE def justify_left(self, *args): sheet = self.get_active_sheet() ! self.left_button.set_active(gtk.STATE_ACTIVE) ! self.center_button.set_active(gtk.STATE_NORMAL) ! self.right_button.set_active(gtk.STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), gtk.JUSTIFY_LEFT) def justify_center(self, *args): sheet = self.get_active_sheet() ! self.center_button.set_active(gtk.STATE_ACTIVE) ! self.left_button.set_active(gtk.STATE_NORMAL) ! self.right_button.set_active(gtk.STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), gtk.JUSTIFY_CENTER) def justify_right(self, *args): sheet = self.get_active_sheet() ! self.right_button.set_active(gtk.STATE_ACTIVE) ! self.left_button.set_active(gtk.STATE_NORMAL) ! self.center_button.set_active(gtk.STATE_NORMAL) ! sheet.range_set_justification(sheet.get_range(), gtk.JUSTIFY_RIGHT) def change_border(self, widget, border, *args): *************** *** 538,585 **** sheet.range_set_border(range, 0, 0) if border == 1: ! border_mask = SHEET_TOP_BORDER range.rowi = range.row0 sheet.range_set_border(range, border_mask, border_width) elif border == 2: ! border_mask = SHEET_BOTTOM_BORDER range.row0 = range.rowi sheet.range_set_border(range, border_mask, border_width) elif border == 3: ! border_mask = SHEET_RIGHT_BORDER range.col0 = range.coli sheet.range_set_border(range, border_mask, border_width) elif border == 4: ! border_mask = SHEET_LEFT_BORDER range.coli = range.col0 sheet.range_set_border(range, border_mask, border_width) elif border == 5: if range.col0 == range.coli: ! border_mask = SHEET_LEFT_BORDER | SHEET_RIGHT_BORDER sheet.range_set_border(range, border_mask, border_width) else: ! border_mask = SHEET_LEFT_BORDER auxcol = range.coli range.coli = range.col0 sheet.range_set_border(range, border_mask, border_width) ! border_mask = SHEET_RIGHT_BORDER range.col0 = range.coli = auxcol sheet.range_set_border(range, border_mask, border_width) elif border == 6: if range.row0 == range.rowi: ! border_mask = SHEET_TOP_BORDER | SHEET_BOTTOM_BORDER sheet.range_set_border(range, border_mask, border_width) else: ! border_mask = SHEET_TOP_BORDER auxrow = range.rowi range.rowi = range.row0 sheet.range_set_border(range, border_mask, border_width) ! border_mask = SHEET_BOTTOM_BORDER range.row0 = range.rowi = auxrow sheet.range_set_border(range, border_mask, border_width) elif border == 7: ! border_mask = SHEET_RIGHT_BORDER | SHEET_LEFT_BORDER sheet.range_set_border(range, border_mask, border_width) elif border == 8: ! border_mask = SHEET_BOTTOM_BORDER | SHEET_TOP_BORDER sheet.range_set_border(range, border_mask, border_width) elif border == 9: --- 542,589 ---- sheet.range_set_border(range, 0, 0) if border == 1: ! border_mask = gtkextra.SHEET_TOP_BORDER range.rowi = range.row0 sheet.range_set_border(range, border_mask, border_width) elif border == 2: ! border_mask = gtkextra.SHEET_BOTTOM_BORDER range.row0 = range.rowi sheet.range_set_border(range, border_mask, border_width) elif border == 3: ! border_mask = gtkextra.SHEET_RIGHT_BORDER range.col0 = range.coli sheet.range_set_border(range, border_mask, border_width) elif border == 4: ! border_mask = gtkextra.SHEET_LEFT_BORDER range.coli = range.col0 sheet.range_set_border(range, border_mask, border_width) elif border == 5: if range.col0 == range.coli: ! border_mask = gtkextra.SHEET_LEFT_BORDER | gtkextra.SHEET_RIGHT_BORDER sheet.range_set_border(range, border_mask, border_width) else: ! border_mask = gtkextra.SHEET_LEFT_BORDER auxcol = range.coli range.coli = range.col0 sheet.range_set_border(range, border_mask, border_width) ! border_mask = gtkextra.SHEET_RIGHT_BORDER range.col0 = range.coli = auxcol sheet.range_set_border(range, border_mask, border_width) elif border == 6: if range.row0 == range.rowi: ! border_mask = gtkextra.SHEET_TOP_BORDER | gtkextra.SHEET_BOTTOM_BORDER sheet.range_set_border(range, border_mask, border_width) else: ! border_mask = gtkextra.SHEET_TOP_BORDER auxrow = range.rowi range.rowi = range.row0 sheet.range_set_border(range, border_mask, border_width) ! border_mask = gtkextra.SHEET_BOTTOM_BORDER range.row0 = range.rowi = auxrow sheet.range_set_border(range, border_mask, border_width) elif border == 7: ! border_mask = gtkextra.SHEET_RIGHT_BORDER | gtkextra.SHEET_LEFT_BORDER sheet.range_set_border(range, border_mask, border_width) elif border == 8: ! border_mask = gtkextra.SHEET_BOTTOM_BORDER | gtkextra.SHEET_TOP_BORDER sheet.range_set_border(range, border_mask, border_width) elif border == 9: *************** *** 588,600 **** for j in xrange(range.col0, range.coli + 1): border_mask = 15 ! auxrange = GtkSheetRange(i, j, i, j) if i == range.rowi: ! border_mask = border_mask ^ SHEET_BOTTOM_BORDER if i == range.row0: ! border_mask = border_mask ^ SHEET_TOP_BORDER if j == range.coli: ! border_mask = border_mask ^ SHEET_RIGHT_BORDER if j == range.col0: ! border_mask = border_mask ^ SHEET_LEFT_BORDER if border_mask != 15: sheet.range_set_border(auxrange, border_mask, --- 592,604 ---- for j in xrange(range.col0, range.coli + 1): border_mask = 15 ! auxrange = gtk.SheetRange(i, j, i, j) if i == range.rowi: ! border_mask = border_mask ^ gtkextra.SHEET_BOTTOM_BORDER if i == range.row0: ! border_mask = border_mask ^ gtkextra.SHEET_TOP_BORDER if j == range.coli: ! border_mask = border_mask ^ gtkextra.SHEET_RIGHT_BORDER if j == range.col0: ! border_mask = border_mask ^ gtkextra.SHEET_LEFT_BORDER if border_mask != 15: sheet.range_set_border(auxrange, border_mask, *************** *** 604,616 **** for j in xrange(range.col0, range.coli + 1): border_mask = 0 ! auxrange = GtkSheetRange(i, j, i, j) if i == range.rowi: ! border_mask = border_mask | SHEET_BOTTOM_BORDER if i == range.row0: ! border_mask = border_mask | SHEET_TOP_BORDER if j == range.coli: ! border_mask = border_mask | SHEET_RIGHT_BORDER if j == range.col0: ! border_mask = border_mask | SHEET_LEFT_BORDER if border_mask != 0: sheet.range_set_border(auxrange, border_mask, --- 608,620 ---- for j in xrange(range.col0, range.coli + 1): border_mask = 0 ! auxrange = gtk.SheetRange(i, j, i, j) if i == range.rowi: ! border_mask = border_mask | gtkextra.SHEET_BOTTOM_BORDER if i == range.row0: ! border_mask = border_mask | gtkextra.SHEET_TOP_BORDER if j == range.coli: ! border_mask = border_mask | gtkextra.SHEET_RIGHT_BORDER if j == range.col0: ! border_mask = border_mask | gtkextra.SHEET_LEFT_BORDER if border_mask != 0: sheet.range_set_border(auxrange, border_mask, *************** *** 622,631 **** def change_foreground(self, widget, i, colorname, *args): sheet = self.get_active_sheet() ! color = sheet.get_colormap().alloc(colorname) sheet.range_set_foreground(sheet.get_range(), color) def change_background(self, widget, i, colorname, *args): sheet = self.get_active_sheet() ! color = sheet.get_colormap().alloc(colorname) sheet.range_set_background(sheet.get_range(), color) --- 626,635 ---- def change_foreground(self, widget, i, colorname, *args): sheet = self.get_active_sheet() ! color = sheet.get_colormap().alloc_color(colorname) sheet.range_set_foreground(sheet.get_range(), color) def change_background(self, widget, i, colorname, *args): sheet = self.get_active_sheet() ! color = sheet.get_colormap().alloc_color(colorname) sheet.range_set_background(sheet.get_range(), color) *************** *** 651,653 **** if __name__ == '__main__': app = Application() ! app.mainloop() --- 655,659 ---- if __name__ == '__main__': app = Application() ! app.connect("destroy", lambda win : gtk.main_quit()) ! gtk.main() ! Index: testpixmap.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testpixmap.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testpixmap.py 31 Dec 2002 18:04:18 -0000 1.2 --- testpixmap.py 2 Jan 2003 22:00:51 -0000 1.3 *************** *** 75,79 **** def __init__(self): gtk.Window.__init__(self) - self.connect("destroy", self.quit) self.set_title=("GtkPlot3D Demo") self.set_size_request(550, 650) --- 75,78 ---- *************** *** 127,135 **** pass - def quit(self, *args): - gtk.main_quit() - if __name__ == '__main__': app = Application() ! #app.connect("destroy", lambda win : gtk.main_quit) ! gtk.mainloop() --- 126,131 ---- pass if __name__ == '__main__': app = Application() ! app.connect("destroy", lambda win : gtk.main_quit()) ! gtk.main() Index: testpolar.py =================================================================== RCS file: /cvsroot/python-gtkextra/python-gtkextra2/examples/testpolar.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testpolar.py 16 Jul 2002 17:05:14 -0000 1.2 --- testpolar.py 2 Jan 2003 22:00:52 -0000 1.3 *************** *** 6,14 **** def __init__(self): - self.hack = [] gtk.Window.__init__(self) self.set_title("GtkPlotPolar Demo") self.set_size_request(500, 320) - self.connect("destroy", self.quit) colormap = self.get_colormap() --- 6,12 ---- *************** *** 36,47 **** data.set_legend("Example") plot.add_data(data) - self.hack.append(data) self.show_all() - def quit(self, *args): - gtk.main_quit() - if __name__ == '__main__': app = Application() gtk.main() --- 34,42 ---- data.set_legend("Example") plot.add_data(data) self.show_all() if __name__ == '__main__': app = Application() + app.connect("destroy", lambda win : gtk.main_quit()) gtk.main() |