gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r22224 - gnunet-gtk/contrib


From: gnunet
Subject: [GNUnet-SVN] r22224 - gnunet-gtk/contrib
Date: Sat, 23 Jun 2012 17:08:01 +0200

Author: grothoff
Date: 2012-06-23 17:08:01 +0200 (Sat, 23 Jun 2012)
New Revision: 22224

Modified:
   gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
Log:
-working on integrating gns setup with gnunet-setup

Modified: gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-06-23 14:35:51 UTC 
(rev 22223)
+++ gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-06-23 15:08:01 UTC 
(rev 22224)
@@ -7,25 +7,25 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="GNUNET_GNS_GTK_delete_button">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Delete Record</property>
         <signal name="activate" 
handler="GNUNET_GNS_GTK_delete_popup_menu_delete_cb" swapped="no"/>
       </object>
     </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_delete_sep">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
       </object>
     </child>
     <child>
       <object class="GtkMenuItem" id="1d_exp">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Record expires in 1 
day</property>
         <property name="use_underline">True</property>
         <signal name="activate" 
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1d_cb" swapped="no"/>
@@ -33,9 +33,9 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="1w_exp">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Record expires in 1 
week</property>
         <property name="use_underline">True</property>
         <signal name="activate" 
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1w_cb" swapped="no"/>
@@ -43,9 +43,9 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="1y_exp">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Record expires in 1 
year</property>
         <property name="use_underline">True</property>
         <signal name="activate" 
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1y_cb" swapped="no"/>
@@ -53,15 +53,97 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="exp_inf">
+        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Record never 
expires</property>
         <property name="use_underline">True</property>
         <signal name="activate" 
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_expinf_cb" swapped="no"/>
       </object>
     </child>
   </object>
+  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name is_public -->
+      <column type="gboolean"/>
+      <!-- column-name record_type -->
+      <column type="guint"/>
+      <!-- column-name record_type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name expiration_time -->
+      <column type="guint64"/>
+      <!-- column-name expiration_time_is_relative -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_color -->
+      <column type="gchararray"/>
+      <!-- column-name name_is_editable -->
+      <column type="gboolean"/>
+      <!-- column-name name_is_row -->
+      <column type="gboolean"/>
+      <!-- column-name not_dummy_row -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_color -->
+      <column type="gchararray"/>
+      <!-- column-name name_color -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
+    <columns>
+      <!-- column-name type -->
+      <column type="guint"/>
+      <!-- column-name typename -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">A</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes">NS</col>
+      </row>
+      <row>
+        <col id="0">5</col>
+        <col id="1" translatable="yes">CNAME</col>
+      </row>
+      <row>
+        <col id="0">6</col>
+        <col id="1" translatable="yes">SOA</col>
+      </row>
+      <row>
+        <col id="0">12</col>
+        <col id="1" translatable="yes">PTR</col>
+      </row>
+      <row>
+        <col id="0">15</col>
+        <col id="1" translatable="yes">MX</col>
+      </row>
+      <row>
+        <col id="0">16</col>
+        <col id="1" translatable="yes">TXT</col>
+      </row>
+      <row>
+        <col id="0">28</col>
+        <col id="1" translatable="yes">AAAA</col>
+      </row>
+      <row>
+        <col id="0">65536</col>
+        <col id="1" translatable="yes">PKEY</col>
+      </row>
+      <row>
+        <col id="0">65538</col>
+        <col id="1" translatable="yes">LEHO</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkWindow" id="GNUNET_GNS_GTK_main_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">gnunet-gns-gtk</property>
@@ -77,9 +159,9 @@
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GNS_GTK_file_menuitem">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -89,9 +171,9 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GNS_GTK_new_imagemenuitem">
                         <property name="label">gtk-new</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" 
handler="GNUNET_GNS_GTK_new_imagemenuitem_activate_cb" swapped="no"/>
@@ -100,9 +182,9 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GNS_GTK_open_imagemenuitem">
                         <property name="label">gtk-open</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" 
handler="GNUNET_GNS_GTK_open_imagemenuitem_activate_cb" swapped="no"/>
@@ -117,9 +199,9 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GNS_GTK_quit_imagemenuitem">
                         <property name="label">gtk-quit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" 
handler="GNUNET_GNS_GTK_quit_imagemenuitem_activate_cb" swapped="no"/>
@@ -131,9 +213,9 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GNS_GTK_options_menuitem">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Options</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -142,9 +224,9 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" 
id="GNUNET_GNS_GTK_autoshort_imagemenuitem">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" 
translatable="yes">Automatically shorten names</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" 
handler="GNUNET_GNS_GTK_autoshort_imagemenuitem_toggled_cb" swapped="no"/>
@@ -156,9 +238,9 @@
             </child>
             <child>
               <object class="GtkMenuItem" id="GNUNET_GNS_GTK_help_menuitem">
+                <property name="use_action_appearance">False</property>
                 <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">
@@ -168,9 +250,9 @@
                     <child>
                       <object class="GtkImageMenuItem" 
id="GNUNET_GNS_GTK_about_imagemenuitem">
                         <property name="label">gtk-about</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" 
handler="GNUNET_GNS_GTK_about_imagemenuitem_activate_cb" swapped="no"/>
@@ -238,11 +320,11 @@
                     <child>
                       <object class="GtkButton" 
id="GNUNET_GNS_GTK_public_key_copy_button">
                         <property name="label">gtk-copy</property>
+                        <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="tooltip_text" translatable="yes">Copy 
the public key of this zone to the clipboard.</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_stock">True</property>
                         <signal name="clicked" 
handler="GNUNET_GNS_GTK_public_key_copy_button_clicked_cb" swapped="no"/>
                       </object>
