X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=a33ac50cfc5272251e1ba7f91aaa11b27ac1675c;hb=853a43324034550e4ff24d9f90045ed9ab11b071;hp=70c9f8f498deb59ffa85252020b4f04e3d35e162;hpb=1b7a05b6906aff730593321f1c5af237873d142b;p=modest diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 70c9f8f..a33ac50 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include typedef enum { CONTENTS_STATE_NONE = 0, @@ -158,15 +160,19 @@ static void update_progress_hint (ModestHeaderWindow *self); static void on_sort_column_changed (GtkTreeSortable *treesortable, gpointer user_data); static void update_sort_button (ModestHeaderWindow *self); - +static void on_horizontal_movement (HildonPannableArea *hildonpannable, + gint direction, + gdouble initial_x, + gdouble initial_y, + gpointer user_data); /* globals */ static GtkWindowClass *parent_class = NULL; #define EMPTYVIEW_XALIGN 0.5 -#define EMPTYVIEW_YALIGN 0.0 +#define EMPTYVIEW_YALIGN 0.5 #define EMPTYVIEW_XSPACE 1.0 -#define EMPTYVIEW_YSPACE 0.0 +#define EMPTYVIEW_YSPACE 1.0 @@ -249,6 +255,9 @@ modest_header_window_finalize (GObject *obj) priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); + tny_folder_sync_async (TNY_FOLDER (priv->folder), + FALSE, NULL, NULL, NULL); + g_object_unref (priv->folder); g_object_unref (priv->header_view); g_object_unref (priv->empty_view); @@ -321,9 +330,8 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_expose_event), self); - sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model ( - GTK_TREE_VIEW (priv->header_view))))); + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (sortable), @@ -350,11 +358,28 @@ connect_signals (ModestHeaderWindow *self) G_OBJECT (modest_runtime_get_window_mgr ()), "progress-list-changed", G_CALLBACK (on_progress_list_changed), self); - priv->sighandlers = + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (priv->new_message_button), "clicked", G_CALLBACK (modest_ui_actions_on_new_msg), self); + + /* Pannable area */ + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + (GObject *) priv->contents_view, + "horizontal-movement", + G_CALLBACK (on_horizontal_movement), + self); +} + +static void +folder_refreshed_cb (ModestMailOperation *mail_op, + TnyFolder *folder, + gpointer user_data) +{ + /* Update the view (folder could be empty) */ + update_view (MODEST_HEADER_WINDOW (user_data), NULL); } static GtkWidget * @@ -363,9 +388,9 @@ create_header_view (ModestWindow *self, TnyFolder *folder) GtkWidget *header_view; header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); - modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, - TRUE, self, NULL, NULL); - modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), + modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, + TRUE, self, folder_refreshed_cb, self); + modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), MODEST_HEADER_VIEW_FILTER_NONE); modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY); @@ -376,6 +401,7 @@ create_header_view (ModestWindow *self, TnyFolder *folder) static GtkWidget * create_empty_view (ModestWindow *self) { + GtkWidget *viewport = NULL; GtkWidget *label = NULL; GtkWidget *align = NULL; GtkWidget *vbox = NULL; @@ -386,6 +412,8 @@ create_empty_view (ModestWindow *self) align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE); label = gtk_label_new (_("mcen_ia_nomessages")); + hildon_helper_set_logical_font (label, "LargeSystemFont"); + gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); gtk_widget_show (label); gtk_widget_show (align); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); @@ -409,7 +437,11 @@ create_empty_view (ModestWindow *self) "clicked", G_CALLBACK (modest_ui_actions_on_new_msg), self); - return vbox; + viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0), + (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0)); + gtk_container_add (GTK_CONTAINER (viewport), vbox); + + return viewport; } static void @@ -425,7 +457,7 @@ on_vertical_movement (HildonPannableArea *area, ModestWindow * -modest_header_window_new (TnyFolder *folder, const gchar *account_name) +modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox) { ModestHeaderWindow *self = NULL; ModestHeaderWindowPrivate *priv = NULL; @@ -436,6 +468,8 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) ModestServerAccountSettings *store_settings = NULL; GtkWidget *action_area_box; GdkPixbuf *new_message_pixbuf; + GtkWidget *alignment; + gchar *account_display_name = NULL; self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL)); priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); @@ -443,6 +477,10 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) priv->folder = g_object_ref (folder); priv->contents_view = hildon_pannable_area_new (); + alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), + 0, 0, + HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE); /* We need to do this here to properly listen for mail operations because create_header_view launches a mail @@ -482,10 +520,12 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) setup_menu (self); priv->top_vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_end (GTK_BOX (priv->top_vbox), priv->contents_view, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (alignment), priv->contents_view); + gtk_box_pack_end (GTK_BOX (priv->top_vbox), alignment, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (self), priv->top_vbox); + gtk_widget_show (alignment); gtk_widget_show (priv->contents_view); gtk_widget_show (priv->top_vbox); @@ -510,15 +550,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) g_object_unref (window_icon); } - /* Set window title */ - if (TNY_IS_FOLDER (folder)) { - gchar *folder_name; - - folder_name = modest_tny_folder_get_display_name (folder); - gtk_window_set_title (GTK_WINDOW (self), folder_name); - g_free (folder_name); - } - /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, @@ -539,9 +570,11 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) modest_window_set_active_account (MODEST_WINDOW (self), account_name); + modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox); mgr = modest_runtime_get_account_mgr (); settings = modest_account_mgr_load_account_settings (mgr, account_name); if (settings) { + account_display_name = g_strdup (modest_account_settings_get_display_name (settings)); store_settings = modest_account_settings_get_store_settings (settings); if (store_settings) { priv->current_store_account = @@ -550,6 +583,26 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) } g_object_unref (settings); } + /* Set window title */ + if (TNY_IS_FOLDER (folder)) { + gchar *folder_name; + + if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { + const gchar *box_name; + box_name = mailbox; + if (box_name == NULL || box_name[0] == '\0') { + box_name = account_display_name; + } + folder_name = g_strconcat (_("mcen_me_folder_inbox"), " - ", box_name, NULL); + } else { + folder_name = modest_tny_folder_get_display_name (folder); + } + + gtk_window_set_title (GTK_WINDOW (self), folder_name); + g_free (folder_name); + } + g_free (account_display_name); + update_progress_hint (self); update_sort_button (self); @@ -594,6 +647,8 @@ static void setup_menu (ModestHeaderWindow *self) g_signal_connect (G_OBJECT (priv->sort_button), "clicked", G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self); hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER); + hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button), modest_ui_dimming_rules_on_sort); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, @@ -869,6 +924,8 @@ update_progress_hint (ModestHeaderWindow *self) if (has_active_operations (self)) { priv->progress_hint = TRUE; + } else { + priv->progress_hint = FALSE; } if (!priv->progress_hint && priv->current_store_account) { @@ -1049,9 +1106,7 @@ update_sort_button (ModestHeaderWindow *self) const gchar *value = NULL; priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model ( - GTK_TREE_VIEW (priv->header_view))))); + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); if (!gtk_tree_sortable_get_sort_column_id (sortable, ¤t_sort_colid, ¤t_sort_type)) { @@ -1105,3 +1160,65 @@ update_sort_button (ModestHeaderWindow *self) hildon_button_set_value (HILDON_BUTTON (priv->sort_button), value?value:""); } + +static void +on_horizontal_movement (HildonPannableArea *hildonpannable, + gint direction, + gdouble initial_x, + gdouble initial_y, + gpointer user_data) +{ +/* ModestHeaderWindowPrivate *priv; */ +/* gint dest_x, dest_y; */ +/* TnyHeader *header; */ + +/* /\* Ignore right to left movement *\/ */ +/* if (direction == HILDON_MOVEMENT_LEFT) */ +/* return; */ + +/* /\* Get the header to delete *\/ */ +/* priv = MODEST_HEADER_WINDOW_GET_PRIVATE (user_data); */ + +/* /\* Get tree view coordinates *\/ */ +/* if (!gtk_widget_translate_coordinates ((GtkWidget *) hildonpannable, */ +/* priv->header_view, */ +/* initial_x, */ +/* initial_y, */ +/* &dest_x, */ +/* &dest_y)) */ +/* return; */ + +/* header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view, */ +/* dest_x, dest_y); */ +/* if (header) { */ +/* gint response; */ +/* gchar *subject, *msg; */ + +/* subject = tny_header_dup_subject (header); */ +/* if (!subject) */ +/* subject = g_strdup (_("mail_va_no_subject")); */ + +/* msg = g_strdup_printf (ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 1), */ +/* subject); */ +/* g_free (subject); */ + +/* /\* Confirmation dialog *\/ */ +/* response = modest_platform_run_confirmation_dialog ((GtkWindow *) user_data, msg); */ +/* g_free (msg); */ + +/* if (response == GTK_RESPONSE_OK) { */ +/* ModestMailOperation *mail_op; */ +/* TnyList *header_list; */ + +/* header_list = tny_simple_list_new (); */ +/* tny_list_append (header_list, (GObject *) header); */ +/* mail_op = modest_mail_operation_new ((GObject *) user_data); */ +/* modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), */ +/* mail_op); */ +/* modest_mail_operation_remove_msgs (mail_op, header_list, FALSE); */ +/* g_object_unref (mail_op); */ +/* g_object_unref (header_list); */ +/* } */ +/* g_object_unref (header); */ +/* } */ +}