[GNUnet-SVN] r3868 - in gnunet-gtk: . src/plugins/fs

[grothoff]

Author: grothoff
Date: 2006-12-03 13:11:19 -0800 (Sun, 03 Dec 2006)
New Revision: 3868

Modified:
   gnunet-gtk/ChangeLog
   gnunet-gtk/TODO
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/fs.h
   gnunet-gtk/src/plugins/fs/search.c
Log:
added highlighting of stared and completed searches/downloads in search list -- 
using yellow and green colors respectively

Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog        2006-12-03 20:52:26 UTC (rev 3867)
+++ gnunet-gtk/ChangeLog        2006-12-03 21:11:19 UTC (rev 3868)
@@ -1,3 +1,12 @@
+Sun Dec  3 14:47:46 MST 2006
+       Buttons that cannot be used are now disabled.
+       Started downloads are marked using a yellow
+       background for size field in the search dialog.
+       Completed downloads are marked using a green
+       background.  When manually entering a path
+       for uploads, switch between recursive and
+       file-only is now automatic.
+
 Wed Nov 15 23:17:36 MST 2006
        Updated to GNUnet 0.7.1pre0 APIs.  Disabled
        incomplete or broken portions of FS API.

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2006-12-03 20:52:26 UTC (rev 3867)
+++ gnunet-gtk/TODO     2006-12-03 21:11:19 UTC (rev 3868)
@@ -1,6 +1,4 @@
 0.7.1:
-- highlight active downloads in search list [ easy ] [pre1]
-- highlight completed downloads [ easy ] [pre1]
 - allow deletion of keywords and metadata [pre1]
 
 - create directory from known file IDs [ medium ] [pre2]

Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2006-12-03 20:52:26 UTC (rev 
3867)
+++ gnunet-gtk/src/plugins/fs/download.c        2006-12-03 21:11:19 UTC (rev 
3868)
@@ -259,8 +259,10 @@
            = gtk_tree_row_reference_new(GTK_TREE_MODEL(sl_parent->tree),
                                         path);
          gtk_tree_path_free(path);
-         /* TODO: extend search model with status;
-            start to indicate active download! */
+         gtk_tree_store_set(sl_parent->tree,
+                            &iter,
+                            SEARCH_CELL_BG_COLOR, "yellow",
+                            -1);
          break;
        }
       } while (TRUE == 
gtk_tree_model_iter_next(GTK_TREE_MODEL(sl_parent->tree),
@@ -339,7 +341,20 @@
  * possibly refresh directory listing.
  */
 void fs_download_completed(DownloadList * downloadContext) {
-  /* FIXME: update summary? / search list status entry (once added) */
+  GtkTreeIter iter;
+  GtkTreePath * path;
+
+  if (downloadContext->searchViewRowReference != NULL) {
+    path = 
gtk_tree_row_reference_get_path(downloadContext->searchViewRowReference);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(downloadContext->searchList->tree),
+                           &iter,
+                           path);
+    gtk_tree_path_free(path);
+    gtk_tree_store_set(downloadContext->searchList->tree,
+                      &iter,
+                      SEARCH_CELL_BG_COLOR, "green",
+                      -1);
+  }
   downloadContext->has_terminated = YES;
   refreshDirectoryViewFromDisk(downloadContext);
 }

Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h      2006-12-03 20:52:26 UTC (rev 3867)
+++ gnunet-gtk/src/plugins/fs/fs.h      2006-12-03 21:11:19 UTC (rev 3868)
@@ -56,6 +56,7 @@
   SEARCH_PIXBUF,
   SEARCH_URI,
   SEARCH_META,
+  SEARCH_CELL_BG_COLOR,
   SEARCH_INTERNAL,
   SEARCH_INTERNAL_PARENT,
   SEARCH_NUM,

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2006-12-03 20:52:26 UTC (rev 3867)
+++ gnunet-gtk/src/plugins/fs/search.c  2006-12-03 21:11:19 UTC (rev 3868)
@@ -123,6 +123,7 @@
                     SEARCH_PIXBUF, pixbuf,
                     SEARCH_URI, ECRS_dupUri(info->uri),
                     SEARCH_META, ECRS_dupMetaData(info->meta),
+                    SEARCH_CELL_BG_COLOR, "white",
                     SEARCH_INTERNAL, searchContext,
                     SEARCH_INTERNAL_PARENT, downloadParent,
                     -1);
@@ -233,6 +234,7 @@
                       GDK_TYPE_PIXBUF, /* preview */   
                       G_TYPE_POINTER,  /* url */
                       G_TYPE_POINTER,  /* meta */
+                      G_TYPE_STRING, /* bg-color */
                       G_TYPE_POINTER,  /* internal: search list */
                       G_TYPE_POINTER); /* internal: download parent list */
 
@@ -268,6 +270,7 @@
                                                    _("Size"),
                                                    renderer,
                                                    "text", SEARCH_HSIZE,
+                                                   "cell-background", 
SEARCH_CELL_BG_COLOR,
                                                    NULL);
   column = gtk_tree_view_get_column(list->treeview,
                                    col - 1);