@@ -398,86 +480,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name is_public -->
-      <column type="gboolean"/>
-      <!-- column-name record_type -->
-      <column type="guint"/>
-      <!-- column-name record_type_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name expiration_time -->
-      <column type="guint64"/>
-      <!-- column-name expiration_time_is_relative -->
-      <column type="gboolean"/>
-      <!-- column-name expiration_time_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_color -->
-      <column type="gchararray"/>
-      <!-- column-name name_is_editable -->
-      <column type="gboolean"/>
-      <!-- column-name name_is_row -->
-      <column type="gboolean"/>
-      <!-- column-name not_dummy_row -->
-      <column type="gboolean"/>
-      <!-- column-name expiration_time_as_color -->
-      <column type="gchararray"/>
-      <!-- column-name name_color -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
-    <columns>
-      <!-- column-name type -->
-      <column type="guint"/>
-      <!-- column-name typename -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes">A</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes">NS</col>
-      </row>
-      <row>
-        <col id="0">5</col>
-        <col id="1" translatable="yes">CNAME</col>
-      </row>
-      <row>
-        <col id="0">6</col>
-        <col id="1" translatable="yes">SOA</col>
-      </row>
-      <row>
-        <col id="0">12</col>
-        <col id="1" translatable="yes">PTR</col>
-      </row>
-      <row>
-        <col id="0">15</col>
-        <col id="1" translatable="yes">MX</col>
-      </row>
-      <row>
-        <col id="0">16</col>
-        <col id="1" translatable="yes">TXT</col>
-      </row>
-      <row>
-        <col id="0">28</col>
-        <col id="1" translatable="yes">AAAA</col>
-      </row>
-      <row>
-        <col id="0">65536</col>
-        <col id="1" translatable="yes">PKEY</col>
-      </row>
-      <row>
-        <col id="0">65538</col>
-        <col id="1" translatable="yes">LEHO</col>
-      </row>
-    </data>
-  </object>
 </interface>

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-06-23 
14:35:51 UTC (rev 22223)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-06-23 
15:08:01 UTC (rev 22224)
@@ -1,55 +1,243 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkMenu" id="GNUNET_GNS_GTK_delete_popup_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="GNUNET_GNS_GTK_delete_button">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Delete GNS 
entry</property>
+        <property name="label" translatable="yes">Delete</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_delete_sep">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="1d_exp">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">1 day</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="1w_exp">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">1 week</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="1y_exp">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">1 year</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="exp_inf">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">never</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name is_public -->
+      <column type="gboolean"/>
+      <!-- column-name record_type -->
+      <column type="guint"/>
+      <!-- column-name record_type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name expiration_time -->
+      <column type="guint64"/>
+      <!-- column-name expiration_time_is_relative -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_color -->
+      <column type="gchararray"/>
+      <!-- column-name name_is_editable -->
+      <column type="gboolean"/>
+      <!-- column-name name_is_row -->
+      <column type="gboolean"/>
+      <!-- column-name not_dummy_row -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_color -->
+      <column type="gchararray"/>
+      <!-- column-name name_color -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
+    <columns>
+      <!-- column-name type -->
+      <column type="guint"/>
+      <!-- column-name typename -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">A</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes">NS</col>
+      </row>
+      <row>
+        <col id="0">5</col>
+        <col id="1" translatable="yes">CNAME</col>
+      </row>
+      <row>
+        <col id="0">6</col>
+        <col id="1" translatable="yes">SOA</col>
+      </row>
+      <row>
+        <col id="0">12</col>
+        <col id="1" translatable="yes">PTR</col>
+      </row>
+      <row>
+        <col id="0">15</col>
+        <col id="1" translatable="yes">MX</col>
+      </row>
+      <row>
+        <col id="0">16</col>
+        <col id="1" translatable="yes">TXT</col>
+      </row>
+      <row>
+        <col id="0">28</col>
+        <col id="1" translatable="yes">AAAA</col>
+      </row>
+      <row>
+        <col id="0">65536</col>
+        <col id="1" translatable="yes">PKEY</col>
+      </row>
+      <row>
+        <col id="0">65538</col>
+        <col id="1" translatable="yes">LEHO</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
-    <property name="value">65536</property>
     <property name="lower">5000</property>
     <property name="upper">999999999</property>
+    <property name="value">65536</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_out_adjustment">
-    <property name="value">65536</property>
     <property name="lower">1024</property>
     <property name="upper">999999999</property>
+    <property name="value">65536</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_setup_gns_liststore">
-    <columns>
-      <!-- column-name hostname -->
-      <column type="gchararray"/>
-      <!-- column-name sourceport -->
-      <column type="guint"/>
-      <!-- column-name targetport -->
-      <column type="guint"/>
-      <!-- column-name targethostname -->
-      <column type="gchararray"/>
-      <!-- column-name isudp -->
-      <column type="gchararray"/>
-    </columns>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_exit_interface_mask_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">127</property>
+    <property name="value">48</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
-    <columns>
-      <!-- column-name url -->
-      <column type="gchararray"/>
-      <!-- column-name editable -->
-      <column type="gboolean"/>
-    </columns>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">3306</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_quota_adjustment">
+    <property name="lower">65536</property>
+    <property name="upper">9999999999</property>
+    <property name="value">1024000</property>
+    <property name="step_increment">65536</property>
+    <property name="page_increment">1024000</property>
+  </object>
   <object class="GtkDialog" id="GNUNET_setup_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">gnunet-setup</property>
     <property name="window_position">center</property>
     <property name="icon_name">preferences-system</property>
     <property name="type_hint">dialog</property>
-    <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/>
+    <signal name="destroy" handler="GNUNET_SETUP_quit_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="GNUNET_setup_dialog-vbox">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="GNUNET_setup_dialog-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_as_button">
+                <property name="label">gtk-save-as</property>
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="GNUNET_setup_save_button">
+                <property name="label">gtk-save</property>
+                <property name="use_action_appearance">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="GNUNET_setup_notebook">
             <property name="visible">True</property>
@@ -57,22 +245,26 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_general_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_defaultservices_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_defaultservices_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_defaultservices_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" 
id="GNUNET_setup_general_services_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">Services:</property>
                               </object>
                               <packing>
@@ -85,6 +277,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_topology_checkbutton">
                                 <property name="label" 
translatable="yes">Topology</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
@@ -104,6 +297,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_hostlist_checkbutton">
                                 <property name="label" 
translatable="yes">Hostlist</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -122,6 +316,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_fs_checkbutton">
                                 <property name="label" translatable="yes">File 
_Sharing</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -141,6 +336,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
                                 <property name="label" 
translatable="yes">PT/VPN</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -151,6 +347,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">4</property>
                               </packing>
@@ -158,6 +355,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_exit_checkbutton">
                                 <property name="label" 
translatable="yes">EXIT</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -168,6 +366,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">5</property>
                               </packing>
@@ -175,6 +374,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_gns_checkbutton">
                                 <property name="label" 
translatable="yes">GNS</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -185,6 +385,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">6</property>
                               </packing>
@@ -196,6 +397,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_defaultservices_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Service Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -211,18 +413,22 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_topology_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_topology_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_topology_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_friends_only_checkbutton">
                                 <property name="label" translatable="yes">F_2F 
only</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -239,9 +445,11 @@
                             <child>
                               <object class="GtkVSeparator" id="vseparator2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
@@ -249,6 +457,7 @@
                             <child>
                               <object class="GtkLabel" 
id="GNUNET_setup_friends_file_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">Friends file:</property>
                               </object>
                               <packing>
