[SCM] zynjacku/master: Add patch to port zynjacku to GtkBuilder.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Apr 22 15:39:28 UTC 2011
The following commit has been merged in the master branch:
commit f819e5e6256f98f9aba0e1ef970710110422f74e
Author: Alessio Treglia <alessio at debian.org>
Date: Fri Apr 22 17:39:21 2011 +0200
Add patch to port zynjacku to GtkBuilder.
diff --git a/debian/patches/1003-libglade_to_gtkbuilder.patch b/debian/patches/1003-libglade_to_gtkbuilder.patch
new file mode 100644
index 0000000..f9a219a
--- /dev/null
+++ b/debian/patches/1003-libglade_to_gtkbuilder.patch
@@ -0,0 +1,614 @@
+Subject: libglade -> GtkBuilder transition.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ lv2rack | 15 -
+ zynjacku | 13 -
+ zynjacku.ui | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ zynworld/host.py | 16 -
+ 4 files changed, 477 insertions(+), 23 deletions(-)
+
+--- /dev/null
++++ zynjacku/zynjacku.ui
+@@ -0,0 +1,456 @@
++<?xml version="1.0"?>
++<!--*- mode: xml -*-->
++<interface>
++ <object class="GtkUIManager" id="uimanager1">
++ <child>
++ <object class="GtkActionGroup" id="actiongroup1">
++ <child>
++ <object class="GtkAction" id="menuitem1">
++ <property name="name">menuitem1</property>
++ <property name="label" translatable="yes">_Preset</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="preset_load">
++ <property name="stock_id">gtk-open</property>
++ <property name="name">preset_load</property>
++ <property name="label" translatable="yes">_Load...</property>
++ <signal handler="on_preset_load_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="preset_save_as">
++ <property name="stock_id">gtk-save-as</property>
++ <property name="name">preset_save_as</property>
++ <property name="label" translatable="yes">_Save As...</property>
++ <signal handler="on_preset_save_as_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="quit">
++ <property name="stock_id">gtk-quit</property>
++ <property name="name">quit</property>
++ <signal handler="on_quit_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="synth">
++ <property name="name">synth</property>
++ <property name="label" translatable="yes">_Synth</property>
++ <signal handler="on_synth_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="synth_load">
++ <property name="stock_id">gtk-add</property>
++ <property name="name">synth_load</property>
++ <property name="label" translatable="yes">_Load...</property>
++ <signal handler="on_synth_load_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="synth_clear">
++ <property name="stock_id">gtk-clear</property>
++ <property name="name">synth_clear</property>
++ <property name="label" translatable="yes">_Clear</property>
++ <signal handler="on_synth_clear_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="menuitem4">
++ <property name="name">menuitem4</property>
++ <property name="label" translatable="yes">_Help</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="about">
++ <property name="stock_id">gtk-about</property>
++ <property name="name">about</property>
++ <property name="label" translatable="yes">_About</property>
++ <signal handler="on_about_activate" name="activate"/>
++ </object>
++ </child>
++ </object>
++ </child>
++ <ui>
++ <menubar name="menubar1">
++ <menu action="menuitem1">
++ <menuitem action="preset_load"/>
++ <menuitem action="preset_save_as"/>
++ <separator/>
++ <menuitem action="quit"/>
++ </menu>
++ <menu action="synth">
++ <menuitem action="synth_load"/>
++ <menuitem action="synth_clear"/>
++ </menu>
++ <menu action="menuitem4">
++ <menuitem action="about"/>
++ </menu>
++ </menubar>
++ </ui>
++ </object>
++ <object class="GtkUIManager" id="uimanager2">
++ <child>
++ <object class="GtkActionGroup" id="actiongroup2">
++ <child>
++ <object class="GtkAction" id="lv2rack_preset_menuitem">
++ <property name="name">lv2rack_preset_menuitem</property>
++ <property name="label" translatable="yes">_Preset</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_preset_load_menuitem">
++ <property name="stock_id">gtk-open</property>
++ <property name="name">lv2rack_preset_load_menuitem</property>
++ <property name="label" translatable="yes">_Load...</property>
++ <signal handler="lv2rack_on_preset_load_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_preset_save_as_menuitem">
++ <property name="stock_id">gtk-save-as</property>
++ <property name="name">lv2rack_preset_save_as_menuitem</property>
++ <property name="label" translatable="yes">_Save As...</property>
++ <signal handler="lv2rack_on_preset_save_as_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_quit_menuitem">
++ <property name="stock_id">gtk-quit</property>
++ <property name="name">lv2rack_quit_menuitem</property>
++ <signal handler="lv2rack_on_quit_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_effect_menuitem">
++ <property name="name">lv2rack_effect_menuitem</property>
++ <property name="label" translatable="yes">_Effect</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_effect_load_menuitem">
++ <property name="stock_id">gtk-add</property>
++ <property name="name">lv2rack_effect_load_menuitem</property>
++ <property name="label" translatable="yes">_Load...</property>
++ <signal handler="lv2rack_on_effect_load_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_effect_clear_menuitem">
++ <property name="stock_id">gtk-clear</property>
++ <property name="name">lv2rack_effect_clear_menuitem</property>
++ <property name="label" translatable="yes">_Clear</property>
++ <signal handler="lv2rack_on_effect_clear_activate" name="activate"/>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_help_menuitem">
++ <property name="name">lv2rack_help_menuitem</property>
++ <property name="label" translatable="yes">_Help</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkAction" id="lv2rack_help_about_menuitem">
++ <property name="stock_id">gtk-about</property>
++ <property name="name">lv2rack_help_about_menuitem</property>
++ <property name="label" translatable="yes">_About</property>
++ <signal handler="lv2rack_on_about_activate" name="activate"/>
++ </object>
++ </child>
++ </object>
++ </child>
++ <ui>
++ <menubar name="lv2rack_menubar">
++ <menu action="lv2rack_preset_menuitem">
++ <menuitem action="lv2rack_preset_load_menuitem"/>
++ <menuitem action="lv2rack_preset_save_as_menuitem"/>
++ <separator/>
++ <menuitem action="lv2rack_quit_menuitem"/>
++ </menu>
++ <menu action="lv2rack_effect_menuitem">
++ <menuitem action="lv2rack_effect_load_menuitem"/>
++ <menuitem action="lv2rack_effect_clear_menuitem"/>
++ </menu>
++ <menu action="lv2rack_help_menuitem">
++ <menuitem action="lv2rack_help_about_menuitem"/>
++ </menu>
++ </menubar>
++ </ui>
++ </object>
++ <object class="GtkWindow" id="zynjacku_main">
++ <property name="title" translatable="yes">zynjacku</property>
++ <property name="role">zynjacku_list</property>
++ <property name="default_width">600</property>
++ <property name="default_height">200</property>
++ <child>
++ <object class="GtkVBox" id="vbox_top">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkHBox" id="hbox_menubar">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
++ <property name="visible">True</property>
++ </object>
++ </child>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkScrolledWindow" id="scrolledwindow1">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="shadow_type">GTK_SHADOW_IN</property>
++ <child>
++ <object class="GtkTreeView" id="treeview_synths">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="rules_hint">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkStatusbar" id="statusbar">
++ <property name="visible">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ <object class="GtkDialog" id="zynjacku_plugin_repo">
++ <property name="width_request">600</property>
++ <property name="height_request">500</property>
++ <property name="title" translatable="yes">Plugins</property>
++ <property name="modal">True</property>
++ <property name="destroy_with_parent">True</property>
++ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++ <child internal-child="vbox">
++ <object class="GtkVBox" id="dialog-vbox1">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkScrolledWindow" id="scrolledwindow2">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="shadow_type">GTK_SHADOW_IN</property>
++ <child>
++ <object class="GtkTreeView" id="treeview_available_plugins">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="reorderable">True</property>
++ <property name="rules_hint">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkProgressBar" id="progressbar">
++ <property name="visible">True</property>
++ <property name="fraction">0.15000000595999999</property>
++ <property name="pulse_step">0.10000000149</property>
++ <property name="text" translatable="yes">scanning plugins...</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ <child internal-child="action_area">
++ <object class="GtkHButtonBox" id="dialog-action_area1">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++ <child>
++ <object class="GtkButton" id="cancel">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="label">gtk-cancel</property>
++ <property name="use_stock">True</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkButton" id="rescan">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <child>
++ <object class="GtkAlignment" id="alignment3">
++ <property name="visible">True</property>
++ <property name="xscale">0</property>
++ <property name="yscale">0</property>
++ <child>
++ <object class="GtkHBox" id="hbox3">
++ <property name="visible">True</property>
++ <property name="spacing">2</property>
++ <child>
++ <object class="GtkImage" id="image31">
++ <property name="visible">True</property>
++ <property name="stock">gtk-refresh</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="label2">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">_Rescan</property>
++ <property name="use_underline">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton" id="load">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <child>
++ <object class="GtkAlignment" id="alignment4">
++ <property name="visible">True</property>
++ <property name="xscale">0</property>
++ <property name="yscale">0</property>
++ <child>
++ <object class="GtkHBox" id="hbox4">
++ <property name="visible">True</property>
++ <property name="spacing">2</property>
++ <child>
++ <object class="GtkImage" id="image32">
++ <property name="visible">True</property>
++ <property name="stock">gtk-add</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="label3">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">_Load</property>
++ <property name="use_underline">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ <action-widgets>
++ <action-widget response="-6">cancel</action-widget>
++ <action-widget response="1">rescan</action-widget>
++ <action-widget response="0">load</action-widget>
++ </action-widgets>
++ </object>
++ <object class="GtkWindow" id="lv2rack">
++ <property name="title" translatable="yes">lv2rack</property>
++ <property name="role">lv2rack_list</property>
++ <property name="default_width">600</property>
++ <property name="default_height">200</property>
++ <child>
++ <object class="GtkVBox" id="lv2rack_vbox_top">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkHBox" id="lv2rack_hbox_menubar">
++ <property name="visible">True</property>
++ <child>
++ <object class="GtkMenuBar" constructor="uimanager2" id="lv2rack_menubar">
++ <property name="visible">True</property>
++ </object>
++ </child>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkScrolledWindow" id="lv2rack_scrolledwindow">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++ <property name="shadow_type">GTK_SHADOW_IN</property>
++ <child>
++ <object class="GtkTreeView" id="lv2rack_treeview_effects">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="rules_hint">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkStatusbar" id="lv2rack_statusbar">
++ <property name="visible">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++</interface>
+--- zynjacku.orig/zynworld/host.py
++++ zynjacku/zynworld/host.py
+@@ -21,7 +21,6 @@
+ import os
+ import sys
+ import gtk
+-import gtk.glade
+ import gobject
+ import re
+ import time
+@@ -2496,9 +2495,9 @@ class host:
+ view.set_model(store)
+
+ def plugins_load(self, title="LV2 plugins"):
+- dialog = self.glade_xml.get_widget("zynjacku_plugin_repo")
+- plugin_repo_widget = self.glade_xml.get_widget("treeview_available_plugins")
+- progressbar = self.glade_xml.get_widget("progressbar")
++ dialog = self.ui_builder.get_object("zynjacku_plugin_repo")
++ plugin_repo_widget = self.ui_builder.get_object("treeview_available_plugins")
++ progressbar = self.ui_builder.get_object("progressbar")
+
+ dialog.set_title(title)
+
+@@ -2793,11 +2792,11 @@ def get_program_data(program_name):
+ if not data_dir:
+ data_dir = "."
+
+- glade_file = data_dir + os.sep + "zynjacku.glade"
++ ui_file = data_dir + os.sep + "zynjacku.ui"
+
+- if not os.path.isfile(glade_file):
++ if not os.path.isfile(ui_file):
+ data_dir = data_dir + os.sep + ".." + os.sep + "share"+ os.sep + "zynjacku"
+- glade_file = data_dir + os.sep + "zynjacku.glade"
++ ui_file = data_dir + os.sep + "zynjacku.ui"
+ logo_dir = data_dir
+ else:
+ logo_dir = data_dir + os.sep + 'art' + os.sep + 'logo'
+@@ -2807,7 +2806,8 @@ def get_program_data(program_name):
+
+ program_data['license'] = file(data_dir + os.sep + "gpl.txt").read()
+
+- program_data['glade_xml'] = gtk.glade.XML(glade_file)
++ program_data['ui_builder'] = gtk.Builder()
++ program_data['ui_builder'].add_from_file(ui_file)
+
+
+ program_data['website'] = "http://home.gna.org/zynjacku/"
+--- zynjacku.orig/zynjacku
++++ zynjacku/zynjacku
+@@ -21,7 +21,6 @@
+ import os
+ import sys
+ import gtk
+-import gtk.glade
+ import gobject
+ import re
+ import time
+@@ -70,14 +69,14 @@ class ZynjackuHostMulti(ZynjackuHost):
+ ZynjackuHost.__init__(self, client_name, "zynjacku", "synth stack", lash_client)
+
+ self.program_data = program_data
+- self.glade_xml = program_data['glade_xml']
++ self.ui_builder = program_data['ui_builder']
+
+- self.main_window = self.glade_xml.get_widget("zynjacku_main")
++ self.main_window = self.ui_builder.get_object("zynjacku_main")
+ self.main_window.set_title(client_name)
+
+- self.statusbar = self.glade_xml.get_widget("statusbar")
++ self.statusbar = self.ui_builder.get_object("statusbar")
+
+- self.hbox_menubar = self.glade_xml.get_widget("hbox_menubar")
++ self.hbox_menubar = self.ui_builder.get_object("hbox_menubar")
+ self.midi_led = zynhost.midi_led()
+ self.midi_led_frame = gtk.Frame()
+ self.midi_led_frame.set_shadow_type(gtk.SHADOW_OUT)
+@@ -95,13 +94,13 @@ class ZynjackuHostMulti(ZynjackuHost):
+
+ self.signal_ids = []
+ for k, v in dic.items():
+- w = self.glade_xml.get_widget(k)
++ w = self.ui_builder.get_object(k)
+ if not w:
+ print "failed to get glade widget '%s'" % k
+ continue
+ self.signal_ids.append([w, w.connect("activate", v)])
+
+- self.synths_widget = self.glade_xml.get_widget("treeview_synths")
++ self.synths_widget = self.ui_builder.get_object("treeview_synths")
+
+ self.store = gtk.ListStore(
+ gobject.TYPE_BOOLEAN, # UI visible
+--- zynjacku.orig/lv2rack
++++ zynjacku/lv2rack
+@@ -20,7 +20,6 @@
+ import os
+ import sys
+ import gtk
+-import gtk.glade
+ import gobject
+ import re
+ import time
+@@ -68,12 +67,12 @@ class lv2rack_multi(lv2rack):
+ lv2rack.__init__(self, client_name, "lv2rack", "effect stack", lash_client)
+
+ self.program_data = program_data
+- self.glade_xml = program_data['glade_xml']
++ self.ui_builder = program_data['ui_builder']
+
+- self.main_window = self.glade_xml.get_widget("lv2rack")
++ self.main_window = self.ui_builder.get_object("lv2rack")
+ self.main_window.set_title(client_name)
+
+- self.statusbar = self.glade_xml.get_widget("lv2rack_statusbar")
++ self.statusbar = self.ui_builder.get_object("lv2rack_statusbar")
+
+ # Create our dictionary and connect it
+ dic = {"lv2rack_quit_menuitem" : self.on_quit,
+@@ -86,13 +85,13 @@ class lv2rack_multi(lv2rack):
+
+ self.signal_ids = []
+ for k, v in dic.items():
+- w = self.glade_xml.get_widget(k)
++ w = self.ui_builder.get_object(k)
+ if not w:
+- print "failed to get glade widget '%s'" % k
++ print "failed to get object '%s'" % k
+ continue
+ self.signal_ids.append([w, w.connect("activate", v)])
+
+- self.effects_widget = self.glade_xml.get_widget("lv2rack_treeview_effects")
++ self.effects_widget = self.ui_builder.get_object("lv2rack_treeview_effects")
+
+ self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
+ text_renderer = gtk.CellRendererText()
+@@ -266,7 +265,7 @@ class lv2rack_single(lv2rack):
+ #print "ZynjackuHostOne constructor called."
+ lv2rack.__init__(self, client_name, "lv2rack")
+
+- self.glade_xml = program_data['glade_xml']
++ self.ui_builder = program_data['ui_builder']
+
+ self.plugin = self.new_plugin(uri)
+ if not self.plugin:
diff --git a/debian/patches/series b/debian/patches/series
index 331d858..db988c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
1001-shebangs.patch
1002-buildsystem.patch
+1003-libglade_to_gtkbuilder.patch
--
zynjacku packaging
More information about the pkg-multimedia-commits
mailing list