#include <modest-window.h>
#include <hildon/hildon-program.h>
#include <hildon/hildon-banner.h>
+#include <hildon/hildon-button.h>
#include <tny-account-store-view.h>
#include <modest-header-window.h>
#include <modest-ui-dimming-rules.h>
#include <modest-ui-dimming-manager.h>
#include <modest-window-priv.h>
#include "modest-text-utils.h"
+#include "modest-tny-account.h"
typedef enum {
EDIT_MODE_COMMAND_MOVE = 1,
GtkWidget *folder_view;
GtkWidget *top_vbox;
+ GtkWidget *new_message_button;
/* signals */
GSList *sighandlers;
static void
modest_folder_window_disconnect_signals (ModestWindow *self)
-{
- ModestFolderWindowPrivate *priv;
+{
+ ModestFolderWindowPrivate *priv;
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
- priv->sighandlers = NULL;
+ priv->sighandlers = NULL;
+}
+
+static void
+on_visible_account_changed (ModestFolderView *folder_view,
+ const gchar *account_id,
+ gpointer user_data)
+{
+ if (account_id) {
+ TnyAccount *acc =
+ modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+ MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+ account_id);
+ if (acc) {
+ const gchar *name;
+ const gchar *mailbox;
+ gchar *title = NULL;
+ ModestFolderWindowPrivate *priv;
+
+ priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
+
+ mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view));
+ if (mailbox) {
+ title = g_strdup (mailbox);
+ } else {
+ name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
+ title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
+ name);
+ }
+ if (title) {
+ gtk_window_set_title (GTK_WINDOW (user_data), title);
+ g_free (title);
+ } else {
+ gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name"));
+ }
+ g_object_unref (acc);
+ }
+ } else {
+ gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name"));
+ }
}
static void
connect_signals (ModestFolderWindow *self)
-{
+{
ModestFolderWindowPrivate *priv;
-
+
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
/* folder view */
G_OBJECT (modest_runtime_get_window_mgr ()),
"progress-list-changed",
G_CALLBACK (on_progress_list_changed), self);
- /* TODO: connect folder view activate */
-
- /* window */
- /* we don't register this in sighandlers, as it should be run after disconnecting all signals,
- * in destroy stage */
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->folder_view),
+ "visible-account-changed",
+ G_CALLBACK (on_visible_account_changed), 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);
-
}
ModestWindow *
HildonProgram *app;
GdkPixbuf *window_icon;
GtkWidget *pannable;
+ GtkWidget *action_area_box;
+ GdkPixbuf *new_message_pixbuf;
+ guint accel_key;
+ GdkModifierType accel_mods;
+ GtkAccelGroup *accel_group;
+ GtkWidget *top_alignment;
self = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
+
g_signal_connect (G_OBJECT (self), "edit-mode-changed",
G_CALLBACK (edit_mode_changed), (gpointer) self);
+ action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->folder_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->folder_view), TRUE);
+
setup_menu (self);
/* Set account store */
TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
priv->top_vbox = gtk_vbox_new (0, FALSE);
+ top_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (top_alignment),
+ 0, 0,
+ HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view);
- gtk_box_pack_end (GTK_BOX (priv->top_vbox), pannable, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (top_alignment), pannable);
+ gtk_box_pack_end (GTK_BOX (priv->top_vbox), top_alignment, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
gtk_widget_show (priv->folder_view);
gtk_widget_show (pannable);
gtk_widget_show (priv->top_vbox);
+ gtk_widget_show (top_alignment);
connect_signals (MODEST_FOLDER_WINDOW (self));
G_OBJECT (self));
update_progress_hint (self);
+ accel_group = gtk_accel_group_new ();
+ gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
+ gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
+ accel_key, accel_mods, 0);
+ gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
+
return MODEST_WINDOW(self);
}
g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-
+
/* Get account data */
mgr = modest_runtime_get_account_mgr ();
if (priv->current_store_account != NULL)
g_free (priv->current_store_account);
priv->current_store_account = g_strdup (modest_server_account_settings_get_account_name (store_settings));
-
- modest_folder_view_set_account_id_of_visible_server_account
+
+ modest_folder_view_set_account_id_of_visible_server_account
(MODEST_FOLDER_VIEW (priv->folder_view),
priv->current_store_account);
modest_window_set_active_account (MODEST_WINDOW (self), account_name);
- gtk_window_set_title (GTK_WINDOW (self),
- modest_account_settings_get_display_name (settings));
+ update_progress_hint (self);
free_refs:
- if (store_settings)
+ if (store_settings)
g_object_unref (store_settings);
if (settings)
g_object_unref (settings);
}
-static void setup_menu (ModestFolderWindow *self)
+void
+modest_folder_window_set_mailbox (ModestFolderWindow *self,
+ const gchar *mailbox)
+{
+ ModestFolderWindowPrivate *priv = NULL;
+
+ g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
+ priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+ modest_folder_view_set_mailbox (MODEST_FOLDER_VIEW (priv->folder_view), mailbox);
+
+}
+
+static void
+setup_menu (ModestFolderWindow *self)
{
g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
NULL);
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
APP_MENU_CALLBACK (set_rename_edit_mode),
- NULL);
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
APP_MENU_CALLBACK (set_moveto_edit_mode),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
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));
- /* new message */
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
- _("mcen_me_new_message"),
- "<Ctrl>n",
- APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
- NULL);
-
}
static void
break;
}
+ hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->folder_view), !enabled);
if (enabled) {
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view),
filter);
priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
priv->current_store_account);
-
+
if (GTK_WIDGET_VISIBLE (self)) {
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint ? 1:0);
}
}
projects / modest / blobdiff