[GNUnet-SVN] r5551 - in GNUnet: contrib src/setup/gtk

[gnunet]

Author: grothoff
Date: 2007-08-26 02:04:58 -0600 (Sun, 26 Aug 2007)
New Revision: 5551

Modified:
   GNUnet/contrib/config-daemon.scm
   GNUnet/src/setup/gtk/ngconf.c
Log:
configuration clean up
'

Modified: GNUnet/contrib/config-daemon.scm
===================================================================
--- GNUnet/contrib/config-daemon.scm    2007-08-26 05:59:31 UTC (rev 5550)
+++ GNUnet/contrib/config-daemon.scm    2007-08-26 08:04:58 UTC (rev 5551)
@@ -104,7 +104,7 @@
    #f
    'always) )
 
-;; paths
+;; fundamentals
 
 (define (paths-home builder)
  (builder
@@ -217,19 +217,6 @@
    (list "SC" "NOTHING" "FATAL" "ERROR" "WARNING" "INFO" "STATUS" "DEBUG")
    'always))
 
-;; option not supported / used at the moment (useful?)
-;(define (log-conf-date builder)
-; (builder
-;   "LOGGING"
-;   "DATE"
-;   (_ "Log the date of the event")
-;   (nohelp)
-;   '()
-;   #t
-;   #t
-;   #t
-;   'advanced))
-
 (define (log-keeplog builder)
  (builder
   "GNUNETD"
@@ -272,7 +259,7 @@
  (builder
    "LOGGING"
    "" 
-   (_ "Configuration of the logging system") 
+   (_ "Logging") 
    (_ "Specify which system messages should be logged how")
    (list 
      (log-keeplog builder)
@@ -283,7 +270,7 @@
    #t
    #f
    #f
-   'always) )
+   'advanced) )
 
  
 (define (general-pidfile builder)
@@ -340,7 +327,7 @@
   #t
   "udp tcp nat"
   (list "MC" "udp" "udp6" "tcp" "tcp6" "nat")
-  'advanced) )
+  'always) )
  
 
 (define (general-applications builder)
@@ -370,7 +357,7 @@
   #t
   "advertising getoption fs stats traffic"
   (list "MC" "advertising" "getoption" "fs" "stats" "traffic" "dht" "tracekit" 
"tbench" "vpn" "chat")
-  'advanced) )
+  'always) )
  
 
 
@@ -379,13 +366,14 @@
  "TCPSERVER"
  "DISABLE"
  (_ "Disable client-server connections")
- (nohelp)
+ (_ "This option can be used to tell gnunetd not to open the client port.  
When run like this, gnunetd will participate as a peer in the network but not 
support any user interfaces.  This maybe useful for headless systems that are 
never expected to have end-user interactions.  Note that this will also prevent 
you from running diagnostic tools like gnunet-stats!")
  '()
  #t
  #f
  #f
- 'advanced) )
+ 'rare) )
 
+
 (define (gnunetd-private-network builder)
  (builder
  "GNUNETD"
@@ -398,7 +386,7 @@
  #f
  'rare) )
 
-(define (network-disable-advertisting builder)
+(define (network-disable-advertising builder)
  (builder
  "NETWORK"
  "DISABLE-ADVERTISEMENTS"
@@ -420,7 +408,7 @@
  #t
  #f
  #f
- 'rare) )
+ 'experimental) )
 
 (define (network-disable-helloexchange builder)
  (builder
@@ -432,13 +420,13 @@
  #t
  #f
  #f
- 'rare) )
+ 'experimental) )
 
 (define (network-port builder)
  (builder
  "NETWORK"
  "PORT"
- (_ "Client/Server Port")
+ (_ "Port for communication with GNUnet user interfaces")
  (_ "Which is the client-server port that is used between gnunetd and the 
clients (TCP only).  You may firewall this port for non-local machines (but you 
do not have to since GNUnet will perform access control and only allow 
connections from machines that are listed under TRUSTED).")
  '()
  #t
@@ -464,28 +452,16 @@
  "GNUNETD"
  "LIMIT-ALLOW"
  (_ "Limit connections to the specfied set of peers.")
- (_ "If this option is not set, any peer is allowed to connect.  If it is set, 
only the specified peers are allowed.")
+ (_ "If this option is not set, any peer is allowed to connect.  If it is set, 
only the specified peers are allowed. Specify the list of peer IDs (not IPs!)")
  '()
  #t
  ""
  '()
  'rare))
 
-(define (username builder)
+(define (general-groupname builder)
  (builder
  "GNUNETD"
- "USER"
- (_ "Run gnunetd as this user.")
- (_ "When started as root, gnunetd will change permissions to the given user.")
- '()
- #t
- "gnunetd"
- '()
- 'advanced))
-
-(define (groupname builder)
- (builder
- "GNUNETD"
  "GROUP"
  (_ "Run gnunetd as this group.")
  (_ "When started as root, gnunetd will change permissions to the given 
group.")
@@ -495,35 +471,23 @@
  '()
  'advanced))
 
-(define (autostart builder)
- (builder
- "GNUNETD"
- "AUTOSTART"
- (_ "Run gnunetd during system startup?")
- (nohelp)
- '()
- #t
- #t
- '()
- 'rare))
-
-
 (define (limit-deny builder)
  (builder
  "GNUNETD"
  "LIMIT-DENY"
  (_ "Prevent the specfied set of peers from connecting.")
- (_ "If this option is not set, any peer is allowed to connect.")
+ (_ "If this option is not set, any peer is allowed to connect.  If the ID of 
a peer is listed here, connections from that peer will be refused.  Specify the 
list of peer IDs (not IPs!)")
  '()
  #t
  ""
  '()
  'rare))
 
-(define (general-advertising builder)
+(define (advertising builder)
  (builder
   "ADVERTISING"
   ""
+ (_ "Topology Maintenance")
  (_ "Rarely used settings for peer advertisements and connections")
  (list
     (general-helloexpires builder) 
@@ -547,36 +511,53 @@
   (_ "General settings")
   (_ "Settings that change the behavior of GNUnet in general")
   (list 
-    (username builder) 
-    (groupname builder) 
-    (autostart builder) 
-    (daemon-fdlimit builder) 
-    (fs-path builder) 
-    (index-path builder) 
-    (general-pidfile builder) 
-    (general-hostlisturl builder)
-    (general-http-proxy builder)
     (network-port builder) 
     (network-trusted builder) 
+    (general-hostlisturl builder)
+    (general-http-proxy builder)
+    (f2f builder) 
+    (fs-path builder) 
+    (index-path builder) 
+    (daemon-fdlimit builder) 
     (general-username builder) 
+    (general-groupname builder) 
+    (general-pidfile builder) 
     (general-autostart builder) 
-    (general-transports builder) 
-    (general-applications builder) 
   )
   #t
   #f
   #f
   'always) )
 
+(define (modules builder)
+ (builder
+  "MODULES"
+  ""
+  (_ "Modules")
+  (_ "Settings that select specific implementations for GNUnet modules")
+  (list 
+    (modules-sqstore builder) 
+    (modules-topology builder) 
+  )
+  #t
+  #f
+  #f
+  'advanced) )
 
-(define (paths builder)
+
+
+
+(define (fundamentals builder)
  (builder
   "PATHS"
   ""
-  (_ "Path settings")
-  (_ "Prefixes for paths used by GNUnet")
+  (_ "Fundamentals")
+  (_ "")
   (list 
     (paths-home builder) 
+    (general-applications builder) 
+    (general-transports builder) 
+    (modules builder) 
   )
   #t
   #f
@@ -599,7 +580,7 @@
   #t
   "sqstore_sqlite"
   (list "SC" "sqstore_sqlite" "sqstore_mysql")
-  'advanced) )
+  'fs-loaded) )
 
 (define (modules-topology builder)
  (builder
@@ -617,23 +598,6 @@
   'advanced) )
 
 
-
-(define (modules builder)
- (builder
-  "MODULES"
-  ""
-  (_ "Modules")
-  (_ "Settings that select specific implementations for GNUnet modules")
-  (list 
-    (modules-sqstore builder) 
-    (modules-topology builder) 
-  )
-  #t
-  #f
-  #f
-  'advanced) )
-
-
 ;; f2f menu
 
 (define (f2f builder)
@@ -835,7 +799,7 @@
  #t
  #t
  #f
- 'tcp-port-nz))
+ 'tcp-loaded))
 
 (define (tcp-blacklist builder)
  (builder
@@ -1223,7 +1187,7 @@
  #t
  50
  (cons 0 10000)
- 'always))
+ 'advanced))
 
 (define (load-cpu-hard builder)
  (builder
@@ -1235,7 +1199,7 @@
  #t
  0
  (cons 0 99999)
- 'advanced))
+ 'rare))
 
 (define (load-hard-up-limit builder)
  (builder
@@ -1247,7 +1211,7 @@
  #t
  0
  (cons 0 999999999)
- 'advanced))
+ 'rare))
 
 (define (load-padding builder)
  (builder
@@ -1325,12 +1289,11 @@
   (nohelp)
   (list 
     (meta builder)
-    (paths builder)
+    (fundamentals builder)
     (general builder) 
+    (advertising builder) 
     (logging builder)
     (load builder)
-    (modules builder) 
-    (f2f builder) 
     (transports builder) 
     (applications builder) 
   )
@@ -1391,8 +1354,8 @@
         (begin 
           (cond
             ((eq? i 'advanced)     (change-visible ctx a b advanced))
-            ((eq? i 'rare)         (change-visible ctx a b rare))
-            ((eq? i 'experimental) (change-visible ctx a b experimental))
+            ((eq? i 'rare)         (change-visible ctx a b (and advanced 
rare)))
+            ((eq? i 'experimental) (change-visible ctx a b (and advanced 
experimental)))
             ((eq? i 'f2f)          (change-visible ctx a b f2f))
             ((eq? i 'mysql)        (change-visible ctx a b mysql))
             ((eq? i 'fs-loaded)    (change-visible ctx a b fs-loaded))

Modified: GNUnet/src/setup/gtk/ngconf.c
===================================================================
--- GNUnet/src/setup/gtk/ngconf.c       2007-08-26 05:59:31 UTC (rev 5550)
+++ GNUnet/src/setup/gtk/ngconf.c       2007-08-26 08:04:58 UTC (rev 5551)
@@ -70,8 +70,8 @@
   while (pos != NULL) {
     if (pos->pos->visible)
       gtk_widget_show(pos->w);
-    else
-      gtk_widget_hide(pos->w);
+    else 
+      gtk_widget_hide(pos->w);    
     pos = pos->next;
   }
 }
@@ -103,23 +103,15 @@
 radio_update (GtkRadioButton * button, gpointer user_data)
 {
   struct GNS_Tree *pos = user_data;
-  GSList *list = gtk_radio_button_get_group (button);
-  int i;
+  const char * opt;
 
-  i = 0;
-  while (pos->value.String.legalRange[i] != NULL)
-    {
-      if (list->data == button)
-        {
-          GC_set_configuration_value_string (cfg,
-                                             ectx,
-                                             pos->section,
-                                             pos->option,
-                                             pos->value.String.legalRange[i]);
-        }
-      list = list->next;
-      i++;
-    }
+  opt = g_object_get_data(G_OBJECT(button),
+                         "SC-value");
+  GC_set_configuration_value_string (cfg,
+                                    ectx,
+                                    pos->section,
+                                    pos->option,
+                                    opt);
   update_visibility();
 }
 
@@ -202,6 +194,7 @@
       w = gtk_check_button_new_with_label (pos->description);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
                                   pos->value.Boolean.val);
+      tooltip(w, pos->help);
       g_signal_connect (w, "toggled", G_CALLBACK(&boolean_toggled), pos);
       gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 10);
       break;
@@ -227,6 +220,7 @@
        
           w =
             gtk_check_button_new_with_label (lri);
+         tooltip(w, pos->help);
          g_object_set_data(G_OBJECT(w),
                            "MC-value",
                            (void*) lri);
@@ -256,19 +250,23 @@
       choice = NULL;
       label = gtk_label_new(pos->description);
       gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 10);
-      while (pos->value.String.legalRange[i] != NULL)
+      while (NULL != (lri = pos->value.String.legalRange[i]) )
         {
          if (w != NULL)
            w =
              gtk_radio_button_new_with_label_from_widget             
-            (GTK_RADIO_BUTTON(w), pos->value.String.legalRange[i]);
+            (GTK_RADIO_BUTTON(w), lri);
          else
            w =
              gtk_radio_button_new_with_label         
-             (NULL, pos->value.String.legalRange[i]);
+             (NULL, lri);
+         tooltip(w, pos->help);
+         g_object_set_data(G_OBJECT(w),
+                           "SC-value",
+                           (void*) lri);
           gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
           if (0 ==
-              strcmp (pos->value.String.legalRange[i], pos->value.String.val))
+              strcmp (lri, pos->value.String.val))
            choice = w;
           g_signal_connect (w, "toggled", G_CALLBACK(&radio_update), pos);
           i++;
@@ -279,6 +277,7 @@
     case GNS_Double:
       SNPRINTF (defStr, 128, "%llf", pos->value.Double.val);
       w = gtk_entry_new ();
+      tooltip(w, pos->help);
       label = gtk_label_new(pos->description);
       gtk_label_set_mnemonic_widget(GTK_LABEL(label),
                                    w);
@@ -291,6 +290,7 @@
       w = gtk_spin_button_new_with_range (pos->value.UInt64.min,
                                          pos->value.UInt64.max,
                                          1);
+      tooltip(w, pos->help);
       label = gtk_label_new(pos->description);
       gtk_label_set_mnemonic_widget(GTK_LABEL(label),
                                    w);