[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13513 - in gnunet-setup: contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13513 - in gnunet-setup: contrib src |
|
Date: |
Wed, 3 Nov 2010 00:03:26 +0100 |
Author: grothoff
Date: 2010-11-03 00:03:26 +0100 (Wed, 03 Nov 2010)
New Revision: 13513
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/gnunet-setup-options.c
Log:
transport tabs
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 22:51:50 UTC (rev
13512)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 23:03:26 UTC (rev
13513)
@@ -2,76 +2,70 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <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 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="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</property>
+ <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="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_bandwidth_out_adjustment">
- <property name="lower">1024</property>
- <property name="upper">999999999</property>
- <property name="value">65536</property>
+ <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="GNUNET_setup_bandwidth_in_adjustment">
- <property name="lower">5000</property>
- <property name="upper">999999999</property>
- <property name="value">65536</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+ <columns>
+ <!-- column-name url -->
+ <column type="gchararray"/>
+ </columns>
</object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
<object class="GtkDialog" id="GNUNET_setup_dialog">
<property name="border_width">5</property>
@@ -724,7 +718,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkVBox" id="tcp_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_tcp_vbox">
<property name="visible">True</property>
<child>
<object class="GtkHBox" id="tcp_hbox">
@@ -776,7 +770,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="udp_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_udp_vbox">
<property name="visible">True</property>
<child>
<object class="GtkHBox" id="hbox5">
@@ -832,7 +826,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox4">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_http_vbox">
<property name="visible">True</property>
<child>
<object class="GtkHBox" id="hbox6">
@@ -890,7 +884,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="http_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_https_vbox">
<property name="visible">True</property>
<child>
<object class="GtkHBox" id="http_hbox">
@@ -946,7 +940,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="https_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_dv_vbox">
<property name="visible">True</property>
<child>
<placeholder/>
@@ -967,7 +961,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="dv_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_wlan_vbox">
<property name="visible">True</property>
<child>
<placeholder/>
@@ -1974,69 +1968,75 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
- <property name="upper">9999</property>
+ <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="GNUNET_setup_transport_https_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">443</property>
+ <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="GNUNET_setup_transport_tcp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</property>
+ <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="GNUNET_setup_transport_udp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</property>
+ <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="GNUNET_setup_transport_http_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">1080</property>
+ <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="GNUNET_setup_hostlist_server_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">8080</property>
+ <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="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
- <columns>
- <!-- column-name url -->
- <column type="gchararray"/>
- </columns>
+ <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
+ <property name="lower">5000</property>
+ <property name="upper">999999999</property>
+ <property name="value">65536</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment7">
- <property name="upper">100</property>
+ <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_out_adjustment">
+ <property name="lower">1024</property>
+ <property name="upper">999999999</property>
+ <property name="value">65536</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">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 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>
</interface>
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2010-11-02 22:51:50 UTC (rev
13512)
+++ gnunet-setup/src/gnunet-setup-options.c 2010-11-02 23:03:26 UTC (rev
13513)
@@ -465,7 +465,68 @@
};
+
/**
+ * Hide "tcp tab" if TCP not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_tcp_tab[] =
+{
+ { "GNUNET_setup_transport_tcp_vbox", "(^| )tcp($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "udp tab" if UDP not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_udp_tab[] =
+{
+ { "GNUNET_setup_transport_udp_vbox", "(^| )udp($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "http tab" if HTTP not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_http_tab[] =
+{
+ { "GNUNET_setup_transport_http_vbox", "(^| )http($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "https tab" if HTTPS not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_https_tab[] =
+{
+ { "GNUNET_setup_transport_https_vbox", "(^| )https($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "dv tab" if DV not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_dv_tab[] =
+{
+ { "GNUNET_setup_transport_dv_vbox", "(^| )dv($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "wlan tab" if WLAN not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_wlan_tab[] =
+{
+ { "GNUNET_setup_transport_wlan_vbox", "(^| )wlan($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
* Option specification data.
*/
const struct GNUNET_SETUP_OptionSpecification option_specifications[] =
@@ -664,6 +725,80 @@
/* Transport TAB */
+ {
+ "GNUNET_setup_transport_tcp_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via TCP"),
+ "https://gnunet.org/configuration-tcp";,
+ &load_option_list,
+ &save_option_list, "tcp",
+ hide_tcp_tab
+ },
+
+ {
+ "GNUNET_setup_transport_udp_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via UDP"),
+ "https://gnunet.org/configuration-udp";,
+ &load_option_list,
+ &save_option_list, "udp",
+ hide_udp_tab
+ },
+
+ {
+ "GNUNET_setup_transport_http_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTP"),
+ "https://gnunet.org/configuration-http";,
+ &load_option_list,
+ &save_option_list, "http",
+ hide_http_tab
+ },
+
+ {
+ "GNUNET_setup_transport_https_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via HTTPS"),
+ "https://gnunet.org/configuration-https";,
+ &load_option_list,
+ &save_option_list, "https",
+ hide_https_tab
+ },
+
+ {
+ "GNUNET_setup_transport_dv_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via DV"),
+ "https://gnunet.org/configuration-dv";,
+ &load_option_list,
+ &save_option_list, "dv",
+ hide_dv_tab
+ },
+
+ {
+ "GNUNET_setup_transport_wlan_checkbutton",
+ "toggled",
+ "transport",
+ "PLUGINS",
+ gettext_noop ("Enable communication via WLAN"),
+ "https://gnunet.org/configuration-wlan";,
+ &load_option_list,
+ &save_option_list, "wlan",
+ hide_wlan_tab
+ },
+
+
+
/* FS TAB */
/* END of list */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13513 - in gnunet-setup: contrib src,
gnunet <=