From 367631c9aa15d6c518b5fd56e707bb101d9992fb Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 6 Jul 2011 19:16:46 +0100
Subject: [PATCH] Migrated `filtertree_menu.glade` to GtkBuilder.

---
 deluge/ui/gtkui/filtertreeview.py           | 11 ++--
 deluge/ui/gtkui/glade/filtertree_menu.glade | 56 -----------------
 deluge/ui/gtkui/glade/filtertree_menu.ui    | 66 +++++++++++++++++++++
 3 files changed, 72 insertions(+), 61 deletions(-)
 delete mode 100644 deluge/ui/gtkui/glade/filtertree_menu.glade
 create mode 100644 deluge/ui/gtkui/glade/filtertree_menu.ui

diff --git a/deluge/ui/gtkui/filtertreeview.py b/deluge/ui/gtkui/filtertreeview.py
index 81beaa5db..6b886d996 100644
--- a/deluge/ui/gtkui/filtertreeview.py
+++ b/deluge/ui/gtkui/filtertreeview.py
@@ -36,7 +36,6 @@
 
 import os
 import gtk
-import gtk.glade
 import logging
 import glib
 import warnings
@@ -111,10 +110,12 @@ class FilterTreeView(component.Component):
         self.sidebar.notebook.connect("hide", self._on_hide)
 
         #menu
-        glade_menu = gtk.glade.XML(deluge.common.resource_filename("deluge.ui.gtkui",
-            os.path.join("glade", "filtertree_menu.glade")))
-        self.menu = glade_menu.get_widget("filtertree_menu")
-        glade_menu.signal_autoconnect({
+        builder = gtk.Builder()
+        builder.add_from_file(deluge.common.resource_filename(
+            "deluge.ui.gtkui", os.path.join("glade", "filtertree_menu.ui")
+        ))
+        self.menu = builder.get_object("filtertree_menu")
+        builder.connect_signals({
             "select_all": self.on_select_all,
             "pause_all": self.on_pause_all,
             "resume_all": self.on_resume_all
diff --git a/deluge/ui/gtkui/glade/filtertree_menu.glade b/deluge/ui/gtkui/glade/filtertree_menu.glade
deleted file mode 100644
index 2e9ccdd15..000000000
--- a/deluge/ui/gtkui/glade/filtertree_menu.glade
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
-  <widget class="GtkMenu" id="filtertree_menu">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkImageMenuItem" id="select_all">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Select All</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="select_all"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="image22">
-            <property name="visible">True</property>
-            <property name="stock">gtk-select-all</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="menuitem_pause">
-        <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="label" translatable="yes">_Pause All</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="pause_all"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image22">
-            <property name="stock">gtk-media-pause</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="menuitem_resume">
-        <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="tooltip" translatable="yes">Resume selected torrents.</property>
-        <property name="label" translatable="yes">Resu_me All</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="resume_all"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image23">
-            <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="stock">gtk-media-play</property>
-            <property name="icon_size">1</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/deluge/ui/gtkui/glade/filtertree_menu.ui b/deluge/ui/gtkui/glade/filtertree_menu.ui
new file mode 100644
index 000000000..f3b4ac0ee
--- /dev/null
+++ b/deluge/ui/gtkui/glade/filtertree_menu.ui
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkMenu" id="filtertree_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="select_all">
+        <property name="label" translatable="yes">_Select All</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">image22</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="select_all" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_pause">
+        <property name="label" translatable="yes">_Pause All</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">menu-item-image22</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="pause_all" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="menuitem_resume">
+        <property name="label" translatable="yes">Resu_me All</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="tooltip_text" translatable="yes">Resume selected torrents.</property>
+        <property name="use_action_appearance">False</property>
+        <property name="use_underline">True</property>
+        <property name="image">menu-item-image23</property>
+        <property name="use_stock">False</property>
+        <signal name="activate" handler="resume_all" swapped="no"/>
+      </object>
+    </child>
+  </object>
+  <object class="GtkImage" id="image22">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-select-all</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="menu-item-image22">
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-media-pause</property>
+    <property name="icon-size">1</property>
+  </object>
+  <object class="GtkImage" id="menu-item-image23">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="stock">gtk-media-play</property>
+    <property name="icon-size">1</property>
+  </object>
+</interface>