[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13519 - in gnunet-setup: contrib src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13519 - in gnunet-setup: contrib src |
Date: |
Wed, 3 Nov 2010 00:28:32 +0100 |
Author: grothoff
Date: 2010-11-03 00:28:32 +0100 (Wed, 03 Nov 2010)
New Revision: 13519
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/gnunet-setup-options.c
Log:
more on FS
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 23:07:47 UTC (rev
13518)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-02 23:28:32 UTC (rev
13519)
@@ -2,70 +2,76 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <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>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
+ <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="adjustment7">
- <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_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="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="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="GtkAdjustment"
id="GNUNET_setup_transport_http_port_adjustment">
- <property name="lower">0</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_transport_udp_port_adjustment">
- <property name="lower">0</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_tcp_port_adjustment">
- <property name="lower">0</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_https_port_adjustment">
- <property name="lower">0</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_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="GtkDialog" id="GNUNET_setup_dialog">
<property name="border_width">5</property>
@@ -1141,17 +1147,17 @@
</packing>
</child>
<child>
- <object class="GtkNotebook"
id="GNUNET_setup_fs_datacache_notebook">
+ <object class="GtkNotebook"
id="GNUNET_setup_fs_datastore_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkLabel" id="label1c">
+ <object class="GtkLabel"
id="GNUNET_setup_fs_datastore_sqlite_label">
<property name="visible">True</property>
<property name="label" translatable="yes">No
setup required.</property>
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="label4c">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label"
translatable="yes">sqLite</property>
</object>
@@ -1160,13 +1166,13 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox8c">
+ <object class="GtkVBox"
id="GNUNET_setup_datastore_mysql_vbox">
<property name="visible">True</property>
<child>
- <object class="GtkHBox" id="hbox13c">
+ <object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_database_name_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_database_name_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL database name:</property>
</object>
@@ -1178,7 +1184,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_database_name_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_database_name_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1199,10 +1205,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox14c">
+ <object class="GtkHBox" id="hbox14">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_config_file_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_config_file_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Configuration file:</property>
</object>
@@ -1213,7 +1219,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton"
id="GNUNET_setup_datacache_config_file_filechooserbutton">
+ <object class="GtkFileChooserButton"
id="GNUNET_setup_datastore_mysql_config_file_filechooserbutton">
<property
name="visible">True</property>
</object>
<packing>
@@ -1231,10 +1237,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox15c">
+ <object class="GtkHBox" id="hbox15">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_username_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_username_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Username:</property>
</object>
@@ -1246,7 +1252,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_username_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_username_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1259,7 +1265,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_password_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_password_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Password:</property>
</object>
@@ -1270,7 +1276,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_password_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_password_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1291,10 +1297,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox16c">
+ <object class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup-datacache_mysql_hostname_label">
+ <object class="GtkLabel"
id="GNUNET_setup-datastore_mysql_hostname_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL Server Hostname:</property>
</object>
@@ -1306,7 +1312,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_hostname_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_hostname_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1320,7 +1326,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_port_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_port_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Port:</property>
</object>
@@ -1332,11 +1338,11 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="GNUNET_setup_datacache_mysql_port_entry">
+ <object class="GtkSpinButton"
id="GNUNET_setup_datastore_mysql_port_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
+ <property
name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
<property
name="numeric">True</property>
</object>
<packing>
@@ -1359,7 +1365,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label5c">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label"
translatable="yes">MySQL</property>
</object>
@@ -1369,10 +1375,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox17c">
+ <object class="GtkHBox"
id="GNUNET_setup_datastore_postgres_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_postgres_config_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datastore_postgres_config_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">Configuration:</property>
</object>
@@ -1384,7 +1390,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_postgres_config_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datastore_postgres_config_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1404,7 +1410,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label6c">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="label"
translatable="yes">Postgres</property>
</object>
@@ -1421,6 +1427,17 @@
</packing>
</child>
<child>
+ <object class="GtkHSeparator" id="hseparator4">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton"
id="GNUNET_setup_fs_migration_checkbutton">
<property name="label" translatable="yes">Enable
content migration</property>
<property name="visible">True</property>
@@ -1434,7 +1451,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>
@@ -1445,7 +1462,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -1565,32 +1582,21 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator4">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">5</property>
</packing>
</child>
<child>
- <object class="GtkNotebook"
id="GNUNET_setup_fs_datastore_notebook">
+ <object class="GtkNotebook"
id="GNUNET_setup_fs_datacache_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel"
id="GNUNET_setup_fs_datacache_sqlite_label">
<property name="visible">True</property>
<property name="label" translatable="yes">No
setup required.</property>
</object>
</child>
<child type="tab">
- <object class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4c">
<property name="visible">True</property>
<property name="label"
translatable="yes">sqLite</property>
</object>
@@ -1599,13 +1605,13 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkVBox"
id="GNUNET_setup_datacache_mysql_vbox">
<property name="visible">True</property>
<child>
- <object class="GtkHBox" id="hbox13">
+ <object class="GtkHBox" id="hbox13c">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_database_name_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_database_name_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL database name:</property>
</object>
@@ -1617,7 +1623,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datastore_database_name_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datacache_database_name_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1638,10 +1644,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox14">
+ <object class="GtkHBox" id="hbox14c">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_config_file_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_config_file_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Configuration file:</property>
</object>
@@ -1652,7 +1658,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton"
id="GNUNET_setup_datastore_config_file_filechooserbutton">
+ <object class="GtkFileChooserButton"
id="GNUNET_setup_datacache_config_file_filechooserbutton">
<property
name="visible">True</property>
</object>
<packing>
@@ -1670,10 +1676,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox15">
+ <object class="GtkHBox" id="hbox15c">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_username_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_username_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Username:</property>
</object>
@@ -1685,7 +1691,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_username_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_username_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1698,7 +1704,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_password_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_password_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Password:</property>
</object>
@@ -1709,7 +1715,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_password_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_password_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1730,10 +1736,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox16">
+ <object class="GtkHBox" id="hbox16c">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup-datastore_mysql_hostname_label">
+ <object class="GtkLabel"
id="GNUNET_setup-datacache_mysql_hostname_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">MySQL Server Hostname:</property>
</object>
@@ -1745,7 +1751,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datastore_mysql_hostname_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_hostname_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1759,7 +1765,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_mysql_port_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_port_label">
<property
name="visible">True</property>
<property name="label"
translatable="yes">Port:</property>
</object>
@@ -1771,11 +1777,11 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="GNUNET_setup_datastore_mysql_port_entry">
+ <object class="GtkSpinButton"
id="GNUNET_setup_datacache_mysql_port_entry">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="invisible_char">•</property>
- <property
name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
+ <property
name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
<property
name="numeric">True</property>
</object>
<packing>
@@ -1798,7 +1804,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label5c">
<property name="visible">True</property>
<property name="label"
translatable="yes">MySQL</property>
</object>
@@ -1808,10 +1814,10 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox17">
+ <object class="GtkHBox"
id="GNUNET_setup_datacache_postgres_hbox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_setup_datastore_postgres_config_label">
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_postgres_config_label">
<property name="visible">True</property>
<property name="label"
translatable="yes">Configuration:</property>
</object>
@@ -1823,7 +1829,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_setup_datastore_postgres_config_entry">
+ <object class="GtkEntry"
id="GNUNET_setup_datacache_postgres_config_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
@@ -1843,7 +1849,7 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label6">
+ <object class="GtkLabel" id="label6c">
<property name="visible">True</property>
<property name="label"
translatable="yes">Postgres</property>
</object>
@@ -1856,7 +1862,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">6</property>
</packing>
</child>
</object>
@@ -1968,75 +1974,69 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</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="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="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="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="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="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="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="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_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>
+ <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_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>
</interface>
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2010-11-02 23:07:47 UTC (rev
13518)
+++ gnunet-setup/src/gnunet-setup-options.c 2010-11-02 23:28:32 UTC (rev
13519)
@@ -527,6 +527,66 @@
/**
+ * Hide "sqlite datastore" tab if sqlite not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datastore_tab[]
=
+{
+ { "GNUNET_setup_fs_datastore_sqlite_label", "^sqlite$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "mysql datastore" tab if mysql not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datastore_tab[] =
+{
+ { "GNUNET_setup_datastore_mysql_vbox", "^mysql$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "postgres datastore" tab if postgres not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datastore_tab[] =
+{
+ { "GNUNET_setup_datastore_postgres_hbox", "^postgres$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "sqlite datacache" tab if sqlite not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datacache_tab[]
=
+{
+ { "GNUNET_setup_fs_datacache_sqlite_label", "^sqlite$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "mysql datacache" tab if mysql not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[] =
+{
+ { "GNUNET_setup_datacache_mysql_vbox", "^mysql$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
+ * Hide "postgres datacache" tab if postgres not active.
+ */
+static struct GNUNET_SETUP_VisibilitySpecification
hide_postgres_datacache_tab[] =
+{
+ { "GNUNET_setup_datacache_postgres_hbox", "^postgres$", NULL },
+ { NULL, NULL, NULL }
+};
+
+
+/**
* Option specification data.
*/
const struct GNUNET_SETUP_OptionSpecification option_specifications[] =
@@ -845,10 +905,85 @@
NULL
},
+ /* FS TAB */
+
+ {
+ "GNUNET_setup_fs_datastore_sqlite_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use sqLite to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "sqlite",
+ hide_sqlite_datastore_tab
+ },
+ {
+ "GNUNET_setup_fs_datastore_mysql_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use MySQL to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "mysql",
+ hide_mysql_datastore_tab
+ },
- /* FS TAB */
+ {
+ "GNUNET_setup_fs_datastore_postgres_radiobutton",
+ "toggled",
+ "datastore",
+ "DATABASE",
+ gettext_noop ("Use Postgres to store file-sharing content"),
+ "https://gnunet.org/configuration-datastore",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "postgres",
+ hide_postgres_datastore_tab
+ },
+
+
+
+
+ {
+ "GNUNET_setup_fs_datacache_sqlite_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use sqLite to cache DHT data"),
+ "https://gnunet.org/configuration-datacache",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "sqlite",
+ hide_sqlite_datacache_tab
+ },
+
+ {
+ "GNUNET_setup_fs_datacache_mysql_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use MySQL to cache DHT data"),
+ "https://gnunet.org/configuration-datacache",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "mysql",
+ hide_mysql_datacache_tab
+ },
+
+ {
+ "GNUNET_setup_fs_datacache_postgres_radiobutton",
+ "toggled",
+ "dhtcache",
+ "DATABASE",
+ gettext_noop ("Use Postgres to cache DHT data"),
+ "https://gnunet.org/configuration-datacache",
+ &load_option_list /* abuse! */,
+ &save_option_list /* abuse! */, "postgres",
+ hide_postgres_datacache_tab
+ },
+
+
/* END of list */
{ NULL, NULL, NULL, NULL, NULL,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13519 - in gnunet-setup: contrib src,
gnunet <=