[GNUnet-SVN] r5550 - in GNUnet: . src/setup/gtk

[gnunet]

Author: grothoff
Date: 2007-08-25 23:59:31 -0600 (Sat, 25 Aug 2007)
New Revision: 5550

Added:
   GNUnet/src/setup/gtk/gnunet-logo-color.png
Modified:
   GNUnet/ChangeLog
   GNUnet/src/setup/gtk/ngconf.c
Log:
new and improved gnunet-setup

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2007-08-26 05:43:27 UTC (rev 5549)
+++ GNUnet/ChangeLog    2007-08-26 05:59:31 UTC (rev 5550)
@@ -1,3 +1,6 @@
+Sat Aug 25 23:58:21 MDT 2007
+       New and improved gnunet-setup GTK interface.
+
 Mon Jul 30 00:07:44 MDT 2007
        Releasing GNUnet 0.7.2b.
 

Added: GNUnet/src/setup/gtk/gnunet-logo-color.png
===================================================================
(Binary files differ)


Property changes on: GNUnet/src/setup/gtk/gnunet-logo-color.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: GNUnet/src/setup/gtk/ngconf.c
===================================================================
--- GNUnet/src/setup/gtk/ngconf.c       2007-08-26 05:43:27 UTC (rev 5549)
+++ GNUnet/src/setup/gtk/ngconf.c       2007-08-26 05:59:31 UTC (rev 5550)
@@ -22,10 +22,6 @@
  * @file setup/gtk/ngconf.c
  * @author Nils Durner
  * @author Christian Grothoff
- *
- * TODO:
- * + handle MC option parsing
- * + test event handlers for widget option changes!
  */
 
 #include "gnunet_setup_lib.h"
@@ -196,6 +192,7 @@
   GtkWidget * label;
   int i;
   char defStr[128];
+  const char * lri;
 
   box = gtk_hbox_new (FALSE, 0);
   link_visibility(pos, box);
@@ -216,7 +213,7 @@
                                    w);
       gtk_box_pack_start (GTK_BOX (ebox), label, FALSE, FALSE, 10);
       gtk_entry_set_text (GTK_ENTRY (w), pos->value.String.val);
-      g_signal_connect (w, "changed", G_CALLBACK(&boolean_toggled), pos);
+      g_signal_connect (w, "changed", G_CALLBACK(&string_update), pos);
       tooltip(w, pos->help);
       gtk_box_pack_start (GTK_BOX (ebox), w, TRUE, TRUE, 10);
       gtk_box_pack_start (GTK_BOX (box), ebox, TRUE, TRUE, 10);
@@ -225,31 +222,29 @@
       i = 0;
       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])) 
         {
+       
           w =
-            gtk_check_button_new_with_label (pos->value.String.legalRange[i]);
+            gtk_check_button_new_with_label (lri);
          g_object_set_data(G_OBJECT(w),
                            "MC-value",
-                           pos->value.String.legalRange[i]);
-          if ((NULL != strstr (pos->value.String.legalRange[i],
-                               pos->value.String.val)) &&
-              ((' ' == strstr (pos->value.String.legalRange[i],
-                               pos->value.String.val)[strlen (pos->value.
-                                                              String.
-                                                              legalRange[i])])
+                           (void*) lri);
+          if ((NULL != strstr (pos->value.String.val,
+                              lri)) &&
+              ((' ' == strstr (pos->value.String.val,
+                              lri)[strlen (lri)])
                || ('\0' ==
-                   strstr (pos->value.String.legalRange[i],
-                           pos->value.String.val)[strlen (pos->value.String.
-                                                          legalRange[i])]))
+                   strstr (pos->value.String.val,
+                          lri)[strlen (lri)]))
               &&
-              ((pos->value.String.legalRange[i] ==
-                strstr (pos->value.String.legalRange[i],
-                        pos->value.String.val))
-               || (' ' ==
-                   strstr (pos->value.String.legalRange[i],
-                           pos->value.String.val)[-1])))
-            gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
+             ((pos->value.String.val ==
+               strstr (pos->value.String.val,
+                       lri))
+              || (' ' ==
+                  strstr (pos->value.String.val,
+                          lri)[-1])))
+           gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
           g_signal_connect (w, "toggled", G_CALLBACK(&multi_update), pos);
           gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 5);
           i++;