-fixes

1 files changed, 35 insertions, 10 deletions

diff --git a/contrib/gnunet_statistics_gtk_main_window.glade b/contrib/gnunet_statistics_gtk_main_window.glade
index fd6a2c42..48f316c6 100644
--- a/contrib/gnunet_statistics_gtk_main_window.glade
+++ b/contrib/gnunet_statistics_gtk_main_window.glade
@@ -1,38 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="GNUNET_STATISTICS_GTK_main_window">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">gnunet-statistics-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_STATISTICS_GTK_quit_cb" after="yes"/>
+    <signal name="delete-event" handler="GNUNET_STATISTICS_GTK_quit_cb" after="yes" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_STATISTICS_GTK_main_window_vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkMenuBar" id="GNUNET_STATISTICS_GTK_main_menu">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="GNUNET_STATISTICS_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_STATISTICS_GTK_main_menu_help_abou">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="GNUNET_STATISTICS_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-statistics-gtk</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="accel_path">&lt;gnunet-statistics-gtk&gt;/Help/About</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="GNUNET_STATISTICS_GTK_main_menu_help_about_activate_cb"/>
+                        <signal name="activate" handler="GNUNET_STATISTICS_GTK_main_menu_help_about_activate_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -42,6 +48,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -50,15 +57,19 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkDrawingArea" id="GNUNET_STATISTICS_GTK_main_notebook_connectivity_drawingarea">
+              <object class="GtkBox" id="GNUNET_STATISTICS_GTK_connectivity_box">
                 <property name="visible">True</property>
-                <signal name="expose_event" handler="GNUNET_STATISTICS_connection_graph_expose"/>
-                <signal name="configure_event" handler="GNUNET_STATISTICS_connection_graph_configure"/>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_STATISTICS_GTK_main_notebook_connectivity_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Connections</property>
                 <property name="use_underline">True</property>
               </object>
@@ -67,8 +78,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkDrawingArea" id="GNUNET_STATISTICS_GTK_main_notebook_traffic_drawingarea">
+              <object class="GtkBox" id="GNUNET_STATISTICS_GTK_traffic_box">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -77,6 +93,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_STATISTICS_GTK_main_notebook_traffic_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Traffic</property>
                 <property name="use_underline">True</property>
               </object>
@@ -86,8 +103,13 @@
               </packing>
             </child>
             <child>
-              <object class="GtkDrawingArea" id="GNUNET_STATISTICS_GTK_main_notebook_storage_drawingarea">
+              <object class="GtkBox" id="GNUNET_STATISTICS_GTK_storage_box">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="position">2</property>
@@ -96,6 +118,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_STATISTICS_GTK_main_notebook_storage_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Storage</property>
                 <property name="use_underline">True</property>
               </object>
@@ -106,6 +129,8 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>