@@ -260,17 +469,22 @@
                             <child>
                               <object class="GtkFileChooserButton" 
id="GNUNET_setup_friends_filechooserbutton">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkVSeparator" id="vseparator1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">4</property>
                               </packing>
@@ -278,6 +492,7 @@
                             <child>
                               <object class="GtkLabel" 
id="GNUNET_setup_minimum_friends_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Min. 
connected friends:</property>
                               </object>
                               <packing>
@@ -290,8 +505,12 @@
                               <object class="GtkSpinButton" 
id="GNUNET_setup_minimum_friends_spinbutton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property 
name="invisible_char">&#x2022;</property>
+                                <property name="invisible_char">•</property>
                                 <property 
name="invisible_char_set">True</property>
+                                <property 
name="primary_icon_activatable">False</property>
+                                <property 
name="secondary_icon_activatable">False</property>
+                                <property 
name="primary_icon_sensitive">True</property>
+                                <property 
name="secondary_icon_sensitive">True</property>
                                 <property 
name="adjustment">GNUNET_setup_min_friends_adjustment</property>
                                 <property name="numeric">True</property>
                               </object>
@@ -308,6 +527,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_topology_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Friend-to-Friend Configuration (restricts P2P 
connections)&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -323,21 +543,26 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_hostlist_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_hostlist_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_hostlist_basics_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_enable_checkbutton">
                                     <property name="label" 
translatable="yes">Use Hostlists to bootstrap</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -354,6 +579,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_client_learn_checkbutton">
                                     <property name="label" 
translatable="yes">Learn Servers from P2P Network</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -377,19 +603,21 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_hostlist_options_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_server_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_offer_hostlist_checkbutton">
                                         <property name="label" 
translatable="yes">Run Hostlist Server</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -400,12 +628,13 @@
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_advertise_checkbutton">
                                         <property name="label" 
translatable="yes">Advertise Hostlist Server</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -416,9 +645,11 @@
                                     <child>
                                       <object class="GtkHBox" id="hbox9">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_hostlist_port_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Port:</property>
                                           </object>
                                           <packing>
@@ -432,11 +663,15 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_hostlist_server_port_spin_button">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                             <property 
name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property>
                                             <property 
name="numeric">True</property>
-                                            <signal name="realize" 
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb"/>
+                                            <signal name="realize" 
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb" 
swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -463,10 +698,11 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox ">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_hostlist_url_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Known Hostlist Servers:</property>
                                       </object>
                                       <packing>
@@ -491,7 +727,7 @@
                                             <property 
name="hadjustment">adjustment7</property>
                                             <property 
name="vadjustment">adjustment8</property>
                                             <property 
name="search_column">0</property>
-                                            <signal name="key_press_event" 
handler="GNUNET_setup_treeview_key_press_event_cb"/>
+                                            <signal name="key-press-event" 
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
                                             <child>
                                               <object 
class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
                                                 <property 
name="sizing">fixed</property>
@@ -504,7 +740,7 @@
                                                 <child>
                                                   <object 
class="GtkCellRendererText" id="GNUNET_setup_hostlist_url_cellrenderertext">
                                                     <property 
name="editable">True</property>
-                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb"/>
+                                                    <signal name="edited" 
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb" swapped="no"/>
                                                   </object>
                                                   <attributes>
                                                     <attribute 
name="text">0</attribute>
@@ -516,16 +752,22 @@
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -536,12 +778,15 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_hostlist_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Hostlist Configuration (for bootstrapping the 
network)&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">2</property>
                   </packing>
@@ -551,6 +796,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_general_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_General</property>
                 <property name="use_underline">True</property>
               </object>
@@ -561,26 +807,30 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_bandwidth_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_bandwidth_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_bandwidth_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_in_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Max. download bandwidth (B/s):</property>
                                   </object>
                                   <packing>
@@ -594,8 +844,12 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_in_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -608,9 +862,12 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_out_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Max. upload bandwidth (B/s)</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -618,12 +875,18 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_bandwidth_out_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
@@ -641,6 +904,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_bandwidth_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Bandwidth Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -655,22 +919,26 @@
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_transport_nat_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_transport_nat_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_transport_nat_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_transport_nat_checkbutton">
                                     <property name="label" 
translatable="yes">Peer is behind _NAT</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -689,10 +957,11 @@
                                 <child>
                                   <object class="GtkButton" 
id="GNUNET_setup_transport_autoconfig_button">
                                     <property name="label" 
translatable="yes">Attempt automatic configuration</property>
+                                    <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_setup_transport_autoconfig_button_clicked_cb"/>
+                                    <signal name="clicked" 
handler="GNUNET_setup_transport_autoconfig_button_clicked_cb" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -704,6 +973,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_transport_disable_ipv6_checkbutton">
                                     <property name="label" 
translatable="yes">Disable IPv_6 support</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -730,10 +1000,12 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_transport_nat_options_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">20</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_transport_nat_options_spacer_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -745,10 +1017,11 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_options_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_hole_punched_checkbutton">
                                         <property name="label" 
translatable="yes">NAT ports have been opened manually</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -758,12 +1031,14 @@
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_upnp_enable_checkbutton">
                                         <property name="label" 
translatable="yes">Enable NAT traversal via UPnP or PMP</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -780,6 +1055,7 @@
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_icmp_server_enable_checkbutton">
                                         <property name="label" 
translatable="yes">Enable NAT traversal using ICMP method</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -796,9 +1072,11 @@
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_transport_external_ip_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_transport_external_ip_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="tooltip_text" 
translatable="yes">Globally visible IP address of your system (IP address of 
the external interface of your NAT).  You can also specify a hostname, in which 
case GNUnet will periodically look up the hostname in DNS to determine our 
external IP address (DynDNS setup).</property>
                                             <property name="label" 
translatable="yes">External (public) IPv4 address:</property>
                                           </object>
@@ -814,10 +1092,16 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">255</property>
-                                            <property 
name="invisible_char">&#x25CF;</property>
+                                            <property 
name="invisible_char">●</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -832,6 +1116,7 @@
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_icmp_client_enable_checkbutton">
                                         <property name="label" 
translatable="yes">Enable connecting to NATed peers using ICMP method</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -849,9 +1134,11 @@
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_transport_internal_ip_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_transport_internal_ip_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="tooltip_text" 
translatable="yes">Specify the IPv4 address of your computers main network 
interface (typically eth0 or wlan0).</property>
                                             <property name="label" 
translatable="yes">Internal (private) IPv4 address:</property>
                                           </object>
@@ -867,20 +1154,30 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="max_length">15</property>
-                                            <property 
name="invisible_char">&#x25CF;</property>
+                                            <property 
name="invisible_char">●</property>
                                             <property 
