[GNUnet-SVN] r4053 - in GNUnet: . contrib

[grothoff]

Author: grothoff
Date: 2006-12-26 19:53:23 -0800 (Tue, 26 Dec 2006)
New Revision: 4053

Modified:
   GNUnet/contrib/config-client.scm
   GNUnet/todo
Log:
have gtk options in scm

Modified: GNUnet/contrib/config-client.scm
===================================================================
--- GNUnet/contrib/config-client.scm    2006-12-27 03:52:48 UTC (rev 4052)
+++ GNUnet/contrib/config-client.scm    2006-12-27 03:53:23 UTC (rev 4053)
@@ -263,6 +263,7 @@
   '()
   'advanced) )
 
+
 (define (fs builder)
  (builder 
   "File-Sharing"
@@ -278,6 +279,72 @@
   #f 
   'always) )
 
+(define (gnunet-gtk-plugins builder)
+ (builder 
+  "GNUNET-GTK"
+  "PLUGINS"
+  (_ "Which plugins should be loaded by gnunet-gtk?")
+  (_ "Load the about plugin for the about dialog.  The daemon plugin allows 
starting and stopping of gnunetd and displays information about gnunetd.  The 
fs plugin provides the file-sharing functionality.  The stats plugin displays 
various statistics about gnunetd.")
+  '()
+  #t 
+  "about daemon fs stats" 
+  '()
+  'advanced) )
+
+(define (gnunet-gtk-stats-interval builder)
+ (builder 
+  "GNUNET-GTK"
+  "STATS-INTERVAL"
+  (_ "How frequently (in milli-seconds) should the statistics update?")
+  (_ "Each pixel in the stats dialog corresponds to the time interval 
specified here.")
+  '()
+  #t 
+  30000
+  (cons 1 999999999)
+  'stats-loaded) )
+
+
+(define (gnunet-gtk-previews builder) 
+ (builder
+   "GNUNET-GTK"
+   "DISABLE-PREVIEWS"
+   (_ "Do not show thumbnail previews from meta-data in search results")
+   (_ "This option is useful for people who maybe offended by some previews or 
use gnunet-gtk at work and would like to avoid bad surprises.")
+   '()
+   #t
+   #f
+   #f
+   'fs-loaded) )
+
+(define (fs-incomingdir builder)
+ (builder
+  "FS"
+  "INCOMINGDIR"
+  (_ "To which directory should gnunet-gtk save downloads to?")
+  (nohelp)
+  '()
+  #t
+  "$HOME/gnunet-downloads"
+  '()
+  'fs-loaded) )
+
+(define (gnunet-gtk builder)
+ (builder 
+  "gnunet-gtk"
+  ""
+  (_ "Options related to gnunet-gtk")
+  (nohelp)
+  (list 
+    (gnunet-gtk-plugins builder)
+    (gnunet-gtk-previews builder)
+    (gnunet-gtk-incomingdir builder)
+    (gnunet-gtk-stats-interval builder)
+  )
+  #t 
+  #f 
+  #f 
+  'always) )
+
 ;; main-menu
 
 (define (general-path builder)
@@ -304,6 +371,7 @@
     (logging builder)
     (general builder)
     (fs builder)
+    (gnunet-gtk builder)
   )
   #t 
   #f 
@@ -331,6 +399,8 @@
      (advanced (get-option ctx "Meta-client" "ADVANCED"))
      (rare (get-option ctx "Meta-client" "RARE"))
      (experimental (get-option ctx "Meta-client" "EXPERIMENTAL"))
+     (stats-loaded (list? (member "stats" (string-split (get-option ctx 
"GNUNET-GTK" "PLUGINS") #\  ) ) ) )
+     (fs-loaded (list? (member "fs" (string-split (get-option ctx "GNUNET-GTK" 
"PLUGINS") #\  ) ) ) )
    )
   (begin 
     (main
@@ -340,6 +410,8 @@
             ((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 'fs-loaded) (change-visible ctx a b fs-loaded))
+            ((eq? i 'stats-loaded) (change-visible ctx a b stats-loaded))
             (else 'nothing)
           )
    ) ) ) )

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-12-27 03:52:48 UTC (rev 4052)
+++ GNUnet/todo 2006-12-27 03:53:23 UTC (rev 4053)
@@ -1,4 +1,4 @@
-Notes:
+notes:
   RC == Release Critical 
 
   All issues that are targeted for the NEXT release
@@ -11,44 +11,53 @@
   Oh, and this is of course just a plan.  And plans always change.
 
 
-0.7.2 [3'07]:
+0.7.1a [1'07]:
 - Windows installer [Nils]
   * uninstall: Remove account
   * libcurl, guile
+- bugfixes:
+  Heikki reports:
+  Ran the current svn over 10 times under gdb (serializetest2)
+  One time it exited with status=1 and said
+  "Download suspended but search reference not set correctly."
+  DexterF reports:
+  gcc -fno-strict-aliasing -Wall -Os -march=i686 -mmmx -msse -m3dnow -o 
.libs/gnunet-setup gnunet-setup.o  ../../src/setup/lib/.libs/libgnunetsetup.so 
../../src/util/.libs/libgnunetutil.so 
../../src/util/loggers/.libs/libgnunetutil_logging.so 
../../src/util/config_impl/.libs/libgnunetutil_config.so /usr/lib/libguile.so 
-lm -lnsl -lpthread 
+  ../../src/util/.libs/libgnunetutil.so: undefined reference to 
`libiconv_open' 
+  ../../src/util/.libs/libgnunetutil.so: undefined reference to 
`libiconv_close' 
+  ../../src/util/.libs/libgnunetutil.so: undefined reference to `libiconv' 
+  collect2: ld returned 1 exit status 
+
+
+0.7.2 [3'07]:
+- new features:
+  * XFS / support for location URIs [CG] 
+    + dstore deletion for quota maintenance [RC]
+    + dht/service.c: timeout [RC]
+    + dht/cs: not done yet [RC]
+    + dht/tools: update clients [RC]
+    + dht/gap integration [RC]
+    + dstore bloomfilter
+  * HTTP transport (libcurl, libmicrohttpd)
+  * SMTP transport (libesmtp)
+  * SMTP logger
 - minor improvements:
   * Scheme (scm) specification of entire configuration;
     check options used in modules:
     + DHT options
     + kvstore
-    + gnunet-gtk
   * directories can be compacted -- add heuristic to determine
     if we should NOT padd with zeros (if we would waste too
     much space).  Needs some lookahead for size of remaining
     directory entries. (theoretically can compact some directories
     by 50% (?) -- incidentially 25% is what gzip can do on the
     current directories!) [ CG ]
-- new features:
-  * XFS / support for location URIs [CG] 
-    + dstore deletion for quota maintenance [RC]
-    + dstore bloomfilter
-    + dht/service.c: timeout [RC]
-    + dht/cs: not done yet [RC]
-    + dht/tools: update clients [RC]
-    + dht/gap integration [RC]
-  * HTTP transport (libcurl, libmicrohttpd)
-  * SMTP transport (libesmtp)
-  * SMTP logger
 - testcases (fix, add):
   * dht/tools
   * ecrs_core
   * gap (incl. economy)
   * advertising
-- bugfixes:
-  Heikki reports:
-  Ran the current svn over 10 times under gdb (serializetest2)
-  One time it exited with status=1 and said
-  "Download suspended but search reference not set correctly."
 
+
 0.7.3 [6'07] (aka "features"):
 - #747 (sharing stats for gnunet-gtk)
 - insert meta-data under hash (md5? sha1? sha-512? GNUnet-URI?)