1 files changed, 48 insertions, 31 deletions

diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade b/contrib/gnunet_peerinfo_gtk_main_window.glade
index ffee717e..55f8cca3 100644
--- a/contrib/gnunet_peerinfo_gtk_main_window.glade
+++ b/contrib/gnunet_peerinfo_gtk_main_window.glade
@@ -2,6 +2,24 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkListStore" id="GNUNET_PEERINFO_GTK_list_store">
+    <columns>
+      <!-- column-name peer_identity -->
+      <column type="gchararray"/>
+      <!-- column-name number_of_known_addresses -->
+      <column type="guint"/>
+      <!-- column-name country_name -->
+      <column type="gchararray"/>
+      <!-- column-name country_flag -->
+      <column type="GdkPixbuf"/>
+      <!-- column-name bandwidth_in -->
+      <column type="guint64"/>
+      <!-- column-name bandwidth_out -->
+      <column type="guint64"/>
+      <!-- column-name addresses -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">gnunet-gtk</property>
@@ -70,19 +88,18 @@
                 <property name="vadjustment">adjustment4</property>
                 <property name="reorderable">True</property>
                 <property name="search_column">0</property>
-                <property name="fixed_height_mode">True</property>
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_name_column">
-                    <property name="sizing">fixed</property>
+                    <property name="spacing">5</property>
+                    <property name="sizing">autosize</property>
                     <property name="title" translatable="yes">Peer</property>
-                    <property name="expand">True</property>
-                    <property name="clickable">True</property>
                     <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
                     <property name="sort_column_id">0</property>
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_name_renderer">
                         <property name="sensitive">False</property>
-                        <property name="width_chars">16</property>
+                        <property name="width_chars">4</property>
                       </object>
                       <attributes>
                         <attribute name="text">0</attribute>
@@ -92,13 +109,14 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_column">
-                    <property name="sizing">fixed</property>
-                    <property name="title" translatable="yes">Bandwidth</property>
+                    <property name="title" translatable="yes">In</property>
                     <property name="clickable">True</property>
+                    <property name="reorderable">True</property>
+                    <property name="sort_indicator">True</property>
                     <property name="sort_order">descending</property>
-                    <property name="sort_column_id">5</property>
+                    <property name="sort_column_id">4</property>
                     <child>
-                      <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_renderer"/>
+                      <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_in_cellrenderertext"/>
                       <attributes>
                         <attribute name="text">4</attribute>
                       </attributes>
@@ -106,13 +124,27 @@
                   </object>
                 </child>
                 <child>
+                  <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_treeviewcolumn">
+                    <property name="title" translatable="yes">Out</property>
+                    <property name="clickable">True</property>
+                    <property name="sort_order">descending</property>
+                    <property name="sort_column_id">5</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_cellrenderertext"/>
+                      <attributes>
+                        <attribute name="text">5</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_country_column">
-                    <property name="sizing">fixed</property>
+                    <property name="sizing">autosize</property>
                     <property name="title" translatable="yes">Country</property>
                     <property name="clickable">True</property>
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
-                    <property name="sort_column_id">3</property>
+                    <property name="sort_column_id">2</property>
                     <child>
                       <object class="GtkCellRendererPixbuf" id="GNUNET_PEERINFO_GTK_main_window_country_renderer"/>
                       <attributes>
@@ -123,12 +155,15 @@
                 </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="GNUNET_PEERINFO_GTK_main_window_address_treeviewcolumn">
-                    <property name="sizing">fixed</property>
+                    <property name="sizing">autosize</property>
                     <property name="title" translatable="yes">Addresses</property>
+                    <property name="expand">True</property>
+                    <property name="clickable">True</property>
+                    <property name="sort_column_id">6</property>
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_addresses_cellrenderertext"/>
                       <attributes>
-                        <attribute name="text">5</attribute>
+                        <attribute name="text">6</attribute>
                       </attributes>
                     </child>
                   </object>
@@ -145,24 +180,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="GNUNET_PEERINFO_GTK_list_store">
-    <columns>
-      <!-- column-name peer_identity -->
-      <column type="gchararray"/>
-      <!-- column-name number_of_known_addresses -->
-      <column type="guint"/>
-      <!-- column-name country_name -->
-      <column type="gchararray"/>
-      <!-- column-name country_flag -->
-      <column type="GdkPixbuf"/>
-      <!-- column-name bandwidth_in -->
-      <column type="guint64"/>
-      <!-- column-name bandwidth_out -->
-      <column type="guint64"/>
-      <!-- column-name addresses -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkAdjustment" id="adjustment3">
     <property name="upper">100</property>
     <property name="step_increment">1</property>