[SCM] zynjacku/master: First attempt to do pygtk2 -> pygi conversion.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Jun 26 10:23:27 UTC 2011
The following commit has been merged in the master branch:
commit 0a55f3ef086ac91328f6b5729756c4da1d7b8619
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Jun 26 12:23:34 2011 +0200
First attempt to do pygtk2 -> pygi conversion.
diff --git a/debian/patches/1006-pygtk2_to_pygi.patch b/debian/patches/1006-pygtk2_to_pygi.patch
new file mode 100644
index 0000000..0c58d90
--- /dev/null
+++ b/debian/patches/1006-pygtk2_to_pygi.patch
@@ -0,0 +1,975 @@
+---
+ zynworld/host.py | 386 +++++++++++++++++++++++++++----------------------------
+ 1 file changed, 194 insertions(+), 192 deletions(-)
+
+--- zynjacku.orig/zynworld/host.py
++++ zynjacku/zynworld/host.py
+@@ -20,8 +20,10 @@
+
+ import os
+ import sys
+-import gtk
+-import gobject
++from gi.repository import Gtk
++from gi.repository import GObject
++from gi.repository import Gdk
++from gi.repository import GdkPixbuf
+ import re
+ import time
+ import xml.dom.minidom
+@@ -126,7 +128,7 @@ def make_knobshape(gaps, gapdepth):
+
+ def hls_to_color(h,l,s):
+ r,g,b = hls_to_rgb(h,l,s)
+- return gtk.gdk.color_parse('#%04X%04X%04X' % (int(r*65535),int(g*65535),int(b*65535)))
++ return Gdk.color_parse('#%04X%04X%04X' % (int(r*65535),int(g*65535),int(b*65535)))
+
+ def color_to_hls(color):
+ string = color.to_string()
+@@ -150,12 +152,12 @@ LEGEND_LED_DOTS = 'led-dots' # leds arou
+
+ class KnobTooltip:
+ def __init__(self):
+- self.tooltip_window = gtk.Window(gtk.WINDOW_POPUP)
+- self.tooltip = gtk.Label()
+- #self.tooltip.modify_fg(gtk.STATE_NORMAL, hls_to_color(0.0, 1.0, 0.0))
++ self.tooltip_window = Gtk.Window(Gtk.WindowType.POPUP)
++ self.tooltip = Gtk.Label()
++ #self.tooltip.modify_fg(Gtk.StateType.NORMAL, hls_to_color(0.0, 1.0, 0.0))
+ self.tooltip_timeout = None
+- vbox = gtk.VBox()
+- vbox2 = gtk.VBox()
++ vbox = Gtk.VBox()
++ vbox2 = Gtk.VBox()
+ vbox2.add(self.tooltip)
+ vbox2.set_border_width(2)
+ vbox.add(vbox2)
+@@ -175,8 +177,8 @@ class KnobTooltip:
+ self.tooltip_window.window.invalidate_rect((0,0,rc.width,rc.height), False)
+ self.tooltip.set_text(text)
+ if self.tooltip_timeout:
+- gobject.source_remove(self.tooltip_timeout)
+- self.tooltip_timeout = gobject.timeout_add(500, self.hide_tooltip)
++ GObject.source_remove(self.tooltip_timeout)
++ self.tooltip_timeout = GObject.timeout_add(500, self.hide_tooltip)
+
+ def hide_tooltip(self):
+ self.tooltip_window.hide_all()
+@@ -202,9 +204,9 @@ def get_knob_tooltip():
+ knob_tooltip = KnobTooltip()
+ return knob_tooltip
+
+-class Knob(gtk.VBox):
++class Knob(Gtk.VBox):
+ def __init__(self):
+- gtk.VBox.__init__(self)
++ GObject.GObject.__init__(self)
+ self.gapdepth = 4
+ self.gaps = 10
+ self.value = 0.0
+@@ -253,7 +255,7 @@ class Knob(gtk.VBox):
+
+ def on_realize(self, widget):
+ self.root = self.get_toplevel()
+- self.root.add_events(gtk.gdk.ALL_EVENTS_MASK)
++ self.root.add_events(Gdk.EventMask.ALL_EVENTS_MASK)
+ self.root.connect('scroll-event', self.on_mousewheel)
+ self.root.connect('button-press-event', self.on_left_down)
+ self.root.connect('button-release-event', self.on_left_up)
+@@ -393,7 +395,7 @@ class Knob(gtk.VBox):
+ rc = self.get_allocation()
+ range = self.max_value - self.min_value
+ scale = rc.height
+- if event.state & gtk.gdk.SHIFT_MASK:
++ if event.get_state() & Gdk.EventMask.SHIFT_MASK:
+ scale = rc.height*8
+ value = self.startvalue - ((y - self.start)*range)/scale
+ oldval = self.value
+@@ -415,14 +417,14 @@ class Knob(gtk.VBox):
+ return
+ range = self.max_value - self.min_value
+ minstep = 1.0 / (10**self.digits)
+- if event.state & (gtk.gdk.SHIFT_MASK | gtk.gdk.BUTTON1_MASK):
++ if event.get_state() & (Gdk.EventMask.SHIFT_MASK | Gdk.EventMask.BUTTON1_MASK):
+ step = minstep
+ else:
+ step = max(self.quantize_value(range/25.0), minstep)
+ value = self.value
+- if event.direction == gtk.gdk.SCROLL_UP:
++ if event.direction == Gdk.ScrollDirection.UP:
+ value += step
+- elif event.direction == gtk.gdk.SCROLL_DOWN:
++ elif event.direction == Gdk.ScrollDirection.DOWN:
+ value -= step
+ self.set_value(value)
+ self.show_tooltip()
+@@ -438,7 +440,7 @@ class Knob(gtk.VBox):
+
+ def draw(self, ctx):
+ if not self.legend_hls:
+- self.legend_hls = color_to_hls(self.style.fg[gtk.STATE_NORMAL])
++ self.legend_hls = color_to_hls(self.style.fg[Gtk.StateType.NORMAL])
+
+ if not self.knobshape:
+ self.update_knobshape()
+@@ -634,9 +636,9 @@ class Knob(gtk.VBox):
+ self.draw(self.context)
+ return False
+
+-class DecoBox(gtk.VBox):
++class DecoBox(Gtk.VBox):
+ def __init__(self):
+- gtk.VBox.__init__(self)
++ GObject.GObject.__init__(self)
+ self.arc1 = 0.0
+ self.arc2 = None
+ self.arc3 = None
+@@ -652,10 +654,10 @@ class DecoBox(gtk.VBox):
+ self.alpha = 1.0
+ self.set_app_paintable(True)
+ self.connect('expose-event', self.on_expose)
+- self.vbox = gtk.VBox()
+- hbox = gtk.HBox()
+- self.pack_start(hbox, expand=False)
+- self.pack_start(self.vbox)
++ self.vbox = Gtk.VBox()
++ hbox = Gtk.HBox()
++ self.pack_start(hbox, False, True, 0)
++ self.pack_start(self.vbox, True, True, 0)
+ self.tabbox = hbox
+ self.set_roundness(6, 6, 6, 6)
+
+@@ -786,35 +788,35 @@ class DecoBox(gtk.VBox):
+ self.draw(self.context)
+ return False
+
+-class midi_led(gtk.EventBox):
++class midi_led(Gtk.EventBox):
+ def __init__(self):
+- gtk.EventBox.__init__(self)
+- self.label = gtk.Label()
+- #attrs = pango.AttrList()
+- #font_attr = pango.AttrFamily("monospace")
++ GObject.GObject.__init__(self)
++ self.label = Gtk.Label()
++ #attrs = Pango.AttrList()
++ #font_attr = Pango.AttrFamily("monospace")
+ #attrs.insert(font_attr)
+ #self.label.set_attributes(attrs)
+ self.add(self.label)
+
+ def set(self, active):
+ if active:
+- self.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, int(65535 * 0.5), 0))
++ self.modify_bg(Gtk.StateType.NORMAL, Gdk.Color(0, int(65535 * 0.5), 0))
+ else:
+- self.modify_bg(gtk.STATE_NORMAL, self.label.style.bg[gtk.STATE_NORMAL])
++ self.modify_bg(Gtk.StateType.NORMAL, self.label.style.bg[Gtk.StateType.NORMAL])
+
+ self.label.set_text(" MIDI ")
+
+-class curve_widget(gtk.DrawingArea):
++class curve_widget(Gtk.DrawingArea):
+ def __init__(self, min_value, max_value, value):
+- gtk.DrawingArea.__init__(self)
++ GObject.GObject.__init__(self)
+
+ self.connect("expose-event", self.on_expose)
+ self.connect("size-request", self.on_size_request)
+ self.connect("size_allocate", self.on_size_allocate)
+
+- self.color_bg = gtk.gdk.Color(0,0,0)
+- self.color_value = gtk.gdk.Color(int(65535 * 0.8), int(65535 * 0.7), 0)
+- self.color_mark = gtk.gdk.Color(int(65535 * 0.2), int(65535 * 0.2), int(65535 * 0.2))
++ self.color_bg = Gdk.Color(0,0,0)
++ self.color_value = Gdk.Color(int(65535 * 0.8), int(65535 * 0.7), 0)
++ self.color_mark = Gdk.Color(int(65535 * 0.2), int(65535 * 0.2), int(65535 * 0.2))
+ self.width = 0
+ self.height = 0
+ self.margin = 5
+@@ -1006,9 +1008,9 @@ class midiccmap:
+ self.map.connect("cc-no-assigned", self.on_cc_no_assigned)
+ self.map.connect("cc-value-changed", self.on_cc_map_value_changed)
+
+- self.window = gtk.Dialog(
+- flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+- buttons=(gtk.STOCK_UNDO, gtk.RESPONSE_NONE, gtk.STOCK_DELETE, gtk.RESPONSE_NO, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
++ self.window = Gtk.Dialog(
++ flags=Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
++ buttons=(Gtk.STOCK_UNDO, Gtk.ResponseType.NONE, Gtk.STOCK_DELETE, Gtk.ResponseType.NO, Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT, Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
+
+ # the grand vbox
+ vbox = self.window.vbox
+@@ -1016,113 +1018,113 @@ class midiccmap:
+ #self.window.add(vbox)
+
+ # top hbox
+- hbox_top = gtk.HBox()
++ hbox_top = Gtk.HBox()
+ hbox_top.set_spacing(10)
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(10, 0, 10, 10)
+ align.add(hbox_top)
+ vbox.pack_start(align, False)
+
+ cc_no = map.get_cc_no()
+ if cc_no == -1:
+- self.adj_cc_no = gtk.Adjustment(-1, -1, 255, 1, 19)
++ self.adj_cc_no = Gtk.Adjustment(-1, -1, 255, 1, 19)
+ else:
+- self.adj_cc_no = gtk.Adjustment(cc_no, 0, 255, 1, 19)
++ self.adj_cc_no = Gtk.Adjustment(cc_no, 0, 255, 1, 19)
+ self.adj_cc_no.connect("value-changed", self.on_cc_no_changed)
+- cc_no = gtk.SpinButton(self.adj_cc_no, 0.0, 0)
+- cc_no_box = gtk.HBox()
+- cc_no_box.pack_start(gtk.Label("MIDI CC #"))
+- cc_no_box.pack_start(cc_no)
++ cc_no = Gtk.SpinButton(self.adj_cc_no, 0.0, 0)
++ cc_no_box = Gtk.HBox()
++ cc_no_box.pack_start(Gtk.Label("MIDI CC #"), True, True, 0)
++ cc_no_box.pack_start(cc_no, True, True, 0)
+ hbox_top.pack_start(cc_no_box, False)
+
+- hbox_top.pack_start(gtk.Label("Show parameter range:"), False)
+- button = gtk.RadioButton(None, "mapped")
++ hbox_top.pack_start(Gtk.Label("Show parameter range:"), False)
++ button = Gtk.RadioButton(None, "mapped")
+ button.connect("toggled", self.on_set_full_range, False)
+ hbox_top.pack_start(button, False)
+- button = gtk.RadioButton(button, "full")
++ button = Gtk.RadioButton(button, "full")
+ button.connect("toggled", self.on_set_full_range, True)
+ hbox_top.pack_start(button, False)
+
+ # middle hbox
+- hbox_middle = gtk.HBox()
++ hbox_middle = Gtk.HBox()
+ hbox_middle.set_spacing(10)
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(0, 0, 10, 10)
+ align.add(hbox_middle)
+- vbox.pack_start(align)
++ vbox.pack_start(align, True, True, 0)
+
+- vbox_left = gtk.VBox()
++ vbox_left = Gtk.VBox()
+ vbox_left.set_spacing(5)
+ hbox_middle.pack_start(vbox_left, False)
+
+- self.ls = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gtk.Adjustment, bool, str)
++ self.ls = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, Gtk.Adjustment, bool, str)
+
+- r = gtk.CellRendererText()
+- c1 = gtk.TreeViewColumn("From", r, text=0)
+- c2 = gtk.TreeViewColumn("->", r, text=4)
+- c3 = gtk.TreeViewColumn("To", r, text=1)
++ r = Gtk.CellRendererText()
++ c1 = Gtk.TreeViewColumn("From", r, text=0)
++ c2 = Gtk.TreeViewColumn("->", r, text=4)
++ c3 = Gtk.TreeViewColumn("To", r, text=1)
+
+- self.tv = gtk.TreeView(self.ls)
++ self.tv = Gtk.TreeView(self.ls)
+ self.tv.set_headers_visible(False)
+ self.tv.append_column(c1)
+ self.tv.append_column(c2)
+ self.tv.append_column(c3)
+- tv_box = gtk.VBox()
++ tv_box = Gtk.VBox()
+
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(3, 3, 10, 10)
+- align.add(gtk.Label("Control points"))
++ align.add(Gtk.Label(label="Control points"))
+ tv_box.pack_start(align, False)
+
+- sw = gtk.ScrolledWindow()
+- sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
++ sw = Gtk.ScrolledWindow()
++ sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+ sw.add(self.tv)
+- tv_box.pack_start(sw)
++ tv_box.pack_start(sw, True, True, 0)
+
+ vbox_left.pack_start(tv_box, True, True)
+
+- self.cc_value_delete_button = gtk.Button("Remove")
++ self.cc_value_delete_button = Gtk.Button("Remove")
+ self.cc_value_delete_button.connect("clicked", self.on_button_clicked)
+ vbox_left.pack_start(self.cc_value_delete_button, False)
+
+- self.cc_value_new_button = gtk.Button("New")
++ self.cc_value_new_button = Gtk.Button("New")
+ self.cc_value_new_button.connect("clicked", self.on_button_clicked)
+ vbox_left.pack_start(self.cc_value_new_button, False)
+
+- self.cc_value_change_button = gtk.Button("Change CC value")
++ self.cc_value_change_button = Gtk.Button("Change CC value")
+ self.cc_value_change_button.connect("clicked", self.on_button_clicked)
+ vbox_left.pack_start(self.cc_value_change_button, False)
+
+ self.curve = curve_widget(min_value, max_value, value)
+ self.curve.set_size_request(250,250)
+- frame = gtk.Frame()
+- frame.set_shadow_type(gtk.SHADOW_ETCHED_OUT)
++ frame = Gtk.Frame()
++ frame.set_shadow_type(Gtk.ShadowType.ETCHED_OUT)
+ frame.add(self.curve)
+ hbox_middle.pack_start(frame, True, True)
+
+ # bottom hbox
+- hbox_bottom = gtk.HBox()
++ hbox_bottom = Gtk.HBox()
+ hbox_bottom.set_spacing(10)
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(0, 2, 10, 10)
+ align.add(hbox_bottom)
+ vbox.pack_start(align, False)
+
+- self.adj_cc_value = gtk.Adjustment(17, 0, 127, 1, 10)
++ self.adj_cc_value = Gtk.Adjustment(17, 0, 127, 1, 10)
+ self.adj_cc_value.connect("value-changed", self.on_cc_value_changed)
+
+- self.cc_value = gtk.SpinButton(None, 0.0, 0)
++ self.cc_value = Gtk.SpinButton(None, 0.0, 0)
+ self.cc_value.set_adjustment(self.adj_cc_value)
+- label = gtk.Label("CC value")
++ label = Gtk.Label(label="CC value")
+ hbox_bottom.pack_start(label, False)
+ hbox_bottom.pack_start(self.cc_value, False)
+
+- hbox_bottom.pack_start(gtk.Label("-> %s" % self.parameter_name), False)
++ hbox_bottom.pack_start(Gtk.Label("-> %s" % self.parameter_name), False)
+
+ self.value_knob = Knob()
+ hbox_bottom.pack_start(self.value_knob, False)
+
+- self.value_spin = gtk.SpinButton(digits=2)
++ self.value_spin = Gtk.SpinButton(digits=2)
+ hbox_bottom.pack_start(self.value_spin, False)
+
+ self.floating_adj = self.create_value_adjustment(value)
+@@ -1142,7 +1144,7 @@ class midiccmap:
+
+ def create_value_adjustment(self, value):
+ range = self.max_value - self.min_value
+- adj = gtk.Adjustment(value, self.min_value, self.max_value, range / 100, range / 5)
++ adj = Gtk.Adjustment(value, self.min_value, self.max_value, range / 100, range / 5)
+ adj.connect("value-changed", self.on_value_change_request)
+ return adj
+
+@@ -1254,15 +1256,15 @@ class midiccmap:
+ self.window.show_all()
+ while True:
+ ret = self.window.run()
+- if ret == gtk.RESPONSE_NONE: # revert/undo button pressed?
++ if ret == Gtk.ResponseType.NONE: # revert/undo button pressed?
+ #print "revert"
+ self.revert_points()
+ continue
+- elif ret == gtk.RESPONSE_REJECT or ret == gtk.RESPONSE_DELETE_EVENT: # cancel button pressed? dialog window closed
++ elif ret == Gtk.ResponseType.REJECT or ret == Gtk.ResponseType.DELETE_EVENT: # cancel button pressed? dialog window closed
+ #print "cancel"
+ self.revert_points()
+ ret = False
+- elif ret == gtk.RESPONSE_NO: # delete button pressed?
++ elif ret == Gtk.ResponseType.NO: # delete button pressed?
+ #print "delete"
+ ret = "delete"
+ else:
+@@ -1375,18 +1377,18 @@ class midiccmap:
+ self.map.point_remove(int(self.ls[self.current_row][0]))
+
+ # Synth window abstraction
+-class PluginUI(gobject.GObject):
++class PluginUI(GObject.GObject):
+
+ __gsignals__ = {
+ 'destroy': # signal name
+ (
+- gobject.SIGNAL_RUN_LAST, # signal flags, when class closure is invoked
+- gobject.TYPE_NONE, # return type
++ GObject.SignalFlags.RUN_LAST, # signal flags, when class closure is invoked
++ None, # return type
+ () # parameter types
+ )}
+
+ def __init__(self, plugin):
+- gobject.GObject.__init__(self)
++ GObject.GObject.__init__(self)
+ self.plugin = plugin
+
+ def show(self):
+@@ -1419,9 +1421,9 @@ class PluginUICustom(PluginUI):
+
+ self.plugin.ui_off()
+
+-class PluginUIUniversalGroup(gobject.GObject):
++class PluginUIUniversalGroup(GObject.GObject):
+ def __init__(self, window, parent_group, name, hints, context):
+- gobject.GObject.__init__(self)
++ GObject.GObject.__init__(self)
+ self.window = window
+ self.parent_group = parent_group
+ self.group_name = name
+@@ -1455,9 +1457,9 @@ class PluginUIUniversalGroup(gobject.GOb
+ else:
+ return PluginUIUniversalGroupGeneric(self.window, self, group_name, hints, context)
+
+-class PluginUIUniversalParameter(gobject.GObject):
++class PluginUIUniversalParameter(GObject.GObject):
+ def __init__(self, window, parent_group, name, context):
+- gobject.GObject.__init__(self)
++ GObject.GObject.__init__(self)
+ self.window = window
+ self.parent_group = parent_group
+ self.parameter_name = name
+@@ -1482,7 +1484,7 @@ class PluginUIUniversal(PluginUI):
+ self.group_shadow_type = group_shadow_type
+ self.layout_type = layout_type
+
+- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
++ self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+
+ # nasty workaround: we assume that dynparam plugins have bigger layout and
+ # non-dynparam plugins have no port grouping and thus their layout is vertical
+@@ -1670,11 +1672,11 @@ class PluginUIUniversalGroupGeneric(Plug
+ PluginUIUniversalGroup.__init__(self, window, parent, group_name, hints, context)
+
+ if self.window.layout_type == PluginUIUniversal.layout_type_horizontal:
+- self.box_params = gtk.VBox()
+- self.box_top = gtk.HBox()
++ self.box_params = Gtk.VBox()
++ self.box_top = Gtk.HBox()
+ else:
+- self.box_params = gtk.HBox()
+- self.box_top = gtk.VBox()
++ self.box_params = Gtk.HBox()
++ self.box_top = Gtk.VBox()
+
+ self.box_top.pack_start(self.box_params, False, False)
+
+@@ -1682,7 +1684,7 @@ class PluginUIUniversalGroupGeneric(Plug
+ if hints.has_key(hint_uris['hidden']):
+ frame = self.box_top
+ else:
+- frame = gtk.Frame(group_name)
++ frame = Gtk.Frame(group_name)
+ frame.set_shadow_type(self.window.group_shadow_type)
+ self.frame = frame
+
+@@ -1691,23 +1693,23 @@ class PluginUIUniversalGroupGeneric(Plug
+ if self.window.layout_type == PluginUIUniversal.layout_type_horizontal:
+ frame.set_label_align(0.5, 0.5)
+
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(0, 10, 10, 10)
+ align.add(frame)
+ self.top = align
+ parent.child_group_add(self)
+ else:
+- self.scrolled_window = gtk.ScrolledWindow()
+- self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
++ self.scrolled_window = Gtk.ScrolledWindow()
++ self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+
+- vp = gtk.Viewport()
+- vp.add_events(gtk.gdk.ALL_EVENTS_MASK) # pass all events so Knob is working
++ vp = Gtk.Viewport()
++ vp.add_events(Gdk.EventMask.ALL_EVENTS_MASK) # pass all events so Knob is working
+ vp.add(self.box_top)
+ self.scrolled_window.add(vp)
+
+- self.window.statusbar = gtk.Statusbar()
++ self.window.statusbar = Gtk.Statusbar()
+
+- box = gtk.VBox()
++ box = Gtk.VBox()
+ box.pack_start(self.scrolled_window, True, True)
+ box.pack_start(self.window.statusbar, False)
+
+@@ -1720,7 +1722,7 @@ class PluginUIUniversalGroupGeneric(Plug
+
+ def child_param_add(self, obj):
+ #print "child_param_add %s for group \"%s\"" % (repr(obj), self.group_name)
+- self.box_params.pack_start(obj.get_top_widget(), False, False)
++ self.box_params.pack_start(obj.get_top_widget(), False, False, 0)
+
+ if self.window.ui_enabled:
+ self.window.window.show_all()
+@@ -1731,7 +1733,7 @@ class PluginUIUniversalGroupGeneric(Plug
+
+ def child_group_add(self, obj):
+ #print "child_group_add %s for group \"%s\"" % (repr(obj), self.group_name)
+- self.box_top.pack_start(obj.get_top_widget(), False, True)
++ self.box_top.pack_start(obj.get_top_widget(), False, True, 0)
+
+ def child_group_remove(self, obj):
+ #print "child_group_remove %s for group \"%s\"" % (repr(obj), self.group_name)
+@@ -1768,14 +1770,14 @@ class PluginUIUniversalGroupToggleFloat(
+ PluginUIUniversalGroup.__init__(self, window, parent, group_name, hints, context)
+
+ if self.window.layout_type == PluginUIUniversal.layout_type_horizontal:
+- self.box = gtk.VBox()
++ self.box = Gtk.VBox()
+ else:
+- self.box = gtk.HBox()
++ self.box = Gtk.HBox()
+
+ self.float = None
+ self.bool = None
+
+- self.align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ self.align.set_padding(0, 10, 10, 10)
+ self.align.add(self.box)
+
+@@ -1794,7 +1796,7 @@ class PluginUIUniversalGroupToggleFloat(
+
+ def child_param_add(self, obj):
+ #print "child_param_add %s for group \"%s\"" % (repr(obj), self.group_name)
+- self.box.pack_start(obj.get_top_widget(), False, False)
++ self.box.pack_start(obj.get_top_widget(), False, False, 0)
+
+ if self.window.ui_enabled:
+ self.window.window.show_all()
+@@ -1821,9 +1823,9 @@ class PluginUIUniversalGroupOneSubGroup(
+ def __init__(self, window, parent, group_name, hints, context):
+ PluginUIUniversalGroup.__init__(self, window, parent, group_name, hints, context)
+
+- self.box = gtk.VBox()
++ self.box = Gtk.VBox()
+
+- self.align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ self.align.set_padding(10, 10, 10, 10)
+ self.align.add(self.box)
+ self.groups = []
+@@ -1836,12 +1838,12 @@ class PluginUIUniversalGroupOneSubGroup(
+
+ def on_realize(self, obj):
+ #print "realize"
+- self.box.pack_start(self.enum.get_top_widget())
++ self.box.pack_start(self.enum.get_top_widget(), True, True, 0)
+ self.enum.connect("zynjacku-parameter-changed", self.on_changed)
+ selected = self.enum.get_selection()
+ for group in self.groups:
+ if group.group_name == selected:
+- self.box.pack_start(group.get_top_widget())
++ self.box.pack_start(group.get_top_widget(), True, True, 0)
+ self.selected_group = group
+
+ def on_enum_appeared(self, window, name, hints, selected_value_index, valid_values, context):
+@@ -1852,7 +1854,7 @@ class PluginUIUniversalGroupOneSubGroup(
+
+ def child_group_add(self, obj):
+ #print "child_group_add %s for group \"%s\"" % (repr(obj), self.group_name)
+- #self.box.pack_start(obj.get_top_widget())
++ #self.box.pack_start(obj.get_top_widget(, True, True, 0))
+ self.groups.append(obj)
+ obj.change_display_name(self.group_name)
+
+@@ -1875,7 +1877,7 @@ class PluginUIUniversalGroupOneSubGroup(
+ selected = self.enum.get_selection()
+ for group in self.groups:
+ if group.group_name == selected:
+- self.box.pack_start(group.get_top_widget())
++ self.box.pack_start(group.get_top_widget(), True, True, 0)
+ group.get_top_widget().show_all()
+ self.selected_group = group
+
+@@ -1883,32 +1885,32 @@ class PluginUIUniversalParameterFloat(Pl
+ def __init__(self, window, parent_group, name, value, min, max, context):
+ PluginUIUniversalParameter.__init__(self, window, parent_group, name, context)
+
+- self.box = gtk.VBox()
++ self.box = Gtk.VBox()
+
+- self.label = gtk.Label(name)
+- align = gtk.Alignment(0, 0)
++ self.label = Gtk.Label(label=name)
++ align = Gtk.Alignment.new(0, 0)
+ align.add(self.label)
+ self.box.pack_start(align, False, False)
+
+- adjustment = gtk.Adjustment(value, min, max, (max - min) / 100, (max - min) / 5)
++ adjustment = Gtk.Adjustment(value, min, max, (max - min) / 100, (max - min) / 5)
+
+- hbox = gtk.HBox()
++ hbox = Gtk.HBox()
+ self.knob = Knob()
+ self.knob.set_adjustment(adjustment)
+ #self.knob.set_size_request(200,-1)
+- #align = gtk.Alignment(0.5, 0.5)
++ #align = Gtk.Alignment.new(0.5, 0.5)
+ #align.add(self.knob)
+ hbox.pack_start(self.knob, True, True)
+- self.spin = gtk.SpinButton(adjustment, 0.0, 2)
+- #align = gtk.Alignment(0.5, 0.5)
++ self.spin = Gtk.SpinButton(adjustment, 0.0, 2)
++ #align = Gtk.Alignment.new(0.5, 0.5)
+ #align.add(self.spin)
+ hbox.pack_start(self.spin, False, False)
+
+- #align = gtk.Alignment(0.5, 0.5)
++ #align = Gtk.Alignment.new(0.5, 0.5)
+ #align.add(hbox)
+ self.box.pack_start(hbox, True, True)
+
+- self.align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ self.align.set_padding(10, 10, 10, 10)
+ self.align.add(self.box)
+
+@@ -1925,7 +1927,7 @@ class PluginUIUniversalParameterFloat(Pl
+ #print "Float \"%s\" created: %s" % (name, repr(self))
+
+ def on_clicked(self, widget, event):
+- if event.type != gtk.gdk._2BUTTON_PRESS:
++ if event.type != Gdk._2BUTTON_PRESS:
+ return False
+
+ #print "double click on %s" % self.parameter_name
+@@ -1976,7 +1978,7 @@ class PluginUIUniversalParameterFloat(Pl
+ def set(self, name, value, min, max):
+ self.adjustment.disconnect(self.cid)
+ self.label.set_text(name)
+- self.adjustment = gtk.Adjustment(value, min, max, 1, 19)
++ self.adjustment = Gtk.Adjustment(value, min, max, 1, 19)
+ self.spin.set_adjustment(self.adjustment)
+ self.knob.set_adjustment(self.adjustment)
+ self.cid = self.adjustment.connect("value-changed", self.on_value_changed)
+@@ -1985,21 +1987,21 @@ class PluginUIUniversalParameterInt(Plug
+ def __init__(self, window, parent_group, name, value, min, max, context):
+ PluginUIUniversalParameter.__init__(self, window, parent_group, name, context)
+
+- self.box = gtk.HBox()
++ self.box = Gtk.HBox()
+
+- self.label = gtk.Label(name)
+- align = gtk.Alignment(0.5, 0.5)
++ self.label = Gtk.Label(label=name)
++ align = Gtk.Alignment.new(0.5, 0.5)
+ align.add(self.label)
+ self.box.pack_start(align, True, True)
+
+- adjustment = gtk.Adjustment(value, min, max, 1, 19)
++ adjustment = Gtk.Adjustment(value, min, max, 1, 19)
+
+- self.spin = gtk.SpinButton(adjustment, 0.0, 0)
+- #align = gtk.Alignment(0.5, 0.5)
++ self.spin = Gtk.SpinButton(adjustment, 0.0, 0)
++ #align = Gtk.Alignment.new(0.5, 0.5)
+ #align.add(self.spin)
+ self.box.pack_start(self.spin, True, False)
+
+- self.align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ self.align.set_padding(10, 10, 10, 10)
+ self.align.add(self.box)
+
+@@ -2025,7 +2027,7 @@ class PluginUIUniversalParameterInt(Plug
+ def set(self, name, value, min, max):
+ self.adjustment.disconnect(self.cid)
+ self.label.set_text(name)
+- self.adjustment = gtk.Adjustment(value, min, max, 1, 19)
++ self.adjustment = Gtk.Adjustment(value, min, max, 1, 19)
+ self.spin.set_adjustment(self.adjustment)
+ self.knob.set_adjustment(self.adjustment)
+ self.cid = self.adjustment.connect("value-changed", self.on_value_changed)
+@@ -2034,12 +2036,12 @@ class PluginUIUniversalParameterBool(Plu
+ def __init__(self, window, parent_group, name, value, context):
+ PluginUIUniversalParameter.__init__(self, window, parent_group, name, context)
+
+- widget = gtk.CheckButton(name)
++ widget = Gtk.CheckButton(name)
+
+ widget.set_active(value)
+ widget.connect("toggled", self.on_toggled)
+
+- self.align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ self.align.set_padding(10, 10, 10, 10)
+ self.align.add(widget)
+
+@@ -2054,19 +2056,19 @@ class PluginUIUniversalParameterEnum(Plu
+ def __init__(self, window, parent_group, name, selected_value_index, valid_values, context):
+ PluginUIUniversalParameter.__init__(self, window, parent_group, name, context)
+
+- label = gtk.Label(name)
++ label = Gtk.Label(label=name)
+
+- self.box = gtk.VBox()
++ self.box = Gtk.VBox()
+
+- self.label = gtk.Label(name)
+- align = gtk.Alignment(0, 0)
++ self.label = Gtk.Label(label=name)
++ align = Gtk.Alignment.new(0, 0)
+ align.set_padding(0, 0, 10, 10)
+ align.add(self.label)
+ self.box.pack_start(align, True, True)
+
+- self.liststore = gtk.ListStore(gobject.TYPE_STRING)
+- self.combobox = gtk.ComboBox(self.liststore)
+- self.cell = gtk.CellRendererText()
++ self.liststore = Gtk.ListStore(GObject.TYPE_STRING)
++ self.combobox = Gtk.ComboBox(self.liststore)
++ self.cell = Gtk.CellRendererText()
+ self.combobox.pack_start(self.cell, True)
+ self.combobox.add_attribute(self.cell, 'text', 0)
+
+@@ -2079,7 +2081,7 @@ class PluginUIUniversalParameterEnum(Plu
+
+ self.combobox.connect("changed", self.on_changed)
+
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(0, 10, 10, 10)
+ align.add(self.combobox)
+
+@@ -2099,34 +2101,34 @@ class PluginUIUniversalParameterEnum(Plu
+
+ class plugin_load_progress_window:
+ def __init__(self):
+- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
++ self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+ #self.window.set_size_request(600,300)
+
+- self.bar = gtk.ProgressBar()
++ self.bar = Gtk.ProgressBar()
+
+- box = gtk.VBox()
++ box = Gtk.VBox()
+ box.set_spacing(10)
+- self.label = gtk.Label("Loading plugin ...")
+- box.pack_start(self.label)
+- box.pack_start(self.bar)
+- align = gtk.Alignment(0.5, 0.5, 1.0, 1.0)
++ self.label = Gtk.Label(label="Loading plugin ...")
++ box.pack_start(self.label, True, True, 0)
++ box.pack_start(self.bar, True, True, 0)
++ align = Gtk.Alignment.new(0.5, 0.5, 1.0, 1.0)
+ align.set_padding(10, 10, 10, 10)
+ align.add(box)
+ self.window.add(align)
+
+- while gtk.events_pending():
+- gtk.main_iteration()
++ while Gtk.events_pending():
++ Gtk.main_iteration()
+
+ def progress(self, name, progress, message):
+ #print "Loading plugin '%s', %5.1f%% complete. %s" % (name, progress, message)
+ self.bar.set_fraction(progress / 100.0)
+ self.label.set_text("Loading plugin '%s'" % name)
+ self.bar.set_text(message);
+- while gtk.events_pending():
+- gtk.main_iteration()
++ while Gtk.events_pending():
++ Gtk.main_iteration()
+
+- while gtk.events_pending():
+- gtk.main_iteration()
++ while Gtk.events_pending():
++ Gtk.main_iteration()
+
+ def show(self, uri):
+ title = "Loading plugin '%s'..." % uri
+@@ -2142,7 +2144,7 @@ class host:
+ def __init__(self, engine, client_name, preset_extension=None, preset_name=None, lash_client=None):
+ #print "host constructor called."
+
+- self.group_shadow_type = gtk.SHADOW_ETCHED_OUT
++ self.group_shadow_type = Gtk.ShadowType.ETCHED_OUT
+ self.layout_type = PluginUIUniversal.layout_type_horizontal
+
+ self.engine = engine
+@@ -2169,7 +2171,7 @@ class host:
+
+ lash.lash_jack_client_name(lash_client, client_name)
+
+- self.lash_check_events_callback_id = gobject.timeout_add(1000, self.lash_check_events)
++ self.lash_check_events_callback_id = GObject.timeout_add(1000, self.lash_check_events)
+
+ if not self.preset_extension:
+ self.preset_extension = "xml"
+@@ -2449,8 +2451,8 @@ class host:
+ if plugin == None:
+ continue
+
+- while gtk.events_pending():
+- gtk.main_iteration()
++ while Gtk.events_pending():
++ Gtk.main_iteration()
+
+ features_met = True
+ for feature in plugin.requiredFeatures:
+@@ -2503,15 +2505,15 @@ class host:
+
+ store = plugin_repo_widget.get_model()
+ if not store:
+- plugin_repo_widget.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
++ plugin_repo_widget.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE)
+
+- store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+- text_renderer = gtk.CellRendererText()
++ store = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING)
++ text_renderer = Gtk.CellRendererText()
+
+- column_name = gtk.TreeViewColumn("Name", text_renderer, text=0)
+- column_uri = gtk.TreeViewColumn("URI", text_renderer, text=1)
+- column_license = gtk.TreeViewColumn("License", text_renderer, text=2)
+- column_maintainer = gtk.TreeViewColumn("Maintainer", text_renderer, text=3)
++ column_name = Gtk.TreeViewColumn("Name", text_renderer, text=0)
++ column_uri = Gtk.TreeViewColumn("URI", text_renderer, text=1)
++ column_license = Gtk.TreeViewColumn("License", text_renderer, text=2)
++ column_maintainer = Gtk.TreeViewColumn("Maintainer", text_renderer, text=3)
+
+ column_name.set_sort_column_id(0)
+ column_uri.set_sort_column_id(1)
+@@ -2523,7 +2525,7 @@ class host:
+ plugin_repo_widget.append_column(column_license)
+ plugin_repo_widget.append_column(column_maintainer)
+
+- store.set_sort_column_id(0, gtk.SORT_ASCENDING)
++ store.set_sort_column_id(0, Gtk.SortType.ASCENDING)
+
+ plugin_repo_widget.set_model(store)
+ def on_row_activated(widget, path, column):
+@@ -2628,7 +2630,7 @@ class host:
+
+ def setup_file_dialog_filters(self, file_dialog):
+ # Create and add the filter
+- filter = gtk.FileFilter()
++ filter = Gtk.FileFilter()
+ pattern = '*.' + self.preset_extension
+ if self.preset_name:
+ filter.set_name(self.preset_name + ' (' + pattern + ')')
+@@ -2638,26 +2640,26 @@ class host:
+ file_dialog.add_filter(filter)
+
+ # Create and add the 'all files' filter
+- filter = gtk.FileFilter()
++ filter = Gtk.FileFilter()
+ filter.set_name("All files")
+ filter.add_pattern("*")
+ file_dialog.add_filter(filter)
+
+
+ def preset_load_ask(self):
+- dialog_buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK)
++ dialog_buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+ if self.preset_name:
+ title = "Load " + self.preset_name
+ else:
+ title = "Load preset"
+- file_dialog = gtk.FileChooserDialog(title=title, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons=dialog_buttons)
++ file_dialog = Gtk.FileChooserDialog(title=title, action=Gtk.FileChooserAction.OPEN, buttons=dialog_buttons)
+
+ self.setup_file_dialog_filters(file_dialog)
+
+ # Init the return value
+ filename = ""
+
+- if file_dialog.run() == gtk.RESPONSE_OK:
++ if file_dialog.run() == Gtk.ResponseType.OK:
+ filename = file_dialog.get_filename()
+ file_dialog.destroy()
+
+@@ -2688,12 +2690,12 @@ class host:
+ store.close()
+
+ def preset_save_ask(self):
+- dialog_buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_SAVE, gtk.RESPONSE_OK)
++ dialog_buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_SAVE, Gtk.ResponseType.OK)
+ if self.preset_name:
+ title = "Save " + self.preset_name
+ else:
+ title = "Save preset"
+- file_dialog = gtk.FileChooserDialog(title=title, action=gtk.FILE_CHOOSER_ACTION_SAVE, buttons=dialog_buttons)
++ file_dialog = Gtk.FileChooserDialog(title=title, action=Gtk.FileChooserAction.SAVE, buttons=dialog_buttons)
+
+ # set the filename
+ if self.preset_filename:
+@@ -2704,7 +2706,7 @@ class host:
+ # Init the return value
+ filename = ""
+
+- if file_dialog.run() == gtk.RESPONSE_OK:
++ if file_dialog.run() == Gtk.ResponseType.OK:
+ filename = file_dialog.get_filename()
+ file_dialog.destroy()
+
+@@ -2737,7 +2739,7 @@ class host:
+ def run_done(self):
+ if self.lash_client:
+ #print "removing lash handler, host object refcount is %u" % sys.getrefcount(self)
+- gobject.source_remove(self.lash_check_events_callback_id)
++ GObject.source_remove(self.lash_check_events_callback_id)
+ #print "removed lash handler, host object refcount is %u" % sys.getrefcount(self)
+
+ for plugin in self.plugins:
+@@ -2747,9 +2749,9 @@ class host:
+ self.engine.disconnect(self.progress_connect_id)
+
+ def run(self):
+- ui_run_callback_id = gobject.timeout_add(40, self.ui_run)
+- gtk.main()
+- gobject.source_remove(ui_run_callback_id)
++ ui_run_callback_id = GObject.timeout_add(40, self.ui_run)
++ Gtk.main()
++ GObject.source_remove(ui_run_callback_id)
+ self.run_done()
+
+ def on_test(self, obj1, obj2):
+@@ -2758,7 +2760,7 @@ class host:
+ print repr(obj2)
+
+ def run_about_dialog(transient_for, program_data):
+- about = gtk.AboutDialog()
++ about = Gtk.AboutDialog()
+ about.set_transient_for(transient_for)
+ about.set_name(program_data['name'])
+ if program_data.has_key('comments'):
+@@ -2771,7 +2773,7 @@ def run_about_dialog(transient_for, prog
+ if program_data.has_key('artists'):
+ about.set_artists(program_data['artists'])
+ if program_data.has_key('logo'):
+- about.set_logo(gtk.gdk.pixbuf_new_from_file(program_data['logo']))
++ about.set_logo(GdkPixbuf.Pixbuf.new_from_file(program_data['logo']))
+ about.show()
+ about.run()
+ about.hide()
+@@ -2806,7 +2808,7 @@ def get_program_data(program_name):
+
+ program_data['license'] = file(data_dir + os.sep + "gpl.txt").read()
+
+- program_data['ui_builder'] = gtk.Builder()
++ program_data['ui_builder'] = Gtk.Builder()
+ program_data['ui_builder'].add_from_file(ui_file)
+
+
+@@ -2831,10 +2833,10 @@ def get_program_data(program_name):
+ return program_data
+
+ def register_types():
+- gobject.signal_new("zynjacku-parameter-changed", PluginUIUniversalParameter, gobject.SIGNAL_RUN_FIRST | gobject.SIGNAL_ACTION, gobject.TYPE_NONE, [])
+- gobject.type_register(PluginUI)
+- gobject.type_register(PluginUIUniversal)
+- gobject.type_register(PluginUIUniversalGroupGeneric)
+- gobject.type_register(PluginUIUniversalGroupToggleFloat)
+- gobject.type_register(PluginUIUniversalParameterFloat)
+- gobject.type_register(PluginUIUniversalParameterBool)
++ GObject.signal_new("zynjacku-parameter-changed", PluginUIUniversalParameter, GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION, None, [])
++ GObject.type_register(PluginUI)
++ GObject.type_register(PluginUIUniversal)
++ GObject.type_register(PluginUIUniversalGroupGeneric)
++ GObject.type_register(PluginUIUniversalGroupToggleFloat)
++ GObject.type_register(PluginUIUniversalParameterFloat)
++ GObject.type_register(PluginUIUniversalParameterBool)
diff --git a/debian/patches/series b/debian/patches/series
index b4b1f2b..863720b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
1003-libglade_to_gtkbuilder.patch
1004-lashd_not_found.patch
1005-xref_fix.patch
+1006-pygtk2_to_pygi.patch
--
zynjacku packaging
More information about the pkg-multimedia-commits
mailing list