[evolution-patches] 62003, UI change, scrollable pgp info

[Not Zed <notzed ximian com>]

a possible solution, will probably look shitty with s/mime since it rarely has much to display.  well it looks shitty anyway, but the bug was marked for 2.1



? mail/evolution-mail-2.0.schemas
? mail/ma.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3556
diff -u -p -r1.3556 ChangeLog
--- mail/ChangeLog	31 Jan 2005 07:28:03 -0000	1.3556
+++ mail/ChangeLog	31 Jan 2005 11:30:30 -0000
@@ -1,5 +1,11 @@
 2005-01-31  Not Zed  <NotZed Ximian com>
 
+	** See bug #62003
+
+	* em-format-html-display.c (efhd_xpkcs7mime_validity_clicked): put
+	the potentially long descriptions into a textbuffer so it's
+	scrollable.
+
 	** See bug #67083
 
 	* em-format-html.c (efh_format_text_header): no-wrap the header line.
Index: mail/em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.61
diff -u -p -r1.61 em-format-html-display.c
--- mail/em-format-html-display.c	21 Jan 2005 06:38:29 -0000	1.61
+++ mail/em-format-html-display.c	31 Jan 2005 11:30:31 -0000
@@ -48,6 +48,8 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkdnd.h>
+#include <gtk/gtktextview.h>
+#include <gtk/gtkscrolledwindow.h>
 
 #include <glade/glade.h>
 
@@ -802,9 +804,23 @@ efhd_xpkcs7mime_validity_clicked(GtkWidg
 	gtk_label_set_line_wrap((GtkLabel *)w, TRUE);
 	gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	if (po->valid->sign.description) {
-		w = gtk_label_new(po->valid->sign.description);
-		gtk_misc_set_alignment((GtkMisc *)w, 0.0, 0.5);
-		gtk_label_set_line_wrap((GtkLabel *)w, FALSE);
+		GtkTextBuffer *buffer;
+
+		buffer = gtk_text_buffer_new(NULL);
+		gtk_text_buffer_set_text(buffer, po->valid->sign.description, strlen(po->valid->sign.description));
+		w = g_object_new(gtk_scrolled_window_get_type(),
+				 "hscrollbar_policy", GTK_POLICY_AUTOMATIC,
+				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
+				 "shadow_type", GTK_SHADOW_IN,
+				 "child", g_object_new(gtk_text_view_get_type(),
+						       "buffer", buffer,
+						       "cursor_visible", FALSE,
+						       "editable", FALSE,
+						       "width_request", 500,
+						       "height_request", 160,
+						       NULL),
+				 NULL);
+		g_object_unref(buffer);
 		gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	}
 
@@ -819,9 +835,23 @@ efhd_xpkcs7mime_validity_clicked(GtkWidg
 	gtk_label_set_line_wrap((GtkLabel *)w, TRUE);
 	gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	if (po->valid->encrypt.description) {
-		w = gtk_label_new(po->valid->encrypt.description);
-		gtk_misc_set_alignment((GtkMisc *)w, 0.0, 0.5);
-		gtk_label_set_line_wrap((GtkLabel *)w, FALSE);
+		GtkTextBuffer *buffer;
+
+		buffer = gtk_text_buffer_new(NULL);
+		gtk_text_buffer_set_text(buffer, po->valid->encrypt.description, strlen(po->valid->encrypt.description));
+		w = g_object_new(gtk_scrolled_window_get_type(),
+				 "hscrollbar_policy", GTK_POLICY_AUTOMATIC,
+				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
+				 "shadow_type", GTK_SHADOW_IN,
+				 "child", g_object_new(gtk_text_view_get_type(),
+						       "buffer", buffer,
+						       "cursor_visible", FALSE,
+						       "editable", FALSE,
+						       "width_request", 500,
+						       "height_request", 160,
+						       NULL),
+				 NULL);
+		g_object_unref(buffer);
 		gtk_box_pack_start((GtkBox *)vbox, w, TRUE, TRUE, 6);
 	}