[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7103 - gnunet-gtk/src/plugins/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7103 - gnunet-gtk/src/plugins/fs |
|
Date: |
Mon, 9 Jun 2008 05:37:14 -0600 (MDT) |
Author: moon
Date: 2008-06-09 05:37:13 -0600 (Mon, 09 Jun 2008)
New Revision: 7103
Modified:
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/status.c
gnunet-gtk/src/plugins/fs/status.h
Log:
replace 'Status' column with an icon
merge 'Name' and 'Type' (?\195?\160 la Nautilus)
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-06-09 06:00:31 UTC (rev
7102)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-06-09 11:37:13 UTC (rev
7103)
@@ -286,13 +286,13 @@
= gtk_tree_row_reference_new (model, path);
gtk_tree_path_free (path);
gtk_tree_store_set (sl_parent->tree,
- &iter,
- SEARCH_CELL_BG_COLOR,
- getColorCode
- (GNUNET_URITRACK_DOWNLOAD_STARTED),
- SEARCH_STATUS,
+ &iter, SEARCH_STATUS,
getStatusName
- (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
+ (GNUNET_URITRACK_DOWNLOAD_STARTED),
+ SEARCH_STATUS_LOGO,
+ getStatusLogo
+ (GNUNET_URITRACK_DOWNLOAD_STARTED),
+ -1);
break;
}
valid = gtk_tree_model_iter_next (model, &iter);
@@ -378,10 +378,10 @@
gtk_tree_path_free (path);
gtk_tree_store_set (downloadContext->searchList->tree,
&iter,
- SEARCH_CELL_BG_COLOR,
- getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
SEARCH_STATUS,
getStatusName (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
+ SEARCH_STATUS_LOGO,
+ getStatusLogo (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
-1);
}
downloadContext->has_terminated = GNUNET_YES;
@@ -409,10 +409,10 @@
gtk_tree_path_free (path);
gtk_tree_store_set (downloadContext->searchList->tree,
&iter,
- SEARCH_CELL_BG_COLOR,
- getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED),
SEARCH_STATUS,
getStatusName (GNUNET_URITRACK_DOWNLOAD_ABORTED),
+ SEARCH_STATUS_LOGO,
+ getStatusLogo (GNUNET_URITRACK_DOWNLOAD_ABORTED),
-1);
}
downloadContext->has_terminated = GNUNET_YES;
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2008-06-09 06:00:31 UTC (rev 7102)
+++ gnunet-gtk/src/plugins/fs/fs.h 2008-06-09 11:37:13 UTC (rev 7103)
@@ -61,11 +61,10 @@
SEARCH_PIXBUF,
SEARCH_URI,
SEARCH_META,
- SEARCH_CELL_BG_COLOR,
- SEARCH_CELL_FG_COLOR,
SEARCH_INTERNAL,
SEARCH_INTERNAL_PARENT,
SEARCH_STATUS,
+ SEARCH_STATUS_LOGO,
SEARCH_AVAILABILITY_RANK,
SEARCH_AVAILABILITY_CERTAINTY,
SEARCH_APPLICABILITY_RANK,
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-09 06:00:31 UTC (rev 7102)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-09 11:37:13 UTC (rev 7103)
@@ -235,7 +235,8 @@
{
mime = GNUNET_strdup (_("Directory"));
icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
- "folder", 16, 0, (GError **) NULL);
+ GTK_STOCK_DIRECTORY, 16, 0,
+ (GError **) NULL);
}
else
{
@@ -266,10 +267,10 @@
SEARCH_PIXBUF, pixbuf, SEARCH_URI,
GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META,
GNUNET_meta_data_duplicate (info->meta),
- SEARCH_CELL_BG_COLOR, getColorCode (state),
- SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
- searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
+ SEARCH_INTERNAL,searchContext,
+ SEARCH_INTERNAL_PARENT, downloadParent,
SEARCH_STATUS, getStatusName (state),
+ SEARCH_STATUS_LOGO, getStatusLogo (state),
SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT,
(long long) 1, SEARCH_RANK_PIXBUF, rankbuf,
#ifdef HAVE_GIO
@@ -728,11 +729,10 @@
GDK_TYPE_PIXBUF, /* preview */
G_TYPE_POINTER, /* url */
G_TYPE_POINTER, /* meta */
- 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_STRING, /* status */
+ GDK_TYPE_PIXBUF, /* status (icon) */
G_TYPE_INT, /* availability rank */
G_TYPE_UINT, /* availability certainty */
G_TYPE_UINT, /* applicability rank */
@@ -751,84 +751,55 @@
"changed",
G_CALLBACK (&on_fssearchSelectionChanged),
list, NULL, 0);
- 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);
+ column = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_title (column, _("Name"));
+#ifdef HAVE_GIO
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (column, renderer, FALSE);
+ gtk_tree_view_column_set_attributes (column, renderer, "pixbuf",
+ SEARCH_ICON, NULL);
+#endif
renderer = gtk_cell_renderer_text_new ();
- col = gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Name"),
- renderer,
- "text", SEARCH_NAME,
- NULL);
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
g_object_set (G_OBJECT (renderer),
"wrap-width", 45,
"width-chars", 45, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- column = gtk_tree_view_get_column (list->treeview, col - 1);
+ gtk_tree_view_column_set_attributes (column, renderer, "text",
+ SEARCH_NAME, NULL);
+ col = gtk_tree_view_insert_column (list->treeview, column, 0);
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_NAME);
- renderer = gtk_cell_renderer_text_new ();
- g_object_set (renderer, "xalign", 1.00, NULL);
+ renderer = gtk_cell_renderer_pixbuf_new ();
col = gtk_tree_view_insert_column_with_attributes (list->treeview,
-1,
- _("Size"),
+ _("Status"),
renderer,
- "text", SEARCH_HSIZE,
+ "pixbuf",
SEARCH_STATUS_LOGO,
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_SIZE);
-
-#ifdef HAVE_GIO
- renderer = gtk_cell_renderer_pixbuf_new ();
- col = gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- _("Type"),
- renderer,
- "pixbuf",
- SEARCH_ICON, NULL);
- column = gtk_tree_view_get_column (list->treeview, col - 1);
- gtk_tree_view_column_set_resizable (column, TRUE);
- gtk_tree_view_column_set_reorderable (column, TRUE);
- gtk_tree_view_column_set_sort_column_id (column, SEARCH_RAW_MIME);
+ gtk_tree_view_column_set_sort_column_id (column, SEARCH_STATUS);
gtk_tree_view_column_set_min_width (column, 20);
-#else
+
renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer, "xalign", 1.00, NULL);
col = gtk_tree_view_insert_column_with_attributes (list->treeview,
-1,
- _("Type"),
+ _("Size"),
renderer,
- "text", SEARCH_MIME,
+ "text", SEARCH_HSIZE,
NULL);
- g_object_set (G_OBJECT (renderer),
- "wrap-width", 30,
- "width-chars", 30, "ellipsize", PANGO_ELLIPSIZE_END, 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_RAW_MIME);
-#endif
+ gtk_tree_view_column_set_sort_column_id (column, SEARCH_SIZE);
#if 0
/* colums for data visualized graphically */
Modified: gnunet-gtk/src/plugins/fs/status.c
===================================================================
--- gnunet-gtk/src/plugins/fs/status.c 2008-06-09 06:00:31 UTC (rev 7102)
+++ gnunet-gtk/src/plugins/fs/status.c 2008-06-09 11:37:13 UTC (rev 7103)
@@ -75,5 +75,29 @@
return "";
}
+const GdkPixbuf *
+getStatusLogo (enum GNUNET_URITRACK_STATE state)
+{
+ if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
+ return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ GTK_STOCK_ADD, 16, 0, (GError **)NULL);
+ if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
+ return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ GTK_STOCK_HOME, 16, 0, (GError **)NULL);
+ if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
+ (0 == (state &
+ (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
+ GNUNET_URITRACK_DOWNLOAD_ABORTED))))
+ return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ GTK_STOCK_GO_DOWN, 16, 0, (GError
**)NULL);
+ if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
+ return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ GTK_STOCK_APPLY, 16, 0, (GError **)NULL);
+ if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
+ return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+ GTK_STOCK_CANCEL, 16, 0, (GError **)NULL);
+ return NULL;
+}
+
/* end of status.c */
Modified: gnunet-gtk/src/plugins/fs/status.h
===================================================================
--- gnunet-gtk/src/plugins/fs/status.h 2008-06-09 06:00:31 UTC (rev 7102)
+++ gnunet-gtk/src/plugins/fs/status.h 2008-06-09 11:37:13 UTC (rev 7103)
@@ -35,4 +35,6 @@
const char *getStatusName (enum GNUNET_URITRACK_STATE state);
+const GdkPixbuf *getStatusLogo (enum GNUNET_URITRACK_STATE state);
+
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7103 - gnunet-gtk/src/plugins/fs,
gnunet <=