name="width_chars">15</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">5</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -899,12 +1196,15 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_transport_nat_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;NAT 
Traversal Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
@@ -917,6 +1217,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_network_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Network</property>
                 <property name="use_underline">True</property>
               </object>
@@ -928,23 +1229,27 @@
             <child>
               <object class="GtkFrame" id="GNUNET_setup_transport_main_frame">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkAlignment" 
id="GNUNET_setup_transport_main_alignment">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkVBox" 
id="GNUNET_setup_transport_main_vbox">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_transport_plugins_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkLabel" 
id="GNUNET_setup_transportlabel">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">Plugins to use:</property>
                               </object>
                               <packing>
@@ -957,6 +1262,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_tcp_checkbutton">
                                 <property name="label" 
translatable="yes">_TCP</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -964,7 +1270,7 @@
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -976,13 +1282,14 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_udp_checkbutton">
                                 <property name="label" 
translatable="yes">_UDP</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -994,6 +1301,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_http_checkbutton">
                                 <property name="label" 
translatable="yes">_HTTP</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -1001,7 +1309,7 @@
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1013,6 +1321,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_https_checkbutton">
                                 <property name="label" 
translatable="yes">HTTP_S</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -1020,7 +1329,7 @@
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1032,12 +1341,13 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_dv_checkbutton">
                                 <property name="label" 
translatable="yes">D_V</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1049,13 +1359,14 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_transport_wlan_checkbutton">
                                 <property name="label" 
translatable="yes">_WLAN</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb"/>
+                                <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -1078,14 +1389,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_port_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Bind to port:</property>
                                       </object>
                                       <packing>
@@ -1100,8 +1413,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1115,6 +1432,7 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_port_detail_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Use Port "0" to only allow outgoing TCP 
connections</property>
                                       </object>
                                       <packing>
@@ -1135,9 +1453,11 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_adv_port_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_adv_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Advertised port:</property>
                                       </object>
                                       <packing>
@@ -1152,8 +1472,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1167,6 +1491,7 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_adv_detail_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
                                       </object>
                                       <packing>
@@ -1186,22 +1511,27 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_test_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label3">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_transport_tcp_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1212,6 +1542,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_tcp_test_success_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
@@ -1224,6 +1555,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_tcp_test_fail_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Test failed!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
@@ -1237,8 +1569,11 @@
                                     <child>
                                       <object class="GtkLabel" id="label5">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">4</property>
                                       </packing>
                                     </child>
@@ -1255,6 +1590,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_tcp_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">TCP</property>
                               </object>
                               <packing>
@@ -1264,14 +1600,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_udp_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_port_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
                                         <property name="label" 
translatable="yes">Bind to port:</property>
                                       </object>
@@ -1287,8 +1625,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1310,14 +1652,17 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_advertised_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_advertised_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Advertised port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -1326,12 +1671,17 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_udp_advertised_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1339,6 +1689,7 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_adv_detail_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
                                       </object>
                                       <packing>
@@ -1359,22 +1710,27 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_test_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label1">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_transport_udp_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1385,6 +1741,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_udp_test_success_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
@@ -1397,6 +1754,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_udp_test_fail_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Test failed!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
@@ -1410,8 +1768,11 @@
                                     <child>
                                       <object class="GtkLabel" id="label2">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">4</property>
                                       </packing>
                                     </child>
@@ -1431,6 +1792,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">UDP</property>
                               </object>
                               <packing>
@@ -1441,14 +1803,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_http_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_http_port_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_http_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="has_tooltip">True</property>
                                         <property name="tooltip_markup">Port 
number that GNUnet&amp;apos;s UDP transport should bind to on the local 
system</property>
                                         <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
@@ -1466,8 +1830,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1489,14 +1857,17 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_http_advertised_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_http_advertised_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Advertised port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -1506,13 +1877,18 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_http_advertised_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1520,6 +1896,7 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_http_adv_detail_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
                                       </object>
                                       <packing>
@@ -1540,22 +1917,27 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_http_test_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label4">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_transport_http_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1566,6 +1948,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_http_test_success_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
@@ -1578,6 +1961,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_http_test_fail_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Test failed!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
@@ -1591,8 +1975,11 @@
                                     <child>
                                       <object class="GtkLabel" id="label6">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">4</property>
                                       </packing>
                                     </child>
@@ -1612,6 +1999,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_http_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">HTTP</property>
                               </object>
                               <packing>
@@ -1622,14 +2010,16 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_https_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_https_port_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_https_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="has_tooltip">True</property>
                                         <property name="tooltip_markup">Port 
number that GNUnet&amp;apos;s UDP transport should bind to on the local 
system</property>
                                         <property name="tooltip_text" 
translatable="yes">Port number that GNUnet's UDP transport should bind to on 
the local system</property>
@@ -1647,8 +2037,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
@@ -1670,14 +2064,17 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_https_advertised_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="spacing">5</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_https_advertised_port_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Advertised port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -1687,13 +2084,18 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">5</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_https_advertised_port_adjustment</property>
                                         <property 
name="numeric">True</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -1701,6 +2103,7 @@
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_https_adv_detail_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">External port visible on our public IP address after 
mappings by NAT/firewalls</property>
                                       </object>
                                       <packing>
@@ -1721,22 +2124,27 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_https_test_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" id="label7">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_transport_https_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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="tooltip_text" 
translatable="yes">Test your network configuration by contacting a public 
gnunet-nat-server and asking it to establish a connection to your system for 
testing.  This test can only work if you are not running your peer at the time 
you run the test.</property>
-                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1747,6 +2155,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_https_test_success_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
@@ -1759,6 +2168,7 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_transport_https_test_fail_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Test failed!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
@@ -1772,8 +2182,11 @@
                                     <child>
                                       <object class="GtkLabel" id="label8">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">4</property>
                                       </packing>
                                     </child>
@@ -1793,6 +2206,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_https_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">HTTPS</property>
                               </object>
                               <packing>
@@ -1803,7 +2217,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_dv_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -1815,6 +2229,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_dv_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">DV</property>
                               </object>
                               <packing>
@@ -1825,13 +2240,15 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_wlan_vbox">
                                 <property name="visible">True</property>
-                                <property 
name="orientation">vertical</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_wlan_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_transport_wlan_interface_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Name of _Monitor Interface</property>
                                         <property 
name="use_underline">True</property>
                                       </object>
@@ -1847,8 +2264,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="max_length">255</property>
-                                        <property 
name="invisible_char">&#x25CF;</property>
+                                        <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1873,6 +2294,7 @@
                             <child type="tab">
                               <object class="GtkLabel" 
