G_CALLBACK (modest_ui_actions_on_new_msg), 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 *
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);
static GtkWidget *
create_empty_view (ModestWindow *self)
{
+ GtkWidget *viewport = NULL;
GtkWidget *label = NULL;
GtkWidget *align = NULL;
GtkWidget *vbox = NULL;
"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
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;
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);
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,
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 =
}
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);
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,
if (has_active_operations (self)) {
priv->progress_hint = TRUE;
+ } else {
+ priv->progress_hint = FALSE;
}
if (!priv->progress_hint && priv->current_store_account) {