Changeset 1276

Timestamp:

11/29/06 01:58:05

Author:

pvanhoof

Message:

A few tryouts

Files:

• trunk/bindings/python/tinymailui-gtk.override (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (19 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.h (modified) (2 diffs)

trunk/bindings/python/tinymailui-gtk.override

@@ -30 +30 @@
-import gobject.GObject as PyGObject_Type
-import gtk.Table as PyGtkTable_Type
+import gtk.Bin as PyGtkBin_Type
+import gtk.VBox as PyGtkVBox_Type
-import gtk.ScrolledWindow as PyGtkScrolledWindow_Type
-import gtk.TextBuffer as PyGtkTextBuffer_Type

trunk/libtinymail-camel/tny-camel-mime-part.c

@@ -278 +278 @@
-                         || camel_content_type_is(dw->mime_type, "application", "x-inlinepgp-signed")
-                         || camel_content_type_is(dw->mime_type, "application", "x-inlinepgp-encrypted")
-camel_content_type_is (dw->mime_type, "text", "*")
-
+ /* camel_content_type_is (dw->mime_type, "text", "*") text/x-patch 
+*/ 
-        }
-

trunk/libtinymailui-gtk/tny-gtk-msg-view.c

@@ -61 +61 @@
-struct _TnyGtkMsgViewPriv
-{
-
+, *root_part
-        TnyHeaderView *headerview;
-        GtkIconView *attachview;
-        GtkWidget *attachview_sw;
-        GList *unattached_views;
-
-        gboolean display_one_body;
-        gboolean display_html;
@@ -72 +71 @@
-        gboolean display_attachments;
-        gboolean display_rfc822;
-
+
-        TnyMimePartView *text_body_viewer;
+        GtkBox *kid;
-};
-
@@ -79 +79 @@
-{
-        gulong signal;
-
+, *root_part
-} RealizePriv;
-
@@ -332 +332 @@
-tny_gtk_msg_view_create_new_inline_viewer_default (TnyMsgView *self)
-{
-
+
+
-}
-
@@ -384 +385 @@
-
-        /* Inline message RFC822 */
-
+
+
-        {
-                retval = TNY_MIME_PART_VIEW (tny_msg_view_create_new_inline_viewer (self));
-                gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (retval),
-                                        GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-
-        /* Attachments */
-
-
+
-        {
-                static gboolean first = TRUE;
-                GtkTreeModel *model;
-
@@ -400 +398 @@
-                gtk_widget_show (GTK_WIDGET (priv->attachview));
-
-firs
+priv->first_attachmen
-                {
-                        model = tny_gtk_attach_list_model_new ();
-                        gtk_icon_view_set_model (priv->attachview, model);
-firs
+priv->first_attachmen
-                } else {
+
-                        model = gtk_icon_view_get_model (priv->attachview);
-                        if (!model || !TNY_IS_LIST (model))
@@ -435 +434 @@
- **/
-static void
-
-
-
-
-
+
+
+
-                {
-                        TnyList *list = tny_simple_list_new ();
@@ -457 +454 @@
-                        tny_gtk_msg_view_display_parts (TNY_MSG_VIEW (mpview), list);
-                        g_object_unref (G_OBJECT (list));
+                } else if (tny_mime_part_content_type_is (part, "multipart/*") && TNY_IS_GTK_MSG_VIEW (mpview))
+                {
+                        if (part != root_part)
+                        {
+                                TnyList *list = tny_simple_list_new ();
+                                tny_mime_part_get_parts (part, list);
+                                tny_gtk_msg_view_display_parts (TNY_MSG_VIEW (mpview), list);
+                                g_object_unref (G_OBJECT (list));
+                        }
+
-                } else
-                        tny_mime_part_view_set_part (mpview, part);
@@ -466 +473 @@
-        RealizePriv *prv = user_data;
-
-
+, prv->root_part
-        g_signal_handler_disconnect (widget, prv->signal);
-        g_object_unref (prv->part);
+        if (prv->root_part)
+                g_object_unref (G_OBJECT (prv->root_part));
-
-        g_slice_free (RealizePriv, prv);
@@ -555 +564 @@
-                                RealizePriv *prv = g_slice_new (RealizePriv);
-                                prv->part = g_object_ref (part);
+                                prv->root_part = priv->part?g_object_ref (G_OBJECT (priv->part)):NULL;
-                                prv->signal = g_signal_connect (G_OBJECT (mpview),
-                                        "realize", G_CALLBACK (on_mpview_realize), prv);
-                        } else
-
+, priv->part
-
-                } else if (TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-
+, priv->part
-                else if (!TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-                {
-                        priv->unattached_views = g_list_prepend (priv->unattached_views, mpview);
-
+, priv->root_part
-                }
-        } else if (!tny_mime_part_content_type_is (part, "multipart/*") &&
@@ -751 +761 @@
-{
-        TnyGtkMsgView *self = g_object_new (TNY_TYPE_GTK_MSG_VIEW, NULL);
-
-        return TNY_MSG_VIEW (self);
-}
-
+static GtkWidget*
+get_non_inline_container (TnyGtkMsgView *self, GtkBox *kid)
+{
+        GtkWidget *widget = gtk_scrolled_window_new (NULL, NULL);
+        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), 
+                                GTK_SHADOW_NONE);
+        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
+                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (widget), 
+                        GTK_WIDGET (kid));
+
+        gtk_widget_show (widget);
+
+        return widget;
+}
+
-static void
-tny_gtk_msg_view_instance_init (GTypeInstance *instance, gpointer g_class)
@@ -760 +785 @@
-        TnyGtkMsgView *self = (TnyGtkMsgView *)instance;
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-
+
+
+
+
-
-        /* Defaults */
@@ -768 +796 @@
-        priv->display_rfc822 = TRUE;
-        priv->display_one_body = FALSE;
-
-        priv->text_body_viewer = NULL;
-
+
-        priv->unattached_views = NULL;
-        priv->part = NULL;
-
-
-
-
-
-
-
-
+
-
-        priv->headerview = tny_gtk_header_view_new ();
@@ -791 +811 @@
-
-        priv->attachview_sw = gtk_scrolled_window_new (NULL, NULL);
-
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self),
-                                        GTK_SHADOW_NONE);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self),
-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->attachview_sw),
-                                        GTK_SHADOW_NONE);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->attachview_sw),
-                                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-        priv->attachview = GTK_ICON_VIEW (gtk_icon_view_new ());
-
-        gtk_icon_view_set_selection_mode (priv->attachview, GTK_SELECTION_SINGLE);
-
-        gtk_icon_view_set_text_column (priv->attachview,
-                        TNY_GTK_ATTACH_LIST_MODEL_FILENAME_COLUMN);
-
-        gtk_icon_view_set_pixbuf_column (priv->attachview,
-                        TNY_GTK_ATTACH_LIST_MODEL_PIXBUF_COLUMN);
-
-        gtk_icon_view_set_columns (priv->attachview, -1);
-        gtk_icon_view_set_item_width (priv->attachview, 100);
@@ -816 +826 @@
-
-        gtk_box_pack_start (GTK_BOX (vbox), priv->attachview_sw, FALSE, TRUE, 0);
-        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self), 
-                        GTK_WIDGET (vbox));
-        gtk_container_add (GTK_CONTAINER (priv->attachview_sw), GTK_WIDGET (priv->attachview));
+
+        /* Default is a non-online viewer */
+        gtk_container_add (GTK_CONTAINER (self), get_non_inline_container (self, vbox));
-
-        gtk_widget_show (GTK_WIDGET (vbox));
@@ -826 +837 @@
-        return;
-}
+
+static void
+widget_size_request (GtkWidget *widget, GtkRequisition *requisition)
+{
+        if (((GtkBin *) widget)->child)
+                gtk_widget_size_request (((GtkBin *) widget)->child, requisition);
+}
+
+static void
+widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+{
+        widget->allocation = *allocation;
+
+        if (((GtkBin *) widget)->child)
+                gtk_widget_size_allocate (((GtkBin *) widget)->child, allocation);
+}
+
-
-static void
@@ -876 +904 @@
-{
-        GObjectClass *object_class;
+        GtkWidgetClass *widget_class;
-
-        parent_class = g_type_class_peek_parent (class);
-        object_class = (GObjectClass*) class;
+
+        widget_class = (GtkWidgetClass *) class;
+        widget_class->size_request  = widget_size_request;
+        widget_class->size_allocate = widget_size_allocate;
-
-        object_class->finalize = tny_gtk_msg_view_finalize;
@@ -892 +925 @@
-
-        g_type_class_add_private (object_class, sizeof (TnyGtkMsgViewPriv));
+
-
-        return;
@@ -931 +965 @@
-                };
-
-SCROLLED_WINDOW
+BIN
-                        "TnyGtkMsgView",
-                        &info, 0);

trunk/libtinymailui-gtk/tny-gtk-msg-view.h

@@ -44 +44 @@
-struct _TnyGtkMsgView
-{
-ScrolledWindow
+Bin
-        GtkContainer *viewers;
-};
@@ -50 +50 @@
-struct _TnyGtkMsgViewClass
-{
-ScrolledWindow
+Bin
-
-        /* virtual methods */