Changeset 40

Timestamp:

11/05/07 00:08:24

Author:

pvanhoof

Message:

• • • • Implemented From-combobox in TMutMsgCreator
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-folder-view.c (modified) (1 diff)
• trunk/src/tmut-menu-view.c (modified) (2 diffs)
• trunk/src/tmut-msg-creator.c (modified) (13 diffs)
• trunk/src/tmut-msg-creator.h (modified) (1 diff)
• trunk/src/tmut-msg-view.c (modified) (6 diffs)
• trunk/src/tmut-msg-view.h (modified) (1 diff)
• trunk/src/tmut-platform-factory.c (modified) (1 diff)

trunk/ChangeLog

@@ -4 +4 @@
-        * Implemented simple versions for tmut_msg_creator_set_reply_msg and
-        tmut_msg_creator_set_forward_msg
+        * Implemented From-combobox in TMutMsgCreator
-
-2007-11-02  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-folder-view.c

@@ -346 +346 @@
-
-        if (!canceled && !err) {
-
+priv->account_store
-                tny_msg_view_set_msg (view, msg);
-                gtk_widget_show (GTK_WIDGET (view));

trunk/src/tmut-menu-view.c

@@ -26 +26 @@
-#include "tmut-menu-view.h"
-#include "tmut-folder-view.h"
+#include "tmut-msg-creator.h"
-#include "tmut-folder-selector.h"
-#include "tmut-shell-window.h"
@@ -317 +318 @@
-void tmut_menu_view_on_new_msg_activated (GObject *sender, TMutMenuView *self)
-{
-
-
+
+
+
+
+
+
+
+
+
+
-
-        return;

trunk/src/tmut-msg-creator.c

@@ -31 +31 @@
-#include <tny-simple-list.h>
-
+#include <tny-gtk-account-list-model.h>
+
-static GObjectClass *parent_class = NULL;
-
@@ -37 +39 @@
-struct _TMutMsgCreatorPriv {
-        TMutShellWindow *shell;
-Widget *subject
-Widget *to_entry
-Widget *message_textview
-Widget *send_button
+Entry *subject_entry, *to
+TextView *message_textview
+Button *send_button
+ComboBox *accounts_combo
-};
-
@@ -50 +52 @@
-{
-        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (user_data);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return;
@@ -149 +165 @@
-{
-        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (self);
-GTK_TEXT_VIEW (priv->message_textview)
+priv->message_textview
-        TnyHeader *header = tny_msg_get_header (msg);
-        GString *str;
@@ -179 +195 @@
-{
-        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (self);
-GTK_TEXT_VIEW (priv->message_textview)
+priv->message_textview
-        TnyHeader *header = tny_msg_get_header (msg);
-        GString *str;
@@ -197 +213 @@
-                g_string_free (str, TRUE);
-        }
+
+        return;
+}
+
+
+static void
+tmut_msg_creator_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store)
+{
+        TMutMsgCreatorPriv *priv = TMUT_MSG_CREATOR_GET_PRIVATE (self);
+        TnyList *accounts = TNY_LIST (tny_gtk_account_list_model_new ());
+
+        tny_account_store_get_accounts (account_store, accounts,
+                TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
+
+        gtk_combo_box_set_model (priv->accounts_combo, GTK_TREE_MODEL (accounts));
+        gtk_combo_box_set_active (priv->accounts_combo, 0);
-
-        return;
@@ -226 +258 @@
-        GtkWidget *label2;
-        GtkWidget *scrolledwindow1;
+        GtkCellRenderer *renderer;
+        GtkTreeViewColumn *column;
-
-        vbox1 = GTK_WIDGET (instance);
-
-2
+3
-        gtk_widget_show (table1);
-        gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, TRUE, 0);
-        gtk_table_set_col_spacings (GTK_TABLE (table1), 2);
-
-To
+From
-        gtk_widget_show (label1);
-        gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 0, 1,
@@ -242 +276 @@
-        gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
-
+        label1 = gtk_label_new (_("<b>To</b>"));
+        gtk_widget_show (label1);
+        gtk_table_attach (GTK_TABLE (table1), label1, 0, 1, 1, 2,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 0);
+        gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
+        gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
+
-        label2 = gtk_label_new (_("<b>Subject</b>"));
-        gtk_widget_show (label2);
-1, 2
+2, 3
-                        (GtkAttachOptions) (GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
@@ -250 +292 @@
-        gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                        (GtkAttachOptions) (0), 0, 0);
@@ -267 +324 @@
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_SHADOW_IN);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        g_signal_connect (G_OBJECT (priv->send_button), "clicked",
@@ -286 +344 @@
-{
-        (*parent_class->finalize) (object);
+
+        return;
+}
+
+static void
+tny_account_store_view_init (gpointer g, gpointer iface_data)
+{
+        TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g;
+
+        klass->set_account_store_func = tmut_msg_creator_set_account_store;
-
-        return;
@@ -352 +420 @@
-                };
-
+                static const GInterfaceInfo tny_account_store_view_info = 
+                {
+                  (GInterfaceInitFunc) tny_account_store_view_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                static const GInterfaceInfo tmut_shell_child_info = 
-                {
@@ -363 +438 @@
-                        &info, 0);
-
+                g_type_add_interface_static (type, TNY_TYPE_ACCOUNT_STORE_VIEW, 
+                        &tny_account_store_view_info);
+
-                g_type_add_interface_static (type, TMUT_TYPE_SHELL_CHILD, 
-                        &tmut_shell_child_info);

trunk/src/tmut-msg-creator.h

@@ -27 +27 @@
-#include <tny-msg.h>
-#include <tmut-shell-child.h>
+
+#include <tny-account.h>
+#include <tny-account-store-view.h>
-
-G_BEGIN_DECLS

trunk/src/tmut-msg-view.c

@@ -41 +41 @@
-        TnyMsgView *msg_view;
-        GtkScrolledWindow *sw;
+        TnyAccountStore *account_store;
-};
-
@@ -55 +56 @@
-        TnyMsg *msg = tny_msg_view_get_msg (priv->msg_view);
-        TMutMsgCreator *view = tmut_msg_creator_new ();
+
+        if (priv->account_store)
+                tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (view), priv->account_store);
-
-        tmut_msg_creator_set_reply_msg (view, msg);
@@ -75 +79 @@
-        TnyMsg *msg = tny_msg_view_get_msg (priv->msg_view);
-        TMutMsgCreator *view = tmut_msg_creator_new ();
+
+        if (priv->account_store)
+                tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (view), priv->account_store);
-
-        tmut_msg_creator_set_forward_msg (view, msg);
@@ -226 +233 @@
- **/
-TnyMsgView*
-void
+TnyAccountStore *account_store
-{
-        TMutMsgView *self = g_object_new (TMUT_TYPE_MSG_VIEW, NULL);
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (self);
+
+        if (account_store)
+                priv->account_store = TNY_ACCOUNT_STORE (g_object_ref (account_store));
-
-        return TNY_MSG_VIEW (self);
@@ -239 +250 @@
-        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (instance);
-
+        priv->account_store = NULL;
-        priv->msg_view = NULL;
-        priv->sw = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
@@ -259 +271 @@
-tmut_msg_view_finalize (GObject *object)
-{
+        TMutMsgViewPriv *priv = TMUT_MSG_VIEW_GET_PRIVATE (object);
+
+        if (priv->account_store)
+                g_object_unref (priv->account_store);
+
-        (*parent_class->finalize) (object);
-

trunk/src/tmut-msg-view.h

@@ -58 +58 @@
-
-GType tmut_msg_view_get_type (void);
-void
+TnyAccountStore *account_store
-
-void tmut_msg_view_set_view (TMutMsgView *self, TnyMsgView *view);

trunk/src/tmut-platform-factory.c

@@ -118 +118 @@
-tmut_platform_factory_new_msg_view (TnyPlatformFactory *self)
-{
-
+NULL
-}
-