X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Flayout-image.cc;fp=src%2Flayout-image.cc;h=3b413bf8ed439da9b30cf5768c498d9c55bfa187;hp=3d0c44cef8c27d7af526f2e5f29b6e124563d1ea;hb=e57cfab83e6ca160d4a1240cc74f6da99bc507b0;hpb=9cad6d70203c3beae92b28db2274f05915b58bb1 diff --git a/src/layout-image.cc b/src/layout-image.cc index 3d0c44ce..3b413bf8 100644 --- a/src/layout-image.cc +++ b/src/layout-image.cc @@ -1242,44 +1242,9 @@ void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gboolean vertical, gb void layout_image_alter_orientation(LayoutWindow *lw, AlterType type) { if (!layout_valid(&lw)) return; - - GtkTreeModel *store; - GList *work; - GtkTreeSelection *selection; - GtkTreePath *tpath; - FileData *fd_n; - GtkTreeIter iter; - if (!lw || !lw->vf) return; - if (lw->vf->type == FILEVIEW_ICON) - { - if (!VFICON(lw->vf)->selection) return; - work = VFICON(lw->vf)->selection; - } - else - { - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(lw->vf->listview)); - work = gtk_tree_selection_get_selected_rows(selection, &store); - } - - while (work) - { - if (lw->vf->type == FILEVIEW_ICON) - { - fd_n = static_cast(work->data); - work = work->next; - } - else - { - tpath = static_cast(work->data); - gtk_tree_model_get_iter(store, &iter, tpath); - gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1); - work = work->next; - } - - image_alter_orientation(lw->image, fd_n, type); - } + vf_selection_foreach(lw->vf, [lw, type](FileData *fd_n) { image_alter_orientation(lw->image, fd_n, type); }); } static void image_alter_rating(FileData *fd_n, const gchar *rating) @@ -1291,44 +1256,9 @@ static void image_alter_rating(FileData *fd_n, const gchar *rating) void layout_image_rating(LayoutWindow *lw, const gchar *rating) { if (!layout_valid(&lw)) return; - - GtkTreeModel *store; - GList *work; - GtkTreeSelection *selection; - GtkTreePath *tpath; - FileData *fd_n; - GtkTreeIter iter; - if (!lw || !lw->vf) return; - if (lw->vf->type == FILEVIEW_ICON) - { - if (!VFICON(lw->vf)->selection) return; - work = VFICON(lw->vf)->selection; - } - else - { - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(lw->vf->listview)); - work = gtk_tree_selection_get_selected_rows(selection, &store); - } - - while (work) - { - if (lw->vf->type == FILEVIEW_ICON) - { - fd_n = static_cast(work->data); - work = work->next; - } - else - { - tpath = static_cast(work->data); - gtk_tree_model_get_iter(store, &iter, tpath); - gtk_tree_model_get(store, &iter, VIEW_FILE_COLUMN_POINTER, &fd_n, -1); - work = work->next; - } - - image_alter_rating(fd_n, rating); - } + vf_selection_foreach(lw->vf, [rating](FileData *fd_n) { image_alter_rating(fd_n, rating); }); } void layout_image_reset_orientation(LayoutWindow *lw)