gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r20832 - in gnunet-gtk: contrib src/setup


From: gnunet
Subject: [GNUnet-SVN] r20832 - in gnunet-gtk: contrib src/setup
Date: Sun, 1 Apr 2012 12:30:35 +0200

Author: grothoff
Date: 2012-04-01 12:30:35 +0200 (Sun, 01 Apr 2012)
New Revision: 20832

Modified:
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
   gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
-cleaning up gnunet-setup GNS-related functions...

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-04-01 
10:07:04 UTC (rev 20831)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-04-01 
10:30:35 UTC (rev 20832)
@@ -42,8 +42,6 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">gnunet-setup</property>
     <property name="window_position">center</property>
-    <property name="default_width">800</property>
-    <property name="default_height">550</property>
     <property name="icon_name">preferences-system</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/>
@@ -59,6 +57,7 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_general_vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" 
id="GNUNET_setup_defaultservices_frame">
                     <property name="visible">True</property>
@@ -381,6 +380,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_server_vbox">
                                     <property name="visible">True</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_hostlist_offer_hostlist_checkbutton">
                                         <property name="label" 
translatable="yes">Run Hostlist Server</property>
@@ -463,6 +463,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_hostlist_vbox ">
                                     <property name="visible">True</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkLabel" 
id="GNUNET_setup_hostlist_url_label">
                                         <property 
name="visible">True</property>
@@ -560,6 +561,7 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame">
                     <property name="visible">True</property>
@@ -572,6 +574,7 @@
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_bandwidth_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_bandwidth_hbox">
                                 <property name="visible">True</property>
@@ -661,6 +664,7 @@
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_transport_nat_hbox">
                                 <property name="visible">True</property>
@@ -741,6 +745,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_transport_nat_options_vbox">
                                     <property name="visible">True</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="GNUNET_setup_transport_hole_punched_checkbutton">
                                         <property name="label" 
translatable="yes">NAT ports have been opened manually</property>
@@ -932,6 +937,7 @@
                     <child>
                       <object class="GtkVBox" 
id="GNUNET_setup_transport_main_vbox">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkHBox" 
id="GNUNET_setup_transport_plugins_hbox">
@@ -1072,6 +1078,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_tcp_port_hbox">
@@ -1257,6 +1264,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_udp_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_udp_port_hbox">
                                     <property name="visible">True</property>
@@ -1433,6 +1441,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_http_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_http_port_hbox">
                                     <property name="visible">True</property>
@@ -1613,6 +1622,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_https_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_https_port_hbox">
                                     <property name="visible">True</property>
@@ -1793,6 +1803,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_dv_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -1814,6 +1825,7 @@
                             <child>
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_wlan_vbox">
                                 <property name="visible">True</property>
+                                <property 
name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" 
id="GNUNET_setup_transport_wlan_hbox">
                                     <property name="visible">True</property>
@@ -1903,6 +1915,7 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_fs_frame">
                     <property name="visible">True</property>
@@ -1976,6 +1989,7 @@
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datastore_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_datastore_hbox">
                                 <property name="visible">True</property>
@@ -2120,6 +2134,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datastore_mysql_vbox">
                                     <property name="visible">True</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datastore_mysql_database_name_hbox">
                                         <property 
name="visible">True</property>
@@ -2467,6 +2482,7 @@
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_datacache_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_datacache_hbox">
                                 <property name="visible">True</property>
@@ -2611,6 +2627,7 @@
                                 <child>
                                   <object class="GtkVBox" 
id="GNUNET_setup_datacache_mysql_vbox">
                                     <property name="visible">True</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkHBox" 
id="GNUNET_setup_datacache_mysql_database_name_hbox">
                                         <property 
name="visible">True</property>
@@ -2972,6 +2989,7 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_pt_frame">
                     <property name="visible">True</property>
@@ -2984,6 +3002,7 @@
                         <child>
                           <object class="GtkVBox" id="GNUNET_setup_pt_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_pt_hbox">
                                 <property name="visible">True</property>
@@ -3074,6 +3093,7 @@
                         <child>
                           <object class="GtkVBox" id="GNUNET_setup_vpn__vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_vpn_interface_hbox">
                                 <child>
@@ -3249,6 +3269,7 @@
             <child>
               <object class="GtkVBox" id="GNUNET_setup_exit_vbox">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="GNUNET_setup_exit_frame">
                     <property name="visible">True</property>
@@ -3261,6 +3282,7 @@
                         <child>
                           <object class="GtkVBox" 
id="GNUNET_setup_exit_frame_vbox">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" 
id="GNUNET_setup_exit_master_hbox">
                                 <property name="visible">True</property>
@@ -3528,53 +3550,29 @@
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="GNUNET_SETUP_gns_vbox">
+              <object class="GtkVBox" id="GNUNET_setup_gns_vbox">
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkVBox" id="vbox1">
+                  <object class="GtkFrame" id="GNUNET_setup_gns_basics_frame">
                     <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" 
