1 files changed, 28 insertions, 19 deletions

diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade b/contrib/gnunet_peerinfo_gtk_main_window.glade
index 02caa760..cb9aeed1 100644
--- a/contrib/gnunet_peerinfo_gtk_main_window.glade
+++ b/contrib/gnunet_peerinfo_gtk_main_window.glade
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
@@ -18,46 +18,43 @@
       <column type="guint64"/>
       <!-- column-name addresses -->
       <column type="gchararray"/>
+      <!-- column-name connectivity_led -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name connected_status -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
-    <property name="can_focus">False</property>
     <property name="title" translatable="yes">gnunet-peerinfo-gtk</property>
     <property name="window_position">center</property>
     <property name="default_width">700</property>
     <property name="default_height">500</property>
     <property name="icon_name">gnunet-gtk</property>
-    <signal name="delete-event" handler="GNUNET_PEERINFO_GTK_quit_cb" after="yes" swapped="no"/>
+    <signal name="delete_event" handler="GNUNET_PEERINFO_GTK_quit_cb" after="yes"/>
     <child>
       <object class="GtkVBox" id="GNUNET_PEERINFO_GTK_main_window_vbox">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="GNUNET_PEERINFO_GTK_main_menu">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="GNUNET_PEERINFO_GTK_main_menu_help">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="GNUNET_PEERINFO_GTK_main_menu_help_abou">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="GNUNET_PEERINFO_GTK_main_menu_help_about">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Display information about this version of gnunet-peerinfo-gtk</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="accel_path">&lt;gnunet-peerinfo-gtk&gt;/Help/About</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="GNUNET_PEERINFO_GTK_main_menu_help_about_activate_cb" swapped="no"/>
+                        <signal name="activate" handler="GNUNET_PEERINFO_GTK_main_menu_help_about_activate_cb"/>
                       </object>
                     </child>
                   </object>
@@ -67,7 +64,6 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -92,7 +88,7 @@
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_name_column">
                     <property name="spacing">5</property>
                     <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Peer</property>
+                    <property name="title">Peer</property>
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
                     <property name="sort_column_id">0</property>
@@ -108,8 +104,23 @@
                   </object>
                 </child>
                 <child>
+                  <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_connectivity_treeviewcolumn">
+                    <property name="sizing">fixed</property>
+                    <property name="fixed_width">20</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
+                    <property name="sort_column_id">8</property>
+                    <child>
+                      <object class="GtkCellRendererPixbuf" id="GNUNET_PEERINFO_GTK_main_window_led_cellrendererpixbuf"/>
+                      <attributes>
+                        <attribute name="pixbuf">7</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_column">
-                    <property name="title" translatable="yes">In</property>
+                    <property name="title">In</property>
                     <property name="clickable">True</property>
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
@@ -125,7 +136,7 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_treeviewcolumn">
-                    <property name="title" translatable="yes">Out</property>
+                    <property name="title">Out</property>
                     <property name="clickable">True</property>
                     <property name="sort_order">descending</property>
                     <property name="sort_column_id">5</property>
@@ -140,7 +151,7 @@
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_country_column">
                     <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Country</property>
+                    <property name="title">Country</property>
                     <property name="clickable">True</property>
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
@@ -156,7 +167,7 @@
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_address_treeviewcolumn">
                     <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">Addresses</property>
+                    <property name="title">Addresses</property>
                     <property name="expand">True</property>
                     <property name="clickable">True</property>
                     <property name="sort_column_id">6</property>
@@ -172,8 +183,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>