Mercurial > geeqie.yaz
comparison src/utilops.c @ 1634:9b692bdb4b9f
unify code paths for New directory
keep the directory visible after rename
https://sourceforge.net/tracker/?func=detail&aid=1951183&group_id=222125&atid=1054680
author | nadvornik |
---|---|
date | Mon, 08 Jun 2009 19:05:49 +0000 |
parents | 011e8dbda7f2 |
children | 5d66965165f2 |
comparison
equal
deleted
inserted
replaced
1633:2f733f8c983f | 1634:9b692bdb4b9f |
---|---|
933 void file_util_check_ci(UtilityData *ud) | 933 void file_util_check_ci(UtilityData *ud) |
934 { | 934 { |
935 gint error = CHANGE_OK; | 935 gint error = CHANGE_OK; |
936 gchar *desc = NULL; | 936 gchar *desc = NULL; |
937 | 937 |
938 if (ud->type != UTILITY_TYPE_CREATE_FOLDER) | 938 if (ud->type != UTILITY_TYPE_CREATE_FOLDER && |
939 ud->type != UTILITY_TYPE_RENAME_FOLDER) | |
939 { | 940 { |
940 if (ud->dest_path && !isdir(ud->dest_path)) | 941 if (ud->dest_path && !isdir(ud->dest_path)) |
941 { | 942 { |
942 error = CHANGE_GENERIC_ERROR; | 943 error = CHANGE_GENERIC_ERROR; |
943 desc = g_strdup_printf(_("%s is not a directory"), ud->dest_path); | 944 desc = g_strdup_printf(_("%s is not a directory"), ud->dest_path); |
2529 | 2530 |
2530 return ok; | 2531 return ok; |
2531 } | 2532 } |
2532 | 2533 |
2533 | 2534 |
2534 static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWidget *parent, UtilityPhase phase) | 2535 static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data) |
2535 { | 2536 { |
2536 UtilityData *ud; | 2537 UtilityData *ud; |
2537 | 2538 |
2538 ud = file_util_data_new(UTILITY_TYPE_RENAME_FOLDER); | 2539 ud = file_util_data_new(UTILITY_TYPE_RENAME_FOLDER); |
2539 | 2540 |
2543 | 2544 |
2544 ud->dir_fd = file_data_ref(fd); | 2545 ud->dir_fd = file_data_ref(fd); |
2545 ud->flist = NULL; | 2546 ud->flist = NULL; |
2546 ud->content_list = NULL; | 2547 ud->content_list = NULL; |
2547 ud->parent = parent; | 2548 ud->parent = parent; |
2549 | |
2550 ud->done_func = done_func; | |
2551 ud->done_data = done_data; | |
2552 ud->dest_path = g_strdup(new_path); | |
2548 | 2553 |
2549 ud->messages.title = _("Rename"); | 2554 ud->messages.title = _("Rename"); |
2550 ud->messages.question = _("Rename folder?"); | 2555 ud->messages.question = _("Rename folder?"); |
2551 ud->messages.desc_flist = _("The folder contains the following files"); | 2556 ud->messages.desc_flist = _("The folder contains the following files"); |
2552 ud->messages.desc_source_fd = ""; | 2557 ud->messages.desc_source_fd = ""; |
2681 void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data) | 2686 void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data) |
2682 { | 2687 { |
2683 file_util_create_dir_full(dir_fd, NULL, parent, UTILITY_PHASE_ENTERING, done_func, done_data); | 2688 file_util_create_dir_full(dir_fd, NULL, parent, UTILITY_PHASE_ENTERING, done_func, done_data); |
2684 } | 2689 } |
2685 | 2690 |
2686 void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent) | 2691 void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data) |
2687 { | 2692 { |
2688 file_util_rename_dir_full(source_fd, new_path, parent, UTILITY_PHASE_ENTERING); | 2693 file_util_rename_dir_full(source_fd, new_path, parent, UTILITY_PHASE_ENTERING, done_func, done_data); |
2689 } | 2694 } |
2690 | 2695 |
2691 | 2696 |
2692 void file_util_copy_path_to_clipboard(FileData *fd) | 2697 void file_util_copy_path_to_clipboard(FileData *fd) |
2693 { | 2698 { |