X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=35e8a9a332dfd3a42eb50c453eca4b1c3fbbc845;hp=4d9e400e05ca3e74aa03cd3a7b41a8b196c45798;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=3fc44f982f734b15af235d7d18b7b044a4ce04f6 diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 4d9e400..35e8a9a 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2008, Nokia Corporation +/* Copyright (c) 2006, Nokia Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,11 +31,7 @@ #include #include -#ifdef MODEST_TOOLKIT_HILDON2 -#include -#else #include -#endif #include #include #include @@ -46,6 +42,7 @@ #include #include #include +#include #include /* for strlen */ static void modest_details_dialog_set_header_default (ModestDetailsDialog *self, @@ -99,7 +96,6 @@ modest_details_dialog_class_init (ModestDetailsDialogClass *klass) static void modest_details_dialog_init (ModestDetailsDialog *self) { - MODEST_DETAILS_DIALOG_GET_CLASS (self)->create_container_func (self); } GtkWidget* @@ -115,6 +111,7 @@ modest_details_dialog_new_with_header (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_header_func (dialog, header); /* Add close button */ @@ -136,6 +133,7 @@ modest_details_dialog_new_with_folder (GtkWindow *parent, "transient-for", parent, NULL)); + MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->create_container_func (dialog); MODEST_DETAILS_DIALOG_GET_CLASS (dialog)->set_folder_func (dialog, folder); /* Add close button */ @@ -157,7 +155,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self, const gchar *label, const gchar *value) { - ModestDetailsDialogPrivate *priv; + ModestDetailsDialogPrivate *priv; guint n_rows = 0; GtkWidget *label_w, *value_w; @@ -203,8 +201,10 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, gchar *size_s; TnyFolder *folder; TnyFolderType folder_type; -#define DATE_TIME_BUFFER_SIZE 128 - gchar date_time_buffer [DATE_TIME_BUFFER_SIZE]; + ModestDatetimeFormatter *datetime_formatter; + const gchar *date_time_str; + + datetime_formatter = modest_datetime_formatter_new (); /* Set window title */ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_message_properties")); @@ -242,29 +242,29 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, if (received && (folder_type != TNY_FOLDER_TYPE_SENT) && (folder_type != TNY_FOLDER_TYPE_DRAFTS) && (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - received); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_received"), - date_time_buffer); + date_time_str); } /* for drafts (created) */ if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - received); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + received); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_created"), - date_time_buffer); + date_time_str); } /* for everyting except outbox, drafts: Sent */ if (sent && (folder_type != TNY_FOLDER_TYPE_DRAFTS)&& (folder_type != TNY_FOLDER_TYPE_OUTBOX)) { - modest_text_utils_strftime (date_time_buffer, DATE_TIME_BUFFER_SIZE, "%x %X", - sent); + date_time_str = modest_datetime_formatter_display_long_datetime (datetime_formatter, + sent); modest_details_dialog_add_data (self, _("mcen_fi_message_properties_sent"), - date_time_buffer); + date_time_str); } /* Set To and CC */ @@ -283,6 +283,7 @@ modest_details_dialog_set_header_default (ModestDetailsDialog *self, g_free (size_s); /* Frees */ + g_object_unref (datetime_formatter); g_free (to); g_free (from); g_free (subject); @@ -348,7 +349,6 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, g_free (count_s); } -#ifndef MODEST_TOOLKIT_HILDON2 static gboolean on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata) { @@ -382,44 +382,28 @@ on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata) return FALSE; } -#endif static void modest_details_dialog_create_container_default (ModestDetailsDialog *self) { ModestDetailsDialogPrivate *priv; -#ifdef MODEST_TOOLKIT_HILDON2 - GtkWidget *pannable; -#else GtkWidget *scrollbar; -#endif priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self); - -#ifdef MODEST_TOOLKIT_HILDON2 - pannable= hildon_pannable_area_new (); -#else scrollbar = gtk_scrolled_window_new (NULL, NULL); -#endif gtk_window_set_default_size (GTK_WINDOW (self), 400, 220); priv->props_table = gtk_table_new (0, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (priv->props_table), 12); gtk_table_set_row_spacings (GTK_TABLE (priv->props_table), 1); - -#ifdef MODEST_TOOLKIT_HILDON2 - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->props_table); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), pannable); -#else gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollbar), priv->props_table); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollbar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->props_table), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollbar))); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), scrollbar); - g_signal_connect (self, "key-press-event", G_CALLBACK (on_key_press_event), self); -#endif - gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); + + g_signal_connect (self, "key-press-event", G_CALLBACK (on_key_press_event), self); }