[SCM] laditools/master: libglade -> GtkBuilder transition.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 22 12:04:58 UTC 2011


The following commit has been merged in the master branch:
commit 854ae0b79f442b0cc3e7aad707642c3aca8aa055
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 22 14:03:12 2011 +0200

    libglade -> GtkBuilder transition.
    
    - Convert data/ladilog_ui.glade into GtkBuilder format .ui file.
    - Port ladilog to gtk.Builder.

diff --git a/debian/patches/1002-libglade_to_gtkbuilder.patch b/debian/patches/1002-libglade_to_gtkbuilder.patch
new file mode 100644
index 0000000..87500f8
--- /dev/null
+++ b/debian/patches/1002-libglade_to_gtkbuilder.patch
@@ -0,0 +1,147 @@
+Subject: libglade -> gtkbuilder transition.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ data/ladilog_ui.ui |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ladilog            |   10 ++---
+ 2 files changed, 97 insertions(+), 5 deletions(-)
+
+--- laditools.orig/ladilog
++++ laditools/ladilog
+@@ -31,7 +31,6 @@ try:
+     import pygtk
+     pygtk.require ('2.0')
+     import gtk
+-    import gtk.glade
+     import vte
+     import laditools
+ except Exception, e:
+@@ -65,7 +64,7 @@ def read_last(lfile, lines):
+     lfile.seek(endpos, 0)
+     return backlog
+ 
+-class ladilog (gtk.glade.XML):
++class ladilog(object):
+     def __init__ (self):
+         self.log_files = [
+             {
+@@ -111,20 +110,21 @@ class ladilog (gtk.glade.XML):
+         max_lines_text = self.param_dict['max_lines']
+         self.max_lines = int (max_lines_text)
+         # Load the glade file
+-        gtk.glade.XML.__init__(self, laditools.find_data_file("ladilog_ui.glade"))
++        builder = gtk.Builder()
++        builder.add_from_file(laditools.find_data_file("ladilog_ui.glade"))
+         # Get the ui ready for action
+         self.event_dict = {"on_ladilog_ui_destroy" : self.on_quit,
+             "on_close_button_clicked" : self.on_quit,
+             "on_clear_button_clicked" : self.on_clear_text,
+             "on_purge_button_clicked" : self.on_purge}
+-        self.signal_autoconnect (self.event_dict)
++        builder.connect_signals(self.event_dict)
+ 
+         # Create our terminal and display it
+         for log in self.log_files:
+             log['term'] = vte.Terminal ()
+             log["tab_label"] = gtk.Label (log["name"])
+ 
+-        self.logview_notebook = self.get_widget ("ladilog_notebook")
++        self.logview_notebook = builder.get_object ("ladilog_notebook")
+ 
+         for log in self.log_files:
+             log['term'].show ()
+--- /dev/null
++++ laditools/data/ladilog_ui.ui
+@@ -0,0 +1,92 @@
++<?xml version="1.0"?>
++<!--Generated with glade3 3.4.0 on Tue Aug  5 23:08:01 2008 -->
++<interface>
++  <object class="GtkWindow" id="ladilog_ui">
++    <property name="visible">True</property>
++    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++    <property name="title" translatable="yes">LADI - Log viewer</property>
++    <property name="icon">laditools_logo.svg</property>
++    <signal handler="on_ladilog_ui_destroy" name="destroy"/>
++    <child>
++      <object class="GtkVBox" id="ladilog_vbox">
++        <property name="visible">True</property>
++        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++        <child>
++          <object class="GtkImage" id="laditools_logo">
++            <property name="visible">True</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="pixbuf">laditools_logo.svg</property>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="padding">5</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkNotebook" id="ladilog_notebook">
++            <property name="visible">True</property>
++            <property name="can_focus">True</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++          </object>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkHBox" id="button_hbox">
++            <property name="visible">True</property>
++            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++            <property name="border_width">10</property>
++            <child>
++              <object class="GtkButton" id="clear_button">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="label" translatable="yes">Clear</property>
++                <signal handler="on_clear_button_clicked" name="clicked"/>
++              </object>
++              <packing>
++                <property name="fill">False</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="purge_button">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="label" translatable="yes">Purge logs</property>
++                <signal handler="on_purge_button_clicked" name="clicked"/>
++              </object>
++              <packing>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="close_button">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
++                <property name="label" translatable="yes">Close</property>
++                <signal handler="on_close_button_clicked" name="clicked"/>
++              </object>
++              <packing>
++                <property name="fill">False</property>
++                <property name="position">2</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
diff --git a/debian/patches/series b/debian/patches/series
index bf28563..ce82ff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001-desktop_files.patch
+1002-libglade_to_gtkbuilder.patch

-- 
laditools packaging



More information about the pkg-multimedia-commits mailing list