#include <modest-runtime.h>
#include <modest-platform.h>
#include <hildon/hildon-program.h>
+#include <hildon/hildon-button.h>
#include <modest-maemo-utils.h>
#include <modest-icon-names.h>
#include <modest-defs.h>
GtkWidget *account_view;
GtkWidget *no_accounts_label;
+ GtkWidget *new_message_button;
/* signals */
GSList *sighandlers;
"row-deleted",
G_CALLBACK (on_row_deleted), self);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->new_message_button),
+ "clicked",
+ G_CALLBACK (modest_ui_actions_on_new_msg), self);
+
/* we don't register this in sighandlers, as it should be run
* after disconnecting all signals, in destroy stage */
}
GdkPixbuf *window_icon;
GtkWidget *pannable;
GtkWidget *box;
+ GdkPixbuf *new_message_pixbuf;
+ GtkWidget *action_area_box;
self = MODEST_ACCOUNTS_WINDOW(g_object_new(MODEST_TYPE_ACCOUNTS_WINDOW, NULL));
priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self);
pannable = hildon_pannable_area_new ();
priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ()));
+ action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->account_view));
+ priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+
+ hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
+ new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
+ hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
+ g_object_unref (new_message_pixbuf);
+
+ gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
+ gtk_widget_show_all (priv->new_message_button);
+ hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->account_view), TRUE);
+
+
setup_menu (self);
gtk_container_add (GTK_CONTAINER (pannable), priv->account_view);
NULL);
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
- NULL);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
- APP_MENU_CALLBACK (modest_ui_actions_on_settings),
- NULL);
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
- APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_settings),
+ NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+ APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
}
ModestAccountsWindowPrivate *priv;
gchar* account_name;
GtkWidget *folder_window;
+ gboolean registered;
priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
return;
folder_window = GTK_WIDGET (modest_folder_window_new (NULL));
- modest_window_mgr_register_window (modest_runtime_get_window_mgr (),
- MODEST_WINDOW (folder_window),
- MODEST_WINDOW (self));
- modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), account_name);
- gtk_widget_show (folder_window);
- g_free (account_name);
+ registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (),
+ MODEST_WINDOW (folder_window),
+ MODEST_WINDOW (self));
+ if (!registered) {
+ gtk_widget_destroy (folder_window);
+ folder_window = NULL;
+ } else {
+ modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), account_name);
+ gtk_widget_show (folder_window);
+ }
+ g_free (account_name);
}
-static gboolean
+static gboolean
_modest_accounts_window_map_event (GtkWidget *widget,
GdkEvent *event,
gpointer userdata)
count = gtk_tree_model_iter_n_children (model, NULL);
if (count == 0) {
- gtk_widget_hide (priv->account_view);
gtk_widget_show (priv->no_accounts_label);
} else {
gtk_widget_hide (priv->no_accounts_label);
- gtk_widget_show (priv->account_view);
}
}