id="GNUNET_setup_transport_wlan_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" 
translatable="yes">WLAN</property>
                               </object>
                               <packing>
@@ -1882,6 +2304,8 @@
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1892,6 +2316,7 @@
                 <child type="label">
                   <object class="GtkLabel" 
id="GNUNET_setup_transport_notebook_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" 
translatable="yes">&lt;b&gt;Transport Configuration&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
@@ -1904,6 +2329,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_transport_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" 
translatable="yes">_Transports</property>
                 <property name="use_underline">True</property>
               </object>
@@ -1915,22 +2341,26 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_fs_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_fs_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_fs_migration_hbox">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_fs_migration_from_checkbutton">
                                 <property name="label" 
translatable="yes">Enable unsolicited content transmission from this 
peer</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -1948,6 +2378,7 @@
                             <child>
                               <object class="GtkCheckButton" 
id="GNUNET_setup_fs_migration_to_checkbutton">
                                 <property name="label" 
translatable="yes">Enable caching content at this peer</property>
+                                <property 
name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
@@ -1956,6 +2387,8 @@
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1966,6 +2399,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_fs_options_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;File Sharing Options&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1980,22 +2414,26 @@
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_datastore_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_datastore_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datastore_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_datastore_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_datastore_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Database Backend to use:</property>
                                   </object>
                                   <packing>
@@ -2008,17 +2446,19 @@
                                 <child>
                                   <object class="GtkHButtonBox" 
id="GNUNET_setup_datastore_hbuttonbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property 
name="layout_style">start</property>
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_sqlite_radiobutton">
                                         <property name="label" 
translatable="yes">sqLite</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2029,6 +2469,7 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_mysql_radiobutton">
                                         <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -2036,7 +2477,7 @@
                                         <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2047,13 +2488,14 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datastore_postgres_radiobutton">
                                         <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2071,9 +2513,11 @@
                                 <child>
                                   <object class="GtkVSeparator" 
id="GNUNET_setup_datastore_vseparator">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -2081,6 +2525,7 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datastore_quota_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Quota (bytes):</property>
                                   </object>
                                   <packing>
@@ -2094,8 +2539,12 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_fs_datastore_quota_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -2119,12 +2568,14 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datastore_sqlite_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">No setup required.</property>
                                   </object>
                                 </child>
                                 <child type="tab">
                                   <object class="GtkLabel" 
id="GNUNET_setup_datastore_sqlite_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">sqLite</property>
                                   </object>
                                   <packing>
@@ -2134,13 +2585,15 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datastore_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_database_name_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_database_name_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL database name:</property>
                                           </object>
                                           <packing>
@@ -2154,27 +2607,37 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_database_name_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb"/>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_config_file_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_config_file_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Configuration file:</property>
                                           </object>
                                           <packing>
@@ -2186,23 +2649,30 @@
                                         <child>
                                           <object class="GtkFileChooserButton" 
id="GNUNET_setup_datastore_mysql_config_file_filechooserbutton">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_username_password_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_username_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Username:</property>
                                           </object>
                                           <packing>
@@ -2216,10 +2686,16 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_username_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -2227,6 +2703,7 @@
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_password_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Password:</property>
                                           </object>
                                           <packing>
@@ -2239,25 +2716,35 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_password_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">3</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_hostname_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_hostname_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
                                           </object>
                                           <packing>
@@ -2271,11 +2758,17 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datastore_mysql_hostname_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -2283,6 +2776,7 @@
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_port_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Port:</property>
                                           </object>
                                           <packing>
@@ -2296,11 +2790,15 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_datastore_mysql_port_spinbutton">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                             <property 
name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
                                             <property 
name="numeric">True</property>
-                                            <signal name="value_changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb"/>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2311,6 +2809,8 @@
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2322,43 +2822,56 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datastore_mysql_tab_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">MySQL</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datastore_mysql_tab_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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_setup_datastore_mysql_tab_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_mysql_tab_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datastore_mysql_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datastore_mysql_tab_error_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2371,13 +2884,16 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_datastore_postgres_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datastore_postgres_config_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Configuration:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -2386,11 +2902,17 @@
                                       <object class="GtkEntry" 
id="GNUNET_setup_datastore_postgres_config_entry">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <signal name="changed" 
handler="GNUNET_setup_datastore_postgres_invalidate_cb"/>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" 
handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -2403,43 +2925,56 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datastore_postgres_hbox ">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datastore_postgres_tab_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Postgres</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datastore_postgres_tab_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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_setup_datastore_postgres_tab_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datastore_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datastore_postgres_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datastore_postgres_tab_error_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2451,6 +2986,8 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2461,34 +2998,41 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_datastore_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Configure Datastore (persistent 
storage)&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_datacache_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_datacache_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datacache_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_datacache_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_datacache_label1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Datacache:</property>
                                   </object>
                                   <packing>
@@ -2501,17 +3045,19 @@
                                 <child>
                                   <object class="GtkHButtonBox" 
id="GNUNET_setup_datacache_hbuttonbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property 
name="layout_style">start</property>
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_sqlite_radiobutton">
                                         <property name="label" 
translatable="yes">sqLite</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2522,6 +3068,7 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_mysql_radiobutton">
                                         <property name="label" 
translatable="yes">MySQL</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
@@ -2529,7 +3076,7 @@
                                         <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2540,13 +3087,14 @@
                                     <child>
                                       <object class="GtkRadioButton" 
id="GNUNET_setup_fs_datacache_postgres_radiobutton">
                                         <property name="label" 
translatable="yes">Postgres</property>
+                                        <property 
name="use_action_appearance">False</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
-                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb"/>
+                                        <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -2564,9 +3112,11 @@
                                 <child>
                                   <object class="GtkVSeparator" 
id="GNUNET_setup_datacache_vseparator">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -2574,6 +3124,7 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_quota_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Quota (bytes):</property>
                                   </object>
                                   <packing>
@@ -2587,8 +3138,12 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_fs_datacache_quota_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x2022;</property>
+                                    <property 
name="invisible_char">•</property>
                                     <property 
name="invisible_char_set">True</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property>
                                     <property name="numeric">True</property>
                                   </object>
@@ -2612,12 +3167,14 @@
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_sqlite_body_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">No setup required.</property>
                                   </object>
                                 </child>
                                 <child type="tab">
                                   <object class="GtkLabel" 
id="GNUNET_setup_fs_datacache_sqlite_tab_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">sqLite</property>
                                   </object>
                                   <packing>
@@ -2627,13 +3184,15 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datacache_mysql_vbox">
                                     <property name="visible">True</property>
