added possibility to disable grouping of selected files

diff --git a/src/filedata.c b/src/filedata.c
index d059a2a..7fd064c 100644 (file)
--- a/src/filedata.c
+++ b/src/filedata.c
@@ -337,7 +337,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
 
        file_data_set_path(fd, path_utf8); /* set path, name, collate_key_*, original_path */
 
-       if (check_sidecars && sidecar_file_priority(fd->extension))
+       if (check_sidecars)
                file_data_check_sidecars(fd);
 
        return fd;
@@ -345,10 +345,17 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
 
 static void file_data_check_sidecars(FileData *fd)
 {
-       int base_len = fd->extension - fd->path;
-       GString *fname = g_string_new_len(fd->path, base_len);
+       int base_len;
+       GString *fname;
        FileData *parent_fd = NULL;
-       GList *work = sidecar_ext_get_list();
+       GList *work;
+
+       if (fd->disable_grouping || !sidecar_file_priority(fd->extension))
+               return;
+
+       base_len = fd->extension - fd->path;
+       fname = g_string_new_len(fd->path, base_len);
+       work = sidecar_ext_get_list();
 
        while (work)
                {
@@ -377,6 +384,13 @@ static void file_data_check_sidecars(FileData *fd)
                                continue;
 
                        new_fd = file_data_new(fname->str, &nst, FALSE);
+                       
+                       if (new_fd->disable_grouping)
+                               {
+                               file_data_unref(new_fd);
+                               continue;
+                               }
+                       
                        new_fd->ref--; /* do not use ref here */
                        }
 
@@ -537,6 +551,45 @@ FileData *file_data_disconnect_sidecar_file(FileData *target, FileData *sfd)
        return sfd;
 }
 
+/* disables / enables grouping for particular file, sends UPDATE notification */
+void file_data_disable_grouping(FileData *fd, gboolean disable)
+{
+       if (!fd->disable_grouping == !disable) return;
+       fd->disable_grouping = !!disable;
+       
+       if (disable)
+               {
+               if (fd->parent)
+                       {
+                       FileData *parent = file_data_ref(fd->parent);
+                       file_data_disconnect_sidecar_file(parent, fd);
+                       file_data_send_notification(fd, NOTIFY_TYPE_INTERNAL);
+                       file_data_send_notification(parent, NOTIFY_TYPE_INTERNAL);
+                       file_data_unref(parent);
+                       }
+               else if (fd->sidecar_files)
+                       {
+                       GList *sidecar_files = filelist_copy(fd->sidecar_files);
+                       GList *work = sidecar_files;
+                       while (work)
+                               {
+                               FileData *sfd = work->data;
+                               work = work->next;
+                               file_data_disconnect_sidecar_file(fd, sfd);
+                               file_data_send_notification(sfd, NOTIFY_TYPE_INTERNAL);
+                               }
+                       file_data_send_notification(fd, NOTIFY_TYPE_INTERNAL);
+                       file_data_check_sidecars((FileData *)sidecar_files->data); /* this will group the sidecars back together */
+                       filelist_free(sidecar_files);
+                       }
+               }
+       else
+               {
+               file_data_check_sidecars(fd);
+               file_data_send_notification(fd, NOTIFY_TYPE_INTERNAL);
+               }
+}
+
 /* compare name without extension */
 gint file_data_compare_name_without_ext(FileData *fd1, FileData *fd2)
 {
@@ -1035,16 +1088,7 @@ gchar *file_data_sc_list_to_string(FileData *fd)
 }
 
 
