* Move tree column creation from UI implementations to modest-tny-header-tree-view.c.

* Add file header draft to modest-tny-header-tree-view.c.
* Remove some obsolete comments.

pmo-trunk-r89

diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c
index 262b01e..aabe1b6 100644 (file)
--- a/src/gtk-glade/modest-ui.c
+++ b/src/gtk-glade/modest-ui.c
@@ -22,8 +22,6 @@
 #include "../modest-tny-transport-actions.h"
 
 
-//#include "modest.glade.h"
-
 #define MODEST_GLADE          PREFIX "/share/modest/glade/modest.glade"
 #define MODEST_GLADE_MAIN_WIN "main"
 #define MODEST_GLADE_EDIT_WIN "new_mail"
@@ -528,8 +526,6 @@ on_password_requested (ModestTnyAccountStore *account_store,
 static GtkWidget*
 modest_main_window_header_tree (TnyMsgFolderIface *folder)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
        GtkWidget *header_tree;
 
        header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
@@ -538,39 +534,11 @@ modest_main_window_header_tree (TnyMsgFolderIface *folder)
                return NULL;
        }
 
-       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(header_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(header_tree), TRUE);
-
        return GTK_WIDGET(header_tree);
 }
 
 
 
-
 static GtkWidget*
 modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
                                TnyAccountStoreIface *account_store)
@@ -579,7 +547,7 @@ modest_main_window_folder_tree (ModestAccountMgr *modest_acc_mgr,
        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
        GtkWidget *folder_tree;
 
-       folder_tree = modest_tny_folder_tree_view_new (account_store);
+       folder_tree = GTK_WIDGET(modest_tny_folder_tree_view_new (account_store));
        if (!folder_tree) {
                g_warning ("could not create folder list");
                return NULL;

diff --git a/src/gtk/modest-main-window.c b/src/gtk/modest-main-window.c
index de23147..1719341 100644 (file)
--- a/src/gtk/modest-main-window.c
+++ b/src/gtk/modest-main-window.c
@@ -261,8 +261,6 @@ modest_main_window_get_ui (ModestTnyFolderTreeView *folder_view,
 static GtkWidget*
 modest_main_window_header_tree (TnyMsgFolderIface *folder)
 {
-       GtkTreeViewColumn *column;
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); 
        GtkWidget *header_tree;
        
        header_tree = GTK_WIDGET(modest_tny_header_tree_view_new(folder));
@@ -271,33 +269,6 @@ modest_main_window_header_tree (TnyMsgFolderIface *folder)
                return NULL;
        }
 
-       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-
-       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
-                                                          "text",
-                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                          NULL);
-       gtk_tree_view_column_set_resizable (column, TRUE);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(header_tree), column);
-
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(header_tree), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(header_tree), TRUE);
-       
        return GTK_WIDGET(header_tree);
 }
 
@@ -542,4 +513,3 @@ static void on_message_clicked (ModestTnyFolderTreeView *folder_tree,
        modest_tny_msg_view_set_message (priv->message_view,
                                         message);
 }
-

diff --git a/src/modest-tny-header-tree-view.c b/src/modest-tny-header-tree-view.c
index 6920f69..95e616f 100644 (file)
--- a/src/modest-tny-header-tree-view.c
+++ b/src/modest-tny-header-tree-view.c
@@ -1,7 +1,25 @@
-/* modest-tny-header-tree-view.c */
-
-/* insert (c)/licensing information) */
-
+/* modest-tny-header-tree-view.c 
+ *
+ * This file is part of modest.
+ *
+ * Copyright (C) 2006 Nokia Corporation
+ * 
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+#include <glib/gi18n.h>
 #include "modest-tny-header-tree-view.h"
 
 /* 'private'/'protected' functions */
@@ -79,11 +97,42 @@ modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass)
 static void
 modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj)
 {
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
        ModestTnyHeaderTreeViewPrivate *priv;
+       
        priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj); 
 
        priv->tny_msg_folder = NULL;
        priv->header_tree_model = NULL;
+       
+       column =  gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
+                                                          "text",
+                                                          TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
+                                                          NULL);
+       gtk_tree_view_column_set_resizable (column, TRUE);
+       gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
+
+
+
+       column =  gtk_tree_view_column_new_with_attributes(_("From"), renderer,
+                                                          "text",
+                                                          TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                          NULL);
+       gtk_tree_view_column_set_resizable (column, TRUE);
+       gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
+
+
+       column =  gtk_tree_view_column_new_with_attributes(_("Subject"), renderer,
+                                                          "text",
+                                                          TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+                                                          NULL);
+       gtk_tree_view_column_set_resizable (column, TRUE);
+       gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
+
+       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(obj), TRUE);
+       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE);
+       
 }
 
 static void