-                                    <property 
name="orientation">vertical</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_database_name_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_database_name_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL database name:</property>
                                           </object>
                                           <packing>
@@ -2647,27 +3206,37 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_database_name_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">gnunet</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_config_file_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_config_file_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Configuration file:</property>
                                           </object>
                                           <packing>
@@ -2679,24 +3248,31 @@
                                         <child>
                                           <object class="GtkFileChooserButton" 
id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
                                             <property 
name="visible">True</property>
-                                            <signal name="file_set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <property 
name="can_focus">False</property>
+                                            <signal name="file-set" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_username_password_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_username_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Username:</property>
                                           </object>
                                           <packing>
@@ -2710,11 +3286,17 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_username_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -2722,6 +3304,7 @@
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_password_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Password:</property>
                                           </object>
                                           <packing>
@@ -2734,26 +3317,36 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_password_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">3</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_hostname_hbox">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_hostname_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">MySQL Server Hostname:</property>
                                           </object>
                                           <packing>
@@ -2767,12 +3360,18 @@
                                           <object class="GtkEntry" 
id="GNUNET_setup_datacache_mysql_hostname_entry">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property name="text" 
translatable="yes">localhost</property>
                                             <property 
name="invisible_char_set">True</property>
-                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
+                                            <signal name="changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
                                             <property 
name="padding">5</property>
                                             <property 
name="position">1</property>
                                           </packing>
@@ -2780,6 +3379,7 @@
                                         <child>
                                           <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_port_label">
                                             <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
                                             <property name="label" 
translatable="yes">Port:</property>
                                           </object>
                                           <packing>
@@ -2793,11 +3393,15 @@
                                           <object class="GtkSpinButton" 
id="GNUNET_setup_datacache_mysql_port_spinbutton">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
-                                            <property 
name="invisible_char">&#x2022;</property>
+                                            <property 
name="invisible_char">•</property>
                                             <property 
name="invisible_char_set">True</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                            <property 
name="primary_icon_sensitive">True</property>
+                                            <property 
name="secondary_icon_sensitive">True</property>
                                             <property 
name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
                                             <property 
name="numeric">True</property>
-                                            <signal name="value_changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb"/>
+                                            <signal name="value-changed" 
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2808,6 +3412,8 @@
                                         </child>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2819,44 +3425,56 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_tab_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_mysql_tab_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">MySQL</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datacache_mysql_tab_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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_setup_datacache_mysql_tab_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datacache_mysql_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datacache_mysql_tab_error_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2869,13 +3487,16 @@
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_datacache_postgres_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_postgres_config_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Configuration:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
@@ -2884,11 +3505,17 @@
                                       <object class="GtkEntry" 
id="GNUNET_setup_datacache_postgres_config_entry">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
-                                        <property 
name="invisible_char">&#x2022;</property>
+                                        <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
-                                        <signal name="changed" 
handler="GNUNET_setup_datacache_postgres_invalidate_cb"/>
+                                        <property 
name="primary_icon_activatable">False</property>
+                                        <property 
name="secondary_icon_activatable">False</property>
+                                        <property 
name="primary_icon_sensitive">True</property>
+                                        <property 
name="secondary_icon_sensitive">True</property>
+                                        <signal name="changed" 
handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -2902,43 +3529,56 @@
                                 <child type="tab">
                                   <object class="GtkHBox" 
id="GNUNET_setup_datacache_postgres_tab_hbox">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_postgres_tab_label">
                                         <property 
name="visible">True</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="label" 
translatable="yes">Postgres</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" 
id="GNUNET_setup_datacache_postgres_tab_test_button">
                                         <property name="label" 
translatable="yes">Test configuration</property>
+                                        <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_setup_datacache_postgres_tab_test_button_clicked_cb"/>
+                                        <signal name="clicked" 
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb" 
swapped="no"/>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datacache_postgres_tab_ok_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration works!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" 
id="GNUNET_setup_datacache_postgres_tab_error_image">
+                                        <property 
name="can_focus">False</property>
                                         <property name="tooltip_text" 
translatable="yes">Configuration error!</property>
                                         <property 
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2951,6 +3591,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -2961,12 +3602,15 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_datacache_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Configure Datacache (temporary 
storage)&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -2978,6 +3622,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_fs_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_File 
Sharing</property>
                 <property name="use_underline">True</property>
               </object>
@@ -2989,26 +3634,30 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_pt_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_pt_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="GNUNET_setup_pt_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_pt_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv4_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel IPv4 Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3025,6 +3674,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_ipv6_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel IPv6 Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3041,6 +3691,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_pt_dns_checkbutton">
                                     <property name="label" 
translatable="yes">Tunnel DNS Traffic</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3069,6 +3720,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="GNUNET_setup_pt_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;Protocol Translation and Tunneling 
Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3084,26 +3736,31 @@
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_vpn_interface_configuration_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_vpn_interface_configuration_frame_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="GNUNET_setup_vpn__vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_interface_hbox">
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">_Interface name:</property>
                                     <property 
name="use_underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3113,29 +3770,38 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Name of the TUN interface GNUnet will create for 
intercepting outgoing Internet traffic from your machine.  The default 
"gnunet-vpn" is almost always fine.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_interface_v4_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v4_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv4 address for interface:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3144,20 +3810,27 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v4_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v4_slash_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3165,29 +3838,38 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_interface_v6_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v6_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv6 address for interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3196,20 +3878,27 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_vpn_interface_v6_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_v6_slash_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3217,17 +3906,23 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_vpn_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_vpn_interface_mask_adjustment</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -3238,6 +3933,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_vpn_interface_configuration_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;VPN 
Interface Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3245,6 +3941,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
@@ -3257,6 +3954,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_vpn_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Configuration 
of the GNUnet VPN and the Protocol Translation (6to4, 4to6, 6over4, 4over6) 
facilities</property>
                 <property name="label" translatable="yes">_VPN</property>
                 <property name="use_underline">True</property>
@@ -3269,26 +3967,30 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_exit_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_exit_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" 
id="GNUNET_setup_exit_frame_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_exit_frame_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_master_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_dns_enable_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable DNS Exit</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3297,6 +3999,7 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3304,6 +4007,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_exit_enable_ipv4_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable IPv4 Exit</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3313,6 +4017,7 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -3320,6 +4025,7 @@
                                 <child>
                                   <object class="GtkCheckButton" 
id="GNUNET_setup_exit_enable_ipv6_exit_checkbutton">
                                     <property name="label" 
translatable="yes">Enable IPv6 Exit</property>
+                                    <property 
name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
@@ -3329,6 +4035,7 @@
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -3336,6 +4043,7 @@
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">0</property>
                               </packing>
