[gthumb] Make better use of fd->utf8_name and utf8_path in gtk labels
- From: Michael J. Chudobiak <mjc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gthumb] Make better use of fd->utf8_name and utf8_path in gtk labels
- Date: Thu, 7 May 2009 09:34:32 -0400 (EDT)
commit 558d719a85e6c4eeec79b4f19496c35aee39c66f
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date: Thu May 7 09:33:45 2009 -0400
Make better use of fd->utf8_name and utf8_path in gtk labels
---
src/dlg-file-utils.c | 22 +++++++++-------------
src/dlg-image-prop.c | 4 ++--
src/dlg-jpegtran.c | 2 +-
src/dlg-reset-exif.c | 2 +-
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/dlg-file-utils.c b/src/dlg-file-utils.c
index 5267358..6628e3a 100644
--- a/src/dlg-file-utils.c
+++ b/src/dlg-file-utils.c
@@ -562,34 +562,30 @@ set_filename_labels (GladeXML *gui,
{
GtkWidget *label;
GtkWidget *eventbox;
- time_t timer;
struct tm *tm;
char time_txt[50];
char *file_size_txt;
- char *utf8_name;
- char *name;
+ FileData *fd;
+
+ fd = file_data_new (filename);
label = glade_xml_get_widget (gui, filename_widget);
eventbox = glade_xml_get_widget (gui, filename_eventbox);
- name = _g_strdup_with_max_size (file_name_from_path (filename), FILE_NAME_MAX_LENGTH);
- _gtk_label_set_filename_text (GTK_LABEL (label), name);
- g_free (name);
-
- utf8_name = get_utf8_display_name_from_uri (filename);
- gtk_widget_set_tooltip_text (eventbox, utf8_name);
- g_free (utf8_name);
+ gtk_label_set_text (GTK_LABEL (label), fd->utf8_name);
+ gtk_widget_set_tooltip_text (eventbox, fd->utf8_path);
label = glade_xml_get_widget (gui, size_widget);
- file_size_txt = g_format_size_for_display (get_file_size (filename));
+ file_size_txt = g_format_size_for_display (fd->size);
_gtk_label_set_locale_text (GTK_LABEL (label), file_size_txt);
g_free (file_size_txt);
label = glade_xml_get_widget (gui, time_widget);
- timer = get_file_mtime (filename);
- tm = localtime (&timer);
+ tm = localtime (&(fd->mtime));
strftime (time_txt, 50, _("%d %b %Y, %H:%M"), tm);
_gtk_label_set_locale_text (GTK_LABEL (label), time_txt);
+
+ file_data_unref (fd);
}
diff --git a/src/dlg-image-prop.c b/src/dlg-image-prop.c
index d6e77b4..f01e13c 100644
--- a/src/dlg-image-prop.c
+++ b/src/dlg-image-prop.c
@@ -430,14 +430,14 @@ update_general_info (DialogData *data)
/**/
- file_size_txt = g_format_size_for_display (get_file_size (fd->utf8_path));
+ file_size_txt = g_format_size_for_display (fd->size);
gtk_label_set_text (GTK_LABEL (data->i_file_size_label), file_size_txt);
g_free (file_size_txt);
/**/
location = remove_level_from_path (fd->utf8_path);
- _gtk_label_set_filename_text (GTK_LABEL (data->i_location_label), location);
+ gtk_label_set_text (GTK_LABEL (data->i_location_label), location);
g_free (location);
/**/
diff --git a/src/dlg-jpegtran.c b/src/dlg-jpegtran.c
index f7ee18e..0d5a050 100644
--- a/src/dlg-jpegtran.c
+++ b/src/dlg-jpegtran.c
@@ -407,7 +407,7 @@ apply_transformation_to_all__apply_to_current (BatchTransformation *bt_data)
FileData *file = bt_data->scan->data;
if (bt_data->cancel == FALSE) {
- _gtk_label_set_filename_text (GTK_LABEL (bt_data->label), file->utf8_name);
+ gtk_label_set_text (GTK_LABEL (bt_data->label), file->utf8_name);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bt_data->bar),
(gdouble) (bt_data->i + 0.5) / bt_data->n);
diff --git a/src/dlg-reset-exif.c b/src/dlg-reset-exif.c
index 3cac454..807dae4 100644
--- a/src/dlg-reset-exif.c
+++ b/src/dlg-reset-exif.c
@@ -228,7 +228,7 @@ apply_transformation_to_all__apply_to_current (BatchTransformation *bt_data)
FileData *file = bt_data->scan->data;
if (bt_data->cancel == FALSE) {
- _gtk_label_set_filename_text (GTK_LABEL (bt_data->label), file->utf8_name);
+ gtk_label_set_text (GTK_LABEL (bt_data->label), file->utf8_name);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bt_data->bar),
(gdouble) (bt_data->i + 0.5) / bt_data->n);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]