X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=a7696f156077737b6bdf6c2d91c6001b66b1a582;hp=3c19dd0052c2c3c61e9b2c47e3031f90e4f31404;hb=9b9efa32a2edc633130c4df8967dee7abc0ec41a;hpb=9344597f4c8e8b0c0cf7481ae04963c73a844035 diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 3c19dd0..a7696f1 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -37,7 +37,7 @@ #include "modest-hildon-includes.h" #include "modest-defs.h" #include - +#include "widgets/modest-header-view-priv.h" #include "widgets/modest-main-window.h" #include "widgets/modest-msg-edit-window.h" #include "widgets/modest-account-view-window.h" @@ -61,6 +61,7 @@ #include "modest-text-utils.h" #include "modest-ui-dimming-manager.h" #include "maemo/modest-osso-state-saving.h" +#include "modest-text-utils.h" #ifdef MODEST_HAVE_HILDON0_WIDGETS #include @@ -246,8 +247,8 @@ static const GtkActionEntry modest_header_view_action_entries [] = { { "HeaderViewCSMCut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut) }, { "HeaderViewCSMCopy", NULL, N_("mcen_me_inbox_copy"), "C", NULL, G_CALLBACK (modest_ui_actions_on_copy) }, { "HeaderViewCSMPaste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste) }, - { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete) }, - { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, NULL }, + { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, + { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, { "HeaderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, }; @@ -441,12 +442,12 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget) } -static gboolean -on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) -{ - modest_window_save_state (MODEST_WINDOW(self)); - return FALSE; -} +/* static gboolean */ +/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) */ +/* { */ +/* modest_window_save_state (MODEST_WINDOW(self)); */ +/* return FALSE; */ +/* } */ typedef struct { @@ -482,6 +483,10 @@ on_response (GtkDialog *dialog, gint arg1, gpointer user_data) static void on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) { + if (err) { + printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); + } + if (header) { gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?", err->message, tny_header_get_subject (header)); @@ -653,7 +658,7 @@ connect_signals (ModestMainWindow *self) self); /* window */ - g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); +/* g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); */ g_signal_connect (G_OBJECT (self), "window-state-event", G_CALLBACK (modest_main_window_window_state_event), NULL); @@ -795,7 +800,8 @@ modest_main_window_new (void) GError *error = NULL; ModestConf *conf = NULL; GtkAction *action = NULL; - + GdkPixbuf *window_icon; + self = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); @@ -806,8 +812,8 @@ modest_main_window_new (void) action_group = gtk_action_group_new ("ModestMainWindowActions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules"); - toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules"); + menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); + toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); /* Add common actions */ gtk_action_group_add_actions (action_group, @@ -892,6 +898,11 @@ modest_main_window_new (void) modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(priv->header_view), MODEST_CONF_HEADER_VIEW_KEY); + /* Other style properties of header view */ + g_object_set (G_OBJECT (priv->header_view), + "rules-hint", FALSE, + NULL); + /* Empty view */ priv->empty_view = create_empty_view (); @@ -926,6 +937,12 @@ modest_main_window_new (void) g_signal_connect (G_OBJECT(self), "show", G_CALLBACK (modest_main_window_on_show), folder_win); + /* Set window icon */ + window_icon = modest_platform_get_icon (MODEST_APP_ICON); + if (window_icon) { + gtk_window_set_icon (GTK_WINDOW (self), window_icon); + g_object_unref (window_icon); + } restore_settings (MODEST_MAIN_WINDOW(self), FALSE); @@ -1268,7 +1285,9 @@ on_account_update (TnyAccountStore *account_store, ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); - /* Create display name. The default account is shown differently */ + /* Create display name. The UI specification specifies a different format string + * to use for the default account, though both seem to be "%s", so + * I don't see what the point is. murrayc. */ if (default_account && account_data->account_name && !(strcmp (default_account, account_data->account_name) == 0)) { display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), @@ -1294,7 +1313,7 @@ on_account_update (TnyAccountStore *account_store, /* Add ui from account data. We allow 2^9-1 account changes in a single execution because we're downcasting the guint to a guint8 in order to use a - GByteArray, it should be enough */ + GByteArray. It should be enough. */ item_name = g_strconcat (account_data->account_name, "Menu", NULL); merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1); @@ -1526,10 +1545,15 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) /* Size / Date */ if (modest_tny_account_is_virtual_local_folders (account) || modest_tny_account_is_memory_card_account (account)) { - /* FIXME: format size */ - label = g_markup_printf_escaped ("%s: %d", - gray_color_markup, _("mcen_fi_rootfolder_size"), - modest_tny_folder_store_get_local_size (folder_store)); + + gchar *size = modest_text_utils_get_display_size ( + modest_tny_folder_store_get_local_size (folder_store)); + + label = g_markup_printf_escaped ("%s: %s", + gray_color_markup, _("mcen_fi_rootfolder_size"), + size); + g_free (size); + label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); @@ -1947,7 +1971,7 @@ on_queue_changed (ModestMailOperationQueue *queue, /* Get toolbar mode from operation id*/ op_type = modest_mail_operation_get_type_operation (mail_op); switch (op_type) { - case MODEST_MAIL_OPERATION_TYPE_SEND: +/* case MODEST_MAIL_OPERATION_TYPE_SEND: */ case MODEST_MAIL_OPERATION_TYPE_RECEIVE: case MODEST_MAIL_OPERATION_TYPE_OPEN: mode = TOOLBAR_MODE_TRANSFER; @@ -2068,6 +2092,14 @@ on_folder_view_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer userdata) { + ModestMainWindow *main_window = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE); + main_window = MODEST_MAIN_WINDOW (userdata); + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + return FALSE; } @@ -2076,8 +2108,12 @@ on_header_view_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer userdata) { - ModestMainWindow *main_window = MODEST_MAIN_WINDOW (userdata); - ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); + ModestMainWindow *main_window = NULL; + ModestMainWindowPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE); + main_window = MODEST_MAIN_WINDOW (userdata); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) { TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view)); @@ -2096,6 +2132,11 @@ on_header_view_focus_in (GtkWidget *widget, g_object_unref (iterator); g_object_unref (selection); } + + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + return FALSE; } @@ -2166,3 +2207,32 @@ modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, modest_ui_actions_on_folder_selection_changed (folder_view, folder_store, selected, main_window); } + +gboolean +modest_main_window_on_msg_view_window_msg_changed (ModestMsgViewWindow *view_window, + GtkTreeModel *model, + GtkTreeRowReference *row_reference, + ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + GtkTreeModel *header_model = NULL; + GtkTreePath *path = NULL; + + g_return_val_if_fail (MODEST_MSG_VIEW_WINDOW (view_window), FALSE); + g_return_val_if_fail (MODEST_MAIN_WINDOW (self), FALSE); + g_return_val_if_fail (gtk_tree_row_reference_valid (row_reference), FALSE); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + header_model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)); + + /* Do nothing if we changed the folder in the main view */ + if (header_model != model) + return FALSE; + + /* Select the message in the header view */ + path = gtk_tree_row_reference_get_path (row_reference); + _modest_header_view_select_from_path (MODEST_HEADER_VIEW (priv->header_view), path); + gtk_tree_path_free (path); + + return TRUE; +}