@@ -3343,13 +4051,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_dns_resolver_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_dns_resolver_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IP Address of external DNS Resolver:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3358,30 +4069,39 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_dns_resolver_ip_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_frame_hbox">
+                                <property name="can_focus">False</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_exit_interface_name_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Exit interface name: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3391,7 +4111,11 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Name of the TUN interface GNUnet will create for Internet 
traffic exiting GNUnet via your machine.  The default "gnunet-exit" is almost 
always fine.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3410,13 +4134,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_ipv4_address_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_exit_ipv4_address_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv4 address for Exit interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3426,20 +4153,27 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">Use a private IPv4 network here that does not conflict with 
your existing setup (i.e. something like 10.53.0.1/255.255.0.0 or 
192.168.0.1/255.255.0.0).  </property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_exit_ipv4_address_slash_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3447,16 +4181,22 @@
                                   <object class="GtkEntry" 
id="GNUNET_setup_exit_interface_v4_mask_entry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">3</property>
                               </packing>
@@ -3464,13 +4204,16 @@
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_ipv6_address_hbox">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_exit_ipv6_address_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">IPv6 address for Exit interface: </property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -3480,20 +4223,27 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="tooltip_text" 
translatable="yes">This should be a globally routed IPv6 subnet of your host.  
Alternatively, if your kernel supports IPv6-NAT, you can pick any site-local 
prefix and manually configure IPv6-NAT.</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" 
id="GNUNET_setup_exit_ipv6_address_slash_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">/</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3501,17 +4251,23 @@
                                   <object class="GtkSpinButton" 
id="GNUNET_setup_exit_interface_v6_mask_spinbutton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
+                                    <property 
name="invisible_char">●</property>
+                                    <property 
name="primary_icon_activatable">False</property>
+                                    <property 
name="secondary_icon_activatable">False</property>
+                                    <property 
name="primary_icon_sensitive">True</property>
+                                    <property 
name="secondary_icon_sensitive">True</property>
                                     <property 
name="adjustment">GNUNET_setup_exit_interface_mask_adjustment</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">4</property>
                               </packing>
                             </child>
@@ -3522,6 +4278,7 @@
                     <child type="label">
                       <object class="GtkLabel" 
id="GNUNET_setup_exit_frame_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" 
translatable="yes">&lt;b&gt;GNUnet Exit Configuration&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -3529,6 +4286,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">0</property>
                   </packing>
@@ -3541,6 +4299,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_exit_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Exit</property>
                 <property name="use_underline">True</property>
               </object>
@@ -3551,50 +4310,27 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_setup_gns_vbox">
-                <property name="orientation">vertical</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkFrame" id="GNUNET_setup_gns_basics_frame">
+                  <object class="GtkFrame" id="GNUNET_setup_gns_key_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" 
id="GNUNET_setup_gns_basics_alignment">
+                      <object class="GtkAlignment" 
id="GNUNET_setup_gns_key_alignment">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVBox" 
id="GNUNET_setup_gns_basics_vbox">
+                          <object class="GtkHBox" 
id="GNUNET_setup_gns_pseu_hbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_hbox">
+                              <object class="GtkLabel" 
id="GNUNET_setup_gns_pseu_label">
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_preferred_name_label">
-                                    <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">_Preferred Name:</property>
-                                    <property 
name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" 
id="GNUNET_setup_gns_basics_preferred_name_entry">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="max_length">63</property>
-                                    <property 
name="invisible_char">&#x25CF;</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">False</property>
+                                <property name="label" 
translatable="yes">Preferred zone name (PSEU):</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3604,46 +4340,16 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_identity_hbox">
+                              <object class="GtkEntry" 
id="GNUNET_setup_gns_pseu_entry">
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_identity_label">
-                                    <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">Cryptographic Identity:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_identity_value_label">
-                                    <property name="visible">True</property>
-                                    <property name="label">---set 
dynamically---</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" 
id="GNUNET_setup_gns_basics_copy_id_button">
-                                    <property name="label">gtk-copy</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">True</property>
-                                    <property name="use_stock">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="max_length">63</property>
+                                <property name="invisible_char">●</property>
+                                <property 
name="invisible_char_set">True</property>
+                                <property 
name="primary_icon_activatable">False</property>
+                                <property 
name="secondary_icon_activatable">False</property>
+                                <property 
name="primary_icon_sensitive">True</property>
+                                <property 
name="secondary_icon_sensitive">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -3652,14 +4358,72 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkButton" 
id="GNUNET_setup_gns_public_key_copy_button">
+                                <property name="label">gtk-copy</property>
+                                <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="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkVSeparator" id="vseparator3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage" 
id="GNUNET_setup_gns_qr_image">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="tooltip_text" 
translatable="yes">QR code for the selected zone</property>
+                                <property 
name="stock">gtk-missing-image</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" 
id="GNUNET_setup_gns_qr_saveas_button">
+                                <property name="label">gtk-save-as</property>
+                                <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="tooltip_text" 
translatable="yes">Save QR code to file</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child type="label">
-                      <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_label">
+                      <object class="GtkLabel" id="GNUNET_GNS_GTK_zone_label">
                         <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;SET 
TO PUBLIC KEY OF THE ZONE&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
@@ -3672,113 +4436,116 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" 
id="GNUNET_setup_gns_configuration_frame">
+                  <object class="GtkScrolledWindow" 
id="GNUNET_setup_gns_main_scrolledwindow">
                     <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">automatic</property>
+                    <property name="vscrollbar_policy">automatic</property>
                     <child>
-                      <object class="GtkAlignment" 
id="GNUNET_setup_gns_configuration_frame_alignment">
+                      <object class="GtkTreeView" 
id="GNUNET_setup_gns_main_treeview">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
+                        <property name="can_focus">True</property>
+                        <property name="model"></property>
+                        <property name="search_column">0</property>
                         <child>
