aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-04-01 10:30:35 +0000
committerChristian Grothoff <christian@grothoff.org>2012-04-01 10:30:35 +0000
commita658f046a4aa4b673d67379c2095c0eaf7070d54 (patch)
treefacee5f2af890e5c5a0b57cbf8b84aff11a9ca0c
parent908a359db16784f4b27890fde0ec9726debcf165 (diff)
downloadgnunet-gtk-a658f046a4aa4b673d67379c2095c0eaf7070d54.tar.gz
gnunet-gtk-a658f046a4aa4b673d67379c2095c0eaf7070d54.zip
-cleaning up gnunet-setup GNS-related functions...
Diffstat
-rw-r--r--contrib/gnunet_setup_gtk_main_window.glade366
-rw-r--r--src/setup/gnunet-setup-options.c24
2 files changed, 211 insertions, 179 deletions
diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index 9463408c..87762fc3 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -42,8 +42,6 @@
42 <property name="border_width">5</property> 42 <property name="border_width">5</property>
43 <property name="title" translatable="yes">gnunet-setup</property> 43 <property name="title" translatable="yes">gnunet-setup</property>
44 <property name="window_position">center</property> 44 <property name="window_position">center</property>
45 <property name="default_width">800</property>
46 <property name="default_height">550</property>
47 <property name="icon_name">preferences-system</property> 45 <property name="icon_name">preferences-system</property>
48 <property name="type_hint">dialog</property> 46 <property name="type_hint">dialog</property>
49 <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/> 47 <signal name="destroy" handler="GNUNET_SETUP_quit_cb"/>
@@ -59,6 +57,7 @@
59 <child> 57 <child>
60 <object class="GtkVBox" id="GNUNET_setup_general_vbox"> 58 <object class="GtkVBox" id="GNUNET_setup_general_vbox">
61 <property name="visible">True</property> 59 <property name="visible">True</property>
60 <property name="orientation">vertical</property>
62 <child> 61 <child>
63 <object class="GtkFrame" id="GNUNET_setup_defaultservices_frame"> 62 <object class="GtkFrame" id="GNUNET_setup_defaultservices_frame">
64 <property name="visible">True</property> 63 <property name="visible">True</property>
@@ -381,6 +380,7 @@
381 <child> 380 <child>
382 <object class="GtkVBox" id="GNUNET_setup_hostlist_server_vbox"> 381 <object class="GtkVBox" id="GNUNET_setup_hostlist_server_vbox">
383 <property name="visible">True</property> 382 <property name="visible">True</property>
383 <property name="orientation">vertical</property>
384 <child> 384 <child>
385 <object class="GtkCheckButton" id="GNUNET_setup_hostlist_offer_hostlist_checkbutton"> 385 <object class="GtkCheckButton" id="GNUNET_setup_hostlist_offer_hostlist_checkbutton">
386 <property name="label" translatable="yes">Run Hostlist Server</property> 386 <property name="label" translatable="yes">Run Hostlist Server</property>
@@ -463,6 +463,7 @@
463 <child> 463 <child>
464 <object class="GtkVBox" id="GNUNET_setup_hostlist_vbox "> 464 <object class="GtkVBox" id="GNUNET_setup_hostlist_vbox ">
465 <property name="visible">True</property> 465 <property name="visible">True</property>
466 <property name="orientation">vertical</property>
466 <child> 467 <child>
467 <object class="GtkLabel" id="GNUNET_setup_hostlist_url_label"> 468 <object class="GtkLabel" id="GNUNET_setup_hostlist_url_label">
468 <property name="visible">True</property> 469 <property name="visible">True</property>
@@ -560,6 +561,7 @@
560 <child> 561 <child>
561 <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox"> 562 <object class="GtkVBox" id="GNUNET_setup_network_tab_vbox">
562 <property name="visible">True</property> 563 <property name="visible">True</property>
564 <property name="orientation">vertical</property>
563 <child> 565 <child>
564 <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame"> 566 <object class="GtkFrame" id="GNUNET_setup_bandwidth_frame">
565 <property name="visible">True</property> 567 <property name="visible">True</property>
@@ -572,6 +574,7 @@
572 <child> 574 <child>
573 <object class="GtkVBox" id="GNUNET_setup_bandwidth_vbox"> 575 <object class="GtkVBox" id="GNUNET_setup_bandwidth_vbox">
574 <property name="visible">True</property> 576 <property name="visible">True</property>
577 <property name="orientation">vertical</property>
575 <child> 578 <child>
576 <object class="GtkHBox" id="GNUNET_setup_bandwidth_hbox"> 579 <object class="GtkHBox" id="GNUNET_setup_bandwidth_hbox">
577 <property name="visible">True</property> 580 <property name="visible">True</property>
@@ -661,6 +664,7 @@
661 <child> 664 <child>
662 <object class="GtkVBox" id="GNUNET_setup_transport_nat_vbox"> 665 <object class="GtkVBox" id="GNUNET_setup_transport_nat_vbox">
663 <property name="visible">True</property> 666 <property name="visible">True</property>
667 <property name="orientation">vertical</property>
664 <child> 668 <child>
665 <object class="GtkHBox" id="GNUNET_setup_transport_nat_hbox"> 669 <object class="GtkHBox" id="GNUNET_setup_transport_nat_hbox">
666 <property name="visible">True</property> 670 <property name="visible">True</property>
@@ -741,6 +745,7 @@
741 <child> 745 <child>
742 <object class="GtkVBox" id="GNUNET_setup_transport_nat_options_vbox"> 746 <object class="GtkVBox" id="GNUNET_setup_transport_nat_options_vbox">
743 <property name="visible">True</property> 747 <property name="visible">True</property>
748 <property name="orientation">vertical</property>
744 <child> 749 <child>
745 <object class="GtkCheckButton" id="GNUNET_setup_transport_hole_punched_checkbutton"> 750 <object class="GtkCheckButton" id="GNUNET_setup_transport_hole_punched_checkbutton">
746 <property name="label" translatable="yes">NAT ports have been opened manually</property> 751 <property name="label" translatable="yes">NAT ports have been opened manually</property>
@@ -932,6 +937,7 @@
932 <child> 937 <child>
933 <object class="GtkVBox" id="GNUNET_setup_transport_main_vbox"> 938 <object class="GtkVBox" id="GNUNET_setup_transport_main_vbox">
934 <property name="visible">True</property> 939 <property name="visible">True</property>
940 <property name="orientation">vertical</property>
935 <property name="spacing">5</property> 941 <property name="spacing">5</property>
936 <child> 942 <child>
937 <object class="GtkHBox" id="GNUNET_setup_transport_plugins_hbox"> 943 <object class="GtkHBox" id="GNUNET_setup_transport_plugins_hbox">
@@ -1072,6 +1078,7 @@
1072 <child> 1078 <child>
1073 <object class="GtkVBox" id="GNUNET_setup_transport_tcp_vbox"> 1079 <object class="GtkVBox" id="GNUNET_setup_transport_tcp_vbox">
1074 <property name="visible">True</property> 1080 <property name="visible">True</property>
1081 <property name="orientation">vertical</property>
1075 <property name="spacing">5</property> 1082 <property name="spacing">5</property>
1076 <child> 1083 <child>
1077 <object class="GtkHBox" id="GNUNET_setup_transport_tcp_port_hbox"> 1084 <object class="GtkHBox" id="GNUNET_setup_transport_tcp_port_hbox">
@@ -1257,6 +1264,7 @@
1257 <child> 1264 <child>
1258 <object class="GtkVBox" id="GNUNET_setup_transport_udp_vbox"> 1265 <object class="GtkVBox" id="GNUNET_setup_transport_udp_vbox">
1259 <property name="visible">True</property> 1266 <property name="visible">True</property>
1267 <property name="orientation">vertical</property>
1260 <child> 1268 <child>
1261 <object class="GtkHBox" id="GNUNET_setup_transport_udp_port_hbox"> 1269 <object class="GtkHBox" id="GNUNET_setup_transport_udp_port_hbox">
1262 <property name="visible">True</property> 1270 <property name="visible">True</property>
@@ -1433,6 +1441,7 @@
1433 <child> 1441 <child>
1434 <object class="GtkVBox" id="GNUNET_setup_transport_http_vbox"> 1442 <object class="GtkVBox" id="GNUNET_setup_transport_http_vbox">
1435 <property name="visible">True</property> 1443 <property name="visible">True</property>
1444 <property name="orientation">vertical</property>
1436 <child> 1445 <child>
1437 <object class="GtkHBox" id="GNUNET_setup_transport_http_port_hbox"> 1446 <object class="GtkHBox" id="GNUNET_setup_transport_http_port_hbox">
1438 <property name="visible">True</property> 1447 <property name="visible">True</property>
@@ -1613,6 +1622,7 @@
1613 <child> 1622 <child>
1614 <object class="GtkVBox" id="GNUNET_setup_transport_https_vbox"> 1623 <object class="GtkVBox" id="GNUNET_setup_transport_https_vbox">
1615 <property name="visible">True</property> 1624 <property name="visible">True</property>
1625 <property name="orientation">vertical</property>
1616 <child> 1626 <child>
1617 <object class="GtkHBox" id="GNUNET_setup_transport_https_port_hbox"> 1627 <object class="GtkHBox" id="GNUNET_setup_transport_https_port_hbox">
1618 <property name="visible">True</property> 1628 <property name="visible">True</property>
@@ -1793,6 +1803,7 @@
1793 <child> 1803 <child>
1794 <object class="GtkVBox" id="GNUNET_setup_transport_dv_vbox"> 1804 <object class="GtkVBox" id="GNUNET_setup_transport_dv_vbox">
1795 <property name="visible">True</property> 1805 <property name="visible">True</property>
1806 <property name="orientation">vertical</property>
1796 <child> 1807 <child>
1797 <placeholder/> 1808 <placeholder/>
1798 </child> 1809 </child>
@@ -1814,6 +1825,7 @@
1814 <child> 1825 <child>
1815 <object class="GtkVBox" id="GNUNET_setup_transport_wlan_vbox"> 1826 <object class="GtkVBox" id="GNUNET_setup_transport_wlan_vbox">
1816 <property name="visible">True</property> 1827 <property name="visible">True</property>
1828 <property name="orientation">vertical</property>
1817 <child> 1829 <child>
1818 <object class="GtkHBox" id="GNUNET_setup_transport_wlan_hbox"> 1830 <object class="GtkHBox" id="GNUNET_setup_transport_wlan_hbox">
1819 <property name="visible">True</property> 1831 <property name="visible">True</property>
@@ -1903,6 +1915,7 @@
1903 <child> 1915 <child>
1904 <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox"> 1916 <object class="GtkVBox" id="GNUNET_setup_fs_main_vbox">
1905 <property name="visible">True</property> 1917 <property name="visible">True</property>
1918 <property name="orientation">vertical</property>
1906 <child> 1919 <child>
1907 <object class="GtkFrame" id="GNUNET_setup_fs_frame"> 1920 <object class="GtkFrame" id="GNUNET_setup_fs_frame">
1908 <property name="visible">True</property> 1921 <property name="visible">True</property>
@@ -1976,6 +1989,7 @@
1976 <child> 1989 <child>
1977 <object class="GtkVBox" id="GNUNET_setup_datastore_vbox"> 1990 <object class="GtkVBox" id="GNUNET_setup_datastore_vbox">
1978 <property name="visible">True</property> 1991 <property name="visible">True</property>
1992 <property name="orientation">vertical</property>
1979 <child> 1993 <child>
1980 <object class="GtkHBox" id="GNUNET_setup_datastore_hbox"> 1994 <object class="GtkHBox" id="GNUNET_setup_datastore_hbox">
1981 <property name="visible">True</property> 1995 <property name="visible">True</property>
@@ -2120,6 +2134,7 @@
2120 <child> 2134 <child>
2121 <object class="GtkVBox" id="GNUNET_setup_datastore_mysql_vbox"> 2135 <object class="GtkVBox" id="GNUNET_setup_datastore_mysql_vbox">
2122 <property name="visible">True</property> 2136 <property name="visible">True</property>
2137 <property name="orientation">vertical</property>
2123 <child> 2138 <child>
2124 <object class="GtkHBox" id="GNUNET_setup_datastore_mysql_database_name_hbox"> 2139 <object class="GtkHBox" id="GNUNET_setup_datastore_mysql_database_name_hbox">
2125 <property name="visible">True</property> 2140 <property name="visible">True</property>
@@ -2467,6 +2482,7 @@
2467 <child> 2482 <child>
2468 <object class="GtkVBox" id="GNUNET_setup_datacache_vbox"> 2483 <object class="GtkVBox" id="GNUNET_setup_datacache_vbox">
2469 <property name="visible">True</property> 2484 <property name="visible">True</property>
2485 <property name="orientation">vertical</property>
2470 <child> 2486 <child>
2471 <object class="GtkHBox" id="GNUNET_setup_datacache_hbox"> 2487 <object class="GtkHBox" id="GNUNET_setup_datacache_hbox">
2472 <property name="visible">True</property> 2488 <property name="visible">True</property>
@@ -2611,6 +2627,7 @@
2611 <child> 2627 <child>
2612 <object class="GtkVBox" id="GNUNET_setup_datacache_mysql_vbox"> 2628 <object class="GtkVBox" id="GNUNET_setup_datacache_mysql_vbox">
2613 <property name="visible">True</property> 2629 <property name="visible">True</property>
2630 <property name="orientation">vertical</property>
2614 <child> 2631 <child>
2615 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_database_name_hbox"> 2632 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_database_name_hbox">
2616 <property name="visible">True</property> 2633 <property name="visible">True</property>
@@ -2972,6 +2989,7 @@
2972 <child> 2989 <child>
2973 <object class="GtkVBox" id="GNUNET_setup_vpn_vbox"> 2990 <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
2974 <property name="visible">True</property> 2991 <property name="visible">True</property>
2992 <property name="orientation">vertical</property>
2975 <child> 2993 <child>
2976 <object class="GtkFrame" id="GNUNET_setup_pt_frame"> 2994 <object class="GtkFrame" id="GNUNET_setup_pt_frame">
2977 <property name="visible">True</property> 2995 <property name="visible">True</property>
@@ -2984,6 +3002,7 @@
2984 <child> 3002 <child>
2985 <object class="GtkVBox" id="GNUNET_setup_pt_vbox"> 3003 <object class="GtkVBox" id="GNUNET_setup_pt_vbox">
2986 <property name="visible">True</property> 3004 <property name="visible">True</property>
3005 <property name="orientation">vertical</property>
2987 <child> 3006 <child>
2988 <object class="GtkHBox" id="GNUNET_setup_pt_hbox"> 3007 <object class="GtkHBox" id="GNUNET_setup_pt_hbox">
2989 <property name="visible">True</property> 3008 <property name="visible">True</property>
@@ -3074,6 +3093,7 @@
3074 <child> 3093 <child>
3075 <object class="GtkVBox" id="GNUNET_setup_vpn__vbox"> 3094 <object class="GtkVBox" id="GNUNET_setup_vpn__vbox">
3076 <property name="visible">True</property> 3095 <property name="visible">True</property>
3096 <property name="orientation">vertical</property>
3077 <child> 3097 <child>
3078 <object class="GtkHBox" id="GNUNET_setup_vpn_interface_hbox"> 3098 <object class="GtkHBox" id="GNUNET_setup_vpn_interface_hbox">
3079 <child> 3099 <child>
@@ -3249,6 +3269,7 @@
3249 <child> 3269 <child>
3250 <object class="GtkVBox" id="GNUNET_setup_exit_vbox"> 3270 <object class="GtkVBox" id="GNUNET_setup_exit_vbox">
3251 <property name="visible">True</property> 3271 <property name="visible">True</property>
3272 <property name="orientation">vertical</property>
3252 <child> 3273 <child>
3253 <object class="GtkFrame" id="GNUNET_setup_exit_frame"> 3274 <object class="GtkFrame" id="GNUNET_setup_exit_frame">
3254 <property name="visible">True</property> 3275 <property name="visible">True</property>
@@ -3261,6 +3282,7 @@
3261 <child> 3282 <child>
3262 <object class="GtkVBox" id="GNUNET_setup_exit_frame_vbox"> 3283 <object class="GtkVBox" id="GNUNET_setup_exit_frame_vbox">
3263 <property name="visible">True</property> 3284 <property name="visible">True</property>
3285 <property name="orientation">vertical</property>
3264 <child> 3286 <child>
3265 <object class="GtkHBox" id="GNUNET_setup_exit_master_hbox"> 3287 <object class="GtkHBox" id="GNUNET_setup_exit_master_hbox">
3266 <property name="visible">True</property> 3288 <property name="visible">True</property>
@@ -3528,53 +3550,29 @@
3528 </packing> 3550 </packing>
3529 </child> 3551 </child>
3530 <child> 3552 <child>
3531 <object class="GtkVBox" id="GNUNET_SETUP_gns_vbox"> 3553 <object class="GtkVBox" id="GNUNET_setup_gns_vbox">
3554 <property name="orientation">vertical</property>
3532 <child> 3555 <child>
3533 <object class="GtkVBox" id="vbox1"> 3556 <object class="GtkFrame" id="GNUNET_setup_gns_basics_frame">
3534 <property name="visible">True</property> 3557 <property name="visible">True</property>
3558 <property name="label_xalign">0</property>
3559 <property name="shadow_type">none</property>
3535 <child> 3560 <child>
3536 <object class="GtkFrame" id="GNUNET_setup_gns_basics_frame"> 3561 <object class="GtkAlignment" id="GNUNET_setup_gns_basics_alignment">
3537 <property name="visible">True</property> 3562 <property name="visible">True</property>
3538 <property name="label_xalign">0</property> 3563 <property name="left_padding">12</property>
3539 <property name="shadow_type">none</property>
3540 <child> 3564 <child>
3541 <object class="GtkAlignment" id="GNUNET_setup_gns_basics_alignment"> 3565 <object class="GtkVBox" id="GNUNET_setup_gns_basics_vbox">
3542 <property name="visible">True</property> 3566 <property name="visible">True</property>
3543 <property name="left_padding">12</property> 3567 <property name="orientation">vertical</property>
3544 <child> 3568 <child>
3545 <object class="GtkVBox" id="GNUNET_setup_gns_basics_vbox"> 3569 <object class="GtkHBox" id="GNUNET_setup_gns_basics_hbox">
3546 <property name="visible">True</property> 3570 <property name="visible">True</property>
3547 <child> 3571 <child>
3548 <object class="GtkHBox" id="GNUNET_setup_gns_basics_hbox"> 3572 <object class="GtkLabel" id="GNUNET_setup_gns_basics_preferred_name_label">
3549 <property name="visible">True</property> 3573 <property name="visible">True</property>
3550 <child> 3574 <property name="label" translatable="yes">_Preferred Name:</property>
3551 <object class="GtkLabel" id="GNUNET_setup_gns_basics_preferred_name_label"> 3575 <property name="use_underline">True</property>
3552 <property name="visible">True</property>
3553 <property name="label" translatable="yes">_Preferred Name:</property>
3554 <property name="use_underline">True</property>
3555 </object>
3556 <packing>
3557 <property name="expand">False</property>
3558 <property name="fill">False</property>
3559 <property name="padding">5</property>
3560 <property name="position">0</property>
3561 </packing>
3562 </child>
3563 <child>
3564 <object class="GtkEntry" id="GNUNET_setup_gns_basics_preferred_name_entry">
3565 <property name="visible">True</property>
3566 <property name="can_focus">True</property>
3567 <property name="tooltip_text" translatable="yes">This is the name you use for your own domain and the name that you would prefer others to use for you. Picking a unique name is a good idea so that others will actually be able to use your unique name to reference your domain.</property>
3568 <property name="max_length">63</property>
3569 <property name="invisible_char">&#x25CF;</property>
3570 </object>
3571 <packing>
3572 <property name="expand">False</property>
3573 <property name="fill">False</property>
3574 <property name="padding">5</property>
3575 <property name="position">1</property>
3576 </packing>
3577 </child>
3578 </object> 3576 </object>
3579 <packing> 3577 <packing>
3580 <property name="expand">False</property> 3578 <property name="expand">False</property>
@@ -3584,47 +3582,11 @@
3584 </packing> 3582 </packing>
3585 </child> 3583 </child>
3586 <child> 3584 <child>
3587 <object class="GtkHBox" id="GNUNET_setup_gns_basics_identity_hbox"> 3585 <object class="GtkEntry" id="GNUNET_setup_gns_basics_preferred_name_entry">
3588 <property name="visible">True</property> 3586 <property name="visible">True</property>
3589 <child> 3587 <property name="can_focus">True</property>
3590 <object class="GtkLabel" id="GNUNET_setup_gns_basics_identity_label"> 3588 <property name="max_length">63</property>
3591 <property name="visible">True</property> 3589 <property name="invisible_char">&#x25CF;</property>
3592 <property name="label" translatable="yes">Cryptographic Identity:</property>
3593 </object>
3594 <packing>
3595 <property name="expand">False</property>
3596 <property name="fill">False</property>
3597 <property name="padding">5</property>
3598 <property name="position">0</property>
3599 </packing>
3600 </child>
3601 <child>
3602 <object class="GtkLabel" id="GNUNET_setup_gns_basics_identity_value_label">
3603 <property name="visible">True</property>
3604 <property name="label">---set dynamically---</property>
3605 </object>
3606 <packing>
3607 <property name="expand">False</property>
3608 <property name="padding">5</property>
3609 <property name="position">1</property>
3610 </packing>
3611 </child>
3612 <child>
3613 <object class="GtkButton" id="GNUNET_setup_gns_basics_copy_id_button">
3614 <property name="label">gtk-copy</property>
3615 <property name="visible">True</property>
3616 <property name="can_focus">True</property>
3617 <property name="receives_default">True</property>
3618 <property name="tooltip_text" translatable="yes">This will copy the string that represents your cryptographic identity (your public key) to the clipboard. This will allow you to share it out-of-band with other users.</property>
3619 <property name="use_stock">True</property>
3620 </object>
3621 <packing>
3622 <property name="expand">False</property>
3623 <property name="fill">False</property>
3624 <property name="padding">5</property>
3625 <property name="position">2</property>
3626 </packing>
3627 </child>
3628 </object> 3590 </object>
3629 <packing> 3591 <packing>
3630 <property name="expand">False</property> 3592 <property name="expand">False</property>
@@ -3634,114 +3596,168 @@
3634 </packing> 3596 </packing>
3635 </child> 3597 </child>
3636 </object> 3598 </object>
3599 <packing>
3600 <property name="expand">False</property>
3601 <property name="fill">False</property>
3602 <property name="padding">5</property>
3603 <property name="position">0</property>
3604 </packing>
3605 </child>
3606 <child>
3607 <object class="GtkHBox" id="GNUNET_setup_gns_basics_identity_hbox">
3608 <property name="visible">True</property>
3609 <child>
3610 <object class="GtkLabel" id="GNUNET_setup_gns_basics_identity_label">
3611 <property name="visible">True</property>
3612 <property name="label" translatable="yes">Cryptographic Identity:</property>
3613 </object>
3614 <packing>
3615 <property name="expand">False</property>
3616 <property name="fill">False</property>
3617 <property name="padding">5</property>
3618 <property name="position">0</property>
3619 </packing>
3620 </child>
3621 <child>
3622 <object class="GtkLabel" id="GNUNET_setup_gns_basics_identity_value_label">
3623 <property name="visible">True</property>
3624 <property name="label">---set dynamically---</property>
3625 </object>
3626 <packing>
3627 <property name="expand">False</property>
3628 <property name="padding">5</property>
3629 <property name="position">1</property>
3630 </packing>
3631 </child>
3632 <child>
3633 <object class="GtkButton" id="GNUNET_setup_gns_basics_copy_id_button">
3634 <property name="label">gtk-copy</property>
3635 <property name="visible">True</property>
3636 <property name="can_focus">True</property>
3637 <property name="receives_default">True</property>
3638 <property name="use_stock">True</property>
3639 </object>
3640 <packing>
3641 <property name="expand">False</property>
3642 <property name="fill">False</property>
3643 <property name="padding">5</property>
3644 <property name="position">2</property>
3645 </packing>
3646 </child>
3647 </object>
3648 <packing>
3649 <property name="expand">False</property>
3650 <property name="fill">False</property>
3651 <property name="padding">5</property>
3652 <property name="position">1</property>
3653 </packing>
3637 </child> 3654 </child>
3638 </object>
3639 </child>
3640 <child type="label">
3641 <object class="GtkLabel" id="GNUNET_setup_gns_basics_label">
3642 <property name="visible">True</property>
3643 <property name="label" translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
3644 <property name="use_markup">True</property>
3645 </object> 3655 </object>
3646 </child> 3656 </child>
3647 </object> 3657 </object>
3648 <packing>
3649 <property name="expand">False</property>
3650 <property name="fill">False</property>
3651 <property name="padding">5</property>
3652 <property name="position">0</property>
3653 </packing>
3654 </child> 3658 </child>
3659 <child type="label">
3660 <object class="GtkLabel" id="GNUNET_setup_gns_basics_label">
3661 <property name="visible">True</property>
3662 <property name="label" translatable="yes">&lt;b&gt;Domain Owner Information&lt;/b&gt;</property>
3663 <property name="use_markup">True</property>
3664 </object>
3665 </child>
3666 </object>
3667 <packing>
3668 <property name="expand">False</property>
3669 <property name="fill">False</property>
3670 <property name="padding">5</property>
3671 <property name="position">0</property>
3672 </packing>
3673 </child>
3674 <child>
3675 <object class="GtkFrame" id="GNUNET_setup_gns_configuration_frame">
3676 <property name="visible">True</property>
3677 <property name="label_xalign">0</property>
3678 <property name="shadow_type">none</property>
3655 <child> 3679 <child>
3656 <object class="GtkFrame" id="GNUNET_setup_gns_configuration_frame"> 3680 <object class="GtkAlignment" id="GNUNET_setup_gns_configuration_frame_alignment">
3657 <property name="visible">True</property> 3681 <property name="visible">True</property>
3658 <property name="label_xalign">0</property> 3682 <property name="left_padding">12</property>
3659 <property name="shadow_type">none</property>
3660 <child> 3683 <child>
3661 <object class="GtkAlignment" id="GNUNET_setup_gns_configuration_frame_alignment"> 3684 <object class="GtkScrolledWindow" id="GNUNET_setup_gns_scrolledwindow">
3662 <property name="visible">True</property> 3685 <property name="visible">True</property>
3663 <property name="left_padding">12</property> 3686 <property name="can_focus">True</property>
3687 <property name="hscrollbar_policy">never</property>
3688 <property name="shadow_type">in</property>
3664 <child> 3689 <child>
3665 <object class="GtkScrolledWindow" id="GNUNET_setup_gns_scrolledwindow"> 3690 <object class="GtkViewport" id="GNUNET_setup_gns_viewport">
3666 <property name="visible">True</property> 3691 <property name="visible">True</property>
3667 <property name="can_focus">True</property> 3692 <property name="resize_mode">queue</property>
3668 <property name="hscrollbar_policy">never</property>
3669 <property name="shadow_type">in</property>
3670 <child> 3693 <child>
3671 <object class="GtkViewport" id="GNUNET_setup_gns_viewport"> 3694 <object class="GtkTreeView" id="GNUNET_setup_gns_treeview">
3672 <property name="visible">True</property> 3695 <property name="visible">True</property>
3673 <property name="resize_mode">queue</property> 3696 <property name="can_focus">True</property>
3674 <child> 3697 <property name="model">GNUNET_setup_gns_liststore</property>
3675 <object class="GtkTreeView" id="GNUNET_setup_gns_treeview"> 3698 <property name="headers_clickable">False</property>
3676 <property name="visible">True</property> 3699 <property name="search_column">0</property>
3677 <property name="can_focus">True</property> 3700 <child>
3678 <property name="model">GNUNET_setup_gns_liststore</property> 3701 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_name_treeviewcolumn">
3679 <property name="headers_clickable">False</property> 3702 <property name="sizing">autosize</property>
3680 <property name="search_column">0</property> 3703 <property name="title">Hostname</property>
3704 <property name="clickable">True</property>
3705 <property name="reorderable">True</property>
3706 <property name="sort_indicator">True</property>
3707 <property name="sort_column_id">0</property>
3681 <child> 3708 <child>
3682 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_name_treeviewcolumn"> 3709 <object class="GtkCellRendererText" id="GNUNET_setup_gns_name_cellrenderertext">
3683 <property name="sizing">autosize</property> 3710 <property name="editable">True</property>
3684 <property name="title">Hostname</property>
3685 <property name="clickable">True</property>
3686 <property name="reorderable">True</property>
3687 <property name="sort_indicator">True</property>
3688 <property name="sort_column_id">0</property>
3689 <child>
3690 <object class="GtkCellRendererText" id="GNUNET_setup_gns_name_cellrenderertext">
3691 <property name="editable">True</property>
3692 </object>
3693 <attributes>
3694 <attribute name="text">0</attribute>
3695 </attributes>
3696 </child>
3697 </object> 3711 </object>
3712 <attributes>
3713 <attribute name="text">0</attribute>
3714 </attributes>
3698 </child> 3715 </child>
3716 </object>
3717 </child>
3718 <child>
3719 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_type_treeviewcolumn">
3720 <property name="sizing">autosize</property>
3721 <property name="title">Type</property>
3699 <child> 3722 <child>
3700 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_type_treeviewcolumn"> 3723 <object class="GtkCellRendererText" id="GNUNET_setup_gns_type_cellrenderertext">
3701 <property name="resizable">True</property> 3724 <property name="editable">True</property>
3702 <property name="sizing">autosize</property>
3703 <property name="title">Type</property>
3704 <child>
3705 <object class="GtkCellRendererText" id="GNUNET_setup_gns_type_cellrenderertext">
3706 <property name="editable">True</property>
3707 </object>
3708 <attributes>
3709 <attribute name="text">4</attribute>
3710 </attributes>
3711 </child>
3712 </object> 3725 </object>
3726 <attributes>
3727 <attribute name="text">4</attribute>
3728 </attributes>
3713 </child> 3729 </child>
3730 </object>
3731 </child>
3732 <child>
3733 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_ttl_treeviewcolumn">
3734 <property name="sizing">autosize</property>
3735 <property name="title">TTL</property>
3714 <child> 3736 <child>
3715 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_ttl_treeviewcolumn"> 3737 <object class="GtkCellRendererText" id="GNUNET_setup_gns_ttl_cellrenderertext">
3716 <property name="sizing">autosize</property> 3738 <property name="editable">True</property>
3717 <property name="title">TTL</property>
3718 <child>
3719 <object class="GtkCellRendererText" id="GNUNET_setup_gns_ttl_cellrenderertext">
3720 <property name="editable">True</property>
3721 </object>
3722 <attributes>
3723 <attribute name="text">1</attribute>
3724 </attributes>
3725 </child>
3726 </object> 3739 </object>
3740 <attributes>
3741 <attribute name="text">1</attribute>
3742 </attributes>
3727 </child> 3743 </child>
3744 </object>
3745 </child>
3746 <child>
3747 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_value_treeviewcolumn">
3748 <property name="resizable">True</property>
3749 <property name="title">Value</property>
3750 <property name="clickable">True</property>
3751 <property name="reorderable">True</property>
3752 <property name="sort_indicator">True</property>
3753 <property name="sort_column_id">2</property>
3728 <child> 3754 <child>
3729 <object class="GtkTreeViewColumn" id="GNUNET_setup_gns_value_treeviewcolumn"> 3755 <object class="GtkCellRendererText" id="GNUNET_setup_gns_value_cellrenderertext">
3730 <property name="resizable">True</property> 3756 <property name="editable">True</property>
3731 <property name="title">Value</property>
3732 <property name="clickable">True</property>
3733 <property name="reorderable">True</property>
3734 <property name="sort_indicator">True</property>
3735 <property name="sort_column_id">2</property>
3736 <child>
3737 <object class="GtkCellRendererText" id="GNUNET_setup_gns_value_cellrenderertext">
3738 <property name="editable">True</property>
3739 </object>
3740 <attributes>
3741 <attribute name="text">3</attribute>
3742 </attributes>
3743 </child>
3744 </object> 3757 </object>
3758 <attributes>
3759 <attribute name="text">3</attribute>
3760 </attributes>
3745 </child> 3761 </child>
3746 </object> 3762 </object>
3747 </child> 3763 </child>
@@ -3751,31 +3767,29 @@
3751 </child> 3767 </child>
3752 </object> 3768 </object>
3753 </child> 3769 </child>
3754 <child type="label">
3755 <object class="GtkLabel" id="GNUNET_setup_gns_configuration_frame_label">
3756 <property name="visible">True</property>
3757 <property name="label" translatable="yes">&lt;b&gt;GNS Database&lt;/b&gt;</property>
3758 <property name="use_markup">True</property>
3759 </object>
3760 </child>
3761 </object> 3770 </object>
3762 <packing> 3771 </child>
3763 <property name="padding">5</property> 3772 <child type="label">
3764 <property name="position">1</property> 3773 <object class="GtkLabel" id="GNUNET_setup_gns_configuration_frame_label">
3765 </packing> 3774 <property name="visible">True</property>
3775 <property name="label" translatable="yes">&lt;b&gt;GNS Database&lt;/b&gt;</property>
3776 <property name="use_markup">True</property>
3777 </object>
3766 </child> 3778 </child>
3767 </object> 3779 </object>
3768 <packing> 3780 <packing>
3769 <property name="position">0</property> 3781 <property name="padding">5</property>
3782 <property name="position">1</property>
3770 </packing> 3783 </packing>
3771 </child> 3784 </child>
3772 </object> 3785 </object>
3773 <packing> 3786 <packing>
3774 <property name="position">6</property> 3787 <property name="position">6</property>
3788 <property name="tab_fill">False</property>
3775 </packing> 3789 </packing>
3776 </child> 3790 </child>
3777 <child type="tab"> 3791 <child type="tab">
3778 <object class="GtkLabel" id="GNUNET_SETUP_gns_label"> 3792 <object class="GtkLabel" id="GNUNET_setup_gns_label">
3779 <property name="visible">True</property> 3793 <property name="visible">True</property>
3780 <property name="label" translatable="yes">GN_S</property> 3794 <property name="label" translatable="yes">GN_S</property>
3781 <property name="use_underline">True</property> 3795 <property name="use_underline">True</property>
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index bc6e2cb7..bac91bf5 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1410,7 +1410,6 @@ static struct GNUNET_SETUP_VisibilitySpecification
1410}; 1410};
1411 1411
1412 1412
1413
1414/** 1413/**
1415 * Hide "fs tab" if FS not active. 1414 * Hide "fs tab" if FS not active.
1416 */ 1415 */
@@ -1420,7 +1419,6 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_fs_tab[] = {
1420}; 1419};
1421 1420
1422 1421
1423
1424/** 1422/**
1425 * Hide "vpn tab" if VPN not active. 1423 * Hide "vpn tab" if VPN not active.
1426 */ 1424 */
@@ -1430,6 +1428,14 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] = {
1430}; 1428};
1431 1429
1432 1430
1431/**
1432 * Hide "gns tab" if GNS not active.
1433 */
1434static struct GNUNET_SETUP_VisibilitySpecification hide_gns_tab[] = {
1435 {"GNUNET_setup_gns_vbox", "(^| )gns($| )", NULL},
1436 {NULL, NULL, NULL}
1437};
1438
1433 1439
1434/** 1440/**
1435 * Hide "tcp tab" if TCP not active. 1441 * Hide "tcp tab" if TCP not active.
@@ -2535,7 +2541,19 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
2535 NULL, NULL, 2541 NULL, NULL,
2536 NULL}, 2542 NULL},
2537 2543
2538 /* DNS treeview */ 2544 /* GNS treeview */
2545
2546 {
2547 "GNUNET_setup_general_services_gns_checkbutton",
2548 "toggled",
2549 "arm",
2550 "DEFAULTSERVICES",
2551 gettext_noop ("Should the GNS be started automatically on startup?"),
2552 "https://gnunet.org/configuration-gns",
2553 &load_option_list,
2554 &save_option_list, "gns",
2555 NULL, NULL,
2556 hide_gns_tab},
2539 2557
2540 { 2558 {
2541 "GNUNET_setup_gns_treeview", 2559 "GNUNET_setup_gns_treeview",
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 23:54:04 +0000