[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33382 - in gnunet-gtk: contrib src/setup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33382 - in gnunet-gtk: contrib src/setup |
|
Date: |
Mon, 26 May 2014 10:07:54 +0200 |
Author: wachs
Date: 2014-05-26 10:07:54 +0200 (Mon, 26 May 2014)
New Revision: 33382
Modified:
gnunet-gtk/contrib/gnunet_setup_main_window.glade
gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
enable http/https_client tabs in transport configuration
- remove HTTP_10 from http/s client tabs since this proxy type is not supported
Modified: gnunet-gtk/contrib/gnunet_setup_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_main_window.glade 2014-05-26 00:34:55 UTC
(rev 33381)
+++ gnunet-gtk/contrib/gnunet_setup_main_window.glade 2014-05-26 08:07:54 UTC
(rev 33382)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
<property name="lower">5000</property>
<property name="upper">999999999</property>
@@ -16,6 +16,304 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_exit_interface_mask_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">127</property>
+ <property name="value">48</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">3306</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_quota_adjustment">
+ <property name="lower">65536</property>
+ <property name="upper">9999999999</property>
+ <property name="value">1024000</property>
+ <property name="step_increment">65536</property>
+ <property name="page_increment">1024000</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">3306</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_quota_adjustment">
+ <property name="lower">1000000</property>
+ <property name="upper">999999999999</property>
+ <property name="value">100000000</property>
+ <property name="step_increment">1000000</property>
+ <property name="page_increment">1000000000</property>
+ </object>
+ <object class="GtkListStore" id="GNUNET_setup_gns_exit_dialog_liststore">
+ <columns>
+ <!-- column-name sourceport -->
+ <column type="guint"/>
+ <!-- column-name targetport -->
+ <column type="guint"/>
+ <!-- column-name targethostname -->
+ <column type="gchararray"/>
+ <!-- column-name isudp -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="GNUNET_setup_gns_treestore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name is_public -->
+ <column type="gboolean"/>
+ <!-- column-name record_type -->
+ <column type="guint"/>
+ <!-- column-name record_type_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name expiration_time -->
+ <column type="guint64"/>
+ <!-- column-name expiration_time_is_relative -->
+ <column type="gboolean"/>
+ <!-- column-name expiration_time_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_color -->
+ <column type="gchararray"/>
+ <!-- column-name name_is_editable -->
+ <column type="gboolean"/>
+ <!-- column-name name_is_record_row -->
+ <column type="gboolean"/>
+ <!-- column-name not_dummy_row -->
+ <column type="gboolean"/>
+ <!-- column-name expiration_time_color -->
+ <column type="gchararray"/>
+ <!-- column-name name_color -->
+ <column type="gchararray"/>
+ <!-- column-name type_is_editable -->
+ <column type="gboolean"/>
+ <!-- column-name is_shadow -->
+ <column type="gboolean"/>
+ <!-- column-name name_is_editable1 -->
+ <column type="gboolean"/>
+ <!-- column-name record_offset -->
+ <column type="guint"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_setup_gns_type_liststore">
+ <columns>
+ <!-- column-name type -->
+ <column type="guint"/>
+ <!-- column-name typename -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">1</col>
+ <col id="1">A</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ <col id="1">NS</col>
+ </row>
+ <row>
+ <col id="0">5</col>
+ <col id="1">CNAME</col>
+ </row>
+ <row>
+ <col id="0">6</col>
+ <col id="1">SOA</col>
+ </row>
+ <row>
+ <col id="0">12</col>
+ <col id="1">PTR</col>
+ </row>
+ <row>
+ <col id="0">15</col>
+ <col id="1">MX</col>
+ </row>
+ <row>
+ <col id="0">16</col>
+ <col id="1">TXT</col>
+ </row>
+ <row>
+ <col id="0">28</col>
+ <col id="1">AAAA</col>
+ </row>
+ <row>
+ <col id="0">65536</col>
+ <col id="1">PKEY</col>
+ </row>
+ <row>
+ <col id="0">65538</col>
+ <col id="1">LEHO</col>
+ </row>
+ <row>
+ <col id="0">65539</col>
+ <col id="1">VPN</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="GNUNET_setup_hosted_service_liststore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name is_udp -->
+ <column type="gboolean"/>
+ <!-- column-name visible_port -->
+ <column type="guint"/>
+ <!-- column-name destination_address -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_hostlist_server_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">8080</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+ <columns>
+ <!-- column-name url -->
+ <column type="gchararray"/>
+ <!-- column-name editable -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
+ <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_http_advertised_port_adjustment">
+ <property name="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>
+ <property name="value">1080</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_https_advertised_port_adjustment">
+ <property name="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>
+ <property name="value">443</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_adv_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">2086</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_port_adjustment">
+ <property name="upper">65535</property>
+ <property name="value">2086</property>
+ <property name="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>
+ <property name="value">2086</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_vpn_interface_mask_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">127</property>
+ <property name="value">48</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment10">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment9">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="edit_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-edit</property>
+ </object>
<object class="GtkDialog" id="GNUNET_setup_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -25,12 +323,12 @@
<property name="type_hint">normal</property>
<signal name="destroy" handler="GNUNET_SETUP_quit_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_setup_dialog-vbox">
+ <object class="GtkBox" id="GNUNET_setup_dialog-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="GNUNET_setup_dialog-action_area">
+ <object class="GtkButtonBox" id="GNUNET_setup_dialog-action_area">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
@@ -335,11 +633,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_min_friends_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -506,11 +801,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property>
<property
name="numeric">True</property>
<signal name="realize"
handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb"
swapped="no"/>
@@ -565,11 +857,14 @@
<object class="GtkTreeView"
id="GNUNET_setup_hostlist_url_treeview">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <property
name="model">GNUNET_setup_hostlist_url_liststore</property>
<property
name="hadjustment">adjustment7</property>
<property
name="vadjustment">adjustment8</property>
+ <property
name="model">GNUNET_setup_hostlist_url_liststore</property>
<property
name="search_column">0</property>
<signal name="key-press-event"
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object
class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
<property
name="sizing">fixed</property>
@@ -675,6 +970,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
</object>
@@ -690,6 +986,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -705,6 +1002,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -720,6 +1018,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -735,6 +1034,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -750,6 +1050,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -765,6 +1066,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
</object>
@@ -811,11 +1113,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -852,11 +1151,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -893,11 +1189,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -990,11 +1283,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -1021,11 +1311,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -1232,11 +1519,8 @@
<property
name="can_focus">True</property>
<property
name="max_length">255</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">True</property>
@@ -1296,8 +1580,6 @@
<property
name="width_chars">15</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">True</property>
@@ -1480,6 +1762,7 @@
<property
name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property
name="yalign">0.56999999284744263</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="realize"
handler="GNUNET_setup_transport_https_client_checkbutton_realize_cb"
swapped="no"/>
@@ -1584,11 +1867,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -1643,11 +1923,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -1795,11 +2072,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -1843,8 +2117,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -1999,11 +2271,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -2046,11 +2315,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_http_advertised_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -2206,6 +2472,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
</object>
@@ -2221,6 +2488,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2232,27 +2500,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
- <property name="label"
translatable="yes">HTTP 1.0 proxy</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="active">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton">
<property name="label"
translatable="yes">SOCKS v4 proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2260,7 +2513,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">3</property>
+ <property
name="position">2</property>
</packing>
</child>
<child>
@@ -2269,6 +2522,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2276,7 +2530,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
<child>
@@ -2285,6 +2539,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2292,7 +2547,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">5</property>
+ <property
name="position">4</property>
</packing>
</child>
<child>
@@ -2301,6 +2556,7 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2308,9 +2564,12 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">6</property>
+ <property
name="position">5</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -2348,11 +2607,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2391,8 +2647,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2429,11 +2683,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2495,11 +2746,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -2542,11 +2790,8 @@
<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="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_transport_https_advertised_port_adjustment</property>
<property
name="numeric">True</property>
</object>
@@ -2671,15 +2916,15 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_transport_http_client_vbox1">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_https_client_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_type_hbox1">
+ <object class="GtkHBox"
id="GNUNET_setup_transport_https_client_proxy_type_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_type_label1">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_https_client_proxy_type_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property name="label"
translatable="yes">_Proxy type:</property>
@@ -2693,15 +2938,16 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_transport_http_client_proxy_type_vbox1">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_https_client_proxy_type_vbox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_none_radiobutton1">
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_none_radiobutton">
<property name="label"
translatable="yes">no proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
</object>
@@ -2712,11 +2958,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_radiobutton1">
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_http_radiobutton">
<property name="label"
translatable="yes">HTTP proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
@@ -2727,11 +2974,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton1">
- <property name="label"
translatable="yes">HTTP 1.0 proxy</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_socks4_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4 proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
@@ -2742,11 +2990,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton1">
- <property name="label"
translatable="yes">SOCKS v4 proxy</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_socks4a_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4a proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
@@ -2757,11 +3006,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton1">
- <property name="label"
translatable="yes">SOCKS v4a proxy</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_socks5_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
@@ -2772,11 +3022,12 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton1">
- <property name="label"
translatable="yes">SOCKS v5 proxy</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_socks5_hostname_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy with hostname</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property
name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
@@ -2787,19 +3038,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton1">
- <property name="label"
translatable="yes">SOCKS v5 proxy with hostname</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">6</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
@@ -2817,11 +3056,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_hostname_hbox1">
+ <object class="GtkHBox"
id="GNUNET_setup_transport_https_client_proxy_hostname_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_hostname_label1">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_https_client_proxy_hostname_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property name="label"
translatable="yes">Proxy hostname:</property>
@@ -2834,15 +3073,12 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_hostname_entry1">
+ <object class="GtkEntry"
id="GNUNET_setup_transport_https_client_proxy_hostname_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2858,11 +3094,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_username_hbox1">
+ <object class="GtkHBox"
id="GNUNET_setup_transport_https_client_proxy_username_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_username_label1">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_https_client_proxy_username_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property name="label"
translatable="yes">Proxy username:</property>
@@ -2875,15 +3111,12 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_username_entry1">
+ <object class="GtkEntry"
id="GNUNET_setup_transport_https_client_proxy_username_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -2899,11 +3132,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_password_hbox1">
+ <object class="GtkHBox"
id="GNUNET_setup_transport_https_client_proxy_password_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_password_label1">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_https_client_proxy_password_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property name="label"
translatable="yes">Proxy password:</property>
@@ -2916,15 +3149,12 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_password_entry1">
+ <object class="GtkEntry"
id="GNUNET_setup_transport_https_client_proxy_password_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -3006,11 +3236,8 @@
<property
name="can_focus">True</property>
<property
name="max_length">255</property>
<property
name="invisible_char">●</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -3276,11 +3503,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -3345,11 +3569,8 @@
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
<property name="text"
translatable="yes">gnunet</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
@@ -3423,11 +3644,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">True</property>
@@ -3453,11 +3671,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">True</property>
@@ -3496,11 +3711,8 @@
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
<property name="text"
translatable="yes">localhost</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property
name="expand">True</property>
@@ -3527,11 +3739,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
<property
name="numeric">True</property>
<signal name="value-changed"
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
@@ -3638,11 +3847,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/>
</object>
<packing>
@@ -3870,11 +4076,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -3954,11 +4157,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/>
</object>
<packing>
@@ -4108,6 +4308,7 @@
<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="xalign">0.5</property>
<property
name="draw_indicator">True</property>
</object>
<packing>
@@ -4124,6 +4325,7 @@
<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="xalign">0.5</property>
<property
name="draw_indicator">True</property>
</object>
<packing>
@@ -4140,6 +4342,7 @@
<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="xalign">0.5</property>
<property
name="draw_indicator">True</property>
</object>
<packing>
@@ -4217,8 +4420,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4257,8 +4458,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4285,8 +4484,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4325,8 +4522,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4353,8 +4548,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_vpn_interface_mask_adjustment</property>
</object>
<packing>
@@ -4513,8 +4706,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4555,8 +4746,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4597,8 +4786,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4625,8 +4812,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4667,8 +4852,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -4695,8 +4878,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_setup_exit_interface_mask_adjustment</property>
</object>
<packing>
@@ -4771,8 +4952,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -4812,8 +4991,6 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -4864,9 +5041,12 @@
<object class="GtkTreeView"
id="GNUNET_setup_hosted_service_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_setup_hosted_service_liststore</property>
<property name="hadjustment">adjustment9</property>
<property
name="vadjustment">adjustment10</property>
+ <property
name="model">GNUNET_setup_hosted_service_liststore</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_SETUP_hosted_service_identifier_treeviewcolumn">
<property name="title"
translatable="yes">_Identifier</property>
@@ -5018,8 +5198,8 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_namestore_sqlite_radiobutton_realize_cb" swapped="no"/>
<signal name="toggled"
handler="GNUNET_setup_namestore_sqlite_radiobutton_toggled_cb" swapped="no"/>
- <signal name="realize"
handler="GNUNET_setup_namestore_sqlite_radiobutton_realize_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -5101,11 +5281,8 @@
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -5276,302 +5453,23 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_exit_interface_mask_adjustment">
- <property name="lower">1</property>
- <property name="upper">127</property>
- <property name="value">48</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
+ <property name="label" translatable="yes">HTTP 1.0 proxy</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_quota_adjustment">
- <property name="lower">65536</property>
- <property name="upper">9999999999</property>
- <property name="value">1024000</property>
- <property name="step_increment">65536</property>
- <property name="page_increment">1024000</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_quota_adjustment">
- <property name="lower">1000000</property>
- <property name="upper">999999999999</property>
- <property name="value">100000000</property>
- <property name="step_increment">1000000</property>
- <property name="page_increment">1000000000</property>
- </object>
- <object class="GtkListStore" id="GNUNET_setup_gns_exit_dialog_liststore">
- <columns>
- <!-- column-name sourceport -->
- <column type="guint"/>
- <!-- column-name targetport -->
- <column type="guint"/>
- <!-- column-name targethostname -->
- <column type="gchararray"/>
- <!-- column-name isudp -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkTreeStore" id="GNUNET_setup_gns_treestore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name is_public -->
- <column type="gboolean"/>
- <!-- column-name record_type -->
- <column type="guint"/>
- <!-- column-name record_type_as_string -->
- <column type="gchararray"/>
- <!-- column-name expiration_time -->
- <column type="guint64"/>
- <!-- column-name expiration_time_is_relative -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_color -->
- <column type="gchararray"/>
- <!-- column-name name_is_editable -->
- <column type="gboolean"/>
- <!-- column-name name_is_record_row -->
- <column type="gboolean"/>
- <!-- column-name not_dummy_row -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_color -->
- <column type="gchararray"/>
- <!-- column-name name_color -->
- <column type="gchararray"/>
- <!-- column-name type_is_editable -->
- <column type="gboolean"/>
- <!-- column-name is_shadow -->
- <column type="gboolean"/>
- <!-- column-name name_is_editable1 -->
- <column type="gboolean"/>
- <!-- column-name record_offset -->
- <column type="guint"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_setup_gns_type_liststore">
- <columns>
- <!-- column-name type -->
- <column type="guint"/>
- <!-- column-name typename -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">1</col>
- <col id="1">A</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1">NS</col>
- </row>
- <row>
- <col id="0">5</col>
- <col id="1">CNAME</col>
- </row>
- <row>
- <col id="0">6</col>
- <col id="1">SOA</col>
- </row>
- <row>
- <col id="0">12</col>
- <col id="1">PTR</col>
- </row>
- <row>
- <col id="0">15</col>
- <col id="1">MX</col>
- </row>
- <row>
- <col id="0">16</col>
- <col id="1">TXT</col>
- </row>
- <row>
- <col id="0">28</col>
- <col id="1">AAAA</col>
- </row>
- <row>
- <col id="0">65536</col>
- <col id="1">PKEY</col>
- </row>
- <row>
- <col id="0">65538</col>
- <col id="1">LEHO</col>
- </row>
- <row>
- <col id="0">65539</col>
- <col id="1">VPN</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="GNUNET_setup_hosted_service_liststore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name is_udp -->
- <column type="gboolean"/>
- <!-- column-name visible_port -->
- <column type="guint"/>
- <!-- column-name destination_address -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_hostlist_server_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">8080</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
- <columns>
- <!-- column-name url -->
- <column type="gchararray"/>
- <!-- column-name editable -->
- <column type="gboolean"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_http_advertised_port_adjustment">
- <property name="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>
- <property name="value">1080</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_https_advertised_port_adjustment">
- <property name="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>
- <property name="value">443</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_adv_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_port_adjustment">
- <property name="upper">65535</property>
- <property name="value">2086</property>
- <property name="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>
- <property name="value">2086</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_vpn_interface_mask_adjustment">
- <property name="lower">1</property>
- <property name="upper">127</property>
- <property name="value">48</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment10">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment7">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment9">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkImage" id="edit_image">
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_https_client_proxy_type_http_10_radiobutton">
+ <property name="label" translatable="yes">HTTP 1.0 proxy</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-edit</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
</object>
</interface>
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2014-05-26 00:34:55 UTC (rev
33381)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2014-05-26 08:07:54 UTC (rev
33382)
@@ -971,7 +971,7 @@
* Hide "http-client" tab if HTTP client not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_http_client_tab[] = {
- {"GNUNET_setup_transport_http_server_vbox", "(^| )http_client($| )", NULL},
+ {"GNUNET_setup_transport_http_client_vbox", "(^| )http_client($| )", NULL},
{NULL, NULL, NULL}
};
@@ -983,6 +983,13 @@
{NULL, NULL, NULL}
};
+/**
+ * Hide "https-client" tab if HTTPS client not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_https_client_tab[] = {
+ {"GNUNET_setup_transport_https_client_vbox", "(^| )https_client($| )", NULL},
+ {NULL, NULL, NULL}
+};
/**
* Hide "https server" tab if HTTPS server not active.
@@ -1507,7 +1514,7 @@
&load_option_list,
&save_option_list, "https_client",
&highlight_port_collisions, NULL,
- NULL},
+ hide_https_client_tab},
{
"GNUNET_setup_transport_dv_checkbutton",
@@ -1755,19 +1762,6 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton",
- "toggled",
- "transport-http_client",
- "PROXY_TYPE",
- gettext_noop ("Use an HTTP v1.0 (only) proxy"),
- "https://gnunet.org/configuration-http";,
- &load_option_list /* abuse! */ ,
- &save_option_list /* abuse! */ , "HTTP_1_0",
- NULL, NULL,
- hide_http_proxy_options
- },
-
- {
"GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
"toggled",
"transport-http_client",
@@ -1858,7 +1852,7 @@
/* HTTPS client */
{
- "GNUNET_setup_transport_http_client_proxy_type_none_radiobutton",
+ "GNUNET_setup_transport_https_client_proxy_type_none_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
@@ -1871,7 +1865,7 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_http_radiobutton",
+ "GNUNET_setup_transport_https_client_proxy_type_http_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
@@ -1884,23 +1878,10 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton",
+ "GNUNET_setup_transport_https_client_proxy_type_socks4_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
- gettext_noop ("Use an HTTP v1.0 (only) proxy"),
- "https://gnunet.org/configuration-http";,
- &load_option_list /* abuse! */ ,
- &save_option_list /* abuse! */ , "HTTP_1_0",
- NULL, NULL,
- hide_https_proxy_options
- },
-
- {
- "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
- "toggled",
- "transport-https_client",
- "PROXY_TYPE",
gettext_noop ("Use a SOCKS v4 proxy"),
"https://gnunet.org/configuration-http";,
&load_option_list /* abuse! */ ,
@@ -1910,7 +1891,7 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton",
+ "GNUNET_setup_transport_https_client_proxy_type_socks4a_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
@@ -1923,7 +1904,7 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton",
+ "GNUNET_setup_transport_https_client_proxy_type_socks5_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
@@ -1936,7 +1917,7 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton",
+
"GNUNET_setup_transport_https_client_proxy_type_socks5_hostname_radiobutton",
"toggled",
"transport-https_client",
"PROXY_TYPE",
@@ -1949,7 +1930,7 @@
},
{
- "GNUNET_setup_transport_http_client_proxy_hostname_entry",
+ "GNUNET_setup_transport_https_client_proxy_hostname_entry",
"changed",
"transport-https_client",
"PROXY",
@@ -1961,7 +1942,7 @@
NULL},
{
- "GNUNET_setup_transport_http_client_proxy_username_entry",
+ "GNUNET_setup_transport_https_client_proxy_username_entry",
"changed",
"transport-https_client",
"PROXY_USERNAME",
@@ -1973,7 +1954,7 @@
NULL},
{
- "GNUNET_setup_transport_http_client_proxy_password_entry",
+ "GNUNET_setup_transport_https_client_proxy_password_entry",
"changed",
"transport-https_client",
"PROXY_PASSWORD",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33382 - in gnunet-gtk: contrib src/setup,
gnunet <=