[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7067 - gnunet-gtk/src/plugins/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7067 - gnunet-gtk/src/plugins/fs |
Date: |
Sat, 7 Jun 2008 01:13:27 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 01:13:27 -0600 (Sat, 07 Jun 2008)
New Revision: 7067
Modified:
gnunet-gtk/src/plugins/fs/fs.h
gnunet-gtk/src/plugins/fs/search.c
Log:
keep raw mime for sorting
Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h 2008-06-07 07:05:43 UTC (rev 7066)
+++ gnunet-gtk/src/plugins/fs/fs.h 2008-06-07 07:13:27 UTC (rev 7067)
@@ -58,6 +58,7 @@
SEARCH_SIZE,
SEARCH_HSIZE,
SEARCH_MIME,
+ SEARCH_RAW_MIME,
SEARCH_DESC,
SEARCH_PIXBUF,
SEARCH_URI,
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-06-07 07:05:43 UTC (rev 7066)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-06-07 07:13:27 UTC (rev 7067)
@@ -262,7 +262,8 @@
SEARCH_ICON, icon,
#endif
SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE,
- size_h, SEARCH_MIME, mime, SEARCH_DESC, desc,
+ size_h, SEARCH_MIME, mime,
+ SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc,
SEARCH_PIXBUF, pixbuf, SEARCH_URI,
GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META,
GNUNET_meta_data_duplicate (info->meta),
@@ -416,7 +417,7 @@
list->last_y,
&path, NULL, NULL, NULL))
{
- GNUNET_GE_BREAK (NULL, 0);
+ /* nothing selected */
return FALSE;
}
if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
@@ -723,6 +724,7 @@
G_TYPE_UINT64, /* size */
G_TYPE_STRING, /* human-readable size
*/
G_TYPE_STRING, /* mime-type */
+ G_TYPE_STRING, /* raw mime-type */
G_TYPE_STRING, /* meta-data (some) */
GDK_TYPE_PIXBUF, /* preview */
G_TYPE_POINTER, /* url */
@@ -765,20 +767,6 @@
gtk_tree_view_column_set_sort_column_id (column, SEARCH_STATUS);
gtk_tree_view_column_set_min_width (column, 0);
-#ifdef HAVE_GIO
- renderer = gtk_cell_renderer_pixbuf_new ();
- col = gtk_tree_view_insert_column_with_attributes (list->treeview,
- -1,
- NULL,
- 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, FALSE);
- gtk_tree_view_column_set_min_width (column, 20);
-#endif
-
renderer = gtk_cell_renderer_text_new ();
col = gtk_tree_view_insert_column_with_attributes (list->treeview,
-1,
@@ -809,6 +797,20 @@
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_min_width (column, 20);
+#else
renderer = gtk_cell_renderer_text_new ();
col = gtk_tree_view_insert_column_with_attributes (list->treeview,
-1,
@@ -823,7 +825,8 @@
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_MIME);
+ gtk_tree_view_column_set_sort_column_id (column, SEARCH_RAW_MIME);
+#endif
#if 0
/* colums for data visualized graphically */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7067 - gnunet-gtk/src/plugins/fs,
gnunet <=