1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
diff --git a/src/gtk/fm-progress-dlg.c b/src/gtk/fm-progress-dlg.c
index 49aebe47..1d124a60 100644
--- a/src/gtk/fm-progress-dlg.c
+++ b/src/gtk/fm-progress-dlg.c
@@ -166,6 +166,8 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
GtkLabel *src_fi, *dest_fi;
GtkEntry *filename;
GtkToggleButton *apply_all;
+ char* comparedate;
+ char* comparesize;
char* tmp;
const char* disp_size;
FmPath* path;
@@ -200,18 +202,34 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
gtk_window_set_transient_for(GTK_WINDOW(dlg), GTK_WINDOW(data->dlg));
gtk_image_set_from_gicon(src_icon, G_ICON(icon), GTK_ICON_SIZE_DIALOG);
+ if (fm_file_info_get_mtime(src) > fm_file_info_get_mtime(dest))
+ comparedate = _("newer");
+ else
+ if (fm_file_info_get_mtime(src) < fm_file_info_get_mtime(dest))
+ comparedate = _("older");
+ else
+ if (fm_file_info_get_mtime(src) == fm_file_info_get_mtime(dest))
+ comparedate = _("same date/time");
disp_size = fm_file_info_get_disp_size(src);
if(disp_size)
{
- tmp = g_strdup_printf(_("Type: %s\nSize: %s\nModified: %s"),
- fm_file_info_get_desc(src), disp_size,
- fm_file_info_get_disp_mtime(src));
+ if (fm_file_info_get_size(src) > fm_file_info_get_size(dest))
+ comparesize = _("larger");
+ else
+ if (fm_file_info_get_size(src) < fm_file_info_get_size(dest))
+ comparesize = _("less");
+ else
+ if (fm_file_info_get_size(src) == fm_file_info_get_size(dest))
+ comparesize = _("same size");
+ tmp = g_strdup_printf(_("Type: %s\nSize: %s (%s)\nModified: %s (%s)"),
+ fm_file_info_get_desc(src), disp_size, comparesize,
+ fm_file_info_get_disp_mtime(src), comparedate);
}
else
{
- tmp = g_strdup_printf(_("Type: %s\nModified: %s"),
+ tmp = g_strdup_printf(_("Type: %s\nModified: %s (%s)"),
fm_file_info_get_desc(src),
- fm_file_info_get_disp_mtime(src));
+ fm_file_info_get_disp_mtime(src), comparedate);
}
gtk_label_set_text(src_fi, tmp);
|
