[GNUnet-SVN] r6568 - gnunet-gtk/src/plugins/fs

[gnunet]

Author: cyberix
Date: 2008-03-16 17:28:33 -0600 (Sun, 16 Mar 2008)
New Revision: 6568

Modified:
   gnunet-gtk/src/plugins/fs/download.c
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/fs.h
   gnunet-gtk/src/plugins/fs/search.c
Log:
Added a separate status column into search view.


Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c        2008-03-14 22:16:21 UTC (rev 
6567)
+++ gnunet-gtk/src/plugins/fs/download.c        2008-03-16 23:28:33 UTC (rev 
6568)
@@ -289,7 +289,11 @@
                                   &iter,
                                   SEARCH_CELL_BG_COLOR,
                                   getColorCode
-                                  (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
+                                  (GNUNET_URITRACK_DOWNLOAD_STARTED),
+                                  SEARCH_STATUS,
+                                  getStatusName
+                                  (GNUNET_URITRACK_DOWNLOAD_STARTED),
+                                  -1);
               break;
             }
           valid = gtk_tree_model_iter_next (model, &iter);
@@ -377,6 +381,8 @@
                           &iter,
                           SEARCH_CELL_BG_COLOR,
                           getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
+                          SEARCH_STATUS,
+                          getStatusName (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
                           -1);
     }
   downloadContext->has_terminated = GNUNET_YES;
@@ -406,6 +412,8 @@
                           &iter,
                           SEARCH_CELL_BG_COLOR,
                           getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED),
+                          SEARCH_STATUS,
+                          getStatusName (GNUNET_URITRACK_DOWNLOAD_ABORTED),
                           -1);
     }
   downloadContext->has_terminated = GNUNET_YES;

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2008-03-14 22:16:21 UTC (rev 6567)
+++ gnunet-gtk/src/plugins/fs/fs.c      2008-03-16 23:28:33 UTC (rev 6568)
@@ -726,8 +726,31 @@
   if (state &
       (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
     return "gray";
-  return "white";
+  return NULL;
 }
 
 
+const char *
+getStatusName (enum GNUNET_URITRACK_STATE state)
+{
+  if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
+    return _("added");
+  if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
+    return _("shared");
+  if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
+      (0 == (state &
+             (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
+              GNUNET_URITRACK_DOWNLOAD_ABORTED))))
+    return _("started");
+  if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
+    return _("completed");
+  if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
+    return _("aborted");
+  if (state &
+      (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
+    return "";
+  return "";
+}
+
+
 /* end of fs.c */

Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h      2008-03-14 22:16:21 UTC (rev 6567)
+++ gnunet-gtk/src/plugins/fs/fs.h      2008-03-16 23:28:33 UTC (rev 6568)
@@ -63,6 +63,7 @@
   SEARCH_CELL_FG_COLOR,
   SEARCH_INTERNAL,
   SEARCH_INTERNAL_PARENT,
+  SEARCH_STATUS,
   SEARCH_NUM,
 };
 
@@ -341,5 +342,7 @@
 
 const char *getColorCode (enum GNUNET_URITRACK_STATE state);
 
+const char *getStatusName (enum GNUNET_URITRACK_STATE state);
 
+
 #endif

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2008-03-14 22:16:21 UTC (rev 6567)
+++ gnunet-gtk/src/plugins/fs/search.c  2008-03-16 23:28:33 UTC (rev 6568)
@@ -139,6 +139,7 @@
                       SEARCH_CELL_BG_COLOR, getColorCode (state),
                       SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
                       searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
+                      SEARCH_STATUS, getStatusName (state),
                       -1);
   if (pixbuf != NULL)
     g_object_unref (pixbuf);
@@ -469,7 +470,8 @@
                                    G_TYPE_STRING,       /* bg-color */
                                    G_TYPE_STRING,       /* fg-color */
                                    G_TYPE_POINTER,      /* internal: search 
list */
-                                   G_TYPE_POINTER);     /* internal: download 
parent list */
+                                   G_TYPE_POINTER,      /* internal: download 
parent list */
+                                   G_TYPE_STRING);      /* status */
 
   gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree));
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (list->treeview),
@@ -482,6 +484,24 @@
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (list->treeview,
                                                      -1,
+                                                     _("Status"),
+                                                     renderer,
+                                                     "text", SEARCH_STATUS,
+                                                     "cell-background",
+                                                     SEARCH_CELL_BG_COLOR,
+                                                     "foreground",
+                                                     SEARCH_CELL_FG_COLOR,
+                                                     NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_STATUS);
+  gtk_tree_view_column_set_min_width (column, 0);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
                                                      _("Name"),
                                                      renderer,
                                                      "text", SEARCH_NAME,
@@ -501,11 +521,7 @@
                                                      -1,
                                                      _("Size"),
                                                      renderer,
-                                                     "text", SEARCH_HSIZE,
-                                                     "cell-background",
-                                                     SEARCH_CELL_BG_COLOR,
-                                                     "foreground",
-                                                     SEARCH_CELL_FG_COLOR,
+                                                     "text", SEARCH_SIZE,
                                                      NULL);
   column = gtk_tree_view_get_column (list->treeview, col - 1);
   gtk_tree_view_column_set_resizable (column, TRUE);