[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19314 - gnunet-gtk/contrib
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19314 - gnunet-gtk/contrib |
|
Date: |
Sun, 22 Jan 2012 20:42:43 +0100 |
Author: grothoff
Date: 2012-01-22 20:42:43 +0100 (Sun, 22 Jan 2012)
New Revision: 19314
Modified:
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
Log:
-work on glade file for gnunet-setup to match new VPN/PT design and options
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-01-22
12:39:57 UTC (rev 19313)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-01-22
19:42:43 UTC (rev 19314)
@@ -24,7 +24,7 @@
<column type="gboolean"/>
</columns>
</object>
- <object class="GtkListStore" id="vpn_dns_config_liststore">
+ <object class="GtkListStore" id="GNUNET_setup_gns_liststore">
<columns>
<!-- column-name hostname -->
<column type="gchararray"/>
@@ -91,6 +91,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">The topology subsystem is required as it ensures that your
peer connects to other peers.</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -108,6 +109,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Hostlist servers are used to find other peers. Here you can
choose to offer a hostlist or simply configure which hostlists by other peers
you want to use.</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -125,6 +127,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Enable GNUnet's file-sharing subsystem.</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -138,20 +141,55 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="GNUNET_setup_general_services_vpn_checkbutton">
- <property name="label"
translatable="yes">_VPN</property>
+ <object class="GtkCheckButton"
id="GNUNET_setup_general_services_exit_checkbutton">
+ <property name="label"
translatable="yes">EXIT</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">By offering an EXIT service, you can allow other peers to
use your Internet connection to reach the IPv4 and/or IPv6 Internet.
Naturally, as your machine will be seen as the origin of the traffic, this
might be risky in some jurisdictions. Enabling the exit for IPv4 and IPv6 and
PT/VPN interception for IPv4 and IPv6 on the same machine will still give you
4to6 and 6to4 protocol translation, allowing you to access IPv4-only servers
from IPv6-only clients and IPv6-only servers from IPv4-only clients.</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="padding">5</property>
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_general_services_pt_checkbutton">
+ <property name="label"
translatable="yes">PT/VPN</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet
traffic over GNUnet. This is useful if you want to access the IPv4-Internet if
you only have IPv6-connectivity or vice versa. Furthermore, if you are only
connected to other peers using WLAN, you could also get Internet access in the
first place by routing IP traffic over GNUnet.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_general_services_gns_checkbutton">
+ <property name="label"
translatable="yes">GNS</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">The GNS is GNUnet's replacement for DNS. Enabling this
subsystem will make the ".gnunet" TLD available on your system. You will be in
charge of your ".gnunet" TLD.</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -1006,7 +1044,6 @@
<child>
<object class="GtkCheckButton"
id="GNUNET_setup_transport_dv_checkbutton">
<property name="label"
translatable="yes">D_V</property>
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="use_underline">True</property>
@@ -1179,6 +1216,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Test your network configuration by contacting a public
gnunet-nat-server and asking it to establish a connection to your system for
testing. This test can only work if you are not running your peer at the time
you run the test.</property>
<signal name="clicked"
handler="GNUNET_setup_transport_tcp_test_button_clicked_cb"/>
</object>
<packing>
@@ -1244,7 +1282,7 @@
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox5">
+ <object class="GtkHBox"
id="GNUNET_setup_transport_udp_port_hbox">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
@@ -1279,9 +1317,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1358,6 +1393,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Test your network configuration by contacting a public
gnunet-nat-server and asking it to establish a connection to your system for
testing. This test can only work if you are not running your peer at the time
you run the test.</property>
<signal name="clicked"
handler="GNUNET_setup_transport_udp_test_button_clicked_cb"/>
</object>
<packing>
@@ -1407,9 +1443,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">1</property>
@@ -1467,9 +1500,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1548,6 +1578,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Test your network configuration by contacting a public
gnunet-nat-server and asking it to establish a connection to your system for
testing. This test can only work if you are not running your peer at the time
you run the test.</property>
<signal name="clicked"
handler="GNUNET_setup_transport_http_test_button_clicked_cb"/>
</object>
<packing>
@@ -1597,9 +1628,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">2</property>
@@ -1657,9 +1685,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1738,6 +1763,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Test your network configuration by contacting a public
gnunet-nat-server and asking it to establish a connection to your system for
testing. This test can only work if you are not running your peer at the time
you run the test.</property>
<signal name="clicked"
handler="GNUNET_setup_transport_https_test_button_clicked_cb"/>
</object>
<packing>
@@ -1787,9 +1813,6 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">3</property>
@@ -1830,6 +1853,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>
@@ -1857,6 +1881,8 @@
<property
name="secondary_icon_sensitive">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>
@@ -1864,16 +1890,14 @@
</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>
- <placeholder/>
- </child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child type="tab">
@@ -2144,7 +2168,7 @@
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox13">
+ <object class="GtkHBox"
id="GNUNET_setup_datastore_mysql_database_name_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_database_name_label">
@@ -2180,7 +2204,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox14">
+ <object class="GtkHBox"
id="GNUNET_setup_datastore_mysql_config_file_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_config_file_label">
@@ -2208,7 +2232,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox15">
+ <object class="GtkHBox"
id="GNUNET_setup_datastore_mysql_username_password_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_username_label">
@@ -2267,10 +2291,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox16">
+ <object class="GtkHBox"
id="GNUNET_setup_datastore_mysql_hostname_hbox">
<property
name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup-datastore_mysql_hostname_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_hostname_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL Server Hostname:</property>
</object>
@@ -2633,13 +2657,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_fs_datacache_sqlite_label">
+ <object class="GtkLabel"
id="GNUNET_setup_fs_datacache_sqlite_body_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">No setup required.</property>
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="label4c">
+ <object class="GtkLabel"
id="GNUNET_setup_fs_datacache_sqlite_tab_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">sqLite</property>
</object>
@@ -2652,7 +2676,7 @@
<property name="visible">True</property>
<property
name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox13c">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_database_name_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_database_name_label">
@@ -2688,7 +2712,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox14c">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_config_file_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_config_file_label">
@@ -2717,7 +2741,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox15c">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_username_password_hbox">
<property
name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_username_label">
@@ -2778,10 +2802,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox16c">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_hostname_hbox">
<property
name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup-datacache_mysql_hostname_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_hostname_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL Server Hostname:</property>
</object>
@@ -2850,7 +2874,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkHBox" id="hbox3a">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_tab_hbox">
<property name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_tab_label">
@@ -2935,7 +2959,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkHBox" id="hbox8a">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_postgres_tab_hbox">
<property name="visible">True</property>
<child>
<object class="GtkLabel"
id="GNUNET_setup_datacache_postgres_tab_label">
@@ -3026,25 +3050,115 @@
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkFrame"
id="GNUNET_setup_vpn_master_interface_configuration_frame">
+ <object class="GtkFrame" id="GNUNET_setup_pt_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment"
id="GNUNET_setup_vpn_master_interface_configuration_frame_alignment">
+ <object class="GtkAlignment"
id="GNUNET_setup_pt_alignment">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_vpn_master_vbox">
+ <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_vpn_master_interface_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_pt_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="label18">
+ <object class="GtkCheckButton"
id="GNUNET_setup_pt_ipv4_checkbutton">
+ <property name="label"
translatable="yes">Tunnel IPv4 Traffic</property>
<property name="visible">True</property>
- <property name="label"
translatable="yes">Master _interface name:</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">By enabling this option, all of your IPv4-Internet traffic
will be routed over GNUnet to a GNUnet exit node. Note that this will enable
other GNUnet peers to observe your unencrypted Internet traffic. This enables
4over6 tunneling and 4to6 protocol translation.</property>
+ <property
name="draw_indicator">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="GtkCheckButton"
id="GNUNET_setup_pt_ipv6_checkbutton">
+ <property name="label"
translatable="yes">Tunnel IPv6 Traffic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">By enabling this option, all of your IPv6-Internet traffic
will be routed over GNUnet to a GNUnet exit node. Note that this will enable
other GNUnet peers to observe your unencrypted Internet traffic. This enables
6over4 tunneling and 6to4 protocol translation.</property>
+ <property
name="draw_indicator">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>
+ <object class="GtkCheckButton"
id="GNUNET_setup_pt_dns_checkbutton1">
+ <property name="label"
translatable="yes">Tunnel DNS Traffic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Enabling this option will cause your DNS traffic to be
routed via the GNUnet network to some other peer offering DNS exit
functionality. This is needed if you have no Internet access (and are thus
tunnelling both IPv4 and IPv6 traffic over GNUnet). If you have regular
Internet access, this option only makes sense if you want to get some 'weak'
anonymity by tunnelling all of your traffic over GNUnet (using the network as a
1-hop proxy in the worst-case, so this does not provide you with strong
anonymity).</property>
+ <property
name="draw_indicator">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">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="GNUNET_setup_pt_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Protocol Translation and Tunneling
Configuration</b></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_vpn_interface_configuration_frame">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment"
id="GNUNET_setup_vpn_interface_configuration_frame_alignment">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <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>
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Interface name:</property>
<property
name="use_underline">True</property>
</object>
<packing>
@@ -3054,9 +3168,10 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_master_interface_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_interface_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Name of the TUN interface GNUnet will create for
intercepting outgoing Internet traffic from your machine. The default
"gnunet-vpn" is almost always fine.</property>
<property
name="invisible_char">●</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
@@ -3073,12 +3188,12 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_vpn_master_interface_v4_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_vpn_interface_v4_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_v4_label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_v4_label">
<property name="visible">True</property>
- <property name="label"
translatable="yes">IPv4 address for Master interface:</property>
+ <property name="label"
translatable="yes">IPv4 address for interface:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3087,7 +3202,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v4_ip_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_interface_v4_ip_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
@@ -3100,7 +3215,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_v4_slash_label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_v4_slash_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">/</property>
</object>
@@ -3110,7 +3225,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v4_mask_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_interface_v4_mask_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
@@ -3129,12 +3244,12 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_vpn_master_interface_v6_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_vpn_interface_v6_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_v6_label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_v6_label">
<property name="visible">True</property>
- <property name="label"
translatable="yes">IPv6 address for Master interface: </property>
+ <property name="label"
translatable="yes">IPv6 address for interface: </property>
</object>
<packing>
<property name="expand">False</property>
@@ -3143,7 +3258,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_master_interface_v6_ip_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_vpn_interface_v6_ip_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
@@ -3156,7 +3271,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_v6_slash_label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_v6_slash_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">/</property>
</object>
@@ -3166,13 +3281,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="GNUNET_setup_vpn_master_interface_v6_mask_spinbutton">
+ <object class="GtkSpinButton"
id="GNUNET_setup_vpn_interface_v6_mask_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">GNUNET_vpn_master_interface_mask_adjustment</property>
+ <property
name="adjustment">GNUNET_setup_vpn_interface_mask_adjustment</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3185,47 +3300,14 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkHBox"
id="GNUNET_setup_vpn_master_vdns_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_vdns_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Virtual DNS Server:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_master_vdns_server_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="invisible_char">●</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel"
id="GNUNET_setup_vpn_master_interface_configuration_frame_label">
+ <object class="GtkLabel"
id="GNUNET_setup_vpn_interface_configuration_frame_label">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>VPN
Master Interface Configuration</b></property>
+ <property name="label" translatable="yes"><b>VPN
Interface Configuration</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -3233,68 +3315,54 @@
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="GNUNET_setup_vpn_master_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_vpn_enable_vpn_exit_checkbutton">
- <property name="label" translatable="yes">Enable VPN
Exit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_setup_vpn_enable_dns_exit_checkbutton">
- <property name="label" translatable="yes">Enable DNS
Exit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="GNUNET_setup_vpn_label">
+ <property name="visible">True</property>
+ <property name="tooltip_text" translatable="yes">Configuration
of the GNUnet VPN and the Protocol Translation (6to4, 4to6, 6over4, 4over6)
facilities</property>
+ <property name="label" translatable="yes">_VPN</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">4</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <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_vpn_exit_frame">
+ <object class="GtkFrame" id="GNUNET_setup_exit_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment"
id="GNUNET_setup_vpn_exit_frame_alignment">
+ <object class="GtkAlignment"
id="GNUNET_setup_exit_frame_alignment">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_vpn_exit_frame_vbox">
+ <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_vpn_exit_frame_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_exit_master_hbox">
<property name="visible">True</property>
- <property name="spacing">5</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_interface_name_label">
+ <object class="GtkCheckButton"
id="GNUNET_setup_dns_enable_exit_checkbutton">
+ <property name="label"
translatable="yes">Enable DNS Exit</property>
<property name="visible">True</property>
- <property name="label"
translatable="yes">Exit interface name: </property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3303,57 +3371,120 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_name_entry">
+ <object class="GtkCheckButton"
id="GNUNET_setup_exit_enable_ipv4_exit_checkbutton">
+ <property name="label"
translatable="yes">Enable IPv4 Exit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="invisible_char">●</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">This option will allow other peers to send IPv4 traffic to
the Internet using your network connection.</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="GNUNET_setup_vpn_exit_enable_udp_checkbutton">
- <property name="label"
translatable="yes">Enable UDP Exit</property>
+ <object class="GtkCheckButton"
id="GNUNET_setup_exit_enable_ipv6_exit_checkbutton">
+ <property name="label"
translatable="yes">Enable IPv6 Exit</property>
<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 will allow other peers to send IPv6 traffic to
the Internet using your network connection. You should make sure that you have
IPv6-support before enabling this option.</property>
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_dns_resolver_hbox">
+ <property name="visible">True</property>
<child>
- <object class="GtkCheckButton"
id="GNUNET_setup_vpn_exit_enable_tcp_checkbutton">
- <property name="label"
translatable="yes">Enable TCP exit</property>
+ <object class="GtkLabel"
id="GNUNET_setup_dns_resolver_label">
<property name="visible">True</property>
+ <property name="label"
translatable="yes">IP Address of external DNS Resolver:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_dns_resolver_ip_entry">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="xalign">0</property>
- <property
name="draw_indicator">True</property>
+ <property
name="invisible_char">●</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_exit_frame_hbox">
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_exit_interface_name_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Exit interface name: </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_exit_interface_name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Name of the TUN interface GNUnet will create for Internet
traffic exiting GNUnet via your machine. The default "gnunet-exit" is almost
always fine.</property>
+ <property
name="invisible_char">●</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_vpn_exit_ipv4_address_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_exit_ipv4_address_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_ipv4_address_label">
+ <object class="GtkLabel"
id="GNUNET_setup_exit_ipv4_address_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">IPv4 address for Exit interface: </property>
</object>
@@ -3364,9 +3495,10 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v4_ip_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_exit_interface_v4_ip_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Use a private IPv4 network here that does not conflict with
your existing setup (i.e. something like 10.53.0.1/255.255.0.0 or
192.168.0.1/255.255.0.0). </property>
<property
name="invisible_char">●</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
@@ -3377,7 +3509,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_ipv4_address_slash_label">
+ <object class="GtkLabel"
id="GNUNET_setup_exit_ipv4_address_slash_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">/</property>
</object>
@@ -3387,7 +3519,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v4_mask_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_exit_interface_v4_mask_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
@@ -3402,14 +3534,15 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="padding">5</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_vpn_exit_ipv6_address_hbox">
+ <object class="GtkHBox"
id="GNUNET_setup_exit_ipv6_address_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_ipv6_address_label">
+ <object class="GtkLabel"
id="GNUNET_setup_exit_ipv6_address_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">IPv6 address for Exit interface: </property>
</object>
@@ -3420,9 +3553,10 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_vpn_exit_interface_v6_ip_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_exit_interface_v6_ip_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">This should be a globally routed IPv6 subnet of your host.
Alternatively, if your kernel supports IPv6-NAT, you can pick any site-local
prefix and manually configure IPv6-NAT.</property>
<property
name="invisible_char">●</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
@@ -3433,7 +3567,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_ipv6_address_slash_label">
+ <object class="GtkLabel"
id="GNUNET_setup_exit_ipv6_address_slash_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">/</property>
</object>
@@ -3443,13 +3577,13 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="GNUNET_setup_vpn_exit_interface_v6_mask_spinbutton">
+ <object class="GtkSpinButton"
id="GNUNET_setup_exit_interface_v6_mask_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">GNUNET_vpn_exit_interface_mask_adjustment</property>
+ <property
name="adjustment">GNUNET_setup_exit_interface_mask_adjustment</property>
</object>
<packing>
<property name="expand">False</property>
@@ -3459,7 +3593,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
@@ -3467,9 +3601,9 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel"
id="GNUNET_setup_vpn_exit_frame_label">
+ <object class="GtkLabel"
id="GNUNET_setup_exit_frame_label">
<property name="visible">True</property>
- <property name="label"
translatable="yes"><b>GNUnet VPN Exit Interface</b></property>
+ <property name="label"
translatable="yes"><b>GNUnet Exit Configuration</b></property>
<property name="use_markup">True</property>
</object>
</child>
@@ -3477,107 +3611,246 @@
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="GNUNET_setup_exit_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Exit</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">5</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="GNUNET_SETUP_gns_vbox">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkFrame"
id="GNUNET_setup_vpn_service_configuration_frame">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkAlignment"
id="GNUNET_setup_vpn_dns_service_configuration_frame_alignment">
+ <object class="GtkFrame"
id="GNUNET_setup_gns_basics_frame">
<property name="visible">True</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkScrolledWindow"
id="GNUNET_setup_vpn_dns_service_scrolledwindow">
+ <object class="GtkAlignment"
id="GNUNET_setup_gns_basics_alignment">
<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="left_padding">12</property>
<child>
- <object class="GtkViewport"
id="GNUNET_setup_vpn_viewport">
+ <object class="GtkVBox"
id="GNUNET_setup_gns_basics_vbox">
<property name="visible">True</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkTreeView"
id="GNUNET_setup_vpn_dns_service_treeview">
+ <object class="GtkHBox"
id="GNUNET_setup_gns_basics_hbox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="model">vpn_dns_config_liststore</property>
- <property name="search_column">0</property>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_setup_vpn_dns_service_dnsname_treeviewcolumn">
- <property
name="sizing">autosize</property>
- <property name="title">DNS
name</property>
- <property
name="clickable">True</property>
- <property
name="reorderable">True</property>
- <property
name="sort_indicator">True</property>
- <property
name="sort_column_id">0</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_dnsname_cellrenderertext">
- <property
name="editable">True</property>
- </object>
- <attributes>
- <attribute
name="text">0</attribute>
- </attributes>
- </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="GtkTreeViewColumn"
id="GNUNET_setup_vpn_dns_service_tcpudp_treeviewcolumn">
- <property
name="sizing">autosize</property>
- <property name="title">Prot.</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_tcpudp_cellrenderertext">
- <property
name="editable">True</property>
- </object>
- <attributes>
- <attribute
name="text">4</attribute>
- </attributes>
- </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">●</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>
+ </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="GtkTreeViewColumn"
id="GNUNET_setup_vpn_dns_service_sourceport_treeviewcolumn">
- <property
name="sizing">autosize</property>
- <property name="title">Source
Port</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_sourceport_cellrenderertext">
- <property
name="editable">True</property>
- </object>
- <attributes>
- <attribute
name="text">1</attribute>
- </attributes>
- </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="GtkTreeViewColumn"
id="GNUNET_setup_vpn_dns_service_destination_treeviewcolumn">
- <property
name="resizable">True</property>
- <property
name="title">Destination</property>
- <property
name="reorderable">True</property>
- <property
name="sort_indicator">True</property>
- <property
name="sort_column_id">2</property>
+ <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>
+ </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>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="GNUNET_setup_gns_basics_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes"><b>Domain Owner Information</b></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="GtkAlignment"
id="GNUNET_setup_gns_configuration_frame_alignment">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkScrolledWindow"
id="GNUNET_setup_gns_scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">never</property>
+ <property
name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport"
id="GNUNET_setup_gns_viewport">
+ <property name="visible">True</property>
+ <property
name="resize_mode">queue</property>
+ <child>
+ <object class="GtkTreeView"
id="GNUNET_setup_gns_treeview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="model">GNUNET_setup_gns_liststore</property>
+ <property
name="headers_clickable">False</property>
+ <property
name="search_column">0</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_targethostname_cellrenderertext">
- <property
name="editable">True</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="GtkCellRendererText" id="GNUNET_setup_gns_name_cellrenderertext">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
</object>
- <attributes>
- <attribute
name="text">3</attribute>
- </attributes>
</child>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_targetcolon_cellrenderertext">
- <property name="text">:</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_setup_gns_typ_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>
</child>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_setup_vpn_dns_service_targetport_cellrenderertext">
- <property
name="editable">True</property>
+ <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>
- <attributes>
- <attribute
name="text">2</attribute>
- </attributes>
</child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="GNUNET_setup_gns_value_treeviewcolumn">
+ <property
name="resizable">True</property>
+ <property
name="title">Value</property>
+ <property
name="clickable">True</property>
+ <property
name="reorderable">True</property>
+ <property
name="sort_indicator">True</property>
+ <property
name="sort_column_id">2</property>
+ <child>
+ <object
class="GtkCellRendererText" id="GNUNET_setup_gns_value_cellrenderertext">
+ <property
name="editable">True</property>
+ </object>
+ <attributes>
+ <attribute
name="text">3</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -3586,34 +3859,37 @@
</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"><b>GNS Database</b></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_vpn_dns_service_configuration_frame_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>DNS
Services Configuration</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
</object>
<packing>
- <property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">6</property>
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="GNUNET_setup_vpn_label">
+ <object class="GtkLabel" id="GNUNET_SETUP_gns_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">_VPN</property>
+ <property name="label" translatable="yes">GN_S</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -3789,14 +4065,14 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="GNUNET_vpn_exit_interface_mask_adjustment">
+ <object class="GtkAdjustment"
id="GNUNET_setup_exit_interface_mask_adjustment">
<property name="value">48</property>
<property name="lower">1</property>
<property name="upper">127</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_vpn_master_interface_mask_adjustment">
+ <object class="GtkAdjustment"
id="GNUNET_setup_vpn_interface_mask_adjustment">
<property name="value">48</property>
<property name="lower">1</property>
<property name="upper">127</property>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19314 - gnunet-gtk/contrib,
gnunet <=