#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>
GtkTreePath *path,
GtkTreeViewColumn *column,
ModestAccountsWindow *accounts_window);
+static void on_progress_list_changed (ModestWindowMgr *mgr,
+ ModestAccountsWindow *self);
static void setup_menu (ModestAccountsWindow *self);
-
+static gboolean _modest_accounts_window_map_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer userdata);
+static void update_progress_hint (ModestAccountsWindow *self);
+static void on_row_inserted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data);
+static void on_row_deleted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ gpointer user_data);
+static void row_count_changed (ModestAccountsWindow *self);
typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate;
struct _ModestAccountsWindowPrivate {
GtkWidget *account_view;
+ GtkWidget *no_accounts_label;
+ GtkWidget *new_message_button;
/* signals */
GSList *sighandlers;
- /* Display state */
- osso_display_state_t display_state;
+ gboolean progress_hint;
};
#define MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNTS_WINDOW, \
priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(obj);
priv->sighandlers = NULL;
- priv->display_state = OSSO_DISPLAY_ON;
priv->account_view = NULL;
+ priv->progress_hint = FALSE;
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
static void
connect_signals (ModestAccountsWindow *self)
-{
+{
ModestAccountsWindowPrivate *priv;
-
+ GtkTreeModel *model;
+
priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self);
/* accounts view */
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT (priv->account_view), "row-activated",
- G_CALLBACK (on_account_activated), self);
-
- /* window */
-
- /* we don't register this in sighandlers, as it should be run after disconnecting all signals,
- * in destroy stage */
-
-
-}
-
-static void
-osso_display_event_cb (osso_display_state_t state,
- gpointer data)
-{
- ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (data);
-
- priv->display_state = state;
-
- /* Stop blinking if the screen becomes on */
- if (priv->display_state == OSSO_DISPLAY_ON)
- modest_platform_remove_new_mail_notifications (TRUE);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->account_view), "row-activated",
+ G_CALLBACK (on_account_activated), self);
+
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (modest_runtime_get_window_mgr ()),
+ "progress-list-changed",
+ G_CALLBACK (on_progress_list_changed), self);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view));
+
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (model),
+ "row-inserted",
+ G_CALLBACK (on_row_inserted), self);
+
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (model),
+ "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 */
}
ModestWindow *
modest_accounts_window_new (void)
{
- ModestAccountsWindow *self = NULL;
+ ModestAccountsWindow *self = NULL;
ModestAccountsWindowPrivate *priv = NULL;
HildonProgram *app;
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);
+ box = gtk_vbox_new (FALSE, 0);
+
+ priv->no_accounts_label = gtk_label_new (_("mcen_ia_noaccounts"));
+ gtk_misc_set_alignment (GTK_MISC (priv->no_accounts_label), 0.5, 0.0);
+ gtk_box_pack_start (GTK_BOX (box), priv->no_accounts_label, TRUE, TRUE, 0);
+
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);
- gtk_container_add (GTK_CONTAINER (self), pannable);
+ gtk_box_pack_start (GTK_BOX (box), pannable, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (self), box);
gtk_widget_show (priv->account_view);
gtk_widget_show (pannable);
+ gtk_widget_show (box);
connect_signals (MODEST_ACCOUNTS_WINDOW (self));
g_object_unref (window_icon);
}
- /* Listen for changes in the screen, we don't want to show a
- led pattern when the display is on for example */
- osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
- osso_display_event_cb,
- self);
-
/* Dont't restore settings here,
* because it requires a gtk_widget_show(),
* and we don't want to do that until later,
* so that the UI is not visible for non-menu D-Bus activation.
*/
- return MODEST_WINDOW(self);
-}
+ g_signal_connect (G_OBJECT (self), "map-event",
+ G_CALLBACK (_modest_accounts_window_map_event),
+ G_OBJECT (self));
+ update_progress_hint (self);
-gboolean
-modest_accounts_window_screen_is_on (ModestAccountsWindow *self)
-{
- ModestAccountsWindowPrivate *priv = NULL;
+ row_count_changed (self);
- g_return_val_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self), FALSE);
- priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
-
- return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+ return MODEST_WINDOW(self);
}
ModestAccountView *
g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self));
/* Settings menu buttons */
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: new account"),
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
NULL);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("TODO: edit accounts"),
+ 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"),
- APP_MENU_CALLBACK (modest_ui_actions_on_settings),
- NULL);
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"),
+ 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_viewer_newemail"),
- 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"),
+ 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"),
+ 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);
-
+
account_name = modest_account_view_get_path_account (MODEST_ACCOUNT_VIEW (priv->account_view), path);
if (!account_name)
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);
+ 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
+_modest_accounts_window_map_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer userdata)
+{
+ ModestAccountsWindow *self = (ModestAccountsWindow *) userdata;
+ ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
+
+ if (priv->progress_hint) {
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+ }
+
+ return FALSE;
+}
+
+static void
+update_progress_hint (ModestAccountsWindow *self)
+{
+ ModestAccountsWindowPrivate *priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
+
+ priv->progress_hint = modest_window_mgr_has_progress_operation (modest_runtime_get_window_mgr ());
+
+ if (GTK_WIDGET_VISIBLE (self)) {
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+ }
+}
+
+static void
+on_progress_list_changed (ModestWindowMgr *mgr,
+ ModestAccountsWindow *self)
+{
+ update_progress_hint (self);
+}
+
+static void
+on_row_inserted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ ModestAccountsWindow *self;
+
+ self = (ModestAccountsWindow *) user_data;
+
+ row_count_changed (self);
+}
+
+static void
+on_row_deleted (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ gpointer user_data)
+{
+ ModestAccountsWindow *self;
+
+ self = (ModestAccountsWindow *) user_data;
+ row_count_changed (self);
}
+static void row_count_changed (ModestAccountsWindow *self)
+{
+ ModestAccountsWindowPrivate *priv;
+ GtkTreeModel *model;
+ gint count;
+
+ priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view));
+
+ count = gtk_tree_model_iter_n_children (model, NULL);
+
+ if (count == 0) {
+ gtk_widget_show (priv->no_accounts_label);
+ } else {
+ gtk_widget_hide (priv->no_accounts_label);
+ }
+}
projects / modest / blobdiff