From: Jose Dapena Paz Date: Tue, 17 Nov 2009 21:56:01 +0000 (+0100) Subject: Refactor part of ModestWindow and ModestHildon2Window X-Git-Tag: jdapena-ppa-3.90.4-modest0~225 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=514d7488390a9c4c31a9ca5e44f78dc9329b833d Refactor part of ModestWindow and ModestHildon2Window --- diff --git a/configure.ac b/configure.ac index fb81572..a2446c0 100644 --- a/configure.ac +++ b/configure.ac @@ -344,6 +344,10 @@ else fi fi +if test "x$with_toolkit" != "xgtk"; then +MODEST_TOOLKIT_CFLAGS="$MODEST_TOOLKIT_CFLAGS -DMAEMO_CHANGES" +fi + dnl --------------- NOTIFICATION STUFF ----------- if test "x$with_toolkit" != "xgtk"; then PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false) diff --git a/src/Makefile.am b/src/Makefile.am index 5f73136..430b715 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,6 @@ INCLUDES=\ -fPIC \ -I$(MODEST_TOOLKIT_DIR) \ -DPREFIX=\"@prefix@\" \ - -DMAEMO_CHANGES \ -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \ -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \ -DMODEST_TOOLKIT=\"$(MODEST_TOOLKIT)\" \ diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am index f5e89b7..6a35351 100644 --- a/src/dbus_api/Makefile.am +++ b/src/dbus_api/Makefile.am @@ -38,7 +38,6 @@ INCLUDES=\ -I ${top_srcdir}/src \ -I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \ -DPREFIX=\"@prefix@\" \ - -DMAEMO_CHANGES \ -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \ -DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \ -DPROVIDER_DATA_DIR=\""${datadir}/modest/provider-data/"\" \ diff --git a/src/gtk/modest-icon-names.h b/src/gtk/modest-icon-names.h index e941f99..85514c5 100644 --- a/src/gtk/modest-icon-names.h +++ b/src/gtk/modest-icon-names.h @@ -90,13 +90,15 @@ #define MODEST_TOOLBAR_ICON_REPLY_ALL "mail-reply-all" #define MODEST_TOOLBAR_ICON_FORWARD "mail-forward" #define MODEST_TOOLBAR_ICON_DELETE GTK_STOCK_DELETE -/* #define MODEST_TOOLBAR_ICON_NEXT PIXMAP_PREFIX "forward.png" */ -/* #define MODEST_TOOLBAR_ICON_PREV PIXMAP_PREFIX "back.png" */ +#define MODEST_TOOLBAR_ICON_NEXT GTK_STOCK_GO_FORWARD +#define MODEST_TOOLBAR_ICON_PREV GTK_STOCK_GO_BACK #define MODEST_TOOLBAR_ICON_STOP GTK_STOCK_STOP #define MODEST_TOOLBAR_ICON_FORMAT_BULLETS GTK_STOCK_INDENT #define MODEST_TOOLBAR_ICON_SPLIT_VIEW PIXMAP_PREFIX "folder" #define MODEST_TOOLBAR_ICON_BOLD GTK_STOCK_BOLD #define MODEST_TOOLBAR_ICON_ITALIC GTK_STOCK_ITALIC +#define MODEST_TOOLBAR_ICON_FIND GTK_STOCK_FIND +#define MODEST_TOOLBAR_ICON_DOWNLOAD_IMAGES GTK_STOCK_MISSING_IMAGE /* Stock icon names */ #define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send" diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am index b2b7333..a064923 100644 --- a/src/hildon2/Makefile.am +++ b/src/hildon2/Makefile.am @@ -43,7 +43,6 @@ INCLUDES=\ -I ${top_srcdir}/src/widgets \ -I ${top_srcdir}/src \ -DPREFIX=\"@prefix@\" \ - -DMAEMO_CHANGES \ -DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \ -Wall diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 0969905..b58b94a 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -80,7 +80,7 @@ static void set_moveto_edit_mode (GtkButton *button, ModestFolderWindow *self); static void set_rename_edit_mode (GtkButton *button, ModestFolderWindow *self); -static void modest_folder_window_pack_toolbar (ModestHildon2Window *self, +static void modest_folder_window_pack_toolbar (ModestWindow *self, GtkPackType pack_type, GtkWidget *toolbar); static void edit_mode_changed (ModestFolderWindow *folder_window, @@ -163,7 +163,6 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass) GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; - ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_window_finalize; @@ -172,7 +171,7 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestFolderWindowPrivate)); modest_window_class->disconnect_signals_func = modest_folder_window_disconnect_signals; - modest_hildon2_window_class->pack_toolbar_func = modest_folder_window_pack_toolbar; + modest_window_class->pack_toolbar_func = modest_folder_window_pack_toolbar; } static void @@ -631,7 +630,7 @@ set_rename_edit_mode (GtkButton *button, } static void -modest_folder_window_pack_toolbar (ModestHildon2Window *self, +modest_folder_window_pack_toolbar (ModestWindow *self, GtkPackType pack_type, GtkWidget *toolbar) { diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 52839d9..60ab7c1 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -96,6 +96,7 @@ static void osso_display_event_cb (osso_display_state_t state, static void on_account_removed (TnyAccountStore *acc_store, TnyAccount *account, gpointer user_data); +static ModestWindow *modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self); typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate; struct _ModestHildon2WindowMgrPrivate { @@ -176,6 +177,7 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass) mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top; mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on; mgr_class->create_caches = modest_hildon2_window_mgr_create_caches; + mgr_class->get_folder_window = modest_hildon2_window_mgr_get_folder_window; g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate)); @@ -967,7 +969,7 @@ find_folder_window (gconstpointer a, return (MODEST_IS_FOLDER_WINDOW (a)) ? 0 : 1; } -ModestWindow * +static ModestWindow * modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self) { ModestHildon2WindowMgrPrivate *priv; diff --git a/src/hildon2/modest-hildon2-window-mgr.h b/src/hildon2/modest-hildon2-window-mgr.h index 49d33bb..8058cf9 100644 --- a/src/hildon2/modest-hildon2-window-mgr.h +++ b/src/hildon2/modest-hildon2-window-mgr.h @@ -76,7 +76,6 @@ ModestWindowMgr* modest_hildon2_window_mgr_new (void); void modest_hildon2_window_mgr_set_account_store (ModestHildon2WindowMgr *self, TnyAccountStore *acc_store); -ModestWindow *modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self); G_END_DECLS diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c index f068745..8262f82 100644 --- a/src/hildon2/modest-hildon2-window.c +++ b/src/hildon2/modest-hildon2-window.c @@ -76,9 +76,6 @@ static void modest_hildon2_window_set_title (ModestWindow *self, static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window, guint button, guint32 time); -static void modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self, - GtkPackType pack_type, - GtkWidget *toolbar); static EditModeRegister *edit_mode_register_new (const gchar *description, const gchar *button_label, GtkTreeView *tree_view, @@ -180,7 +177,6 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data) modest_window_class->set_title_func = modest_hildon2_window_set_title; modest_window_class->show_progress_func = modest_hildon2_window_show_progress; - modest_hildon2_window_class->pack_toolbar_func = modest_hildon2_window_pack_toolbar_not_implemented; } static void @@ -247,27 +243,6 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window) hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here")); return FALSE; } - -static void -modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self, - GtkPackType pack_type, - GtkWidget *toolbar) -{ - g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self)); - - g_debug ("%s not implemented", __FUNCTION__); -} - -void -modest_hildon2_window_pack_toolbar (ModestHildon2Window *self, - GtkPackType pack_type, - GtkWidget *toolbar) -{ - g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self)); - - MODEST_HILDON2_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar); -} - void modest_hildon2_window_add_item_to_menu (ModestWindow *self, GtkWidget *button, @@ -462,8 +437,8 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self, reg->description); hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), reg->button_label); - modest_hildon2_window_pack_toolbar (self, GTK_PACK_START, - priv->edit_toolbar); + modest_window_pack_toolbar (MODEST_WINDOW (self), GTK_PACK_START, + priv->edit_toolbar); g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked", G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self); diff --git a/src/hildon2/modest-hildon2-window.h b/src/hildon2/modest-hildon2-window.h index 2233ccc..7df7e99 100644 --- a/src/hildon2/modest-hildon2-window.h +++ b/src/hildon2/modest-hildon2-window.h @@ -55,17 +55,18 @@ struct _ModestHildon2Window { struct _ModestHildon2WindowClass { ModestWindowClass parent_class; - void (*pack_toolbar_func) (ModestHildon2Window *self, GtkPackType pack_type, GtkWidget *toolbar); void (*edit_mode_changed) (ModestHildon2Window *self, gint edit_mode, gboolean enabled); + }; -typedef gboolean (*ModestHildon2EditModeCallback) (ModestHildon2Window *self); +typedef gboolean (*ModestHildon2EditModeCallback) (ModestWindow *self); #define EDIT_MODE_CALLBACK(x) ((ModestHildon2EditModeCallback) (x)) /* edit mode id for no edit mode */ #define MODEST_HILDON2_WINDOW_EDIT_MODE_NONE -1 + /** * modest_hildon2_window_get_type: * @@ -76,18 +77,6 @@ typedef gboolean (*ModestHildon2EditModeCallback) (ModestHildon2Window *self); GType modest_hildon2_window_get_type (void) G_GNUC_CONST; -/** - * modest_hildon2_window_pack_toolbar: - * @self: a #ModestHildon2Window - * @pack_type: a #GtkPackType - * @toolbar: a toolbar widget - * - * packs a toolbar (widget @toolbar) in @self with @pack_type - */ -void modest_hildon2_window_pack_toolbar (ModestHildon2Window *self, - GtkPackType pack_type, - GtkWidget *toolbar); - void modest_hildon2_window_register_edit_mode (ModestHildon2Window *self, gint edit_mode_id, const gchar *description, diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c index b545c48..353b72f 100644 --- a/src/hildon2/modest-maemo-utils.c +++ b/src/hildon2/modest-maemo-utils.c @@ -244,106 +244,6 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser) } -static gboolean match_all (TnyList *list, GObject *item, gpointer match_data) -{ - return TRUE; -} - -gboolean -modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs) -{ - GtkTreeModel *model; - TnyIterator *iterator; - GtkWidget *selector; - GtkCellRenderer *renderer; - GtkWidget *dialog; - gint response; - gboolean result = TRUE; - gint attachments_added = 0; - - model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT)); - for (iterator = tny_list_create_iterator (att_list); - !tny_iterator_is_done (iterator); - tny_iterator_next (iterator)) { - GtkTreeIter iter; - TnyMimePart *part; - gchar *filename = NULL; - - part = (TnyMimePart *) tny_iterator_get_current (iterator); - - /* Ignore purged attachments and messages if ignore is - set to TRUE */ - if (!(tny_mime_part_is_purged (part) || - (TNY_IS_MSG (part) && !include_msgs))) { - - if (TNY_IS_MSG (part)) { - TnyHeader *header = tny_msg_get_header (TNY_MSG (part)); - filename = tny_header_dup_subject (header); - g_object_unref (header); - } else { - filename = g_strdup (tny_mime_part_get_filename (part)); - } - if ((filename == NULL) || (filename[0] == '\0')) { - g_free (filename); - filename = g_strdup (_("mail_va_no_subject")); - } - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filename, 1, part, -1); - attachments_added ++; - g_free (filename); - } - g_object_unref (part); - } - g_object_unref (iterator); - - selector = GTK_WIDGET (hildon_touch_selector_new ()); - renderer = gtk_cell_renderer_text_new (); - g_object_set((GObject *) renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); - hildon_touch_selector_append_column ((HildonTouchSelector *) selector, model, renderer, - "text", 0, NULL); - hildon_touch_selector_set_column_selection_mode ((HildonTouchSelector *) selector, - HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE); - - dialog = hildon_picker_dialog_new (window); - gtk_window_set_title (GTK_WINDOW (dialog), (attachments_added > 1)? - _("mcen_ti_select_attachments_title"):_("mcen_ti_select_attachment_title")); - hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), (HildonTouchSelector *) selector); - hildon_touch_selector_unselect_all ((HildonTouchSelector *) selector, 0); - hildon_picker_dialog_set_done_label (HILDON_PICKER_DIALOG (dialog), _HL("wdgt_bd_done")); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - - if (response == GTK_RESPONSE_OK) { - GList *selected_rows, *node; - - tny_list_remove_matches (att_list, match_all, NULL); - selected_rows = hildon_touch_selector_get_selected_rows ((HildonTouchSelector *) selector, 0); - for (node = selected_rows; node != NULL; node = g_list_next (node)) { - GtkTreePath *path; - GObject *selected; - GtkTreeIter iter; - - path = (GtkTreePath *) node->data; - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, 1, &selected, -1); - tny_list_append (att_list, selected); - } - if (tny_list_get_length (att_list) == 0) - result = FALSE; - - g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selected_rows); - } else { - result = FALSE; - } - - gtk_widget_destroy (dialog); - - g_object_unref (model); - - return result; -} - #ifdef MODEST_PLATFORM_MAEMO gboolean modest_maemo_utils_in_usb_mode () diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h index 92cc141..d5c7f47 100644 --- a/src/hildon2/modest-maemo-utils.h +++ b/src/hildon2/modest-maemo-utils.h @@ -105,8 +105,6 @@ void modest_maemo_utils_set_osso_context (osso_context_t *osso_context); */ GtkWidget *modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager, const gchar *item_name); -gboolean modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs); - #ifdef MODEST_PLATFORM_MAEMO /** * modest_maemo_utils_in_usb_mode: diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 4822c00..2ba63db 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -2654,7 +2654,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, if (att_list == NULL) { att_list = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view)); - if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), att_list, TRUE)) { + if (!modest_toolkit_utils_select_attachments (GTK_WINDOW (window), att_list, TRUE)) { g_object_unref (att_list); return; } diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 8e0e9a1..29e96b5 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -1001,12 +1001,12 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, GtkSizeGroup *sizegroup; ModestFolderView *folder_view; ModestWindow *folder_window; - ModestHildon2WindowMgr *window_mgr; + ModestWindowMgr *window_mgr; FolderPickerHelper *helper = NULL; GtkWidget *top_vbox, *top_align; - window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr (); - folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr); + window_mgr = modest_runtime_get_window_mgr (); + folder_window = modest_window_mgr_get_folder_window (window_mgr); g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE); folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window)); diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 0c8dd2e..eb71510 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -76,6 +76,7 @@ #include #include #include +#include #include @@ -447,55 +448,12 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check first if the header view has the focus */ - if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *header_view = NULL; - - header_view = - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - if (!gtk_widget_is_focus (header_view)) - return FALSE; - } -#endif /* Get the headers, either from the header view (if win is the main window), * or from the message view window: */ header_list = get_selected_headers (win); if (!header_list) return FALSE; /* Check if any of the headers are already opened, or in the process of being opened */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) { - gint opened_headers = 0; - - iter = tny_list_create_iterator (header_list); - mgr = modest_runtime_get_window_mgr (); - while (!tny_iterator_is_done (iter)) { - header = TNY_HEADER (tny_iterator_get_current (iter)); - if (header) { - if (modest_window_mgr_find_registered_header (mgr, header, NULL)) - opened_headers++; - g_object_unref (header); - } - tny_iterator_next (iter); - } - g_object_unref (iter); - - if (opened_headers > 0) { - gchar *msg; - - msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), - opened_headers); - - modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg, FALSE); - - g_free (msg); - g_object_unref (header_list); - return FALSE; - } - } -#endif /* Select message */ if (tny_list_get_length(header_list) == 1) { @@ -526,31 +484,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) ModestMailOperation *mail_op = NULL; /* Find last selected row */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) { - GList *tmp = NULL; - ModestWindowMgr *mgr = NULL; - GtkTreeModel *model = NULL; - GtkTreeRowReference *next_row_reference = NULL, *prev_row_reference = NULL; - GtkTreePath *next_path = NULL, *prev_path = NULL; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); - sel_list = gtk_tree_selection_get_selected_rows (sel, &model); - for (tmp=sel_list; tmp; tmp=tmp->next) { - if (tmp->next == NULL) { - prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); - next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data); - - gtk_tree_path_prev (prev_path); - gtk_tree_path_next (next_path); - - prev_row_reference = gtk_tree_row_reference_new (model, prev_path); - next_row_reference = gtk_tree_row_reference_new (model, next_path); - } - } - } -#endif /* Disable window dimming management */ modest_window_disable_dimming (win); @@ -573,26 +506,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win) /* Get main window */ mgr = modest_runtime_get_window_mgr (); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - /* Select next or previous row */ - if (gtk_tree_row_reference_valid (next_row_reference)) { - gtk_tree_selection_select_path (sel, next_path); - } - else if (gtk_tree_row_reference_valid (prev_row_reference)) { - gtk_tree_selection_select_path (sel, prev_path); - } - - /* Free */ - if (gtk_tree_row_reference_valid (next_row_reference)) - gtk_tree_row_reference_free (next_row_reference); - if (next_path != NULL) - gtk_tree_path_free (next_path); - if (gtk_tree_row_reference_valid (prev_row_reference)) - gtk_tree_row_reference_free (prev_row_reference); - if (prev_path != NULL) - gtk_tree_path_free (prev_path); -#endif } /* Update toolbar dimming state */ @@ -4143,7 +4056,9 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store, gtk_widget_set_sensitive (entry_username, FALSE); /* Auto-capitalization is the default, so let's turn it off: */ +#ifdef MAEMO_CHANGES hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_username), HILDON_GTK_INPUT_MODE_FULL); +#endif /* Create a size group to be used by all captions. * Note that HildonCaption does not create a default size group if we do not specify one. diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index df400c0..e8d2c5c 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -52,9 +52,7 @@ #include #include #include -#ifdef MODEST_TOOLKIT_HILDON2 #include -#endif static gboolean _invalid_attach_selected (ModestWindow *win, @@ -73,166 +71,7 @@ static gboolean _msgs_send_in_progress (void); static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view) G_GNUC_UNUSED; static gboolean _forbid_outgoing_xfers (ModestWindow *window); -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean _folder_is_any_of_type (TnyFolder *folder, TnyFolderType types[], guint ntypes); -static gboolean _clipboard_is_empty (ModestWindow *win); -static gboolean _invalid_msg_selected (ModestMainWindow *win, gboolean unique, ModestDimmingRule *rule); -static gboolean _selected_folder_not_writeable (ModestMainWindow *win, gboolean for_paste); -static gboolean _selected_folder_not_moveable (ModestMainWindow *win); -static gboolean _selected_folder_not_renameable (ModestMainWindow *win); -static gboolean _selected_folder_not_deletable (ModestMainWindow *win); -static gboolean _selected_folder_is_root (ModestMainWindow *win); -static gboolean _selected_folder_is_root_or_inbox (ModestMainWindow *win); -static gboolean _selected_folder_is_empty (ModestMainWindow *win); -static gboolean _header_view_is_all_selected (ModestMainWindow *win); -static gboolean _folder_view_has_focus (ModestWindow *win); -static gboolean _selected_folder_is_same_as_source (ModestWindow *win); -static gboolean _msg_download_completed (ModestMainWindow *win); -static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win); -#endif - -#ifndef MODEST_TOOLKIT_HILDON2 -static DimmedState * -_define_main_window_dimming_state (ModestMainWindow *window) -{ - DimmedState *state = NULL; - GtkWidget *focused_widget = NULL; - GtkWidget *header_view = NULL; - GtkTreeModel *model = NULL; - TnyList *selected_headers = NULL; - TnyIterator *iter = NULL; - TnyHeader *header = NULL; - ModestCacheMgr *cache_mgr = NULL; - GHashTable *send_queue_cache = NULL; - ModestTnySendQueue *send_queue = NULL; - GSList *send_queues = NULL, *node = NULL; - ModestWindowMgr *mgr = NULL; - gboolean found = FALSE; - gchar *msg_uid = NULL; - TnyHeaderFlags flags; - gboolean all_deleted = TRUE; - gboolean all_seen = TRUE; - gboolean all_cached = TRUE; - gboolean all_has_attach = TRUE; - TnyFolder *folder = NULL; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(window), NULL); - - /* Init state */ - state = g_slice_new0 (DimmedState); - state->n_selected = 0; - state->already_opened_msg = 0; - state->any_marked_as_deleted = FALSE; - state->all_marked_as_deleted = FALSE; - state->any_marked_as_seen = FALSE; - state->all_marked_as_seen = FALSE; - state->any_marked_as_cached = FALSE; - state->all_marked_as_cached = FALSE; - state->any_has_attachments = FALSE; - state->all_has_attachments = FALSE; - state->sent_in_progress = FALSE; - state->all_selected = FALSE; - - /* Get focused widget */ - focused_widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (MODEST_IS_FOLDER_VIEW (focused_widget)) { - state->n_selected++; - return state; - } else if (MODEST_IS_HEADER_VIEW (focused_widget)) { - header_view = focused_widget; - } else { - header_view = modest_main_window_get_child_widget (window, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - } - - /* Get header view and selected headers */ - selected_headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view)); - if (!selected_headers) - return state; - - /* Examine selected headers */ - iter = tny_list_create_iterator (selected_headers); - while (!tny_iterator_is_done (iter)) { - header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); - - /* No selected */ - state->n_selected++; - - /* Already opened */ - mgr = modest_runtime_get_window_mgr (); - if (modest_window_mgr_find_registered_header (mgr, header, NULL)) - state->already_opened_msg++; - - - /* Mark as deleted */ - all_deleted = all_deleted && (flags & TNY_HEADER_FLAG_DELETED); - state->all_marked_as_deleted = all_deleted; - if (!state->any_marked_as_deleted) - state->any_marked_as_deleted = flags & TNY_HEADER_FLAG_DELETED; - - /* Mark as seen */ - all_seen = all_seen && (flags & TNY_HEADER_FLAG_SEEN); - state->all_marked_as_seen = all_seen; - if (!state->any_marked_as_seen) - state->any_marked_as_seen = flags & TNY_HEADER_FLAG_SEEN; - - /* Mark as cached */ - all_cached = all_cached && (flags & TNY_HEADER_FLAG_CACHED); - state->all_marked_as_cached = all_cached; - if (!state->any_marked_as_cached) - state->any_marked_as_cached = flags & TNY_HEADER_FLAG_CACHED; - - /* Mark has_attachments */ - all_has_attach = all_has_attach && (flags & TNY_HEADER_FLAG_ATTACHMENTS); - state->all_has_attachments = all_has_attach; - if (!state->any_has_attachments) - state->any_has_attachments = flags & TNY_HEADER_FLAG_ATTACHMENTS; - - /* sent in progress */ - folder = tny_header_get_folder (header); - if (folder) { - if (modest_tny_folder_guess_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) { - msg_uid = modest_tny_send_queue_get_msg_id (header); - if (!state->sent_in_progress) { - cache_mgr = modest_runtime_get_cache_mgr (); - send_queue_cache = modest_cache_mgr_get_cache (cache_mgr, - MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE); - - g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues); - - for (node = send_queues; node != NULL && !found; node = g_slist_next (node)) { - send_queue = MODEST_TNY_SEND_QUEUE (node->data); - - /* Check if msg uid is being processed inside send queue */ - found = modest_tny_send_queue_msg_is_being_sent (send_queue, msg_uid); - } - state->sent_in_progress = found; - } - } - g_object_unref (folder); - } - tny_iterator_next (iter); - g_object_unref (header); - } - - /* check if all the headers are selected or not */ - model = gtk_tree_view_get_model(GTK_TREE_VIEW(header_view)); - if (model != NULL){ - gint count; - count = gtk_tree_model_iter_n_children(model, NULL); - if(state->n_selected == count) - state->all_selected = TRUE; - } - /* Free */ - g_free(msg_uid); - g_object_unref(selected_headers); - g_object_unref(iter); - g_slist_free (send_queues); - - return state; -} -#endif static DimmedState * _define_msg_view_window_dimming_state (ModestMsgViewWindow *window) @@ -338,11 +177,6 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window) if (MODEST_IS_MSG_VIEW_WINDOW (window)) { state = _define_msg_view_window_dimming_state (MODEST_MSG_VIEW_WINDOW(window)); } -#ifndef MODEST_TOOLKIT_HILDON2 - else if (MODEST_IS_MAIN_WINDOW (window)) { - state = _define_main_window_dimming_state (MODEST_MAIN_WINDOW(window)); - } -#endif return state; } @@ -358,99 +192,9 @@ modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) rule = MODEST_DIMMING_RULE (user_data); /* Check dimmed rule */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MSG_VIEW_WINDOW(win)) { - dimmed = _msg_download_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } else if (MODEST_IS_MAIN_WINDOW(win)) { - dimmed = !modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), - TRUE); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - } -#endif return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - GtkWidget *folder_view = NULL; - TnyFolderStore *parent_folder = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - rule = MODEST_DIMMING_RULE (user_data); - - dimmed = _transfer_mode_enabled (win); - if (dimmed) { - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error")); - return dimmed; - } - - /* Get selected folder as parent of new folder to create */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) /* folder view may not have been created yet */ - return TRUE; - - parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!parent_folder) - return TRUE; - - if (TNY_IS_ACCOUNT (parent_folder)) { - /* If it's the local account then do not dim */ - if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) { - dimmed = FALSE; - } else { - ModestProtocolType protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (parent_folder)); - if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) { - ModestProtocolRegistry *protocol_registry; - - protocol_registry = modest_runtime_get_protocol_registry (); - /* If account does not support folders (pop) then dim */ - dimmed = (!modest_protocol_registry_protocol_type_has_tag (protocol_registry, protocol_type, - MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error")); - } - } - } else { - TnyFolderType types[3]; - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - - /* Apply folder rules */ - if (!dimmed) { - dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win), FALSE); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error")); - } - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error")); - } - } - - /* if not the folder is selected then dim */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (folder_view && !gtk_widget_is_focus (folder_view)) - dimmed = TRUE; - - g_object_unref (parent_folder); - - return dimmed; -} -#endif gboolean modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) @@ -461,7 +205,6 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); -#ifdef MODEST_TOOLKIT_HILDON2 if (MODEST_IS_FOLDER_WINDOW (win)) { dimmed = modest_ui_dimming_rules_on_folder_window_delete (win, user_data); } else if (MODEST_IS_HEADER_WINDOW (win)) { @@ -489,106 +232,20 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) g_object_unref (folder); } } -#else - GtkWidget *folder_view = NULL; - GtkWidget *header_view = NULL; - - if (MODEST_IS_MAIN_WINDOW (win)) { - /* Get the folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - - /* Get header view */ - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - - if (header_view && gtk_widget_is_focus (header_view)) - dimmed = modest_ui_dimming_rules_on_delete_msg (win, rule); - - if (folder_view && gtk_widget_is_focus (folder_view)) - dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule); - - if (header_view && folder_view && - !gtk_widget_is_focus (header_view) && - !gtk_widget_is_focus (folder_view)) { - dimmed = TRUE; - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); - } - } else { - dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule); -#endif } return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - TnyFolderType types[6]; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - types[3] = TNY_FOLDER_TYPE_INBOX; - types[4] = TNY_FOLDER_TYPE_ROOT; - types[5] = TNY_FOLDER_TYPE_ARCHIVE; - - - /* Check dimmed rule */ - dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error")); - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 6); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error")); - } - if (!dimmed) { - dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error")); - } - if (!dimmed) { - dimmed = _transfer_mode_enabled (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); - } - - return dimmed; -} -#endif gboolean modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data) { gboolean dimmed = FALSE; -#ifdef MODEST_TOOLKIT_HILDON2 if (MODEST_IS_HEADER_WINDOW (win)) { return FALSE; } -#else - ModestDimmingRule *rule = NULL; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - - rule = MODEST_DIMMING_RULE (user_data); - - /* Check dimmed rule */ - dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win)); - - if (!dimmed) - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); -#endif return dimmed; } @@ -608,26 +265,12 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) types[2] = TNY_FOLDER_TYPE_SENT; types[3] = TNY_FOLDER_TYPE_ARCHIVE; -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check dimmed rule */ - if (MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _selected_folder_not_renameable (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - if (!dimmed) { - dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - } -#else if (MODEST_IS_FOLDER_WINDOW (win)) { ModestFolderView *folder_view; folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (win)); dimmed = !modest_folder_view_any_folder_fulfils_rules (folder_view, MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE); } -#endif if (!dimmed) { dimmed = _selected_folder_is_any_of_type (win, types, 4); @@ -638,39 +281,6 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - gboolean dimmed = FALSE; - const DimmedState *state = NULL; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - /* Check dimmed rule */ - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE, user_data); - if (!dimmed) { - if (state) - dimmed = state->any_marked_as_deleted; - if (dimmed) { - gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); - modest_dimming_rule_set_notification (rule, msg); - g_free (msg); - } - } - if (!dimmed) { - dimmed = _selected_msg_sent_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_open_while_sent")); - } - - return dimmed; -} -#endif gboolean modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) @@ -714,45 +324,11 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); } -#ifndef MODEST_TOOLKIT_HILDON2 - /* main window dimming rules */ - } else if (MODEST_IS_MAIN_WINDOW(win)) { - if (!dimmed) { - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_nothing_to_reply")); - } - if (!dimmed) { - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE, rule); - } -#endif } return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_contents_msg (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - - /* Check dimmed rule */ - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); - if (!dimmed) { - dimmed = _msg_download_completed (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - - return dimmed; -} -#endif gboolean modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data) @@ -808,7 +384,6 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } /* Check dimmed rule */ -#ifdef MODEST_TOOLKIT_HILDON2 if (MODEST_IS_MSG_VIEW_WINDOW (win)) { /* This could happen if we load the msg view window with a preview before loading the full message */ @@ -852,43 +427,6 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) } } } -#else - } else if (MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_nothing_to_delete")); - if (!dimmed) { - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); - } - if (!dimmed) { - if (state) - dimmed = state->sent_in_progress; - if (dimmed) - modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); - } - if (!dimmed) { - if (state) - dimmed = state->any_marked_as_deleted; - if (dimmed) { - gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win); - modest_dimming_rule_set_notification (rule, msg); - g_free (msg); - } - } - if (!dimmed) { - if (state) { - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if (dimmed) { - gchar *message = NULL; - - message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), - state->already_opened_msg); - modest_dimming_rule_set_notification (rule, message); - g_free(message); - } - } - } -#endif } return dimmed; @@ -903,67 +441,16 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); -#ifndef MODEST_TOOLKIT_HILDON2 - /* main window dimming rules */ - if (MODEST_IS_MAIN_WINDOW(win)) { - GtkWidget *header_view = NULL; - - /* Check dimmed rule */ - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + { + /* Check dimmed rule */ + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, ""); + } - /* If the header view has the focus: */ - if (header_view && gtk_widget_is_focus (header_view)) { - /* Check dimmed rule */ - if (!dimmed) - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), TRUE, user_data); - } - else { - /* If the folder view has the focus: */ - GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (folder_view && gtk_widget_is_focus (folder_view)) { - TnyFolderStore *folder_store - = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - if (folder_store) { - /* Only enable for folders, not accounts, - * though the UI spec is not clear about that. - * If we enable this for accounts then we must - * add code to handle them in modest_ui_actions_on_details(). */ - if (!TNY_IS_FOLDER(folder_store)) { - dimmed = TRUE; - modest_dimming_rule_set_notification (rule, ""); - } - - g_object_unref (folder_store); - } else { - dimmed = TRUE; - modest_dimming_rule_set_notification (rule, ""); - } - if (!dimmed) { - dimmed = _msg_download_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - - } else { - return TRUE; - } - } - /* msg view window dimming rules */ - } else { -#else - { -#endif - /* Check dimmed rule */ - if (MODEST_IS_MSG_VIEW_WINDOW (win)) - dimmed = _msg_download_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - - return dimmed; -} + return dimmed; +} gboolean modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data) @@ -1045,61 +532,6 @@ modest_ui_dimming_rules_on_mark_as_unread_msg_in_view (ModestWindow *win, gpoint return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - TnyHeaderFlags flags; - const DimmedState *state = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - flags = TNY_HEADER_FLAG_SEEN; - - /* Check dimmed rule */ - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); - if (!dimmed) { - if (state) - dimmed = state->all_marked_as_seen; - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - return dimmed; -} - -gboolean -modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - TnyHeaderFlags flags; - const DimmedState *state = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - flags = TNY_HEADER_FLAG_SEEN; - - /* Check dimmed rule */ - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); - if (!dimmed) { - if (state) - dimmed = !state->any_marked_as_seen; - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - - return dimmed; -} -#endif - gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data) { @@ -1109,111 +541,16 @@ modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data) g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); rule = MODEST_DIMMING_RULE (user_data); -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) - dimmed = modest_ui_dimming_rules_on_main_window_move_to (win, user_data); -#else if (MODEST_IS_HEADER_WINDOW (win)) dimmed = modest_ui_dimming_rules_on_header_window_move_to (win, user_data); else if (MODEST_IS_FOLDER_WINDOW (win)) dimmed = modest_ui_dimming_rules_on_folder_window_move_to (win, user_data); -#endif else if (MODEST_IS_MSG_VIEW_WINDOW (win)) dimmed = modest_ui_dimming_rules_on_view_window_move_to (win, user_data); return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data) -{ - GtkWidget *folder_view = NULL; - ModestDimmingRule *rule = NULL; - const DimmedState *state = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), TRUE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - /* Get the folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - - if (folder_view) { - TnyFolderStore *selected = modest_folder_view_get_selected ((ModestFolderView *)folder_view); - if (selected) { - TnyAccount *account = NULL; - - if (TNY_IS_ACCOUNT (selected)) { - account = g_object_ref (selected); - } else if (!TNY_IS_MERGE_FOLDER (selected)){ - account = tny_folder_get_account (TNY_FOLDER (selected)); - } - if (account) { - ModestProtocolType protocol_type; - - protocol_type = modest_tny_account_get_protocol_type (account); - dimmed = modest_protocol_registry_protocol_type_has_tag - (modest_runtime_get_protocol_registry (), - protocol_type, - MODEST_PROTOCOL_REGISTRY_STORE_FORBID_OUTGOING_XFERS); - - g_object_unref (account); - } - g_object_unref (selected); - } - } - - /* Check diming rules for folders transfer */ - if (!dimmed && folder_view && gtk_widget_is_focus (folder_view)) { - TnyFolderType types[5]; - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - types[3] = TNY_FOLDER_TYPE_ROOT; - types[4] = TNY_FOLDER_TYPE_INBOX; - - /* Apply folder rules */ - dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 5); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); - } - } - - /* Check diming rules for messages transfer */ - if (!dimmed) { - if (state) { - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if (dimmed) { - gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"), - state->already_opened_msg); - modest_dimming_rule_set_notification (rule, message); - g_free(message); - } - } - } - if (!dimmed) { - if (!(folder_view && gtk_widget_is_focus (folder_view))) - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); - - } - if (!dimmed) { - dimmed = _selected_msg_sent_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("sfil_ib_unable_to_move_selected_items")); - } - - return dimmed; -} -#endif static gboolean _forbid_outgoing_xfers (ModestWindow *window) @@ -1337,59 +674,6 @@ modest_ui_dimming_rules_on_find_in_msg (ModestWindow *win, gpointer user_data) return dimmed; } -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - TnyFolderType types[3]; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - - /* Check dimmed rule */ - dimmed = _clipboard_is_empty (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, - _CS("ecoc_ib_edwin_nothing_to_paste")); - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, - _CS("ckct_ib_unable_to_paste_here")); - } - if (!dimmed) { - dimmed = !_folder_view_has_focus (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, - _CS("ckct_ib_unable_to_paste_here")); - } - if (!dimmed) { - dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win), TRUE); - if (dimmed) - modest_dimming_rule_set_notification (rule, - _CS("ckct_ib_unable_to_paste_here")); - } - if (!dimmed) { - dimmed = _selected_folder_is_same_as_source (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error")); - } - if (!dimmed) { - dimmed = _selected_folder_has_subfolder_with_same_name (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error")); - } - - return dimmed; -} -#endif gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data) @@ -1404,14 +688,6 @@ modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data) focused = gtk_window_get_focus (GTK_WINDOW (win)); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Main window dimming rules */ - if (MODEST_IS_MAIN_WINDOW (win)) - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); - - if (!dimmed && MODEST_IS_MAIN_WINDOW (win)) - dimmed = _header_view_is_all_selected (MODEST_MAIN_WINDOW(win)); -#endif if (!dimmed && GTK_IS_ENTRY (focused)) { const gchar *current_text; @@ -1526,18 +802,7 @@ modest_ui_dimming_rules_on_save_attachments (ModestWindow *win, gpointer user_da /* Check dimmed rule */ -#ifdef MODEST_TOOLKIT_HILDON2 dimmed = _not_valid_attachments (win, TRUE); -#else - dimmed = _invalid_attach_selected (win, FALSE, FALSE, FALSE, rule); - - if (!dimmed) { - dimmed = _purged_attach_selected (win, TRUE, NULL); - if (dimmed) { - modest_dimming_rule_set_notification (rule, _("mail_ib_attach_not_local")); - } - } -#endif return dimmed; } @@ -1553,12 +818,6 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ rule = MODEST_DIMMING_RULE (user_data); state = modest_window_get_dimming_state (win); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check in main window if there's only one message selected */ - if (MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW (win), TRUE, rule); - } -#endif /* Check in view window if there's any attachment selected */ if (!dimmed && MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -1582,22 +841,6 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); } -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check if the selected message in main window has attachments */ - if (!dimmed && MODEST_IS_MAIN_WINDOW (win)) { - if (state) - dimmed = !(state->any_has_attachments); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); - } - - /* Check if the message is already downloaded */ - if (!dimmed && MODEST_IS_MAIN_WINDOW (win)) { - dimmed = !_msg_download_completed (MODEST_MAIN_WINDOW (win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mail_ib_attach_not_local")); - } -#endif /* Check if all attachments are already purged */ if (!dimmed) { dimmed = _purged_attach_selected (win, TRUE, rule); @@ -1616,14 +859,6 @@ modest_ui_dimming_rules_on_undo (ModestWindow *win, gpointer user_data) rule = MODEST_DIMMING_RULE (user_data); /* Check dimmed rule */ -#ifndef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _clipboard_is_empty (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } -#endif - if (!dimmed && MODEST_IS_MSG_EDIT_WINDOW (win)) { dimmed = !modest_msg_edit_window_can_undo (MODEST_MSG_EDIT_WINDOW (win)); } @@ -1662,57 +897,6 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data) /* Check common dimming rules */ dimmed = _invalid_clipboard_selected (win, rule); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check window specific dimming rules */ - if (MODEST_IS_MAIN_WINDOW (win)) { - /* Get focused widget */ - GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (win)); - - if (MODEST_IS_HEADER_VIEW (focused)) { - if (!dimmed) { - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - if (!dimmed) { - dimmed = _selected_msg_sent_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_cut_mess")); - } - if (!dimmed) { - if (state) - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if(dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_cut_mess")); - } - } - else if (MODEST_IS_FOLDER_VIEW (focused)) { - TnyFolderType types[3]; - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - - /* Apply folder rules */ - if (!dimmed) { - dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); - } - if (!dimmed) { - dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); - } - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items")); - } - } - } -#endif - return dimmed; } @@ -1730,51 +914,6 @@ modest_ui_dimming_rules_on_copy (ModestWindow *win, gpointer user_data) /* Check common dimming rules */ dimmed = _invalid_clipboard_selected (win, rule); -#ifndef MODEST_TOOLKIT_HILDON2 - /* Check window specific dimming rules */ - if (MODEST_IS_MAIN_WINDOW (win)) { - /* Get focused widget */ - GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (win)); - - if (MODEST_IS_HEADER_VIEW (focused)) { - if (!dimmed) { - dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - if (!dimmed) { - dimmed = _selected_msg_sent_in_progress (win); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("")); - } - if (!dimmed) { - if (state) - dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE; - if(dimmed) - modest_dimming_rule_set_notification (rule, _("")); - } - } - else if (MODEST_IS_FOLDER_VIEW (focused)) { - TnyFolderType types[3]; - - types[0] = TNY_FOLDER_TYPE_DRAFTS; - types[1] = TNY_FOLDER_TYPE_OUTBOX; - types[2] = TNY_FOLDER_TYPE_SENT; - - if (!dimmed) { - dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("")); - } - if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); - if (dimmed) - modest_dimming_rule_set_notification (rule, _("")); - } - } - } -#endif - return dimmed; } @@ -1878,13 +1017,8 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer MODEST_MSG_EDIT_WINDOW (win), MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS); -#ifdef MODEST_TOOLKIT_HILDON2 selected_attachments = modest_attachments_view_get_attachments ( MODEST_ATTACHMENTS_VIEW (attachments_view)); -#else - selected_attachments = modest_attachments_view_get_selection ( - MODEST_ATTACHMENTS_VIEW (attachments_view)); -#endif n_att_selected = tny_list_get_length (selected_attachments); g_object_unref (selected_attachments); @@ -1970,578 +1104,166 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data) if (dimmed) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); - if (!dimmed) { - dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)); - modest_dimming_rule_set_notification (rule, NULL); - } - - return dimmed; -} - - -gboolean -modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data) -{ - gboolean dimmed; - ModestAccountMgr *mgr; - - mgr = modest_runtime_get_account_mgr(); - dimmed = !modest_account_mgr_has_accounts(mgr, TRUE); - - /* Dimm it if we only have metaaccounts */ - if (!dimmed) { - ModestProtocolRegistry *reg = modest_runtime_get_protocol_registry (); - GSList *account_names = modest_account_mgr_account_names (mgr, TRUE); - - if (account_names) { - ModestProtocolType store_protocol; - gboolean found = FALSE; - GSList *iter = account_names; - const gchar *tag = MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS; - - while (iter && !found) { - gchar* account_name; - - account_name = (gchar *) iter->data; - store_protocol = modest_account_mgr_get_store_protocol (mgr, account_name); - - if (!modest_protocol_registry_protocol_type_has_tag (reg, store_protocol, tag)) - found = TRUE; - else - iter = g_slist_next (iter); - } - modest_account_mgr_free_account_names (account_names); - dimmed = !found; - } - } - - return dimmed; -} - -#ifndef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - TnyFolderType types[1]; - const DimmedState *state = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - state = modest_window_get_dimming_state (win); - - types[0] = TNY_FOLDER_TYPE_OUTBOX; - - /* Check dimmed rules */ - dimmed = !_selected_folder_is_any_of_type (win, types, 1); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - if (!dimmed) { - if (state) - dimmed = !state->sent_in_progress; - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); - } - return dimmed; -} -#endif - -gboolean -modest_ui_dimming_rules_on_cancel_sending_all (ModestWindow *win, gpointer user_data) -{ - /* We dim if no msg send is in progress (and then cancelling send all has no - * effect */ - return !_msgs_send_in_progress (); -} - -gboolean -modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - gboolean dimmed = FALSE; - ModestAccountMgr *mgr; - const gchar* account_name; - - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - mgr = modest_runtime_get_account_mgr(); - - /* Check dimmed rule */ - account_name = modest_window_get_active_account (win); - - if (account_name) - dimmed = modest_account_mgr_account_is_busy (mgr, account_name); - else - dimmed = TRUE; - - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - - return dimmed; -} - -gboolean -modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - gboolean dimmed = FALSE; - - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - - /* Check dimmed rule */ - GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); - if (g_slist_length (account_names) < 1) - dimmed = TRUE; - if (dimmed) - modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - - modest_account_mgr_free_account_names (account_names); - - if (!dimmed) { - dimmed = _send_receive_in_progress (win); - } - - return dimmed; -} - -#ifdef MODEST_TOOLKIT_HILDON2 -gboolean -modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data) -{ - GSList *recipients; - gboolean has_recipients_to_add; - - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - - if (MODEST_IS_MSG_VIEW_WINDOW (win)) { - TnyMsg *msg; - - msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win)); - - /* Message is loaded asynchronously, so this could happen */ - if (!msg) { - TnyHeader *header; - - header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - if (!header) - return TRUE; - - recipients = modest_tny_msg_header_get_all_recipients_list (header); - g_object_unref (header); - } else { - recipients = modest_tny_msg_get_all_recipients_list (msg); - g_object_unref (msg); - } - } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) { - /* Check if there are pending addresses to add */ - return !modest_msg_edit_window_has_pending_addresses ((ModestMsgEditWindow *) win); - } - - has_recipients_to_add = FALSE; - - if (recipients) { - GSList *node; - for (node = recipients; node != NULL; node = g_slist_next (node)) { - const gchar *recipient = (const gchar *) node->data; - if (modest_text_utils_validate_recipient (recipient, NULL)) { - if (!modest_address_book_has_address (recipient)) { - has_recipients_to_add = TRUE; - break; - } - } - } - g_slist_foreach (recipients, (GFunc) g_free, NULL); - g_slist_free (recipients); - } - - return !has_recipients_to_add; -} -#else -gboolean -modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data) -{ - ModestDimmingRule *rule = NULL; - gboolean dimmed = FALSE; - GtkWidget *focused = NULL; - - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - rule = MODEST_DIMMING_RULE (user_data); - focused = gtk_window_get_focus (GTK_WINDOW (win)); - - dimmed = !focused; - - if (!dimmed) { - gchar *selection = NULL; - if (GTK_IS_TEXT_VIEW (focused)) { - GtkTextIter start, end; - GtkTextBuffer *buffer = NULL; - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused)); - if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) { - selection = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); - } - } else if (GTK_IS_LABEL (focused)) { - selection = modest_text_utils_label_get_selection (GTK_LABEL (focused)); - } else { - gboolean do_check = TRUE; - GtkClipboard *clipboard; - if (GTK_IS_HTML (focused)) { - const gchar *sel; - int len = -1; - sel = gtk_html_get_selection_html (GTK_HTML (focused), &len); - do_check = !((sel == NULL) || (sel[0] == '\0')); - } else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) { - do_check = FALSE; - } - if (do_check) { - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - selection = gtk_clipboard_wait_for_text (clipboard); - } else { - selection = NULL; - } - } - dimmed = !((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL))); - } - - return dimmed; -} -#endif - -/* *********************** static utility functions ******************** */ - -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_selected_folder_not_writeable (ModestMainWindow *win, - gboolean for_paste) -{ - GtkWidget *folder_view = NULL; - TnyFolderStore *parent_folder = NULL; - ModestEmailClipboard *clipboard = NULL; - ModestTnyFolderRules rules; - gboolean is_local_acc = FALSE; - gboolean xfer_folders = FALSE; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) - return TRUE; - - /* Get selected folder as parent of new folder to create */ - parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(parent_folder && TNY_IS_FOLDER(parent_folder))) { - /* If it's the local account and its transfering folders, then do not dim */ - if (TNY_IS_ACCOUNT (parent_folder)) { - is_local_acc = modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder)); - if (for_paste) { - clipboard = modest_runtime_get_email_clipboard (); - xfer_folders = modest_email_clipboard_folder_copied (clipboard); - } - } - - if (for_paste) - result = !(is_local_acc && xfer_folders); - else - result = !is_local_acc; - goto frees; - } - - /* Check dimmed rule */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (parent_folder)); - result = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; - - /* free */ - frees: - if (parent_folder != NULL) - g_object_unref (parent_folder); - - return result; -} -#endif - -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_selected_folder_not_deletable (ModestMainWindow *win) -{ - GtkWidget *folder_view = NULL; - TnyFolderStore *parent_folder = NULL; - ModestTnyFolderRules rules; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) - return TRUE; - - /* Get selected folder as parent of new folder to create */ - parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(parent_folder && TNY_IS_FOLDER(parent_folder))) { - result = TRUE; - goto frees; - } - - /* Check dimmed rule */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (parent_folder)); - result = rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE; - - /* free */ - frees: - if (parent_folder != NULL) - g_object_unref (parent_folder); - - return result; -} - -static gboolean -_selected_folder_not_moveable (ModestMainWindow *win) -{ - GtkWidget *folder_view = NULL; - TnyFolderStore *parent_folder = NULL; - ModestTnyFolderRules rules; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) - return TRUE; - - /* Get selected folder as parent of new folder to create */ - parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(parent_folder && TNY_IS_FOLDER(parent_folder))) { - result = TRUE; - goto frees; - } - - /* Check dimmed rule */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (parent_folder)); - result = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE; - - /* free */ - frees: - if (parent_folder != NULL) - g_object_unref (parent_folder); - - return result; -} - -static gboolean -_selected_folder_not_renameable (ModestMainWindow *win) -{ - GtkWidget *folder_view = NULL; - TnyFolderStore *parent_folder = NULL; - ModestTnyFolderRules rules; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) - return TRUE; - - /* Get selected folder as parent of new folder to create */ - parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(parent_folder && TNY_IS_FOLDER(parent_folder))) { - result = TRUE; - goto frees; + if (!dimmed) { + dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)); + modest_dimming_rule_set_notification (rule, NULL); } - - /* Check dimmed rule */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (parent_folder)); - result = rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE; - - /* free */ - frees: - if (parent_folder != NULL) - g_object_unref (parent_folder); - return result; + return dimmed; } -static gboolean -_selected_folder_is_root_or_inbox (ModestMainWindow *win) -{ - TnyFolderType types[2]; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - types[0] = TNY_FOLDER_TYPE_ROOT; - types[1] = TNY_FOLDER_TYPE_INBOX; - /* Check folder type */ - result = _selected_folder_is_any_of_type (MODEST_WINDOW(win), types, 2); +gboolean +modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data) +{ + gboolean dimmed; + ModestAccountMgr *mgr; - /* Check pop and MMC accounts */ - if (!result) { - result = _selected_folder_is_root (win); - } - - return result; -} + mgr = modest_runtime_get_account_mgr(); + dimmed = !modest_account_mgr_has_accounts(mgr, TRUE); + /* Dimm it if we only have metaaccounts */ + if (!dimmed) { + ModestProtocolRegistry *reg = modest_runtime_get_protocol_registry (); + GSList *account_names = modest_account_mgr_account_names (mgr, TRUE); -static gboolean -_selected_folder_is_root (ModestMainWindow *win) -{ - TnyFolderType types[1]; - gboolean result = FALSE; + if (account_names) { + ModestProtocolType store_protocol; + gboolean found = FALSE; + GSList *iter = account_names; + const gchar *tag = MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + while (iter && !found) { + gchar* account_name; - /* All accounts are root items: */ - GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (folder_view) { - gboolean is_account = FALSE; - TnyFolderStore *folder_store = - modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (folder_store) { - is_account = TNY_IS_ACCOUNT (folder_store); + account_name = (gchar *) iter->data; + store_protocol = modest_account_mgr_get_store_protocol (mgr, account_name); - g_object_unref (folder_store); - folder_store = NULL; + if (!modest_protocol_registry_protocol_type_has_tag (reg, store_protocol, tag)) + found = TRUE; + else + iter = g_slist_next (iter); + } + modest_account_mgr_free_account_names (account_names); + dimmed = !found; } - - if (is_account) - return TRUE; } - - /* Try something more precise: */ - types[0] = TNY_FOLDER_TYPE_ROOT; - /* Check folder type */ - result = _selected_folder_is_any_of_type (MODEST_WINDOW(win), types, 1); - - return result; + return dimmed; } -static gboolean -_header_view_is_all_selected (ModestMainWindow *win) +gboolean +modest_ui_dimming_rules_on_cancel_sending_all (ModestWindow *win, gpointer user_data) { - const DimmedState *state = NULL; - - g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE); - - state = modest_window_get_dimming_state (MODEST_WINDOW(win)); - - return (state) ? state->all_selected : TRUE; + /* We dim if no msg send is in progress (and then cancelling send all has no + * effect */ + return !_msgs_send_in_progress (); } -static gboolean -_selected_folder_is_empty (ModestMainWindow *win) +gboolean +modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data) { - GtkWidget *folder_view = NULL, *header_view = NULL; - TnyFolderStore *folder = NULL; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + ModestDimmingRule *rule = NULL; + gboolean dimmed = FALSE; + ModestAccountMgr *mgr; + const gchar* account_name; - /* If no folder view, always dimmed */ - if (!folder_view || !header_view) - return TRUE; + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); + rule = MODEST_DIMMING_RULE (user_data); + mgr = modest_runtime_get_account_mgr(); - /* Get selected folder as parent of new folder to create */ - folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(folder && TNY_IS_FOLDER(folder))) { - if (folder) - g_object_unref (folder); - return TRUE; - } + /* Check dimmed rule */ + account_name = modest_window_get_active_account (win); - /* Check folder type */ - if (modest_header_view_is_empty (MODEST_HEADER_VIEW (header_view)) || - tny_folder_get_all_count (TNY_FOLDER (folder)) == 0) - result = TRUE; + if (account_name) + dimmed = modest_account_mgr_account_is_busy (mgr, account_name); + else + dimmed = TRUE; - /* free */ - g_object_unref (folder); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - return result; + return dimmed; } -static gboolean -_folder_view_has_focus (ModestWindow *win) +gboolean +modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data) { - GtkWidget *folder_view = NULL; + ModestDimmingRule *rule = NULL; + gboolean dimmed = FALSE; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); + rule = MODEST_DIMMING_RULE (user_data); + + /* Check dimmed rule */ + GSList *account_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); + if (g_slist_length (account_names) < 1) + dimmed = TRUE; + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_nc_no_email_acnts_defined")); - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return FALSE; + modest_account_mgr_free_account_names (account_names); - if (gtk_widget_is_focus(folder_view)) - return TRUE; + if (!dimmed) { + dimmed = _send_receive_in_progress (win); + } - return FALSE; + return dimmed; } -static gboolean -_selected_folder_is_same_as_source (ModestWindow *win) +gboolean +modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data) { - ModestEmailClipboard *clipboard = NULL; - GtkWidget *folder_view = NULL; - TnyFolderStore *folder = NULL; - gboolean result = FALSE; + GSList *recipients; + gboolean has_recipients_to_add; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE); - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return FALSE; + if (MODEST_IS_MSG_VIEW_WINDOW (win)) { + TnyMsg *msg; - /* Get selected folder as destination folder */ - folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(folder && TNY_IS_FOLDER(folder))) { - result = FALSE; - goto frees; - } + msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win)); + + /* Message is loaded asynchronously, so this could happen */ + if (!msg) { + TnyHeader *header; + + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); + if (!header) + return TRUE; - /* Check clipboard is cleared */ - clipboard = modest_runtime_get_email_clipboard (); - if (modest_email_clipboard_cleared (clipboard)) { - result = FALSE; - goto frees; + recipients = modest_tny_msg_header_get_all_recipients_list (header); + g_object_unref (header); + } else { + recipients = modest_tny_msg_get_all_recipients_list (msg); + g_object_unref (msg); + } + } else if (MODEST_IS_MSG_EDIT_WINDOW (win)) { + /* Check if there are pending addresses to add */ + return !modest_msg_edit_window_has_pending_addresses ((ModestMsgEditWindow *) win); } - /* Check source folder */ - result = modest_email_clipboard_check_source_folder (clipboard, TNY_FOLDER (folder)); + has_recipients_to_add = FALSE; - /* Free */ - frees: - g_object_unref (folder); + if (recipients) { + GSList *node; + for (node = recipients; node != NULL; node = g_slist_next (node)) { + const gchar *recipient = (const gchar *) node->data; + if (modest_text_utils_validate_recipient (recipient, NULL)) { + if (!modest_address_book_has_address (recipient)) { + has_recipients_to_add = TRUE; + break; + } + } + } + g_slist_foreach (recipients, (GFunc) g_free, NULL); + g_slist_free (recipients); + } - return result; + return !has_recipients_to_add; } -#endif + +/* *********************** static utility functions ******************** */ static gboolean _selected_folder_is_any_of_type (ModestWindow *win, @@ -2559,29 +1281,6 @@ _selected_folder_is_any_of_type (ModestWindow *win, for (i=0; i < ntypes; i++) { result = result || folder_type == types[i]; } -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW(win)) { - GtkWidget *folder_view = NULL; - - /* Get folder view */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) - return FALSE; - - /* Get selected folder as parent of new folder to create */ - folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - - if (!(folder && TNY_IS_FOLDER(folder))) { - if (folder) - g_object_unref (folder); - return FALSE; - } - - /* Check folder type */ - result = _folder_is_any_of_type (TNY_FOLDER(folder), types, ntypes); -#endif } /* free */ @@ -2591,47 +1290,6 @@ _selected_folder_is_any_of_type (ModestWindow *win, return result; } -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_folder_is_any_of_type (TnyFolder *folder, - TnyFolderType types[], - guint ntypes) -{ - TnyFolderType folder_type; - gboolean result = FALSE; - guint i; - - g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE); - - /* Get folder type */ - folder_type = modest_tny_folder_guess_folder_type (folder); - if (folder_type == TNY_FOLDER_TYPE_INVALID) - g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); - - /* Check foler type */ - for (i=0; i < ntypes; i++) { - result = result || folder_type == types[i]; - } - - return result; -} - -static gboolean -_clipboard_is_empty (ModestWindow *win) -{ - gboolean result = FALSE; - - if (MODEST_IS_MAIN_WINDOW (win)) { - ModestEmailClipboard *clipboard = NULL; - clipboard = modest_runtime_get_email_clipboard (); - if (modest_email_clipboard_cleared (clipboard)) - result = TRUE; - } - - return result; -} -#endif - static gboolean _invalid_clipboard_selected (ModestWindow *win, ModestDimmingRule *rule) @@ -2687,17 +1345,6 @@ _invalid_clipboard_selected (ModestWindow *win, } if (result) modest_dimming_rule_set_notification (rule, ""); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - const DimmedState *state = NULL; - - /* Check dimming */ - state = modest_window_get_dimming_state (win); - if (state) - result = state->n_selected == 0; - if (result) - modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected")); -#endif } return result; @@ -2739,9 +1386,7 @@ _invalid_attach_selected (ModestWindow *win, TnyIterator *iter; iter = tny_list_create_iterator (attachments); while (!tny_iterator_is_done (iter) && !result) { -#ifdef MODEST_TOOLKIT_HILDON2 gboolean not_selectable = FALSE; -#endif TnyMimePart *mime_part = TNY_MIME_PART (tny_iterator_get_current (iter)); TnyList *nested_list = tny_simple_list_new (); tny_mime_part_get_parts (mime_part, nested_list); @@ -2751,26 +1396,16 @@ _invalid_attach_selected (ModestWindow *win, window_msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win)); if ((TnyMimePart *) window_msg != mime_part) { selected_messages = TRUE; -#ifdef MODEST_TOOLKIT_HILDON2 not_selectable = TRUE; -#else - result = TRUE; -#endif } g_object_unref (window_msg); } if (!for_remove && tny_list_get_length (nested_list) > 0) { nested_attachments = TRUE; -#ifdef MODEST_TOOLKIT_HILDON2 not_selectable = TRUE; -#else - result = TRUE; -#endif } -#ifdef MODEST_TOOLKIT_HILDON2 if (not_selectable) n_selected --; -#endif g_object_unref (nested_list); g_object_unref (mime_part); tny_iterator_next (iter); @@ -2797,14 +1432,6 @@ _invalid_attach_selected (ModestWindow *win, /* Free */ g_object_unref (attachments); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - if (!result) { - const DimmedState *state = NULL; - state = modest_window_get_dimming_state (win); - result = !state->any_has_attachments; - } -#endif } return result; @@ -2826,11 +1453,6 @@ _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rul /* Get selected atachments */ if (MODEST_IS_MSG_VIEW_WINDOW (win)) { attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - /* If we're in main window, we won't know if there are already purged attachments */ - return FALSE; -#endif } if (attachments == NULL) @@ -2869,45 +1491,6 @@ _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rul return result; } -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_invalid_msg_selected (ModestMainWindow *win, - gboolean unique, - ModestDimmingRule *rule) -{ - GtkWidget *folder_view = NULL; - const DimmedState *state = NULL; - gboolean result = FALSE; - gint n_selected = 0; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - g_return_val_if_fail (MODEST_IS_DIMMING_RULE (rule), FALSE); - - state = modest_window_get_dimming_state (MODEST_WINDOW(win)); - if (state) - n_selected = state->n_selected; - - /* Get folder view to check focus */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - - /* Check dimmed rule (TODO: check focus on widgets */ - if (!result) { - result = ((n_selected == 0 ) || - (gtk_widget_is_focus (folder_view))); - if (result) - modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected")); - } - if (!result && unique) { - result = n_selected > 1; - if (result) - modest_dimming_rule_set_notification (rule, _("mcen_ib_select_one_message")); - } - - return result; -} -#endif - static gboolean _msg_download_in_progress (ModestWindow *win) { @@ -2917,24 +1500,11 @@ _msg_download_in_progress (ModestWindow *win) if (MODEST_IS_MSG_VIEW_WINDOW (win)) { result = modest_msg_view_window_toolbar_on_transfer_mode (MODEST_MSG_VIEW_WINDOW(win)); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - result = modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW(win)); -#endif } return result; } -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_msg_download_completed (ModestMainWindow *win) -{ - const DimmedState *state = modest_window_get_dimming_state (MODEST_WINDOW(win)); - return (state) ? state->any_marked_as_cached : TRUE; -} -#endif - static void fill_list_of_caches (gpointer key, gpointer value, gpointer userdata) { @@ -2969,17 +1539,6 @@ _invalid_folder_for_purge (ModestWindow *win, result = TRUE; goto frees; } -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW (win)) { - GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (!folder_view) - return FALSE; - folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)); - /* Could be a folder store */ - if (folder == NULL || ! TNY_IS_FOLDER (folder)) - goto frees; -#endif } else { g_return_val_if_reached (FALSE); } @@ -3022,15 +1581,10 @@ _transfer_mode_enabled (ModestWindow *win) /* Check dimming */ if (MODEST_IS_MSG_VIEW_WINDOW(win)) { result = modest_msg_view_window_transfer_mode_enabled (MODEST_MSG_VIEW_WINDOW (win)); -#ifndef MODEST_TOOLKIT_HILDON2 - } else if (MODEST_IS_MAIN_WINDOW(win)) { - result = modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW (win)); -#else } else if (MODEST_IS_FOLDER_WINDOW (win)) { result = modest_folder_window_transfer_mode_enabled (MODEST_FOLDER_WINDOW (win)); } else if (MODEST_IS_HEADER_WINDOW (win)) { result = modest_header_window_transfer_mode_enabled (MODEST_HEADER_WINDOW (win)); -#endif } else { g_warning("_transfer_mode_enabled called with wrong window type"); } @@ -3038,47 +1592,6 @@ _transfer_mode_enabled (ModestWindow *win) return result; } -#ifndef MODEST_TOOLKIT_HILDON2 -static gboolean -_selected_folder_has_subfolder_with_same_name (ModestWindow *win) -{ - GtkWidget *folder_view = NULL; - TnyFolderStore *folder = NULL; - ModestEmailClipboard *clipboard = NULL; - const gchar *folder_name = NULL; - gboolean result = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), TRUE); - - /*Get current parent folder */ - folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - /* If no folder view, always dimmed */ - if (!folder_view) return FALSE; - - /* Get selected folder as parent of new folder to create */ - folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); - if (!(folder && TNY_IS_FOLDER(folder))) goto frees; - - /* get modest clipboard and source folder */ - clipboard = modest_runtime_get_email_clipboard (); - folder_name = modest_email_clipboard_get_folder_name (clipboard); - if (folder_name == NULL) goto frees; - - /* Check source subfolders names */ - result = modest_tny_folder_has_subfolder_with_name (folder, folder_name, - TRUE); - - /* Free */ - frees: - if (folder != NULL) - g_object_unref (folder); - - - return result; -} -#endif - static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view) { @@ -3197,7 +1710,6 @@ _msgs_send_in_progress (void) /********************** HILDON2 only dimming rules ***************************/ /*****************************************************************************/ -#ifdef MODEST_TOOLKIT_HILDON2 gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data) { @@ -3307,4 +1819,3 @@ modest_ui_dimming_rules_on_edit_accounts (ModestWindow *win, gpointer user_data) { return !modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), TRUE); } -#endif diff --git a/src/widgets/modest-details-dialog.c b/src/widgets/modest-details-dialog.c index 08db041..de77559 100644 --- a/src/widgets/modest-details-dialog.c +++ b/src/widgets/modest-details-dialog.c @@ -409,7 +409,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, #ifdef MODEST_TOOLKIT_HILDON2 modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_messages"), count_s); #else - gchar *tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL); + tmp = g_strconcat (_("mcen_fi_folder_properties_messages"), ":", NULL); modest_details_dialog_add_data (self, tmp, count_s); g_free (tmp); #endif @@ -417,7 +417,7 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self, #ifdef MODEST_TOOLKIT_HILDON2 modest_details_dialog_add_data (self, _("mcen_fi_folder_properties_size"), size_s); #else - gchar *tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL); + tmp = g_strconcat (_("mcen_fi_folder_properties_size"), ":", NULL); modest_details_dialog_add_data (self, tmp, size_s); g_free (tmp); #endif diff --git a/src/widgets/modest-header-window.c b/src/widgets/modest-header-window.c index 5c121aa..56db5ba 100644 --- a/src/widgets/modest-header-window.c +++ b/src/widgets/modest-header-window.c @@ -28,14 +28,16 @@ */ #include +#ifdef MODEST_TOOLKIT_HILDON2 #include +#include +#endif #include #include #include #include #include #include -#include #include #include #include @@ -48,6 +50,7 @@ #include #include #include +#include typedef enum { CONTENTS_STATE_NONE = 0, @@ -55,10 +58,12 @@ typedef enum { CONTENTS_STATE_HEADERS = 2 } ContentsState; +#ifdef MODEST_TOOLKIT_HILDON2 typedef enum { EDIT_MODE_COMMAND_MOVE = 1, EDIT_MODE_COMMAND_DELETE = 2, } EditModeCommand; +#endif typedef struct _ModestHeaderWindowPrivate ModestHeaderWindowPrivate; struct _ModestHeaderWindowPrivate { @@ -131,10 +136,12 @@ static void on_header_activated (ModestHeaderView *header_view, static void on_updating_msg_list (ModestHeaderView *header_view, gboolean starting, gpointer user_data); +#ifdef MODEST_TOOLKIT_HILDON2 static void set_delete_edit_mode (GtkButton *button, ModestHeaderWindow *self); static void set_moveto_edit_mode (GtkButton *button, ModestHeaderWindow *self); +#endif static gboolean on_expose_event(GtkTreeView *header_view, GdkEventExpose *event, gpointer user_data); @@ -155,13 +162,15 @@ static void on_queue_changed (ModestMailOperationQueue *queue, ModestMailOperation *mail_op, ModestMailOperationQueueNotification type, ModestHeaderWindow *self); -static void modest_header_window_pack_toolbar (ModestHildon2Window *self, +static void modest_header_window_pack_toolbar (ModestWindow *self, GtkPackType pack_type, GtkWidget *toolbar); +#ifdef MODEST_TOOLKIT_HILDON2 static void edit_mode_changed (ModestHeaderWindow *header_window, gint edit_mode_id, gboolean enabled, ModestHeaderWindow *self); +#endif static void on_progress_list_changed (ModestWindowMgr *mgr, ModestHeaderWindow *self); static void update_progress_hint (ModestHeaderWindow *self); @@ -200,7 +209,12 @@ modest_header_window_get_type (void) (GInstanceInitFunc) modest_header_window_init, NULL }; - my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW, + my_type = g_type_register_static ( +#ifdef MODEST_TOOLKIT_HILDON2 + MODEST_TYPE_HILDON2_WINDOW, +#else + MODEST_TYPE_WINDOW, +#endif "ModestHeaderWindow", &my_info, 0); } @@ -213,7 +227,6 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass) GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; - ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_header_window_finalize; @@ -222,7 +235,7 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate)); modest_window_class->disconnect_signals_func = modest_header_window_disconnect_signals; - modest_hildon2_window_class->pack_toolbar_func = modest_header_window_pack_toolbar; + modest_window_class->pack_toolbar_func = modest_header_window_pack_toolbar; } static void @@ -625,9 +638,11 @@ create_header_view (ModestWindow *self, TnyFolder *folder) gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_read_item); gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_unread_item); +#ifdef MAEMO_CHANGES hildon_gtk_widget_set_theme_size (delete_item, MODEST_EDITABLE_SIZE); hildon_gtk_widget_set_theme_size (mark_unread_item, MODEST_EDITABLE_SIZE); hildon_gtk_widget_set_theme_size (mark_read_item, MODEST_EDITABLE_SIZE); +#endif gtk_widget_show_all (priv->csm_menu); /* Connect signals */ @@ -641,7 +656,9 @@ create_header_view (ModestWindow *self, TnyFolder *folder) G_CALLBACK (on_mark_unread_csm_activated), self); /* Add tap&hold handling */ +#ifdef MAEMO_CHANGES gtk_widget_tap_and_hold_setup (header_view, priv->csm_menu, NULL, 0); +#endif return header_view; } @@ -653,14 +670,14 @@ create_empty_view (ModestWindow *self) GtkWidget *label = NULL; GtkWidget *align = NULL; GtkWidget *vbox = NULL; - GtkWidget *button = NULL; - GdkPixbuf *new_message_pixbuf; vbox = gtk_vbox_new (0, FALSE); align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE); label = gtk_label_new (_("mcen_ia_nomessages")); +#ifdef MODEST_TOOLKIT_HILDON2 hildon_helper_set_logical_font (label, "LargeSystemFont"); +#endif gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); gtk_widget_show (label); gtk_widget_show (align); @@ -668,6 +685,9 @@ create_empty_view (ModestWindow *self) gtk_container_add (GTK_CONTAINER (align), label); gtk_box_pack_end (GTK_BOX (vbox), align, TRUE, TRUE, 0); +#ifdef MODEST_TOOLKIT_HILDON2 + GdkPixbuf *new_message_pixbuf; + GtkWidget *button = NULL; button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); @@ -678,12 +698,15 @@ create_empty_view (ModestWindow *self) g_object_unref (new_message_pixbuf); gtk_widget_show_all (button); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); +#endif gtk_widget_show (vbox); +#ifdef MODEST_TOOLKIT_HILDON2 g_signal_connect (button, "clicked", G_CALLBACK (modest_ui_actions_on_new_msg), self); +#endif viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0), (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0)); @@ -710,13 +733,10 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc { ModestHeaderWindow *self = NULL; ModestHeaderWindowPrivate *priv = NULL; - HildonProgram *app; GdkPixbuf *window_icon; ModestAccountMgr *mgr; ModestAccountSettings *settings = NULL; ModestServerAccountSettings *store_settings = NULL; - GtkWidget *action_area_box; - GdkPixbuf *new_message_pixbuf; GtkWidget *alignment; gchar *account_display_name = NULL; @@ -726,8 +746,8 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc priv->contents_view = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), - HILDON_MARGIN_HALF, 0, - HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE); + MODEST_MARGIN_HALF, 0, + MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); /* We need to do this here to properly listen for mail operations because create_header_view launches a mail @@ -749,6 +769,10 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc g_object_ref_sink (priv->header_view); g_object_ref_sink (priv->empty_view); +#ifdef MODEST_TOOLKIT_HILDON2 + GdkPixbuf *new_message_pixbuf; + GtkWidget *action_area_box; + g_signal_connect (G_OBJECT (self), "edit-mode-changed", G_CALLBACK (edit_mode_changed), (gpointer) self); @@ -763,6 +787,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc 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->header_view), TRUE); +#endif setup_menu (self); @@ -780,11 +805,15 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc update_view (self, NULL); +#ifdef MODEST_TOOLKIT_HILDON2 + HildonProgram *app; + /* Get device name */ modest_maemo_utils_get_device_name (); - app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); +#endif + /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG); @@ -800,6 +829,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc */ /* setup edit modes */ +#ifdef MODEST_TOOLKIT_HILDON2 modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE, _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"), GTK_TREE_VIEW (priv->header_view), @@ -810,6 +840,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gc GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); +#endif modest_window_set_active_account (MODEST_WINDOW (self), account_name); @@ -877,6 +908,7 @@ static void setup_menu (ModestHeaderWindow *self) modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive)); +#ifdef MODEST_TOOLKIT_HILDON2 modest_window_add_to_menu (MODEST_WINDOW (self), dngettext(GETTEXT_PACKAGE, "mcen_me_move_message", @@ -888,6 +920,7 @@ static void setup_menu (ModestHeaderWindow *self) modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL, MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); +#endif modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_folder_details"), NULL, MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details)); @@ -1095,6 +1128,7 @@ on_updating_msg_list (ModestHeaderView *header_view, } } +#ifdef MODEST_TOOLKIT_HILDON2 static void set_delete_edit_mode (GtkButton *button, ModestHeaderWindow *self) @@ -1108,6 +1142,7 @@ set_moveto_edit_mode (GtkButton *button, { modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE); } +#endif static gboolean on_expose_event(GtkTreeView *header_view, @@ -1136,7 +1171,7 @@ on_map_event(GtkWidget *widget, g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); if (priv->progress_hint) { - hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); + modest_window_show_progress (MODEST_WINDOW (self), TRUE); } return FALSE; } @@ -1197,7 +1232,7 @@ update_progress_hint (ModestHeaderWindow *self) modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); if (GTK_WIDGET_VISIBLE (self)) { - hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0); + modest_window_show_progress (MODEST_WINDOW (self), priv->progress_hint?1:0); } } @@ -1291,7 +1326,7 @@ on_queue_changed (ModestMailOperationQueue *queue, } static void -modest_header_window_pack_toolbar (ModestHildon2Window *self, +modest_header_window_pack_toolbar (ModestWindow *self, GtkPackType pack_type, GtkWidget *toolbar) { @@ -1307,6 +1342,7 @@ modest_header_window_pack_toolbar (ModestHildon2Window *self, } } +#ifdef MODEST_TOOLKIT_HILDON2 static void edit_mode_changed (ModestHeaderWindow *header_window, gint edit_mode_id, @@ -1348,6 +1384,7 @@ edit_mode_changed (ModestHeaderWindow *header_window, filter); } } +#endif #ifdef MODEST_TOOLKIT_HILDON2 static void diff --git a/src/widgets/modest-header-window.h b/src/widgets/modest-header-window.h index 409d963..bbe3cf5 100644 --- a/src/widgets/modest-header-window.h +++ b/src/widgets/modest-header-window.h @@ -30,7 +30,10 @@ #ifndef __MODEST_HEADER_WINDOW_H__ #define __MODEST_HEADER_WINDOW_H__ +#ifdef MODEST_TOOLKIT_HILDON2 #include +#endif +#include #include G_BEGIN_DECLS @@ -48,11 +51,19 @@ typedef struct _ModestHeaderWindow ModestHeaderWindow; typedef struct _ModestHeaderWindowClass ModestHeaderWindowClass; struct _ModestHeaderWindow { +#ifdef MODEST_TOOLKIT_HILDON2 ModestHildon2Window parent; +#else + ModestWindow parent; +#endif }; struct _ModestHeaderWindowClass { +#ifdef MODEST_TOOLKIT_HILDON2 ModestHildon2WindowClass parent_class; +#else + ModestWindowClass parent_class; +#endif }; /** diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c index 7f62301..d1bcbce 100644 --- a/src/widgets/modest-msg-view-window.c +++ b/src/widgets/modest-msg-view-window.c @@ -67,8 +67,9 @@ #include #include #include -#include +#include #include +#include #define MYDOCS_ENV "MYDOCSDIR" #define DOCS_FOLDER ".documents" @@ -2183,7 +2184,7 @@ view_msg_cb (ModestMailOperation *mail_op, if (self) { priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); /* First we check if the parent is a folder window */ - if (priv->msg_uid && !modest_hildon2_window_mgr_get_folder_window (MODEST_HILDON2_WINDOW_MGR (modest_runtime_get_window_mgr ()))) { + if (priv->msg_uid && !modest_window_mgr_get_folder_window (MODEST_WINDOW_MGR (modest_runtime_get_window_mgr ()))) { gboolean is_merge; TnyAccount *account = NULL; GtkWidget *header_window = NULL; @@ -3217,7 +3218,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, /* In Hildon 2.2 save and delete operate over all the attachments as there's no * selection available */ mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view)); - if (mime_parts && !modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) { + if (mime_parts && !modest_toolkit_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) { g_object_unref (mime_parts); return; } @@ -3372,7 +3373,7 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean g_object_unref (tmp); g_object_unref (iter); - if (!modest_maemo_utils_select_attachments (GTK_WINDOW (window), mime_parts, TRUE) || + if (!modest_toolkit_utils_select_attachments (GTK_WINDOW (window), mime_parts, TRUE) || tny_list_get_length (mime_parts) == 0) { g_object_unref (mime_parts); return; diff --git a/src/widgets/modest-toolkit-factory.c b/src/widgets/modest-toolkit-factory.c index c16cfd1..234d49a 100644 --- a/src/widgets/modest-toolkit-factory.c +++ b/src/widgets/modest-toolkit-factory.c @@ -57,7 +57,7 @@ #include #endif -#ifdef USE_GTK_TOOLBAR +#ifdef USE_GTK_FIND_TOOLBAR #include #else #include diff --git a/src/widgets/modest-toolkit-factory.h b/src/widgets/modest-toolkit-factory.h index 82497ed..efe4dc1 100644 --- a/src/widgets/modest-toolkit-factory.h +++ b/src/widgets/modest-toolkit-factory.h @@ -225,6 +225,7 @@ gint modest_selector_get_value_max_chars (GtkWidget *self); #ifndef MODEST_TOOLKIT_HILDON2 #define USE_PROVIDER_COMBOBOX #define USE_SERVERTYPE_COMBOBOX +#define USE_GTK_SPIN_BUTTON #endif #ifndef USE_GTK_SPIN_BUTTON diff --git a/src/widgets/modest-toolkit-utils.c b/src/widgets/modest-toolkit-utils.c index 45e88c5..c67338d 100644 --- a/src/widgets/modest-toolkit-utils.c +++ b/src/widgets/modest-toolkit-utils.c @@ -34,6 +34,7 @@ #include #include +#include #include "modest-toolkit-utils.h" #include "modest-ui-constants.h" #ifdef MODEST_TOOLKIT_HILDON2 @@ -328,3 +329,108 @@ modest_toolkit_utils_create_group_box (const gchar *label_text, GtkWidget *conte return box; } + +static gboolean match_all (TnyList *list, GObject *item, gpointer match_data) +{ + return TRUE; +} + +gboolean +modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs) +{ +#ifdef MODEST_TOOLKIT_HILDON2 + GtkTreeModel *model; + TnyIterator *iterator; + GtkWidget *selector; + GtkCellRenderer *renderer; + GtkWidget *dialog; + gint response; + gboolean result = TRUE; + gint attachments_added = 0; + + model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT)); + for (iterator = tny_list_create_iterator (att_list); + !tny_iterator_is_done (iterator); + tny_iterator_next (iterator)) { + GtkTreeIter iter; + TnyMimePart *part; + gchar *filename = NULL; + + part = (TnyMimePart *) tny_iterator_get_current (iterator); + + /* Ignore purged attachments and messages if ignore is + set to TRUE */ + if (!(tny_mime_part_is_purged (part) || + (TNY_IS_MSG (part) && !include_msgs))) { + + if (TNY_IS_MSG (part)) { + TnyHeader *header = tny_msg_get_header (TNY_MSG (part)); + filename = tny_header_dup_subject (header); + g_object_unref (header); + } else { + filename = g_strdup (tny_mime_part_get_filename (part)); + } + if ((filename == NULL) || (filename[0] == '\0')) { + g_free (filename); + filename = g_strdup (_("mail_va_no_subject")); + } + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filename, 1, part, -1); + attachments_added ++; + g_free (filename); + } + g_object_unref (part); + } + g_object_unref (iterator); + + selector = GTK_WIDGET (hildon_touch_selector_new ()); + renderer = gtk_cell_renderer_text_new (); + g_object_set((GObject *) renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + hildon_touch_selector_append_column ((HildonTouchSelector *) selector, model, renderer, + "text", 0, NULL); + hildon_touch_selector_set_column_selection_mode ((HildonTouchSelector *) selector, + HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE); + + dialog = hildon_picker_dialog_new (window); + gtk_window_set_title (GTK_WINDOW (dialog), (attachments_added > 1)? + _("mcen_ti_select_attachments_title"):_("mcen_ti_select_attachment_title")); + hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), (HildonTouchSelector *) selector); + hildon_touch_selector_unselect_all ((HildonTouchSelector *) selector, 0); + hildon_picker_dialog_set_done_label (HILDON_PICKER_DIALOG (dialog), _HL("wdgt_bd_done")); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + if (response == GTK_RESPONSE_OK) { + GList *selected_rows, *node; + + tny_list_remove_matches (att_list, match_all, NULL); + selected_rows = hildon_touch_selector_get_selected_rows ((HildonTouchSelector *) selector, 0); + for (node = selected_rows; node != NULL; node = g_list_next (node)) { + GtkTreePath *path; + GObject *selected; + GtkTreeIter iter; + + path = (GtkTreePath *) node->data; + gtk_tree_model_get_iter (model, &iter, path); + gtk_tree_model_get (model, &iter, 1, &selected, -1); + tny_list_append (att_list, selected); + } + if (tny_list_get_length (att_list) == 0) + result = FALSE; + + g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected_rows); + } else { + result = FALSE; + } + + gtk_widget_destroy (dialog); + + g_object_unref (model); + + return result; +#else + return FALSE; +#endif +} + diff --git a/src/widgets/modest-toolkit-utils.h b/src/widgets/modest-toolkit-utils.h index 43f08fc..02f46e7 100644 --- a/src/widgets/modest-toolkit-utils.h +++ b/src/widgets/modest-toolkit-utils.h @@ -84,6 +84,8 @@ void modest_toolkit_utils_set_vbutton_layout (GtkSizeGroup *sizegroup, GtkWidget *modest_toolkit_utils_create_group_box (const gchar *label, GtkWidget *contents); +gboolean modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs); + #endif /*__MODEST_TOOLKIT_UTILS_H__*/ diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c index 7dd86e3..64dfafd 100644 --- a/src/widgets/modest-window-mgr.c +++ b/src/widgets/modest-window-mgr.c @@ -76,6 +76,7 @@ static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self); static ModestWindow *modest_window_mgr_show_initial_window_default (ModestWindowMgr *self); static ModestWindow *modest_window_mgr_get_current_top_default (ModestWindowMgr *self); static gboolean modest_window_mgr_screen_is_on_default (ModestWindowMgr *self); +static ModestWindow *modest_window_mgr_get_folder_window_default (ModestWindowMgr *self); static void modest_window_mgr_create_caches_default (ModestWindowMgr *self); static void modest_window_mgr_on_queue_changed (ModestMailOperationQueue *queue, ModestMailOperation *mail_op, @@ -179,6 +180,7 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass) mgr_class->screen_is_on = modest_window_mgr_screen_is_on_default; mgr_class->create_caches = modest_window_mgr_create_caches_default; mgr_class->close_all_but_initial = modest_window_mgr_close_all_but_initial_default; + mgr_class->get_folder_window = modest_window_mgr_get_folder_window_default; g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate)); @@ -1230,3 +1232,18 @@ modest_window_mgr_close_all_but_initial_default (ModestWindowMgr *self) /* Empty default implementation */ return FALSE; } + +ModestWindow * +modest_window_mgr_get_folder_window (ModestWindowMgr *self) +{ + return MODEST_WINDOW_MGR_GET_CLASS (self)->get_folder_window (self); +} + +static ModestWindow * +modest_window_mgr_get_folder_window_default (ModestWindowMgr *self) +{ + /* Default implementation returns NULL always */ + + return NULL; +} + diff --git a/src/widgets/modest-window-mgr.h b/src/widgets/modest-window-mgr.h index 878bafd..1df970d 100644 --- a/src/widgets/modest-window-mgr.h +++ b/src/widgets/modest-window-mgr.h @@ -90,6 +90,8 @@ struct _ModestWindowMgrClass { gboolean (*screen_is_on) (ModestWindowMgr *self); void (*create_caches) (ModestWindowMgr *self); + ModestWindow * (*get_folder_window) (ModestWindowMgr *self); + /* Signals */ void (*window_list_empty) (ModestWindowMgr *self); void (*progress_list_changed) (ModestWindowMgr *self); diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c index c17e501..13e60db 100644 --- a/src/widgets/modest-window.c +++ b/src/widgets/modest-window.c @@ -89,6 +89,10 @@ static void _make_zoom_buttons_grabeable (GtkWidget* widget); static gboolean _modest_window_map_event (GtkWidget *widget, GdkEvent *event, gpointer userdata); +static void modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar); + /* list my signals */ enum { @@ -157,6 +161,7 @@ modest_window_class_init (ModestWindowClass *klass) klass->set_title_func = modest_window_set_title_default; klass->disconnect_signals_func = modest_window_disconnect_signals_default; klass->show_progress_func = modest_window_show_progress_default; + klass->pack_toolbar_func = modest_window_pack_toolbar_not_implemented; g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate)); } @@ -638,3 +643,24 @@ _make_zoom_buttons_grabeable (GtkWidget* widget) XA_INTEGER, 32, PropModeReplace, (unsigned char *) &val, 1); } + +static void +modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + g_return_if_fail (MODEST_IS_WINDOW (self)); + + g_debug ("%s not implemented", __FUNCTION__); +} + +void +modest_window_pack_toolbar (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + g_return_if_fail (MODEST_IS_WINDOW (self)); + + MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar); +} + diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h index 0f7521e..64a68e8 100644 --- a/src/widgets/modest-window.h +++ b/src/widgets/modest-window.h @@ -122,8 +122,11 @@ struct _ModestWindowClass { void (*add_item_to_menu_func) (ModestWindow *self, GtkWidget *widget, ModestDimmingCallback dimming_callback); + void (*pack_toolbar_func) (ModestWindow *self, GtkPackType pack_type, GtkWidget *toolbar); + void (*edit_mode_changed) (ModestWindow *self, gint edit_mode, gboolean enabled); }; + /** * modest_window_get_type: * @@ -371,6 +374,19 @@ modest_window_add_item_to_menu (ModestWindow *self, GtkWidget *item, ModestDimmingCallback dimming_callback); +/** + * modest_window_pack_toolbar: + * @self: a #ModestWindow + * @pack_type: a #GtkPackType + * @toolbar: a toolbar widget + * + * packs a toolbar (widget @toolbar) in @self with @pack_type + */ +void modest_window_pack_toolbar (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar); + + G_END_DECLS #endif /* __MODEST_WINDOW_H__ */