https://github.com/BestImageViewer/geeqie/issues/642
There is no stock icon for a folder as a link. The icon used is not
particularly appropriate, but its meaning should be clear.
The target path is shown as a tooltip.
GdkPixbuf *open;
GdkPixbuf *deny;
GdkPixbuf *parent;
GdkPixbuf *open;
GdkPixbuf *deny;
GdkPixbuf *parent;
};
struct _SecureSaveInfo {
};
struct _SecureSaveInfo {
pf->open = gtk_widget_render_icon(widget, GTK_STOCK_OPEN, size, NULL);
pf->deny = gtk_widget_render_icon(widget, GTK_STOCK_STOP, size, NULL);
pf->parent = gtk_widget_render_icon(widget, GTK_STOCK_GO_UP, size, NULL);
pf->open = gtk_widget_render_icon(widget, GTK_STOCK_OPEN, size, NULL);
pf->deny = gtk_widget_render_icon(widget, GTK_STOCK_STOP, size, NULL);
pf->parent = gtk_widget_render_icon(widget, GTK_STOCK_GO_UP, size, NULL);
+ /* FIXME: this is not a suitable icon */
+ pf->link = gtk_widget_render_icon(widget, GTK_STOCK_REDO, size, NULL);
#else
/* GQView legacy icons */
pf->close = pixbuf_inline(PIXBUF_INLINE_FOLDER_CLOSED);
#else
/* GQView legacy icons */
pf->close = pixbuf_inline(PIXBUF_INLINE_FOLDER_CLOSED);
g_object_unref(pf->open);
g_object_unref(pf->deny);
g_object_unref(pf->parent);
g_object_unref(pf->open);
g_object_unref(pf->deny);
g_object_unref(pf->parent);
+ g_object_unref(pf->link);
DIR_COLUMN_NAME,
DIR_COLUMN_COLOR,
DIR_COLUMN_DATE,
DIR_COLUMN_NAME,
DIR_COLUMN_COLOR,
DIR_COLUMN_DATE,
FileData *fd;
SortType sort_type = SORT_NAME;
gboolean sort_ascend = TRUE;
FileData *fd;
SortType sort_type = SORT_NAME;
gboolean sort_ascend = TRUE;
old_list = VDLIST(vd)->list;
old_list = VDLIST(vd)->list;
if (access_file(fd->path, R_OK | X_OK) && fd->name)
{
if (access_file(fd->path, R_OK | X_OK) && fd->name)
{
- if (fd->name[0] == '.' && fd->name[1] == '\0')
+ if (islink(fd->path))
+ {
+ pixbuf = vd->pf->link;
+ }
+ else if (fd->name[0] == '.' && fd->name[1] == '\0')
{
pixbuf = vd->pf->open;
}
{
pixbuf = vd->pf->open;
}
+ if (islink(fd->path))
+ {
+ link = realpath(fd->path, NULL);
+ }
+ else
+ {
+ link = NULL;
+ }
+
if (match < 0)
{
GtkTreeIter new;
if (match < 0)
{
GtkTreeIter new;
DIR_COLUMN_POINTER, fd,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, fd->name,
DIR_COLUMN_POINTER, fd,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, fd->name,
DIR_COLUMN_DATE, date,
-1);
DIR_COLUMN_DATE, date,
-1);
gtk_list_store_set(store, &iter,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, fd->name,
gtk_list_store_set(store, &iter,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, fd->name,
DIR_COLUMN_DATE, date,
-1);
DIR_COLUMN_DATE, date,
-1);
vd->drop_fd = NULL;
filelist_free(old_list);
vd->drop_fd = NULL;
filelist_free(old_list);
- store = gtk_list_store_new(5, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING);
+ store = gtk_list_store_new(6, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
+ gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(vd->view), DIR_COLUMN_LINK);
+
return vd;
}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
return vd;
}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
{
GtkTreeModel *store;
GtkTreePath *tpath;
{
GtkTreeModel *store;
GtkTreePath *tpath;
+ NodeData *nd;
+ FileData *fd = NULL;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, iter);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, iter);
that the iter is populated */
g_signal_handlers_block_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
that the iter is populated */
g_signal_handlers_block_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
- vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+ fd = (nd) ? nd->fd : NULL;
+
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ }
+
g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
}
else
g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
}
else
GdkPixbuf *pixbuf;
NodeData *end;
GtkTreeIter empty;
GdkPixbuf *pixbuf;
NodeData *end;
GtkTreeIter empty;
if (!fd) return;
if (access_file(fd->path, R_OK | X_OK))
{
if (!fd) return;
if (access_file(fd->path, R_OK | X_OK))
{
- pixbuf = vd->pf->close;
+ if (islink(fd->path))
+ {
+ pixbuf = vd->pf->link;
+ }
+ else
+ {
+ pixbuf = vd->pf->close;
+ }
nd->expanded = FALSE;
nd->last_update = time(NULL);
nd->expanded = FALSE;
nd->last_update = time(NULL);
+ if (islink(fd->path))
+ {
+ link = realpath(fd->path, NULL);
+ }
+ else
+ {
+ link = NULL;
+ }
+
store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)));
gtk_tree_store_append(store, &child, parent);
gtk_tree_store_set(store, &child, DIR_COLUMN_POINTER, nd,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, nd->fd->name,
store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)));
gtk_tree_store_append(store, &child, parent);
gtk_tree_store_set(store, &child, DIR_COLUMN_POINTER, nd,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, nd->fd->name,
DIR_COLUMN_COLOR, FALSE, -1);
/* all nodes are created with an "empty" node, so that the expander is shown
DIR_COLUMN_COLOR, FALSE, -1);
/* all nodes are created with an "empty" node, so that the expander is shown
}
gtk_tree_path_free(tpath);
}
}
gtk_tree_path_free(tpath);
}
}
gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
}
gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
GtkTreeIter child;
NodeData *nd;
gboolean add_hidden = FALSE;
GtkTreeIter child;
NodeData *nd;
gboolean add_hidden = FALSE;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
}
gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_NAME, fd->name, -1);
}
gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_NAME, fd->name, -1);
+
+ if (islink(fd->path))
+ {
+ link = realpath(fd->path, NULL);
+ }
+ else
+ {
+ link = NULL;
+ }
+
+ gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_LINK, link, -1);
+
cnd->version = fd->version;
old = g_list_remove(old, cnd);
file_data_unref(fd);
cnd->version = fd->version;
old = g_list_remove(old, cnd);
file_data_unref(fd);
nd->expanded = TRUE;
nd->last_update = current_time;
nd->expanded = TRUE;
nd->last_update = current_time;
if (fd)
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
if (fd)
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
- vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+
+ if (islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+ }
GtkTreeViewColumn *column;
GtkTreeIter iter;
NodeData *nd = NULL;
GtkTreeViewColumn *column;
GtkTreeIter iter;
NodeData *nd = NULL;
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
&tpath, &column, NULL, NULL))
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
&tpath, &column, NULL, NULL))
!gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
!gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
- vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+ }
}
gtk_tree_path_free(tpath);
}
gtk_tree_path_free(tpath);
static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
+ GtkTreeModel *store;
+ NodeData *nd = NULL;
+ FileData *fd;
+
+ gtk_tree_view_set_tooltip_column(treeview, DIR_COLUMN_LINK);
vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
- vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+
+ gtk_tree_model_get_iter(store, iter, tpath);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ }
}
static void vdtree_row_collapsed(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
}
static void vdtree_row_collapsed(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
+ GtkTreeModel *store;
+ NodeData *nd = NULL;
+ FileData *fd;
+
+ vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
- vdtree_icon_set_by_iter(vd, iter, vd->pf->close);
+ gtk_tree_model_get_iter(store, iter, tpath);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->close);
+ }
}
static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
}
static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
vd->dnd_drop_leave_func = vdtree_dnd_drop_expand_cancel;
vd->dnd_drop_update_func = vdtree_dnd_drop_expand;
vd->dnd_drop_leave_func = vdtree_dnd_drop_expand_cancel;
vd->dnd_drop_update_func = vdtree_dnd_drop_expand;
- store = gtk_tree_store_new(4, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
+ store = gtk_tree_store_new(6, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
+ gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(vd->view), DIR_COLUMN_LINK);
+
vdtree_setup_root(vd);
g_signal_connect(G_OBJECT(vd->view), "row_expanded",
vdtree_setup_root(vd);
g_signal_connect(G_OBJECT(vd->view), "row_expanded",