id="GNUNET_setup_gns_basics_frame">
+                      <object class="GtkAlignment" 
id="GNUNET_setup_gns_basics_alignment">
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkAlignment" 
id="GNUNET_setup_gns_basics_alignment">
+                          <object class="GtkVBox" 
id="GNUNET_setup_gns_basics_vbox">
                             <property name="visible">True</property>
-                            <property name="left_padding">12</property>
+                            <property name="orientation">vertical</property>
                             <child>
-                              <object class="GtkVBox" 
id="GNUNET_setup_gns_basics_vbox">
+                              <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_hbox">
                                 <property name="visible">True</property>
                                 <child>
-                                  <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_hbox">
+                                  <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_preferred_name_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="tooltip_text" 
translatable="yes">This is the name you use for your own domain and the name 
that you would prefer others to use for you.  Picking a unique name is a good 
idea so that others will actually be able to use your unique name to reference 
your domain.</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="label" 
translatable="yes">_Preferred Name:</property>
+                                    <property 
name="use_underline">True</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3584,47 +3582,11 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" 
id="GNUNET_setup_gns_basics_identity_hbox">
+                                  <object class="GtkEntry" 
id="GNUNET_setup_gns_basics_preferred_name_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="tooltip_text" 
translatable="yes">This will copy the string that represents your cryptographic 
identity (your public key) to the clipboard.  This will allow you to share it 
out-of-band with other users.</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">&#x25CF;</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3634,114 +3596,168 @@
                                   </packing>
                                 </child>
                               </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="GtkHBox" 
id="GNUNET_setup_gns_basics_identity_hbox">
+                                <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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
-                        <child type="label">
-                          <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_label">
-                            <property name="visible">True</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
                       </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 type="label">
+                      <object class="GtkLabel" 
id="GNUNET_setup_gns_basics_label">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </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="GtkFrame" 
id="GNUNET_setup_gns_configuration_frame">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkFrame" 
id="GNUNET_setup_gns_configuration_frame">
+                      <object class="GtkAlignment" 
id="GNUNET_setup_gns_configuration_frame_alignment">
                         <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkAlignment" 
id="GNUNET_setup_gns_configuration_frame_alignment">
+                          <object class="GtkScrolledWindow" 
id="GNUNET_setup_gns_scrolledwindow">
                             <property name="visible">True</property>
-                            <property name="left_padding">12</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkScrolledWindow" 
id="GNUNET_setup_gns_scrolledwindow">
+                              <object class="GtkViewport" 
id="GNUNET_setup_gns_viewport">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="hscrollbar_policy">never</property>
-                                <property name="shadow_type">in</property>
+                                <property name="resize_mode">queue</property>
                                 <child>
-                                  <object class="GtkViewport" 
id="GNUNET_setup_gns_viewport">
+                                  <object class="GtkTreeView" 
id="GNUNET_setup_gns_treeview">
                                     <property name="visible">True</property>
-                                    <property 
name="resize_mode">queue</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="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>
+                                      <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="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 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="GtkTreeViewColumn" 
id="GNUNET_setup_gns_type_treeviewcolumn">
-                                            <property 
name="resizable">True</property>
-                                            <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 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="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 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="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 class="GtkCellRendererText" 
id="GNUNET_setup_gns_value_cellrenderertext">
+                                            <property 
name="editable">True</property>
                                           </object>
+                                          <attributes>
+                                            <attribute 
name="text">3</attribute>
+                                          </attributes>
                                         </child>
                                       </object>
                                     </child>
@@ -3751,31 +3767,29 @@
                             </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="position">1</property>
-                      </packing>
                     </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="position">0</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="position">6</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="GNUNET_SETUP_gns_label">
+              <object class="GtkLabel" id="GNUNET_setup_gns_label">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">GN_S</property>
                 <property name="use_underline">True</property>

Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2012-04-01 10:07:04 UTC (rev 
20831)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2012-04-01 10:30:35 UTC (rev 
20832)
@@ -1410,7 +1410,6 @@
 };
 
 
-
 /**
  * Hide "fs tab" if FS not active.
  */
@@ -1420,7 +1419,6 @@
 };
 
 
-
 /**
  * Hide "vpn tab" if VPN not active.
  */
@@ -1430,7 +1428,15 @@
 };
 
 
+/**
+ * Hide "gns tab" if GNS not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tab[] = {
+  {"GNUNET_setup_gns_vbox", "(^| )gns($| )", NULL},
+  {NULL, NULL, NULL}
+};
 
+
 /**
  * Hide "tcp tab" if TCP not active.
  */
@@ -2535,9 +2541,21 @@
    NULL, NULL,
    NULL},
 
-  /* DNS treeview */
+  /* GNS treeview */
 
   {
+   "GNUNET_setup_general_services_gns_checkbutton",
+   "toggled",
+   "arm",
+   "DEFAULTSERVICES",
+   gettext_noop ("Should the GNS be started automatically on startup?"),
+   "https://gnunet.org/configuration-gns";,
+   &load_option_list,
+   &save_option_list, "gns",
+   NULL, NULL,
+   hide_gns_tab},
+
+  {
    "GNUNET_setup_gns_treeview",
    NULL,
    NULL,




reply via email to

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