Mercurial > geeqie.yaz
comparison src/view_file_list.c @ 1650:890eca727486
improved list view
- do the string formatting in the cell_data callback
- show the sidecar list only in collapsed entries
author | nadvornik |
---|---|
date | Sat, 20 Jun 2009 16:46:32 +0000 |
parents | 011e8dbda7f2 |
children | 3968a763e2b1 |
comparison
equal
deleted
inserted
replaced
1649:8b2ba0e1fc09 | 1650:890eca727486 |
---|---|
36 enum { | 36 enum { |
37 FILE_COLUMN_POINTER = 0, | 37 FILE_COLUMN_POINTER = 0, |
38 FILE_COLUMN_VERSION, | 38 FILE_COLUMN_VERSION, |
39 FILE_COLUMN_THUMB, | 39 FILE_COLUMN_THUMB, |
40 FILE_COLUMN_NAME, | 40 FILE_COLUMN_NAME, |
41 FILE_COLUMN_MULTILINE, | 41 FILE_COLUMN_SIDECARS, |
42 FILE_COLUMN_SIZE, | 42 FILE_COLUMN_SIZE, |
43 FILE_COLUMN_DATE, | 43 FILE_COLUMN_DATE, |
44 FILE_COLUMN_COLOR, | 44 FILE_COLUMN_COLOR, |
45 FILE_COLUMN_MARKS, | 45 FILE_COLUMN_MARKS, |
46 FILE_COLUMN_MARKS_LAST = FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1, | 46 FILE_COLUMN_MARKS_LAST = FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1, |
51 /* Index to tree view */ | 51 /* Index to tree view */ |
52 enum { | 52 enum { |
53 FILE_VIEW_COLUMN_MARKS = 0, | 53 FILE_VIEW_COLUMN_MARKS = 0, |
54 FILE_VIEW_COLUMN_MARKS_LAST = FILE_VIEW_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1, | 54 FILE_VIEW_COLUMN_MARKS_LAST = FILE_VIEW_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1, |
55 FILE_VIEW_COLUMN_THUMB, | 55 FILE_VIEW_COLUMN_THUMB, |
56 FILE_VIEW_COLUMN_MULTILINE, | |
57 FILE_VIEW_COLUMN_NAME, | 56 FILE_VIEW_COLUMN_NAME, |
58 FILE_VIEW_COLUMN_SIZE, | 57 FILE_VIEW_COLUMN_SIZE, |
59 FILE_VIEW_COLUMN_DATE, | 58 FILE_VIEW_COLUMN_DATE, |
60 FILE_VIEW_COLUMN_COUNT | 59 FILE_VIEW_COLUMN_COUNT |
61 }; | 60 }; |
63 | 62 |
64 | 63 |
65 static gboolean vflist_row_is_selected(ViewFile *vf, FileData *fd); | 64 static gboolean vflist_row_is_selected(ViewFile *vf, FileData *fd); |
66 static gboolean vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data); | 65 static gboolean vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data); |
67 static void vflist_populate_view(ViewFile *vf); | 66 static void vflist_populate_view(ViewFile *vf); |
67 static gboolean vflist_is_multiline(ViewFile *vf); | |
68 | 68 |
69 | 69 |
70 /* | 70 /* |
71 *----------------------------------------------------------------------------- | 71 *----------------------------------------------------------------------------- |
72 * misc | 72 * misc |
810 gboolean path_currently_selected, gpointer data) | 810 gboolean path_currently_selected, gpointer data) |
811 { | 811 { |
812 return TRUE; | 812 return TRUE; |
813 } | 813 } |
814 */ | 814 */ |
815 | |
816 static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd) | 815 static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd) |
817 { | 816 { |
818 gchar *size; | 817 gchar *size; |
819 gchar *sidecars = NULL; | 818 gchar *sidecars = NULL; |
820 gchar *name_sidecars; | 819 gchar *name; |
821 gchar *multiline; | |
822 const gchar *time = text_from_time(fd->date); | 820 const gchar *time = text_from_time(fd->date); |
823 gchar *link = islink(fd->path) ? GQ_LINK_STR : ""; | 821 gchar *link = islink(fd->path) ? GQ_LINK_STR : ""; |
824 | 822 const gchar *disabled_grouping; |
825 | 823 |
826 if (fd->sidecar_files) | 824 sidecars = file_data_sc_list_to_string(fd); |
827 { | 825 |
828 sidecars = file_data_sc_list_to_string(fd); | 826 disabled_grouping = fd->disable_grouping ? _(" [NO GROUPING]") : ""; |
829 name_sidecars = g_strdup_printf("%s%s %s", link, fd->name, sidecars); | 827 name = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping); |
830 } | |
831 else | |
832 { | |
833 gchar *disabled_grouping = fd->disable_grouping ? _(" [NO GROUPING]") : ""; | |
834 name_sidecars = g_strdup_printf("%s%s%s", link, fd->name, disabled_grouping); | |
835 } | |
836 size = text_from_size(fd->size); | 828 size = text_from_size(fd->size); |
837 | 829 |
838 multiline = g_strdup_printf("%s\n%s\n%s", name_sidecars, size, time); | |
839 | |
840 gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd, | 830 gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd, |
841 FILE_COLUMN_VERSION, fd->version, | 831 FILE_COLUMN_VERSION, fd->version, |
842 FILE_COLUMN_THUMB, fd->thumb_pixbuf, | 832 FILE_COLUMN_THUMB, fd->thumb_pixbuf, |
843 FILE_COLUMN_MULTILINE, multiline, | 833 FILE_COLUMN_SIDECARS, sidecars, |
844 FILE_COLUMN_NAME, name_sidecars, | 834 FILE_COLUMN_NAME, name, |
845 FILE_COLUMN_SIZE, size, | 835 FILE_COLUMN_SIZE, size, |
846 FILE_COLUMN_DATE, time, | 836 FILE_COLUMN_DATE, time, |
847 #define STORE_SET_IS_SLOW 1 | 837 #define STORE_SET_IS_SLOW 1 |
848 #if STORE_SET_IS_SLOW | 838 #if STORE_SET_IS_SLOW |
849 /* this is 3x faster on a directory with 20000 files */ | 839 /* this is 3x faster on a directory with 20000 files */ |
866 gtk_tree_store_set(store, iter, FILE_COLUMN_MARKS + i, file_data_get_mark(fd, i), -1); | 856 gtk_tree_store_set(store, iter, FILE_COLUMN_MARKS + i, file_data_get_mark(fd, i), -1); |
867 } | 857 } |
868 #endif | 858 #endif |
869 g_free(size); | 859 g_free(size); |
870 g_free(sidecars); | 860 g_free(sidecars); |
871 g_free(name_sidecars); | 861 g_free(name); |
872 g_free(multiline); | |
873 } | 862 } |
874 | 863 |
875 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected) | 864 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected) |
876 { | 865 { |
877 GList *work; | 866 GList *work; |
1617 *----------------------------------------------------------------------------- | 1606 *----------------------------------------------------------------------------- |
1618 * core (population) | 1607 * core (population) |
1619 *----------------------------------------------------------------------------- | 1608 *----------------------------------------------------------------------------- |
1620 */ | 1609 */ |
1621 | 1610 |
1622 static void vflist_listview_set_columns(GtkWidget *listview, gboolean thumb) | 1611 static void vflist_listview_set_columns(GtkWidget *listview, gboolean thumb, gboolean multiline) |
1623 { | 1612 { |
1624 GtkTreeViewColumn *column; | 1613 GtkTreeViewColumn *column; |
1625 GtkCellRenderer *cell; | 1614 GtkCellRenderer *cell; |
1626 GList *list; | 1615 GList *list; |
1627 gboolean multiline; | |
1628 | 1616 |
1629 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_THUMB); | 1617 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_THUMB); |
1630 if (!column) return; | 1618 if (!column) return; |
1631 | 1619 |
1632 gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 4); | 1620 gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 4); |
1637 g_list_free(list); | 1625 g_list_free(list); |
1638 | 1626 |
1639 g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL); | 1627 g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL); |
1640 gtk_tree_view_column_set_visible(column, thumb); | 1628 gtk_tree_view_column_set_visible(column, thumb); |
1641 | 1629 |
1642 multiline = (thumb && options->thumbnails.max_height >= 48); | |
1643 | |
1644 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_MULTILINE); | |
1645 if (!column) return; | |
1646 gtk_tree_view_column_set_visible(column, multiline); | |
1647 if (multiline) gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column); | |
1648 | |
1649 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_NAME); | 1630 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_NAME); |
1650 if (!column) return; | 1631 if (!column) return; |
1651 gtk_tree_view_column_set_visible(column, !multiline); | 1632 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column); |
1652 if (!multiline) gtk_tree_view_set_expander_column(GTK_TREE_VIEW(listview), column); | |
1653 | 1633 |
1654 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_SIZE); | 1634 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_VIEW_COLUMN_SIZE); |
1655 if (!column) return; | 1635 if (!column) return; |
1656 gtk_tree_view_column_set_visible(column, !multiline); | 1636 gtk_tree_view_column_set_visible(column, !multiline); |
1657 | 1637 |
1660 gtk_tree_view_column_set_visible(column, !multiline); | 1640 gtk_tree_view_column_set_visible(column, !multiline); |
1661 | 1641 |
1662 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview)); | 1642 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview)); |
1663 } | 1643 } |
1664 | 1644 |
1645 static gboolean vflist_is_multiline(ViewFile *vf) | |
1646 { | |
1647 return (VFLIST(vf)->thumbs_enabled && options->thumbnails.max_height >= 48); | |
1648 } | |
1649 | |
1650 | |
1665 static void vflist_populate_view(ViewFile *vf) | 1651 static void vflist_populate_view(ViewFile *vf) |
1666 { | 1652 { |
1667 GtkTreeStore *store; | 1653 GtkTreeStore *store; |
1668 gboolean thumbs_enabled; | |
1669 GList *selected; | 1654 GList *selected; |
1670 | 1655 |
1671 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); | 1656 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
1672 thumbs_enabled = VFLIST(vf)->thumbs_enabled; | |
1673 | 1657 |
1674 vf_thumb_stop(vf); | 1658 vf_thumb_stop(vf); |
1675 | 1659 |
1676 if (!vf->list) | 1660 if (!vf->list) |
1677 { | 1661 { |
1678 vflist_store_clear(vf); | 1662 vflist_store_clear(vf); |
1679 vf_send_update(vf); | 1663 vf_send_update(vf); |
1680 return; | 1664 return; |
1681 } | 1665 } |
1682 | 1666 |
1683 vflist_listview_set_columns(vf->listview, thumbs_enabled); | 1667 vflist_listview_set_columns(vf->listview, VFLIST(vf)->thumbs_enabled, vflist_is_multiline(vf)); |
1684 | 1668 |
1685 selected = vflist_selection_get_list(vf); | 1669 selected = vflist_selection_get_list(vf); |
1686 | 1670 |
1687 vflist_setup_iter_recursive(vf, store, NULL, vf->list, selected); | 1671 vflist_setup_iter_recursive(vf, store, NULL, vf->list, selected); |
1688 | 1672 |
1777 g_object_set(G_OBJECT(cell), | 1761 g_object_set(G_OBJECT(cell), |
1778 "cell-background-gdk", vflist_listview_color_shifted(vf->listview), | 1762 "cell-background-gdk", vflist_listview_color_shifted(vf->listview), |
1779 "cell-background-set", set, NULL); | 1763 "cell-background-set", set, NULL); |
1780 } | 1764 } |
1781 | 1765 |
1782 static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gboolean image, gboolean right_justify, gboolean expand) | 1766 static void vflist_name_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, |
1767 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) | |
1768 { | |
1769 ViewFile *vf = data; | |
1770 gboolean multiline = vflist_is_multiline(vf); | |
1771 gchar *text; | |
1772 gboolean expanded; | |
1773 GtkTreePath *tpath; | |
1774 | |
1775 tpath = gtk_tree_model_get_path(tree_model, iter); | |
1776 expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(vf->listview), tpath); | |
1777 gtk_tree_path_free(tpath); | |
1778 | |
1779 if (multiline) | |
1780 { | |
1781 gchar *name, *sidecars, *size, *time; | |
1782 gtk_tree_model_get(tree_model, iter, FILE_COLUMN_SIDECARS, &sidecars, | |
1783 FILE_COLUMN_NAME, &name, | |
1784 FILE_COLUMN_SIZE, &size, | |
1785 FILE_COLUMN_DATE, &time, | |
1786 -1); | |
1787 text = g_strdup_printf("%s %s\n%s\n%s", name, expanded ? "" : sidecars, size, time); | |
1788 g_free(name); | |
1789 g_free(sidecars); | |
1790 g_free(size); | |
1791 g_free(time); | |
1792 } | |
1793 else | |
1794 { | |
1795 gchar *name, *sidecars; | |
1796 gtk_tree_model_get(tree_model, iter, FILE_COLUMN_SIDECARS, &sidecars, | |
1797 FILE_COLUMN_NAME, &name, | |
1798 -1); | |
1799 text = g_strdup_printf("%s %s", name, expanded ? "" : sidecars); | |
1800 g_free(name); | |
1801 g_free(sidecars); | |
1802 } | |
1803 | |
1804 g_object_set(cell, "text", text, NULL); | |
1805 g_free(text); | |
1806 | |
1807 /* now call the common cb */ | |
1808 vflist_listview_color_cb(tree_column, cell, tree_model, iter, data); | |
1809 } | |
1810 | |
1811 | |
1812 static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gboolean image, gboolean right_justify, | |
1813 gboolean expand, GtkTreeCellDataFunc cell_data_func) | |
1783 { | 1814 { |
1784 GtkTreeViewColumn *column; | 1815 GtkTreeViewColumn *column; |
1785 GtkCellRenderer *renderer; | 1816 GtkCellRenderer *renderer; |
1786 | 1817 |
1787 column = gtk_tree_view_column_new(); | 1818 column = gtk_tree_view_column_new(); |
1808 cell_renderer_height_override(renderer); | 1839 cell_renderer_height_override(renderer); |
1809 gtk_tree_view_column_pack_start(column, renderer, TRUE); | 1840 gtk_tree_view_column_pack_start(column, renderer, TRUE); |
1810 gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n); | 1841 gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n); |
1811 } | 1842 } |
1812 | 1843 |
1813 gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vf, NULL); | 1844 if (cell_data_func) |
1845 gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func, vf, NULL); | |
1846 else | |
1847 gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vf, NULL); | |
1814 g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); | 1848 g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); |
1815 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); | 1849 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); |
1816 | 1850 |
1817 gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); | 1851 gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
1818 } | 1852 } |
1925 | 1959 |
1926 flist_types[FILE_COLUMN_POINTER] = G_TYPE_POINTER; | 1960 flist_types[FILE_COLUMN_POINTER] = G_TYPE_POINTER; |
1927 flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT; | 1961 flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT; |
1928 flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF; | 1962 flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF; |
1929 flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING; | 1963 flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING; |
1930 flist_types[FILE_COLUMN_MULTILINE] = G_TYPE_STRING; | 1964 flist_types[FILE_COLUMN_SIDECARS] = G_TYPE_STRING; |
1931 flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING; | 1965 flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING; |
1932 flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING; | 1966 flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING; |
1933 flist_types[FILE_COLUMN_COLOR] = G_TYPE_BOOLEAN; | 1967 flist_types[FILE_COLUMN_COLOR] = G_TYPE_BOOLEAN; |
1934 for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++) | 1968 for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++) |
1935 flist_types[i] = G_TYPE_BOOLEAN; | 1969 flist_types[i] = G_TYPE_BOOLEAN; |
1953 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, ""); | 1987 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, ""); |
1954 g_assert(column == FILE_VIEW_COLUMN_MARKS + i); | 1988 g_assert(column == FILE_VIEW_COLUMN_MARKS + i); |
1955 column++; | 1989 column++; |
1956 } | 1990 } |
1957 | 1991 |
1958 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE); | 1992 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE, NULL); |
1959 g_assert(column == FILE_VIEW_COLUMN_THUMB); | 1993 g_assert(column == FILE_VIEW_COLUMN_THUMB); |
1960 column++; | 1994 column++; |
1961 | 1995 |
1962 vflist_listview_add_column(vf, FILE_COLUMN_MULTILINE, _("Name"), FALSE, FALSE, TRUE); | 1996 vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, TRUE, vflist_name_cell_data_cb); |
1963 g_assert(column == FILE_VIEW_COLUMN_MULTILINE); | |
1964 column++; | |
1965 | |
1966 vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, TRUE); | |
1967 g_assert(column == FILE_VIEW_COLUMN_NAME); | 1997 g_assert(column == FILE_VIEW_COLUMN_NAME); |
1968 column++; | 1998 column++; |
1969 | 1999 |
1970 vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE); | 2000 vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE, NULL); |
1971 g_assert(column == FILE_VIEW_COLUMN_SIZE); | 2001 g_assert(column == FILE_VIEW_COLUMN_SIZE); |
1972 column++; | 2002 column++; |
1973 | 2003 |
1974 vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE); | 2004 vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE, NULL); |
1975 g_assert(column == FILE_VIEW_COLUMN_DATE); | 2005 g_assert(column == FILE_VIEW_COLUMN_DATE); |
1976 column++; | 2006 column++; |
1977 | 2007 |
1978 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); | 2008 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
1979 return vf; | 2009 return vf; |