diff options
-rw-r--r-- | fileset.c | 10 | ||||
-rw-r--r-- | fileset.h | 6 | ||||
-rw-r--r-- | ui/gtk/fileset_dlg.c | 15 |
3 files changed, 15 insertions, 16 deletions
@@ -267,7 +267,7 @@ fileset_sort_compare(gconstpointer a, gconstpointer b) /* add all file set entries to the dialog */ -void fileset_update_dlg(void) +void fileset_update_dlg(void *window) { GList *le; @@ -275,7 +275,7 @@ void fileset_update_dlg(void) /* add all entires to the dialog */ le = g_list_first(set.entries); while(le) { - fileset_dlg_add_file((fileset_entry *)le->data); + fileset_dlg_add_file((fileset_entry *)le->data, window); le = g_list_next(le); } } @@ -283,7 +283,7 @@ void fileset_update_dlg(void) /* walk through the directory of the loaded file and add every file matching the current file */ void -fileset_add_dir(const char *fname) +fileset_add_dir(const char *fname, void *window) { WS_DIR *dir; /* scanned directory */ WS_DIRENT *file; /* current file */ @@ -325,7 +325,7 @@ fileset_add_dir(const char *fname) /* sort entries by creation time */ set.entries = g_list_sort(set.entries, fileset_sort_compare); - fileset_update_dlg(); + fileset_update_dlg(window); } @@ -430,5 +430,3 @@ void fileset_delete(void) set.dirname = NULL; } } - - @@ -46,7 +46,7 @@ extern gboolean fileset_filename_match_pattern(const char *fname); /* helper: test, if both files could be in the same file set */ extern gboolean fileset_is_file_in_set(const char *fname1, const char *fname2); -extern void fileset_add_dir(const char *fname); +extern void fileset_add_dir(const char *fname, void *window); extern void fileset_delete(void); @@ -59,9 +59,9 @@ extern fileset_entry *fileset_get_previous(void); /* this file is a part of the current file set */ -extern void fileset_dlg_add_file(fileset_entry *entry); +extern void fileset_dlg_add_file(fileset_entry *entry, void *window); -extern void fileset_update_dlg(void); +extern void fileset_update_dlg(void *window); extern void fileset_update_file(const char *path); diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index cbe95c88b0..0819566acb 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -131,8 +131,9 @@ fileset_dlg_name2date_dup(const char * name) { pfx++; pos = pfx - name; - /* start conversion behind that underscore */ - filename = g_strdup_printf("%c%c%c%c.%c%c.%c%c %c%c:%c%c:%c%c", + /* Start conversion behind that underscore */ + /* http://en.wikipedia.org/wiki/ISO_8601 */ + filename = g_strdup_printf("%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c", /* year */ name[pos] , name[pos+1], name[pos+2], name[pos+3], /* month */ name[pos+4], name[pos+5], /* day */ name[pos+6], name[pos+7], @@ -146,7 +147,7 @@ fileset_dlg_name2date_dup(const char * name) { /* this file is a part of the current file set, add it to the dialog */ void -fileset_dlg_add_file(fileset_entry *entry) { +fileset_dlg_add_file(fileset_entry *entry, void *window _U_) { char *created; char *modified; char *size; @@ -165,13 +166,13 @@ fileset_dlg_add_file(fileset_entry *entry) { /* if this file doesn't follow the file set pattern, */ /* use the creation time of that file */ local = localtime(&entry->ctime); - created = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u", + created = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", local->tm_year+1900, local->tm_mon+1, local->tm_mday, local->tm_hour, local->tm_min, local->tm_sec); } local = localtime(&entry->mtime); - modified = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u", + modified = g_strdup_printf("%04u-%02u-%02u %02u:%02u:%02u", local->tm_year+1900, local->tm_mon+1, local->tm_mday, local->tm_hour, local->tm_min, local->tm_sec); size = g_strdup_printf("%" G_GINT64_MODIFIER "d Bytes", entry->size); @@ -328,7 +329,7 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_) g_signal_connect(fs_w, "destroy", G_CALLBACK(fs_destroy_cb), NULL); /* init the dialog content */ - fileset_update_dlg(); + fileset_update_dlg(NULL); gtk_widget_show_all(fs_w); window_present(fs_w); @@ -366,7 +367,7 @@ fileset_previous_cb(GtkWidget *w _U_, gpointer d _U_) /* a new capture file was opened, browse the dir and look for files matching the given file set */ void fileset_file_opened(const capture_file *cf) { - fileset_add_dir(cf->filename); + fileset_add_dir(cf->filename, NULL); if(fs_w) { window_present(fs_w); } |