Changeset 29

Timestamp:

02/09/06 12:45:18

Author:

pvanhoof

Message:

SummaryWindow? stuff

Files:

• trunk/libtinymailui/Makefile.am (modified) (1 diff)
• trunk/libtinymailui/tny-summary-window-iface.c (added)
• trunk/libtinymailui/tny-summary-window-iface.h (added)
• trunk/tinymail/tny-main.c (modified) (2 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (11 diffs)
• trunk/tinymail/tny-summary-window.h (modified) (1 diff)

trunk/libtinymailui/Makefile.am

@@ -7 +7 @@
-libtinymailui_1_0_headers =             \
-        tny-msg-header-list-model.h     \
-
+
+
-
-libtinymailui_1_0_la_SOURCES =          \
-        $(libtinymailui_1_0_headers)    \
-        tny-msg-header-list-model.c     \
-
+
+
-
-libtinymailui_1_0_la_LIBADD =           \

trunk/tinymail/tny-main.c

@@ -20 +20 @@
-#include <gtk/gtk.h>
-#include <tny-summary-window.h>
+#include <tny-summary-window-iface.h>
+#include <tny-account-store-iface.h>
+#include <tny-account-store.h>
-
-int 
@@ -30 +33 @@
-
-        window = GTK_WINDOW (tny_summary_window_new ());
+
+        tny_summary_window_iface_set_account_store (TNY_SUMMARY_WINDOW_IFACE (window),
+                TNY_ACCOUNT_STORE_IFACE (tny_account_store_get_instance ()));
+
-        gtk_widget_show (GTK_WIDGET (window));
-

trunk/tinymail/tny-summary-window.c

@@ -33 +33 @@
-
-#include <tny-summary-window.h>
+#include <tny-summary-window-iface.h>
-
-static GObjectClass *parent_class = NULL;
-
-
+typedef struct _TnySummaryWindowPriv TnySummaryWindowPriv;
+
+struct _TnySummaryWindowPriv
+{
+        TnyAccountStoreIface *account_store;
+        GtkTreeView *mailbox_view, *header_view;
+};
+
+#define TNY_SUMMARY_WINDOW_GET_PRIVATE(o)       \
+        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_SUMMARY_WINDOW_TYPE, TnySummaryWindowPriv))
+
+static void 
+reload_accounts (TnySummaryWindowPriv *priv)
+{
+        TnyAccountStoreIface *account_store = priv->account_store;
+        GtkTreeModel *mailbox_model = GTK_TREE_MODEL (tny_account_tree_model_new ());
+        const GList* accounts;
+
+        accounts = tny_account_store_iface_get_accounts (account_store);
+        
+        while (accounts)
+        {
+                TnyAccountIface *account = accounts->data;
+
+                tny_account_tree_model_add (TNY_ACCOUNT_TREE_MODEL 
+                        (mailbox_model), account);
+
+                accounts = g_list_next (accounts);
+        }
+
+        gtk_tree_view_set_model (GTK_TREE_VIEW (priv->mailbox_view), mailbox_model);
+
+        return;
+}
+
+static void
+tny_summary_window_set_account_store (TnySummaryWindowIface *self, TnyAccountStoreIface *account_store)
+{
+        TnySummaryWindowPriv *priv = TNY_SUMMARY_WINDOW_GET_PRIVATE (self);
+
+        if (priv->account_store)
+                g_object_unref (G_OBJECT (priv->account_store));
+
+        g_object_ref (G_OBJECT (account_store));
+
+        priv->account_store = account_store;
+
+        reload_accounts (priv);
+
+        return;
+}
-
-static void
@@ -180 +232 @@
-{
-        TnySummaryWindow *self = (TnySummaryWindow *)instance;
+        TnySummaryWindowPriv *priv = TNY_SUMMARY_WINDOW_GET_PRIVATE (self);
-        GtkWindow *window = GTK_WINDOW (self);
+
+
-        GtkWidget *hbox;
-        GtkWidget *mailbox_view;
-        GtkWidget *header_view;
-        GtkWidget *mailbox_sw;
-        GtkWidget *header_sw;
@@ -191 +244 @@
-        GtkTreeSelection *select;
-        gint t = 0, i = 0;
-        const GList *accounts;
-
-        TnyAccountStoreIface *account_store = TNY_ACCOUNT_STORE_IFACE
-                (tny_account_store_get_instance ());
-
-        gtk_window_set_title (window, "Tinymail");
@@ -212 +261 @@
-                                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        /* mailbox_view columns */
@@ -225 +276 @@
-        column = gtk_tree_view_column_new_with_attributes ("Folder", renderer,
-                        "text", TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN, NULL);
-
+priv->
-
-        renderer = gtk_cell_renderer_text_new ();
-        column = gtk_tree_view_column_new_with_attributes ("Folder", renderer,
-                        "text", TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, NULL);
-
+priv->
-
-        /* header_view columns */
@@ -240 +291 @@
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-        gtk_tree_view_column_set_fixed_width (column, 200);
-
+
+
-        
-        renderer = gtk_cell_renderer_text_new ();
@@ -248 +300 @@
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-        gtk_tree_view_column_set_fixed_width (column, 200);
-
+
+
-
-        renderer = gtk_cell_renderer_text_new ();
@@ -256 +309 @@
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-        gtk_tree_view_column_set_fixed_width (column, 200);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-        g_signal_connect (G_OBJECT (select), "changed",
-
-
-
-
+
+
+
-        gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-        g_signal_connect (G_OBJECT (select), "changed",
-
-
-
-
-
-
+
+
+
+
-
-        gtk_box_pack_start (GTK_BOX (hbox), mailbox_sw, FALSE, FALSE, 0);
@@ -311 +346 @@
-}
-
+static void
+tny_summary_window_iface_init (gpointer g_iface, gpointer iface_data)
+{
+        TnySummaryWindowIfaceClass *klass = (TnySummaryWindowIfaceClass *)g_iface;
+
+        klass->set_account_store_func = tny_summary_window_set_account_store;
+
+        return;
+}
-
-static void 
@@ -321 +365 @@
-
-        object_class->finalize = tny_summary_window_finalize;
+
+        g_type_class_add_private (object_class, sizeof (TnySummaryWindowPriv));
-
-        return;
@@ -345 +391 @@
-                };
-
+                static const GInterfaceInfo tny_summary_window_iface_info = 
+                {
+                  (GInterfaceInitFunc) tny_summary_window_iface_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (GTK_TYPE_WINDOW,
-                        "TnySummaryWindow",
-                        &info, 0);
-
+                g_type_add_interface_static (type, TNY_SUMMARY_WINDOW_IFACE_TYPE, 
+                        &tny_summary_window_iface_info);
+
-        }
-

trunk/tinymail/tny-summary-window.h

@@ -47 +47 @@
-};
-
-
-
+   
+   
-
-