[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13509 - in gnunet-setup: contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13509 - in gnunet-setup: contrib src |
|
Date: |
Tue, 2 Nov 2010 23:06:58 +0100 |
Author: grothoff
Date: 2010-11-02 23:06:58 +0100 (Tue, 02 Nov 2010)
New Revision: 13509
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/gnunet-setup-options.c
Log:
more
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 21:47:08 UTC (rev
13508)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 22:06:58 UTC (rev
13509)
@@ -2,69 +2,63 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <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 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_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="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_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="adjustment6">
+ <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="adjustment5">
- <property name="upper">100</property>
+ <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+ <columns>
+ <!-- column-name url -->
+ <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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment4">
- <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="adjustment3">
- <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="adjustment2">
- <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="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>
@@ -220,6 +214,7 @@
<object class="GtkCheckButton"
id="GNUNET_setup_general_services_topology_checkbutton">
<property name="label"
translatable="yes">Topology</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="use_action_appearance">False</property>
@@ -234,6 +229,23 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton"
id="GNUNET_setup_general_services_hostlist_checkbutton">
+ <property name="label"
translatable="yes">Hostlist</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="active">True</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>
+ <child>
<object class="GtkCheckButton"
id="GNUNET_setup_general_services_fs_checkbutton">
<property name="label" translatable="yes">File
_Sharing</property>
<property name="visible">True</property>
@@ -248,7 +260,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -264,7 +276,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
@@ -328,7 +340,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox8">
+ <object class="GtkHBox"
id="GNUNET_setup_hostlist_hbox">
<property name="visible">True</property>
<child>
<object class="GtkVBox" id="vbox6">
@@ -493,7 +505,7 @@
<child>
<object class="GtkLabel"
id="GNUNET_setup_bandwidth_in_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Max.
download bandwidth (KB/s):</property>
+ <property name="label" translatable="yes">Max.
download bandwidth (B/s):</property>
</object>
<packing>
<property name="expand">False</property>
@@ -519,7 +531,7 @@
<child>
<object class="GtkLabel"
id="GNUNET_setup_bandwidth_out_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Max.
upload bandwidth (KB/s)</property>
+ <property name="label" translatable="yes">Max.
upload bandwidth (B/s)</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1574,62 +1586,68 @@
<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_tcp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</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_udp_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_http_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">1080</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_hostlist_server_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">8080</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="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
- <columns>
- <!-- column-name url -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="adjustment7">
+ <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="adjustment8">
- <property name="upper">100</property>
+ <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>
- <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_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>
</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>
</interface>
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2010-11-02 21:47:08 UTC (rev
13508)
+++ gnunet-setup/src/gnunet-setup-options.c 2010-11-02 22:06:58 UTC (rev
13509)
@@ -324,8 +324,32 @@
};
+/**
+ * Hide "hostlist" options if hostlist is not in use.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_hostlist_options[] =
+{
+ { "GNUNET_setup_hostlist_client_enable_checkbutton", "(^| )hostlist($| )",
NULL },
+ { "GNUNET_setup_hostlist_client_learn_checkbutton", "(^| )hostlist($| )",
NULL },
+ { "GNUNET_setup_hostlist_hbox", "(^| )hostlist($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
/**
+ * Hide "hostlist" server options if hostlist server is not in use.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification
hide_hostlist_server_options[] =
+{
+ { "GNUNET_setup_hostlist_advertise_checkbutton", "(^| )-p($| )", NULL },
+ { "GNUNET_setup_hostlist_port_label", "(^| )-p($| )", NULL },
+ { "GNUNET_setup_hostlist_server_port_spin_button", "(^| )-p($| )", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+
+/**
* Hide "fs tab" if FS not active.
*/
static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] =
@@ -377,6 +401,31 @@
},
{
+ "GNUNET_setup_general_services_topology_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Topology should always be loaded"),
+ "https://gnunet.org/configuration-topology";,
+ &load_option_list,
+ &save_option_list, "topology",
+ NULL
+ },
+
+ {
+ "GNUNET_setup_general_services_hostlist_checkbutton",
+ "toggled",
+ "arm",
+ "DEFAULTSERVICES",
+ gettext_noop ("Should hostlist support be started automatically on
startup?"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "hostlist",
+ hide_hostlist_options
+ },
+
+
+ {
"GNUNET_setup_general_services_fs_checkbutton",
"toggled",
"arm",
@@ -411,6 +460,94 @@
&save_option_list, "-b",
NULL
},
+
+ {
+ "GNUNET_setup_hostlist_client_learn_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should GNUnet learn hostlists from other peers"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "-e",
+ NULL
+ },
+
+ {
+ "GNUNET_setup_hostlist_offer_hostlist_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should this peer offer a hostlist to other peers"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "-p",
+ hide_hostlist_server_options
+ },
+
+ {
+ "GNUNET_setup_hostlist_advertise_checkbutton",
+ "toggled",
+ "hostlist",
+ "OPTIONS",
+ gettext_noop ("Should this peer advertise its hostlist to other peers"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_option_list,
+ &save_option_list, "-a",
+ NULL
+ },
+
+ {
+ "GNUNET_setup_hostlist_server_port_spin_button",
+ "value-changed",
+ "hostlist",
+ "HTTPPORT",
+ gettext_noop ("Port this peers hostlist should be offered on"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_number,
+ &save_number, NULL,
+ NULL
+ },
+
+#if 0
+ {
+ "GNUNET_setup_hostlist_url_liststore",
+ "row-changed",
+ "hostlist",
+ "SERVERS",
+ gettext_noop ("Known hostlist URLs"),
+ "https://gnunet.org/configuration-hostlist";,
+ &load_string_list_store,
+ &save_string_list_store, NULL,
+ NULL
+ },
+#endif
+
+ {
+ "GNUNET_setup_bandwidth_in_spinbutton",
+ "value-changed",
+ "core",
+ "TOTAL_QUOTA_IN",
+ gettext_noop ("How many bytes per second are we allowed to transmit?"),
+ "https://gnunet.org/configuration-bandwidth";,
+ &load_number,
+ &save_number, NULL,
+ NULL
+ },
+
+ {
+ "GNUNET_setup_bandwidth_out_spinbutton",
+ "value-changed",
+ "core",
+ "TOTAL_QUOTA_OUT",
+ gettext_noop ("How many bytes per second are we allowed to receive?"),
+ "https://gnunet.org/configuration-bandwidth";,
+ &load_number,
+ &save_number, NULL,
+ NULL
+ },
+
+
{ NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL }
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13509 - in gnunet-setup: contrib src,
gnunet <=