Mercurial > geeqie

comparison src/view_file_list.c @ 834:e5cb9f4389f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
join name and sidecars to one string
author nadvornik
date Sat, 14 Jun 2008 17:32:27 +0000
parents 1d6fedb891dc
children 1014e8f72f94
comparison
equal deleted inserted replaced
833:1d6fedb891dc 834:e5cb9f4389f4
723 723
724 static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd) 724 static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd)
725 { 725 {
726 gchar *size; 726 gchar *size;
727 gchar *sidecars = NULL; 727 gchar *sidecars = NULL;
728 gchar *name_sidecars;
729
730 name_sidecars = (gchar *)fd->name;
728 731
729 if (fd->sidecar_files) 732 if (fd->sidecar_files)
733 {
730 sidecars = file_data_sc_list_to_string(fd); 734 sidecars = file_data_sc_list_to_string(fd);
735 name_sidecars = g_strdup_printf("%s %s", fd->name, sidecars);
736 }
731 size = text_from_size(fd->size); 737 size = text_from_size(fd->size);
732 738
733 gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd, 739 gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd,
734 FILE_COLUMN_VERSION, fd->version, 740 FILE_COLUMN_VERSION, fd->version,
735 FILE_COLUMN_THUMB, fd->pixbuf, 741 FILE_COLUMN_THUMB, fd->pixbuf,
736 FILE_COLUMN_NAME, fd->name, 742 FILE_COLUMN_NAME, name_sidecars,
737 FILE_COLUMN_SIDECARS, sidecars,
738 FILE_COLUMN_SIZE, size, 743 FILE_COLUMN_SIZE, size,
739 FILE_COLUMN_DATE, text_from_time(fd->date), 744 FILE_COLUMN_DATE, text_from_time(fd->date),
740 #define STORE_SET_IS_SLOW 1 745 #define STORE_SET_IS_SLOW 1
741 #if STORE_SET_IS_SLOW 746 #if STORE_SET_IS_SLOW
742 /* this is 3x faster on a directory with 20000 files */ 747 /* this is 3x faster on a directory with 20000 files */
759 gtk_tree_store_set(store, iter, FILE_COLUMN_MARKS + i, file_data_get_mark(fd, i), -1); 764 gtk_tree_store_set(store, iter, FILE_COLUMN_MARKS + i, file_data_get_mark(fd, i), -1);
760 } 765 }
761 #endif 766 #endif
762 g_free(size); 767 g_free(size);
763 if (sidecars) 768 if (sidecars)
769 {
764 g_free(sidecars); 770 g_free(sidecars);
771 g_free(name_sidecars);
772 }
765 } 773 }
766 774
767 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected) 775 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected)
768 { 776 {
769 GList *work; 777 GList *work;
1869 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE); 1877 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE);
1870 1878
1871 for (i = 0; i < FILEDATA_MARKS_SIZE; i++) 1879 for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
1872 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, ""); 1880 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, "");
1873 1881
1874 vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, FALSE); 1882 vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, TRUE);
1875 vflist_listview_add_column(vf, FILE_COLUMN_SIDECARS, _("SC"), FALSE, FALSE, FALSE); 1883 vflist_listview_add_column(vf, FILE_COLUMN_SIDECARS, _("SC"), FALSE, FALSE, FALSE);
1876 1884
1877 vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE); 1885 vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE);
1878 vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE); 1886 vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE);
1879 1887