gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r15894 - gnunet-setup/contrib


From: gnunet
Subject: [GNUnet-SVN] r15894 - gnunet-setup/contrib
Date: Fri, 8 Jul 2011 15:33:04 +0200

Author: grothoff
Date: 2011-07-08 15:33:03 +0200 (Fri, 08 Jul 2011)
New Revision: 15894

Modified:
   gnunet-setup/contrib/gnunet-setup.glade
Log:
gui updates

Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade     2011-07-08 12:06:31 UTC (rev 
15893)
+++ gnunet-setup/contrib/gnunet-setup.glade     2011-07-08 13:33:03 UTC (rev 
15894)
@@ -28,7 +28,6 @@
       <object class="GtkBox" id="GNUNET_setup_dialog-vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="GNUNET_setup_dialog-action_area">
@@ -726,6 +725,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">Check this box if your machine is behind a NAT box (router 
that performs network address translation).  Leave off if your machine has a 
globally unique IPv4 address.  NAT options only impact IPv4 addresses at this 
time.</property>
                                     <property 
name="use_action_appearance">False</property>
                                     <property 
name="use_underline">True</property>
                                     <property name="xalign">0</property>
@@ -760,6 +760,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">Disable advertising IPv6 addresses. Check this box if you 
know that your system has no IPv6 Internet connectivity.</property>
                                     <property 
name="use_action_appearance">False</property>
                                     <property 
name="use_underline">True</property>
                                     <property name="xalign">0</property>
@@ -807,6 +808,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">Set this option if you have configured your NAT to forward 
the ports for the various enabled GNUnet transports.  If the external ports are 
different, the respective values of the external port should be specified under 
"advertised port" for the respective transport. You also need to specify the 
"External (public) IPv4 address" of your NAT box below.</property>
                                         <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
@@ -823,6 +825,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This option enables the use of upnpc from miniupnpd for NAT 
traversal</property>
                                         <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
@@ -839,6 +842,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This option enables the use of the "Autonomous NAT 
Traversal" method (presented at P2P 2010).  It requires 
gnunet-helper-nat-server to be installed SUID on the local system.</property>
                                         <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
@@ -857,6 +861,7 @@
                                           <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>
                                           <packing>
@@ -894,6 +899,7 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
+                                        <property name="tooltip_text" 
translatable="yes">This method allows this peer to initiate connections to 
NATed peers using the 'Autonomous NAT traversal' method (presented at P2P 
2010). It requires having gnunet-helper-nat-client installed SUID on the local 
system.</property>
                                         <property 
name="use_action_appearance">False</property>
                                         <property name="xalign">0</property>
                                         <property name="active">True</property>
@@ -913,6 +919,7 @@
                                           <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>
                                           <packing>
@@ -1160,6 +1167,7 @@
                               <object class="GtkVBox" 
id="GNUNET_setup_transport_tcp_vbox">
                                 <property name="visible">True</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>
@@ -1181,13 +1189,16 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_tcp_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
                                         <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
+                                        <property 
name="numeric">True</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>
@@ -1233,6 +1244,7 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_tcp_adv_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
                                         <property 
name="invisible_char">●</property>
                                         <property 
name="invisible_char_set">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
@@ -1254,6 +1266,7 @@
                                       <packing>
                                         <property 
name="expand">False</property>
                                         <property name="fill">False</property>
+                                        <property name="padding">10</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
@@ -1360,11 +1373,13 @@
                                   <object class="GtkHBox" id="hbox5">
                                     <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="label" 
translatable="yes">Port:</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>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1377,113 +1392,163 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_udp_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
                                         <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
+                                        <property 
name="numeric">True</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>
+                                    <child>
+                                      <placeholder/>
+                                    </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="GtkVBox" 
id="GNUNET_setup_transport_udp_test_vbox">
+                                  <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="GtkHBox" 
id="GNUNET_setup_transport_udp_test_hbox">
+                                      <object class="GtkLabel" 
id="GNUNET_setup_transport_udp_advertised_port_label">
                                         <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="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="receives_default">True</property>
-                                            <property 
name="use_action_appearance">False</property>
-                                            <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb" swapped="no"/>
-                                          </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">False</property>
-                                            <property 
name="padding">5</property>
-                                            <property 
name="position">1</property>
-                                          </packing>
-                                        </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="stock">gtk-ok</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="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="stock">gtk-dialog-error</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">False</property>
-                                            <property 
name="padding">5</property>
-                                            <property 
name="position">3</property>
-                                          </packing>
-                                        </child>
-                                        <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>
+                                        <property name="label" 
translatable="yes">Advertised port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
+                                        <property name="fill">True</property>
                                         <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <placeholder/>
+                                      <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">●</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>
                                     </child>
+                                    <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>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="padding">5</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
+                                <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="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_udp_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </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="stock">gtk-ok</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="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="stock">gtk-dialog-error</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <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>
+                                  </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>
+                                  <placeholder/>
+                                </child>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -1505,14 +1570,18 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox6">
+                                  <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="label" 
translatable="yes">Port:</property>
+                                        <property 
name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" 
translatable="yes">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>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1525,6 +1594,7 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_http_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
                                         <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
@@ -1537,14 +1607,150 @@
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </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_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>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_http_advertised_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">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>
+                                    </child>
+                                    <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>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</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>
+                                <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="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_http_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </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="stock">gtk-ok</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="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="stock">gtk-dialog-error</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <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>
+                                  </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>
                                   <placeholder/>
                                 </child>
                               </object>
@@ -1568,14 +1774,18 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkHBox" id="http_hbox">
+                                  <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="label" 
translatable="yes">Port:</property>
+                                        <property 
name="has_tooltip">True</property>
+                                        <property name="tooltip_markup" 
translatable="yes">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>
+                                        <property name="label" 
translatable="yes">Bind to port:</property>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -1588,24 +1798,163 @@
                                       <object class="GtkSpinButton" 
id="GNUNET_setup_transport_https_port_spinbutton">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
                                         <property 
name="invisible_char">•</property>
                                         <property 
name="invisible_char_set">True</property>
                                         <property 
name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
+                                        <property 
name="numeric">True</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>
+                                    <child>
+                                      <placeholder/>
+                                    </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_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>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSpinButton" 
id="GNUNET_setup_transport_https_advertised_port_spinbutton">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="max_length">5</property>
+                                        <property 
name="invisible_char">●</property>
+                                        <property 
name="invisible_char_set">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>
+                                    </child>
+                                    <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>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">10</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>
+                                <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="visible">True</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property 
name="use_action_appearance">False</property>
+                                        <signal name="clicked" 
handler="GNUNET_setup_transport_https_test_button_clicked_cb" swapped="no"/>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </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="stock">gtk-ok</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="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="stock">gtk-dialog-error</property>
+                                      </object>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="padding">5</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <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>
+                                  </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>
                                   <placeholder/>
                                 </child>
                               </object>
@@ -3743,6 +4092,13 @@
     <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="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="lower">1</property>
     <property name="upper">65535</property>
@@ -3750,6 +4106,13 @@
     <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="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="lower">1</property>
     <property name="upper">65535</property>
@@ -3770,6 +4133,13 @@
     <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="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="lower">1</property>
     <property name="upper">65535</property>




reply via email to

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