-/* disables / enables grouping for particular file, sends UPDATE notification */
-void file_data_disable_grouping(FileData *fd); // now file_data_disconnect_sidecar_file, broken
-void file_data_disable_grouping(FileData *fd);
-
-/* runs stat on a file and sends UPDATE notification if it has been changed */
-void file_data_sc_update(FileData *fd);
-
-
-
-
+                               
 /* 
  * add FileDataChangeInfo (see typedefs.h) for the given operation 
  * uses file_data_add_change_info

diff --git a/src/filedata.h b/src/filedata.h
index 80ed4e4..8fa47f8 100644 (file)
--- a/src/filedata.h
+++ b/src/filedata.h
@@ -29,6 +29,8 @@ void file_data_increment_version(FileData *fd);
 gboolean file_data_add_change_info(FileData *fd, FileDataChangeType type, const gchar *src, const gchar *dest);
 void file_data_change_info_free(FileDataChangeInfo *fdci, FileData *fd);
 
+void file_data_disable_grouping(FileData *fd, gboolean disable);
+
 gint filelist_sort_compare_filedata(FileData *fa, FileData *fb);
 gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType method, gint ascend);
 GList *filelist_sort(GList *list, SortType method, gint ascend);

diff --git a/src/typedefs.h b/src/typedefs.h
index d0e6496..623b3f7 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -446,10 +446,13 @@ struct _FileData {
        FileDataChangeInfo *change; /* for rename, move ... */
        GdkPixbuf *thumb_pixbuf;
 
-       GdkPixbuf *pixbuf; /* full-size image */
+       GdkPixbuf *pixbuf; /* full-size image, only complete images, NULL during loading
+                             all FileData with non-NULL pixbuf are referenced by image_cache */
 
        gint ref;
        gint version; /* increased when any field in this structure is changed */
+       gint disable_grouping;
+
        gint user_orientation;
        gint exif_orientation;
        

diff --git a/src/utilops.c b/src/utilops.c
index 28b644d..8a9d0e7 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -1187,6 +1187,20 @@ static void file_util_warn_op_in_progress(const gchar *title)
        file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, NULL);
 }
 
+static void file_util_disable_grouping_sc_list(GList *list)
+{
+       GList *work = list;
+       
+       while(work)
+               {
+               FileData *fd = work->data;
+               work = work->next;
+               
+               if (fd->parent) file_data_disable_grouping(fd, TRUE);
+               }
+               
+}
+
 static void file_util_delete_full(FileData *source_fd, GList *source_list, GtkWidget *parent, UtilityPhase phase)
 {
        UtilityData *ud;
@@ -1195,6 +1209,8 @@ static void file_util_delete_full(FileData *source_fd, GList *source_list, GtkWi
        if (source_fd)
                flist = g_list_append(flist, file_data_ref(source_fd));
 
+       file_util_disable_grouping_sc_list(flist);
+       
        if (!file_data_sc_add_ci_delete_list(flist))
                {
                file_util_warn_op_in_progress(_("File deletion failed"));
@@ -1229,6 +1245,8 @@ static void file_util_move_full(FileData *source_fd, GList *source_list, const g
        if (source_fd)
                flist = g_list_append(flist, file_data_ref(source_fd));
 
+       file_util_disable_grouping_sc_list(flist);
+
        if (!file_data_sc_add_ci_move_list(flist, dest_path))
                {
                file_util_warn_op_in_progress(_("Move failed"));
@@ -1264,6 +1282,8 @@ static void file_util_copy_full(FileData *source_fd, GList *source_list, const g
        if (source_fd)
                flist = g_list_append(flist, file_data_ref(source_fd));
 
+       file_util_disable_grouping_sc_list(flist);
+
        if (!file_data_sc_add_ci_copy_list(flist, dest_path))
                {
                file_util_warn_op_in_progress(_("Copy failed"));
@@ -1300,6 +1320,8 @@ static void file_util_rename_full(FileData *source_fd, GList *source_list, const
        if (source_fd)
                flist = g_list_append(flist, file_data_ref(source_fd));
 
+       file_util_disable_grouping_sc_list(flist);
+
        if (!file_data_sc_add_ci_rename_list(flist, dest_path))
                {
                file_util_warn_op_in_progress(_("Rename failed"));
@@ -1334,6 +1356,8 @@ static void file_util_start_editor_full(gint n, FileData *source_fd, GList *sour
        if (source_fd)
                flist = g_list_append(flist, file_data_ref(source_fd));
 
+       file_util_disable_grouping_sc_list(flist);
+
        if (!file_data_sc_add_ci_unspecified_list(flist, dest_path))
                {
                file_util_warn_op_in_progress(_("Can't run external editor"));