X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-details-dialog.c;h=de77559f90e633762e6dedde19635a21fb826461;hp=8242c34621ae37381a70f024634ff353b9380daf;hb=HEAD;hpb=8321e6535af81520d17a8a091ead7d81301dc9cd

diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c
index 8242c34..de77559 100644
--- a/src/widgets/modest-details-dialog.c
+++ b/src/widgets/modest-details-dialog.c
@@ -31,10 +31,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <tny-msg.h>
 #include <tny-header.h>
 #include <tny-header-view.h>
@@ -44,6 +41,9 @@
 #include <modest-text-utils.h>
 #include <modest-datetime-formatter.h>
 #include <string.h> /* for strlen */
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-helper.h>
+#endif
 
 static void    modest_details_dialog_set_header_default          (ModestDetailsDialog *self,
 								  TnyHeader *header,
@@ -61,6 +61,10 @@ static void    modest_details_dialog_add_data_default            (ModestDetailsD
 								  const gchar *label,
 								  const gchar *value);
 
+static gboolean on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata);
+
+static void value_w_size_allocate (GtkWidget *label, GtkAllocation *allocation, gpointer data);
+
 
 G_DEFINE_TYPE (ModestDetailsDialog, 
 	       modest_details_dialog, 
@@ -171,6 +175,7 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 	ModestDetailsDialogPrivate *priv;
 	guint n_rows = 0;
 	GtkWidget *label_w, *value_w;
+	gchar *secure_value;
 
 	priv = MODEST_DETAILS_DIALOG_GET_PRIVATE (self);
 
@@ -178,15 +183,26 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 
 	/* Create label */
 	label_w = gtk_label_new (label);
-	gtk_misc_set_alignment (GTK_MISC (label_w), 1.0, 0.0);
-	gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_RIGHT);
+	gtk_misc_set_alignment (GTK_MISC (label_w), 0.0, 0.0);
+	gtk_label_set_justify (GTK_LABEL (label_w), GTK_JUSTIFY_LEFT);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	hildon_helper_set_logical_color (label_w,
+			GTK_RC_FG, GTK_STATE_NORMAL, "SecondaryTextColor");
+#endif
+
+	/* Create secure value */
+	secure_value = modest_text_utils_get_secure_header (value, "");
 
 	/* Create value */
-	value_w = gtk_label_new (value);
-	gtk_label_set_line_wrap (GTK_LABEL (value_w), TRUE);
-	gtk_label_set_line_wrap_mode (GTK_LABEL (value_w), PANGO_WRAP_WORD_CHAR);
+	value_w = gtk_label_new (secure_value);
+	g_signal_connect (G_OBJECT (value_w), "size-allocate",
+			  G_CALLBACK (value_w_size_allocate), NULL);
+
+	gtk_label_set_line_wrap ((GtkLabel *) value_w, TRUE);
+	gtk_label_set_line_wrap_mode ((GtkLabel *) value_w, PANGO_WRAP_WORD_CHAR);
 	gtk_misc_set_alignment (GTK_MISC (value_w), 0.0, 0.0);
-	gtk_label_set_justify (GTK_LABEL (value_w), GTK_JUSTIFY_LEFT);
+	gtk_label_set_justify ((GtkLabel *) value_w, GTK_JUSTIFY_LEFT);
 
 	/* Attach label and value */
 	gtk_table_attach (GTK_TABLE (priv->props_table), 
@@ -201,6 +217,8 @@ modest_details_dialog_add_data_default (ModestDetailsDialog *self,
 			  GTK_EXPAND|GTK_FILL, 
 			  GTK_SHRINK|GTK_FILL, 
 			  0, 0);
+
+	g_free (secure_value);
 }
 
 static void 
@@ -348,7 +366,6 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 					  TnyFolder *folder)
 {
 	gchar *count_s, *size_s, *name = NULL;
-	gchar *tmp = NULL;
 	guint size, count;
 
 	g_return_if_fail (folder && TNY_IS_FOLDER (folder));
@@ -381,17 +398,29 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 			name = g_strdup (tny_folder_get_name (folder));
 	}
 
-	tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
+	modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_foldername"), name);
+#else
+	gchar *tmp = g_strconcat (_("mcen_fi_folder_properties_foldername"), ":", NULL);
 	modest_details_dialog_add_data (self, tmp, name);
 	g_free (tmp);
+#endif
 
+#ifdef MODEST_TOOLKIT_HILDON2
+	modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count_s);
+#else
 	tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL);
 	modest_details_dialog_add_data (self, tmp, count_s);
 	g_free (tmp);
+#endif
 
+#ifdef MODEST_TOOLKIT_HILDON2
+	modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s);
+#else
 	tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL);
 	modest_details_dialog_add_data (self, tmp, size_s);
 	g_free (tmp);
+#endif
 
 	/* Frees */
 	g_free (name);
@@ -399,6 +428,12 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
 	g_free (count_s);
 }
 
+static void 
+value_w_size_allocate (GtkWidget *label, GtkAllocation *allocation, gpointer data)
+{
+	gtk_widget_set_size_request(label, allocation->width, -1);
+}
+
 static gboolean
 on_key_press_event (GtkWindow *window, GdkEventKey *event, gpointer userdata)
 {