[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13578 - in gnunet-setup: contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13578 - in gnunet-setup: contrib src |
|
Date: |
Sat, 6 Nov 2010 00:12:06 +0100 |
Author: grothoff
Date: 2010-11-06 00:12:06 +0100 (Sat, 06 Nov 2010)
New Revision: 13578
Added:
gnunet-setup/src/gnunet-setup-hostlist-editing.c
gnunet-setup/src/gnunet-setup-transport-plugins.c
gnunet-setup/src/gnunet-setup.h
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/Makefile.am
gnunet-setup/src/gnunet-setup-options.c
gnunet-setup/src/gnunet-setup-options.h
gnunet-setup/src/gnunet-setup.c
Log:
detect available transport plugins
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-05 22:16:16 UTC (rev
13577)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-05 23:12:06 UTC (rev
13578)
@@ -2,71 +2,85 @@
<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>
- <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="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="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_hostlist_server_port_adjustment">
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
<property name="lower">1</property>
<property name="upper">65535</property>
- <property name="value">8080</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_transport_http_port_adjustment">
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
<property name="lower">1</property>
<property name="upper">65535</property>
- <property name="value">1080</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_transport_udp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</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>
</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="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_transport_https_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">443</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_min_friends_adjustment">
- <property name="upper">9999</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="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="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="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="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>
<property name="title" translatable="yes">gnunet-setup</property>
@@ -122,7 +136,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -143,8 +156,6 @@
<property name="visible">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -154,7 +165,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
@@ -197,7 +207,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -281,8 +290,6 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -299,7 +306,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
@@ -458,6 +464,7 @@
<property
name="hadjustment">adjustment7</property>
<property
name="vadjustment">adjustment8</property>
<property
name="search_column">0</property>
+ <signal name="key-press-event"
handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_setup_hostlist_url_treeviewcolumn">
<property name="title"
translatable="yes">URL</property>
@@ -465,8 +472,11 @@
<property
name="sort_indicator">True</property>
<property
name="sort_column_id">0</property>
<child>
- <object
class="GtkCellRendererText" id="GNUNET_setup_hostlist_url_cellrenderertext"/>
+ <object
class="GtkCellRendererText" id="GNUNET_setup_hostlist_url_cellrenderertext">
+ <signal name="edited"
handler="GNUNET_setup_hostlist_url_cellrenderertext_edited_cb" swapped="no"/>
+ </object>
<attributes>
+ <attribute
name="editable">1</attribute>
<attribute
name="text">0</attribute>
</attributes>
</child>
@@ -476,22 +486,16 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -501,7 +505,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">6</property>
</packing>
@@ -541,8 +544,6 @@
<property name="label" translatable="yes">Max.
upload bandwidth (B/s)</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -555,8 +556,6 @@
<property name="numeric">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -611,6 +610,7 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -628,6 +628,7 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -646,6 +647,7 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_http_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -664,6 +666,7 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_https_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -681,6 +684,7 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -698,6 +702,7 @@
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
+ <signal name="realize"
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -983,8 +988,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1102,7 +1105,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1185,16 +1187,12 @@
<property name="text"
translatable="yes">gnunet</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1217,16 +1215,12 @@
<property
name="visible">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1252,8 +1246,6 @@
<property
name="invisible_char">•</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1277,16 +1269,12 @@
<property
name="invisible_char_set">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1313,8 +1301,6 @@
<property name="text"
translatable="yes">localhost</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1348,8 +1334,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1378,7 +1362,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -1391,8 +1374,6 @@
<property name="text"
translatable="yes">connect_timeout=10;dbname=gnunet</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1415,8 +1396,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1426,7 +1405,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1454,7 +1432,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
@@ -1540,7 +1517,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1624,16 +1600,12 @@
<property name="text"
translatable="yes">gnunet</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1656,16 +1628,12 @@
<property
name="visible">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1691,8 +1659,6 @@
<property
name="invisible_char">•</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1716,16 +1682,12 @@
<property
name="invisible_char_set">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1752,8 +1714,6 @@
<property name="text"
translatable="yes">localhost</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1787,8 +1747,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1817,7 +1775,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -1830,8 +1787,6 @@
<property name="text"
translatable="yes">connect_timeout=10;dbname=gnunet</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1854,8 +1809,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
@@ -1881,8 +1834,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1899,7 +1850,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1955,7 +1905,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -1968,75 +1917,63 @@
<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>
+ <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_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_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 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>
- <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>
</interface>
Modified: gnunet-setup/src/Makefile.am
===================================================================
--- gnunet-setup/src/Makefile.am 2010-11-05 22:16:16 UTC (rev 13577)
+++ gnunet-setup/src/Makefile.am 2010-11-05 23:12:06 UTC (rev 13578)
@@ -8,8 +8,10 @@
bin_PROGRAMS = gnunet-setup
gnunet_setup_SOURCES = \
- gnunet-setup.c \
+ gnunet-setup.c gnunet-setup.h \
gnunet-setup-options.c gnunet-setup-options.h \
+ gnunet-setup-transport-plugins.c \
+ gnunet-setup-hostlist-editing.c \
os_installation.c
gnunet_setup_LDADD = \
@GTK_LIBS@ \
Added: gnunet-setup/src/gnunet-setup-hostlist-editing.c
===================================================================
--- gnunet-setup/src/gnunet-setup-hostlist-editing.c
(rev 0)
+++ gnunet-setup/src/gnunet-setup-hostlist-editing.c 2010-11-05 23:12:06 UTC
(rev 13578)
@@ -0,0 +1,72 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/gnunet-setup-hostlist-editing.c
+ * @brief allow editing of the hostlist
+ * @author Christian Grothoff
+ */
+#include "gnunet-setup.h"
+
+/**
+ * Handle editing of text in the GtkListModel. Changes
+ * the new entry to non-editable and creates another
+ * empty entry at the end.
+ *
+ * @param renderer renderer emitting the signal
+ * @param path path identifying the edited cell
+ * @param new_text text that was added
+ * @param user_data not used
+ */
+void
+GNUNET_setup_hostlist_url_cellrenderertext_edited_cb (GtkCellRendererText
*renderer,
+ gchar *path,
+ gchar *new_text,
+ gpointer user_data)
+{
+ GtkListStore *ls;
+ GtkTreeIter old;
+ GtkTreeIter iter;
+
+ ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
+
"GNUNET_setup_hostlist_url_liststore"));
+ if (ls == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (TRUE !=
+ gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ls),
+ &old,
+ path))
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ gtk_list_store_insert_before (ls, &iter, &old);
+ gtk_list_store_set (ls,
+ &iter,
+ 0, new_text,
+ 1, FALSE,
+ -1);
+}
+
+/* end of gnunet-setup-hostlist-editing.c */
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2010-11-05 22:16:16 UTC (rev
13577)
+++ gnunet-setup/src/gnunet-setup-options.c 2010-11-05 23:12:06 UTC (rev
13578)
@@ -25,6 +25,7 @@
*/
#include "gnunet-setup-options.h"
#include <gnunet/gnunet_util_lib.h>
+#include <gdk/gdkkeysyms.h>
/**
* Regular expression for YES
@@ -373,7 +374,55 @@
}
+
/**
+ * User pressed a key in a sensitive tree view with a list store.
+ * Check if it was the 'delete' key and if so remove the selected
+ * row.
+ *
+ * @param tv tree view emitting the signal
+ * @param event key stroke data
+ * @param user_data not used
+ * @return TRUE to stop other handlers from being invoked
+ */
+gboolean
+GNUNET_setup_treeview_key_press_event_cb (GtkTreeView *tv,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ GtkListStore *ls;
+ GtkTreeModel *tm;
+ GtkTreeSelection *sel;
+ GtkTreeIter iter;
+ gboolean editable;
+
+ if ( (event->type != GDK_KEY_PRESS) ||
+ (event->state != 0) ||
+ (event->keyval != GDK_Delete) )
+ return FALSE;
+ ls = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
+ if (ls == NULL)
+ {
+ GNUNET_break (0);
+ return FALSE;
+ }
+ sel = gtk_tree_view_get_selection (tv);
+ if (TRUE !=
+ gtk_tree_selection_get_selected (sel,
+ &tm,
+ &iter))
+ return FALSE;
+ gtk_tree_model_get (tm, &iter, 1, &editable, -1);
+ if (TRUE == editable)
+ return FALSE; /* likely currently editing... */
+ gtk_list_store_remove (ls, &iter);
+ gtk_tree_model_get_iter_first (tm, &iter);
+ gtk_tree_selection_select_iter (sel, &iter);
+ return FALSE;
+}
+
+
+/**
* Initialize a GtkListStore by tokenizing the value into strings.
*
* @param cls closure (unused)
@@ -408,10 +457,17 @@
&iter,
G_MAXINT,
0, w,
+ 1, FALSE,
-1);
w = strtok (NULL, " ");
}
GNUNET_free (t);
+ gtk_list_store_insert_with_values (ls,
+ &iter,
+ G_MAXINT,
+ 0, "",
+ 1, TRUE,
+ -1);
return GNUNET_OK;
}
Modified: gnunet-setup/src/gnunet-setup-options.h
===================================================================
--- gnunet-setup/src/gnunet-setup-options.h 2010-11-05 22:16:16 UTC (rev
13577)
+++ gnunet-setup/src/gnunet-setup-options.h 2010-11-05 23:12:06 UTC (rev
13578)
@@ -26,18 +26,9 @@
#ifndef GNUNET_SETUP_OPTIONS_H
#define GNUNET_SETUP_OPTIONS_H
-#ifndef HAVE_USED_CONFIG_H
-#define HAVE_USED_CONFIG_H
-#include "gnunet_setup_config.h"
-#endif
+#include "gnunet-setup.h"
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_directories.h>
-#include <gnunet/gnunet_util_lib.h>
-#include <gladeui/glade.h>
-#include <gtk/gtk.h>
-
/**
* Function to setup the value on load.
*
Added: gnunet-setup/src/gnunet-setup-transport-plugins.c
===================================================================
--- gnunet-setup/src/gnunet-setup-transport-plugins.c
(rev 0)
+++ gnunet-setup/src/gnunet-setup-transport-plugins.c 2010-11-05 23:12:06 UTC
(rev 13578)
@@ -0,0 +1,98 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/gnunet-setup-transport-plugins.c
+ * @brief (de)sensitize transport plugin buttons based on plugin availability
+ * @author Christian Grothoff
+ */
+#include "gnunet-setup.h"
+
+
+static void
+test_plugin (GtkWidget *widget,
+ const char *name)
+{
+ if (GNUNET_YES ==
+ GNUNET_PLUGIN_test (name))
+ {
+ gtk_widget_set_sensitive (widget,
+ TRUE);
+ }
+ else
+ {
+ gtk_widget_set_sensitive (widget,
+ FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
+ FALSE);
+ }
+}
+
+
+
+void
+GNUNET_setup_transport_tcp_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_tcp");
+}
+
+
+void
+GNUNET_setup_transport_udp_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_udp");
+}
+
+
+void
+GNUNET_setup_transport_http_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_http");
+}
+
+
+void
+GNUNET_setup_transport_https_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_https");
+}
+
+
+void
+GNUNET_setup_transport_dv_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_dv");
+}
+
+
+void
+GNUNET_setup_transport_wlan_checkbutton_realize_cb (GtkWidget *widget,
+ gpointer user_data)
+{
+ test_plugin (widget, "libgnunet_plugin_transport_wlan");
+}
+
+/* end of gnunet-setup-transport-plugins.c */
+
Modified: gnunet-setup/src/gnunet-setup.c
===================================================================
--- gnunet-setup/src/gnunet-setup.c 2010-11-05 22:16:16 UTC (rev 13577)
+++ gnunet-setup/src/gnunet-setup.c 2010-11-05 23:12:06 UTC (rev 13578)
@@ -26,18 +26,19 @@
#if ENABLE_NLS
#include <locale.h>
#endif
+#include "gnunet-setup.h"
#include "gnunet-setup-options.h"
#include <regex.h>
/**
- * Builder for the main window.
+ * Builder for the main window (global!)
*/
-static GtkBuilder *builder;
+GtkBuilder *builder;
/**
- * Our configuration.
+ * Our configuration (global!)
*/
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+struct GNUNET_CONFIGURATION_Handle *cfg;
/**
Added: gnunet-setup/src/gnunet-setup.h
===================================================================
--- gnunet-setup/src/gnunet-setup.h (rev 0)
+++ gnunet-setup/src/gnunet-setup.h 2010-11-05 23:12:06 UTC (rev 13578)
@@ -0,0 +1,52 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/gnunet-setup.h
+ * @brief globals
+ * @author Christian Grothoff
+ */
+#ifndef GNUNET_SETUP_H
+#define GNUNET_SETUP_H
+
+#ifndef HAVE_USED_CONFIG_H
+#define HAVE_USED_CONFIG_H
+#include "gnunet_setup_config.h"
+#endif
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_directories.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gladeui/glade.h>
+#include <gtk/gtk.h>
+
+/**
+ * Builder for the main window.
+ */
+extern GtkBuilder *builder;
+
+/**
+ * Our configuration.
+ */
+extern struct GNUNET_CONFIGURATION_Handle *cfg;
+
+
+#endif
+/* end of gnunet-setup.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13578 - in gnunet-setup: contrib src,
gnunet <=