-adding status pixbuf column to search tabs

1 files changed, 38 insertions, 10 deletions

diff --git a/contrib/gnunet_fs_gtk_search_tab.glade b/contrib/gnunet_fs_gtk_search_tab.glade
index 69675b89..809f04b3 100644
--- a/contrib/gnunet_fs_gtk_search_tab.glade
+++ b/contrib/gnunet_fs_gtk_search_tab.glade
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
@@ -43,6 +43,7 @@
     </columns>
   </object>
   <object class="GtkWindow" id="_search_result_frame_window">
+    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="title">You should never see this</property>
     <property name="skip_taskbar_hint">True</property>
@@ -65,10 +66,10 @@
             <property name="search_column">6</property>
             <property name="enable_grid_lines">horizontal</property>
             <property name="enable_tree_lines">True</property>
-            <signal name="cursor_changed" handler="GNUNET_FS_GTK_search_treeview_cursor_changed"/>
-            <signal name="button_press_event" handler="GNUNET_FS_GTK_search_treeview_button_press_event"/>
-            <signal name="row_activated" handler="GNUNET_FS_GTK_search_treeview_row_activated"/>
-            <signal name="popup_menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu"/>
+            <signal name="cursor-changed" handler="GNUNET_FS_GTK_search_treeview_cursor_changed" swapped="no"/>
+            <signal name="button-press-event" handler="GNUNET_FS_GTK_search_treeview_button_press_event" swapped="no"/>
+            <signal name="row-activated" handler="GNUNET_FS_GTK_search_treeview_row_activated" swapped="no"/>
+            <signal name="popup-menu" handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
             <child>
               <object class="GtkTreeViewColumn" id="search_result_description_column">
                 <property name="title">Description</property>
@@ -87,10 +88,21 @@
               </object>
             </child>
             <child>
+              <object class="GtkTreeViewColumn" id="search_result_status_pixbuf_column">
+                <property name="title" translatable="yes">Status</property>
+                <child>
+                  <object class="GtkCellRendererPixbuf" id="search_result_status_cellrendererpixbuf"/>
+                  <attributes>
+                    <attribute name="pixbuf">17</attribute>
+                    <attribute name="stock-id">8</attribute>
+                  </attributes>
+                </child>
+              </object>
+            </child>
+            <child>
               <object class="GtkTreeViewColumn" id="search_result_availability_column">
                 <property name="title">Availability</property>
                 <property name="clickable">True</property>
-                <property name="visible">True</property>
                 <property name="reorderable">True</property>
                 <property name="sort_indicator">True</property>
                 <property name="sort_column_id">5</property>
@@ -201,6 +213,7 @@
     </child>
   </object>
   <object class="GtkWindow" id="_search_result_label_window">
+    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <property name="title" translatable="yes">You shouldn't see this also</property>
     <property name="type_hint">dock</property>
@@ -212,9 +225,11 @@
     <child>
       <object class="GtkHBox" id="_search_result_label_hbox">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkAlignment" id="_search_result_label_window_label_alignment">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">2</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
@@ -222,6 +237,7 @@
               <object class="GtkLabel" id="_search_result_label_window_label">
                 <property name="height_request">30</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label">query</property>
               </object>
             </child>
@@ -235,16 +251,19 @@
         <child>
           <object class="GtkAlignment" id="_search_result_label_play_button_alignment">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
               <object class="GtkButton" id="_search_result_label_play_button">
+                <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_play_button_clicked"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_play_button_clicked" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="play_icon_stock_image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="stock">gtk-media-play</property>
                     <property name="icon-size">2</property>
                   </object>
@@ -261,17 +280,20 @@
         <child>
           <object class="GtkAlignment" id="_search_result_label_pause_button_alignment">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
               <object class="GtkButton" id="_search_result_label_pause_button">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_pause_button_clicked"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_pause_button_clicked" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="pause_icon_stock_image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="stock">gtk-media-pause</property>
                     <property name="icon-size">2</property>
                   </object>
@@ -288,17 +310,20 @@
         <child>
           <object class="GtkAlignment" id="_search_result_label_clear_button_alignment">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
               <object class="GtkButton" id="_search_result_label_clear_button">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_clear_button_clicked"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_clear_button_clicked" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="clear_icon_stock_image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="stock">gtk-clear</property>
                     <property name="icon-size">2</property>
                   </object>
@@ -316,18 +341,21 @@
         <child>
           <object class="GtkAlignment" id="_search_result_label_close_button_alignment">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xscale">0</property>
             <property name="yscale">0</property>
             <child>
               <object class="GtkButton" id="_search_result_label_close_button">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="relief">half</property>
-                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_close_button_clicked"/>
+                <signal name="clicked" handler="GNUNET_FS_GTK_search_result_close_button_clicked" swapped="no"/>
                 <child>
                   <object class="GtkImage" id="close_icon_stock_image">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="stock">gtk-close</property>
                     <property name="icon-size">2</property>
                   </object>