-                          <object class="GtkScrolledWindow" 
id="GNUNET_setup_gns_scrolledwindow">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">never</property>
-                            <property name="shadow_type">in</property>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_name_treeviewcolumn">
+                            <property name="title">Name</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="GtkViewport" 
id="GNUNET_setup_gns_viewport">
-                                <property name="visible">True</property>
-                                <property name="resize_mode">queue</property>
-                                <child>
-                                  <object class="GtkTreeView" 
id="GNUNET_setup_gns_treeview">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="model">GNUNET_setup_gns_liststore</property>
-                                    <property 
name="headers_clickable">False</property>
-                                    <property name="search_column">0</property>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_name_treeviewcolumn">
-                                        <property 
name="sizing">autosize</property>
-                                        <property 
name="title">Hostname</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_setup_gns_name_cellrenderertext">
-                                            <property 
name="editable">True</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute 
name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_type_treeviewcolumn">
-                                        <property 
name="sizing">autosize</property>
-                                        <property name="title">Type</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_type_cellrenderertext">
-                                            <property 
name="editable">True</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute 
name="text">4</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_ttl_treeviewcolumn">
-                                        <property 
name="sizing">autosize</property>
-                                        <property name="title">TTL</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_ttl_cellrenderertext">
-                                            <property 
name="editable">True</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute 
name="text">1</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_value_treeviewcolumn">
-                                        <property 
name="resizable">True</property>
-                                        <property name="title">Value</property>
-                                        <property 
name="clickable">True</property>
-                                        <property 
name="reorderable">True</property>
-                                        <property 
name="sort_indicator">True</property>
-                                        <property 
name="sort_column_id">2</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_value_cellrenderertext">
-                                            <property 
name="editable">True</property>
-                                          </object>
-                                          <attributes>
-                                            <attribute 
name="text">3</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_name_cellrenderertext"/>
+                              <attributes>
+                                <attribute name="visible">9</attribute>
+                                <attribute name="background">13</attribute>
+                                <attribute name="editable">9</attribute>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_ispublic_treeviewcolumn">
+                            <property name="sizing">fixed</property>
+                            <property name="fixed_width">50</property>
+                            <property name="title">Public</property>
+                            <property name="clickable">True</property>
+                            <child>
+                              <object class="GtkCellRendererToggle" 
id="GNUNET_setup_gns_ispublic_cellrenderertoggle"/>
+                              <attributes>
+                                <attribute name="visible">10</attribute>
+                                <attribute name="active">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_type_treeviewcolumn">
+                            <property name="sizing">autosize</property>
+                            <property name="fixed_width">90</property>
+                            <property name="title">Type</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererCombo" 
id="GNUNET_setup_gns_type_cellrenderercombo">
+                                <property name="editable">True</property>
+                                <property name="model"></property>
+                                <property name="text_column">1</property>
                               </object>
+                              <attributes>
+                                <attribute name="visible">11</attribute>
+                                <attribute name="text">3</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_expiration_treeviewcolumn">
+                            <property name="title">Expiration</property>
+                            <property name="clickable">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_indicator">True</property>
+                            <property name="sort_column_id">4</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_expiration_cellrenderertext">
+                                <property name="editable">True</property>
+                              </object>
+                              <attributes>
+                                <attribute name="visible">10</attribute>
+                                <attribute name="background">12</attribute>
+                                <attribute name="text">6</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="GNUNET_setup_gns_value_treeviewcolumn">
+                            <property name="sizing">autosize</property>
+                            <property name="title">Value</property>
+                            <property name="expand">True</property>
+                            <property name="clickable">True</property>
+                            <property name="sort_column_id">7</property>
+                            <child>
+                              <object class="GtkCellRendererText" 
id="GNUNET_setup_gns_value_cellrenderertext">
+                                <property name="editable">True</property>
+                              </object>
+                              <attributes>
+                                <attribute name="visible">10</attribute>
+                                <attribute name="background">8</attribute>
+                                <attribute name="text">7</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
-                    <child type="label">
-                      <object class="GtkLabel" 
id="GNUNET_setup_gns_configuration_frame_label">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;GNS 
Database&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
                   </object>
                   <packing>
-                    <property name="padding">5</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -3791,6 +4558,7 @@
             <child type="tab">
               <object class="GtkLabel" id="GNUNET_setup_gns_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">GN_S</property>
                 <property name="use_underline">True</property>
               </object>
@@ -3802,12 +4570,14 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLinkButton" id="GNUNET_setup_help_text">
             <property name="label" translatable="yes">Welcome to 
gnunet-setup.</property>
+            <property name="use_action_appearance">False</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -3817,58 +4587,10 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="GNUNET_setup_dialog-action_area">
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_save_as_button">
-                <property name="label">gtk-save-as</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="GNUNET_setup_save_button">
-                <property name="label">gtk-save</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -3877,112 +4599,113 @@
       <action-widget response="-3">GNUNET_setup_save_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_exit_interface_mask_adjustment">
-    <property name="value">48</property>
+  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
     <property name="lower">1</property>
-    <property name="upper">127</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
-    <property name="value">3306</property>
-    <property name="lower">1</property>
     <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datacache_quota_adjustment">
-    <property name="value">1024000</property>
-    <property name="lower">65536</property>
-    <property name="upper">9999999999</property>
-    <property name="step_increment">65536</property>
-    <property name="page_increment">1024000</property>
-  </object>
-  <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
     <property name="value">3306</property>
-    <property name="lower">1</property>
-    <property name="upper">65535</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_fs_datastore_quota_adjustment">
-    <property name="value">100000000</property>
     <property name="lower">1000000</property>
     <property name="upper">999999999999</property>
+    <property name="value">100000000</property>
     <property name="step_increment">1000000</property>
     <property name="page_increment">1000000000</property>
   </object>
+  <object class="GtkListStore" id="GNUNET_setup_gns_liststore">
+    <columns>
+      <!-- column-name hostname -->
+      <column type="gchararray"/>
+      <!-- column-name sourceport -->
+      <column type="guint"/>
+      <!-- column-name targetport -->
+      <column type="guint"/>
+      <!-- column-name targethostname -->
+      <column type="gchararray"/>
+      <!-- column-name isudp -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_hostlist_server_port_adjustment">
-    <property name="value">8080</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">8080</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+    <columns>
+      <!-- column-name url -->
+      <column type="gchararray"/>
+      <!-- column-name editable -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
   <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
     <property name="upper">9999</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_http_advertised_port_adjustment">
-    <property name="value">1080</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">1080</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_http_port_adjustment">
-    <property name="value">1080</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">1080</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_https_advertised_port_adjustment">
-    <property name="value">443</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">443</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_https_port_adjustment">
-    <property name="value">443</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">443</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_tcp_adv_port_adjustment">
-    <property name="value">2086</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">2086</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_tcp_port_adjustment">
+    <property name="upper">65535</property>
     <property name="value">2086</property>
-    <property name="upper">65535</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_udp_advertised_port_adjustment">
-    <property name="value">2086</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">2086</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_transport_udp_port_adjustment">
-    <property name="value">2086</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">2086</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" 
id="GNUNET_setup_vpn_interface_mask_adjustment">
-    <property name="value">48</property>
     <property name="lower">1</property>
     <property name="upper">127</property>
+    <property name="value">48</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]