Changeset 13

Timestamp:

10/29/07 23:29:25

Author:

pvanhoof

Message:

• • • • Scrolled-window msg-view
        
      • Scretching the childs to full size of the shell
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-folder-view.c (modified) (1 diff)
• trunk/src/tmut-msg-view.c (modified) (5 diffs)
• trunk/src/tmut-msg-view.h (modified) (2 diffs)
• trunk/src/tmut-shell-window.c (modified) (2 diffs)

trunk/ChangeLog

@@ -4 +4 @@
-        * Introduced TMutShellWindow, TMutShellChild
-        * Refactored all types to GtkWidgets in stead of GtkWindows
+        * Scrolled-window msg-view
+        * Scretching the childs to full size of the shell
-
-2007-10-28  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-folder-view.c

@@ -193 +193 @@
-
-        gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (sw), 
-FALS
+TRU
-
-        gtk_widget_show (sw);

trunk/src/tmut-msg-view.c

@@ -33 +33 @@
-struct _TMutMsgViewPriv {
-        TMutShellWindow *shell;
+        TnyMsgView *msg_view;
+        GtkScrolledWindow *widget;
+
-};
-
@@ -40 +43 @@
-
-
+static void
+tmut_msg_view_set_unavailable (TnyMsgView *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+        tny_msg_view_set_unavailable (priv->msg_view);
+        return;
+}
+
+static TnyMsg* 
+tmut_msg_view_get_msg (TnyMsgView *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+        return tny_msg_view_get_msg (priv->msg_view);
+}
+
+static void 
+tmut_msg_view_set_msg (TnyMsgView *self, TnyMsg *msg)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        tny_msg_view_set_msg (priv->msg_view, msg);
+
+        return;
+}
+
+
+
+
+static void 
+tmut_msg_view_clear (TnyMsgView *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        tny_msg_view_clear (priv->msg_view);
+
+        return;
+}
+
+static TnyMsgView* 
+tmut_msg_view_create_new_inline_viewer (TnyMsgView *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        /* This should not be a window, but the decorated one, as it has to be 
+           embeddable within a window. So we even decorate this one as usual. */
+
+        return tny_msg_view_create_new_inline_viewer (priv->msg_view);
+}
+
+static TnyMimePartView* 
+tmut_msg_view_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        return tny_msg_view_create_mime_part_view_for (priv->msg_view, part);
+}
+
+
+
+static void 
+tmut_msg_view_mp_clear (TnyMimePartView *self)
+{
+        tny_msg_view_clear (TNY_MSG_VIEW (self));
+
+        return;
+}
+
+
+static void 
+tmut_msg_view_mp_set_part (TnyMimePartView *self, TnyMimePart *part)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->msg_view), part);
+
+        return;
+}
+
+
+static TnyMimePart* 
+tmut_msg_view_mp_get_part (TnyMimePartView *self)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        return tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->msg_view));
+}
+
+/**
+ * tmut_msg_view_set_view:
+ * @self: a #TnyGtkMsgView instance
+ * @view: a #TnyMsgView to decorate
+ *
+ * Set the @view to decorate with @self
+ **/
+void 
+tmut_msg_view_set_view (TMutMsgView *self, TnyMsgView *view)
+{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        if (G_UNLIKELY (priv->msg_view))
+                gtk_container_remove (GTK_CONTAINER (self), GTK_WIDGET (priv->msg_view));
+
+        priv->msg_view = view;
+
+        /* This adds a reference to msgview (it's a gtkwidget) */
+        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self), 
+                                GTK_WIDGET (view));
+
+        gtk_widget_show (GTK_WIDGET (priv->msg_view));
+
+        return;
+}
-
-/**
@@ -59 +174 @@
-tmut_msg_view_instance_init (GTypeInstance *instance, gpointer g_class)
-{
+
+        tmut_msg_view_set_view (TMUT_MSG_VIEW (instance),
+                tny_gtk_msg_view_new ());
+
-        return;
-}
@@ -107 +226 @@
-
-        g_type_class_add_private (object_class, sizeof (TMutMsgViewPriv));
+
+        return;
+}
+
+
+static void
+tny_msg_view_init (gpointer g, gpointer iface_data)
+{
+        TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
+
+        klass->get_msg_func = tmut_msg_view_get_msg;
+        klass->set_msg_func = tmut_msg_view_set_msg;
+        klass->set_unavailable_func = tmut_msg_view_set_unavailable;
+        klass->clear_func = tmut_msg_view_clear;
+        klass->create_mime_part_view_for_func = tmut_msg_view_create_mime_part_view_for;
+        klass->create_new_inline_viewer_func = tmut_msg_view_create_new_inline_viewer;
+
+        return;
+}
+
+static void
+tny_mime_part_view_init (gpointer g, gpointer iface_data)
+{
+        TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
+
+        klass->get_part_func = tmut_msg_view_mp_get_part;
+        klass->set_part_func = tmut_msg_view_mp_set_part;
+        klass->clear_func = tmut_msg_view_mp_clear;
-
-        return;
@@ -139 +286 @@
-                };
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        "TMutMsgView",
-                        &info, 0);
-
+                g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
+                        &tny_mime_part_view_info);
+
+                g_type_add_interface_static (type, TNY_TYPE_MSG_VIEW, 
+                        &tny_msg_view_info);
+
-                g_type_add_interface_static (type, TMUT_TYPE_SHELL_CHILD, 
-                        &tmut_shell_child_info);

trunk/src/tmut-msg-view.h

@@ -41 +41 @@
-struct _TMutMsgView
-{
-TnyGtkMsgVie
+GtkScrolledWindo
-};
-
-struct _TMutMsgViewClass
-{
-TnyGtkMsgVie
+GtkScrolledWindo
-};
-
@@ -52 +52 @@
-TnyMsgView* tmut_msg_view_new (void);
-
+void tmut_msg_view_set_view (TMutMsgView *self, TnyMsgView *view);
+
-G_END_DECLS
-

trunk/src/tmut-shell-window.c

@@ -48 +48 @@
-        priv->current = child; 
-        gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (priv->current), 
-FALS
+TRU
-
-        tmut_shell_child_set_window (child, self);
@@ -69 +69 @@
-
-        gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (priv->current), 
-FALS
+TRU
-
-        return;