updating gnunet-peerinfo-gtk to display more information about connectivity and connection state processing (wip)

1 files changed, 29 insertions, 27 deletions

diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade b/contrib/gnunet_peerinfo_gtk_main_window.glade
index 96e087a5..32bcff32 100644
--- a/contrib/gnunet_peerinfo_gtk_main_window.glade
+++ b/contrib/gnunet_peerinfo_gtk_main_window.glade
@@ -2,30 +2,6 @@
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkImage" id="connected_image_core">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">CORE</property>
-    <property name="stock">gtk-connect</property>
-  </object>
-  <object class="GtkImage" id="connected_image_neighbours">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">TRANSPORT</property>
-    <property name="stock">gtk-connect</property>
-  </object>
-  <object class="GtkImage" id="connected_image_plugin">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">PLUGIN</property>
-    <property name="stock">gtk-connect</property>
-  </object>
   <object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store">
     <columns>
       <!-- column-name peer_identity -->
@@ -78,6 +54,8 @@
       <column type="gchararray"/>
       <!-- column-name show_friend -->
       <column type="gboolean"/>
+      <!-- column-name peerinfo_address_expiration -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
@@ -86,12 +64,36 @@
     <property name="page_increment">10</property>
     <property name="page_size">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkImage" id="connected_image_ats">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="tooltip_text" translatable="yes">ATS</property>
     <property name="stock">gtk-connect</property>
   </object>
+  <object class="GtkImage" id="connected_image_core">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">CORE</property>
+    <property name="stock">gtk-connect</property>
+  </object>
+  <object class="GtkImage" id="connected_image_neighbours">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">TRANSPORT</property>
+    <property name="stock">gtk-connect</property>
+  </object>
+  <object class="GtkImage" id="connected_image_plugin">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">PLUGIN</property>
+    <property name="stock">gtk-connect</property>
+  </object>
   <object class="GtkImage" id="validated_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -282,7 +284,7 @@
                     <child>
                       <object class="GtkCellRendererPixbuf" id="GNUNET_PEERINFO_GTK_main_window_country_renderer"/>
                       <attributes>
-                        <attribute name="pixbuf">3</attribute>
+                        <attribute name="pixbuf">2</attribute>
                       </attributes>
                     </child>
                   </object>
@@ -313,7 +315,7 @@
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_in_cellrenderertext"/>
                       <attributes>
-                        <attribute name="text">4</attribute>
+                        <attribute name="text">3</attribute>
                       </attributes>
                     </child>
                   </object>
@@ -327,7 +329,7 @@
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_PEERINFO_GTK_main_window_bandwidth_out_cellrenderertext"/>
                       <attributes>
-                        <attribute name="text">5</attribute>
+                        <attribute name="text">4</attribute>
                       </attributes>
                     </child>
                   </object>