TnyAccount *account,
gpointer user_data);
-static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void set_zoom_do_nothing (ModestWindow *window, gdouble zoom);
-static gdouble get_zoom_do_nothing (ModestWindow *window);
-
static void init_window (ModestMsgEditWindow *obj);
gboolean scroll_drag_timeout (gpointer userdata);
ModestMsgEditWindow *userdata);
static void on_message_settings (GtkAction *action,
ModestMsgEditWindow *window);
-static void add_to_menu (ModestMsgEditWindow *self,
- HildonAppMenu *menu,
- gchar *label,
- GCallback callback,
- ModestDimmingRulesGroup *group,
- GCallback dimming_callback);
-static void setup_menu (ModestMsgEditWindow *self,
- ModestDimmingRulesGroup *group);
-static gboolean modest_msg_edit_window_toggle_menu (HildonWindow *window,
- guint button,
- guint32 time);
+static void setup_menu (ModestMsgEditWindow *self);
static void DEBUG_BUFFER (WPTextBuffer *buffer)
{
}
static const GtkActionEntry hildon2_msg_edit_action_entries [] = {
- { "MessageSettings", NULL, N_("TODO: settings..."), NULL, NULL, G_CALLBACK (on_message_settings)},
+ { "MessageSettings", NULL, N_("mcen_me_message_settings"), NULL, NULL, G_CALLBACK (on_message_settings)},
};
GtkWidget *font_tool_button_label;
GSList *size_items_group;
GtkWidget *size_tool_button_label;
-
+
GtkWidget *find_toolbar;
gchar *last_search;
GtkWidget *font_dialog;
GtkWidget *pannable;
+ guint correct_scroll_idle;
guint scroll_drag_timeout_id;
gdouble last_upper;
gint images_count;
TnyHeaderFlags priority_flags;
-
+
gboolean can_undo, can_redo;
gulong clipboard_change_handler_id;
gulong default_clipboard_change_handler_id;
GtkWidget *app_menu;
GtkWidget *cc_button;
GtkWidget *bcc_button;
- GtkWidget *find_toolbar_button;
};
#define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
(GInstanceInitFunc) modest_msg_edit_window_init,
NULL
};
- my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+ my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
"ModestMsgEditWindow",
&my_info, 0);
{
GObjectClass *gobject_class;
ModestWindowClass *modest_window_class;
- HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
gobject_class = (GObjectClass*) klass;
modest_window_class = (ModestWindowClass*) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_msg_edit_window_finalize;
- hildon_window_class->toggle_menu = modest_msg_edit_window_toggle_menu;
-
- modest_window_class->set_zoom_func = set_zoom_do_nothing;
- modest_window_class->get_zoom_func = get_zoom_do_nothing;
- modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
- modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
modest_window_class->save_state_func = save_state;
modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals;
priv->sent = FALSE;
priv->scroll_drag_timeout_id = 0;
+ priv->correct_scroll_idle = 0;
priv->last_upper = 0.0;
priv->font_dialog = NULL;
return FALSE;
}
-static void
-correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused)
+static gboolean
+correct_scroll_without_drag_check_idle (gpointer userdata)
{
+ ModestMsgEditWindow *w = (ModestMsgEditWindow *) userdata;
ModestMsgEditWindowPrivate *priv;
- GtkTextMark *insert;
GtkTextIter iter;
GdkRectangle rectangle;
gdouble new_value;
gint offset;
+ GtkTextMark *insert;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
-
- if (only_if_focused && !gtk_widget_is_focus (priv->msg_body))
- return;
-
+
insert = gtk_text_buffer_get_insert (priv->text_buffer);
gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert);
new_value = (offset + rectangle.y);
hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value);
+
+ priv->correct_scroll_idle = 0;
+ return FALSE;
+}
+
+static void
+correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused)
+{
+ ModestMsgEditWindowPrivate *priv;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
+
+ if (only_if_focused && !gtk_widget_is_focus (priv->msg_body))
+ return;
+
+ if (priv->correct_scroll_idle > 0) {
+ return;
+ }
+
+ priv->correct_scroll_idle = g_idle_add ((GSourceFunc) correct_scroll_without_drag_check_idle,
+ (gpointer) w);
}
static void
g_signal_connect_after (G_OBJECT (priv->subject_field), "move-cursor", G_CALLBACK (subject_field_move_cursor), obj);
g_signal_connect (G_OBJECT (priv->subject_field), "insert-text", G_CALLBACK (subject_field_insert_text), obj);
- g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj);
-
+ g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
+
priv->clipboard_change_handler_id =
g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
to_caption = modest_maemo_utils_create_captioned_with_size_type
(title_size_group, value_size_group,
- _("mail_va_to"), priv->to_field,
+ _("mail_va_to"), FALSE, priv->to_field,
HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type
(title_size_group, value_size_group,
- _("mail_va_cc"), priv->cc_field,
+ _("mail_va_cc"), FALSE, priv->cc_field,
HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type
(title_size_group, value_size_group,
- _("mail_va_hotfix1"), priv->bcc_field,
+ _("mail_va_hotfix1"), FALSE, priv->bcc_field,
HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- _("mail_va_subject"), subject_box);
+ _("mail_va_subject"), FALSE, subject_box);
priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group,
_("mail_va_attachment"),
+ FALSE,
priv->attachments_view,
HILDON_SIZE_AUTO_WIDTH |
HILDON_SIZE_AUTO_HEIGHT);
g_object_unref (priv->outbox_msg);
priv->outbox_msg = NULL;
}
+ if (priv->correct_scroll_idle > 0) {
+ g_source_remove (priv->correct_scroll_idle);
+ priv->correct_scroll_idle = 0;
+ }
if (priv->scroll_drag_timeout_id > 0) {
g_source_remove (priv->scroll_drag_timeout_id);
priv->scroll_drag_timeout_id = 0;
/* font color */
priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
priv->font_color_button = hildon_color_button_new ();
- GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+ GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button);
gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->font_color_toolitem), TRUE);
GObject *obj;
ModestWindowPrivate *parent_priv;
ModestMsgEditWindowPrivate *priv;
- ModestDimmingRulesGroup *menu_rules_group = NULL;
ModestDimmingRulesGroup *toolbar_rules_group = NULL;
ModestDimmingRulesGroup *clipboard_rules_group = NULL;
ModestWindowMgr *mgr = NULL;
priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL;
- parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
- menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
/* Add common dimming rules */
- modest_dimming_rules_group_add_rules (menu_rules_group,
- modest_msg_edit_window_menu_dimming_entries,
- G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
- MODEST_WINDOW (obj));
modest_dimming_rules_group_add_rules (toolbar_rules_group,
modest_msg_edit_window_toolbar_dimming_entries,
G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
G_CALLBACK (modest_ui_dimming_rules_on_set_style),
MODEST_WINDOW (obj));
/* Insert dimming rules group for this window */
- modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
/* Setup app menu */
- setup_menu (MODEST_MSG_EDIT_WINDOW (obj), menu_rules_group);
+ setup_menu (MODEST_MSG_EDIT_WINDOW (obj));
/* Checks the dimming rules */
- g_object_unref (menu_rules_group);
g_object_unref (toolbar_rules_group);
g_object_unref (clipboard_rules_group);
set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
}
-void
-modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
-{
- GtkWidget *dialog = NULL;
- gint response = 0;
+static void
+on_attach_file_response (GtkDialog *dialog,
+ gint arg1,
+ gpointer user_data)
+{
GSList *uris = NULL;
GSList *uri_node;
GnomeVFSFileSize total_size, allowed_size;
+ ModestMsgEditWindow *window;
ModestMsgEditWindowPrivate *priv;
gint att_num;
guint64 att_size;
- g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window));
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
- return;
-
- dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window));
-
- response = gtk_dialog_run (GTK_DIALOG (dialog));
- switch (response) {
+ switch (arg1) {
case GTK_RESPONSE_OK:
uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
break;
default:
break;
}
- gtk_widget_destroy (dialog);
+
+ window = MODEST_MSG_EDIT_WINDOW (user_data);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
/* allowed size is the maximum size - what's already there */
- modest_attachments_view_get_sizes (
- MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
- &att_num, &att_size);
+ modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+ &att_num, &att_size);
allowed_size = MODEST_MAX_ATTACHMENT_SIZE - att_size;
total_size = 0;
for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
const gchar *uri = (const gchar *) uri_node->data;
-
- total_size += modest_msg_edit_window_attach_file_one
- (window, uri, allowed_size);
-
+
+ total_size +=
+ modest_msg_edit_window_attach_file_one (window, uri, allowed_size);
+
if (total_size > allowed_size) {
g_warning ("%s: total size: %u",
__FUNCTION__, (unsigned int)total_size);
break;
}
-
allowed_size -= total_size;
-
-
}
g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
+
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+void
+modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
+{
+ GtkWidget *dialog = NULL;
+ ModestMsgEditWindowPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window));
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE))
+ return;
+
+ dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window),
+ GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
+ gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ GTK_WINDOW (dialog), GTK_WINDOW (window));
+
+ /* Connect to response & show */
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (on_attach_file_response), window);
+ gtk_widget_show (dialog);
}
GnomeVFSFileSize size = 0;
g_return_val_if_fail (window, 0);
g_return_val_if_fail (uri, 0);
-
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
+
result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
if (result == GNOME_VFS_OK) {
TnyMimePart *mime_part;
} else {
filename = g_strdup ("");
}
- message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+ message = g_strdup_printf (ngettext("emev_nc_delete_attachment",
+ "emev_nc_delete_attachments",
tny_list_get_length (att_list)), filename);
g_free (filename);
- dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), message);
+ dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+ message);
g_free (message);
if (dialog_response != GTK_RESPONSE_OK) {
g_object_unref (att_list);
return;
}
- hildon_banner_show_information (NULL, NULL, _("mcen_me_inbox_remove_attachments"));
-
+
for (iter = tny_list_create_iterator (att_list);
!tny_iterator_is_done (iter);
tny_iterator_next (iter)) {
dgettext("hildon-common-strings",
"ckdg_ib_maximum_characters_reached"));
}
-
g_string_free (result, TRUE);
}
gtk_widget_hide_all (priv->find_toolbar);
gtk_widget_grab_focus (priv->msg_body);
}
-
}
static gboolean
g_free (current_search);
}
-static void
-modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
- ModestMsgEditWindow *window)
-{
- ModestMsgEditWindowPrivate *priv;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
-
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), FALSE);
-}
-
gboolean
modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
{
priv->sent = sent;
}
+static void
+modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
+ ModestMsgEditWindow *window)
+{
+ modest_msg_edit_window_toggle_find_toolbar (window, FALSE);
+}
-void
+void
modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
TnyMsg *draft)
{
}
}
-static gboolean
-on_zoom_minus_plus_not_implemented (ModestWindow *window)
-{
- g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
-
- hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
- return FALSE;
-
-}
-
-static void
-set_zoom_do_nothing (ModestWindow *window,
- gdouble zoom)
-{
-}
-
-static gdouble
-get_zoom_do_nothing (ModestWindow *window)
-{
- return 1.0;
-}
-
typedef struct _MessageSettingsHelper {
ModestMsgEditWindow *window;
GSList *priority_group;
- GtkWidget *align_picker;
+ GSList *format_group;
} MessageSettingsHelper;
static void
-on_priority_toggle (HildonCheckButton *button,
+on_priority_toggle (GtkToggleButton *button,
MessageSettingsHelper *helper)
{
GSList *node;
ModestMsgEditWindowPrivate *priv;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window);
- if (hildon_check_button_get_active (button)) {
+ if (gtk_toggle_button_get_active (button)) {
for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
- HildonCheckButton *node_button = (HildonCheckButton *) node->data;
+ GtkToggleButton *node_button = (GtkToggleButton *) node->data;
if ((node_button != button) &&
- hildon_check_button_get_active (node_button)) {
- hildon_check_button_set_active (node_button, FALSE);
+ gtk_toggle_button_get_active (node_button)) {
+ gtk_toggle_button_set_active (node_button, FALSE);
}
- if (priv->priority_flags != (TnyHeaderFlags) g_object_get_data (G_OBJECT (button), "priority"))
- modest_msg_edit_window_set_priority_flags (helper->window,
- (TnyHeaderFlags)
- g_object_get_data (G_OBJECT (button),
- "priority"));
}
-
+ if (priv->priority_flags != (TnyHeaderFlags) g_object_get_data (G_OBJECT (button), "priority"))
+ modest_msg_edit_window_set_priority_flags (helper->window,
+ (TnyHeaderFlags)
+ g_object_get_data (G_OBJECT (button),
+ "priority"));
} else {
gboolean found = FALSE;
/* If no one is active, activate it again */
for (node = helper->priority_group; node != NULL; node = g_slist_next (node)) {
- HildonCheckButton *node_button = (HildonCheckButton *) node->data;
- if (hildon_check_button_get_active (node_button)) {
+ GtkToggleButton *node_button = (GtkToggleButton *) node->data;
+ if (gtk_toggle_button_get_active (node_button)) {
found = TRUE;
break;
}
}
if (!found) {
- hildon_check_button_set_active (button, TRUE);
+ gtk_toggle_button_set_active (button, TRUE);
}
}
}
static void
-on_format_picker_value_changed (HildonPickerButton *button,
- MessageSettingsHelper *helper)
+on_format_toggle (GtkToggleButton *button,
+ MessageSettingsHelper *helper)
{
- ModestMsgEditFormat new_format, old_format;
- gint file_format;
-
- switch (hildon_picker_button_get_active (button)) {
- case 1:
- new_format = MODEST_MSG_EDIT_FORMAT_HTML;
- file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT;
- break;
- case 0:
- default:
- new_format = MODEST_MSG_EDIT_FORMAT_TEXT;
- file_format = MODEST_FILE_FORMAT_PLAIN_TEXT;
- break;
- }
+ GSList *node;
+ ModestMsgEditWindowPrivate *priv;
+ ModestMsgEditFormat old_format;
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (helper->window);
old_format = modest_msg_edit_window_get_format (helper->window);
- if (new_format != old_format) {
- modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window), file_format);
+ if (gtk_toggle_button_get_active (button)) {
- switch (modest_msg_edit_window_get_format (helper->window)) {
- case MODEST_MSG_EDIT_FORMAT_TEXT:
- hildon_picker_button_set_active (button, 0);
- gtk_widget_set_sensitive (helper->align_picker, FALSE);
- break;
- case MODEST_MSG_EDIT_FORMAT_HTML:
- default:
- hildon_picker_button_set_active (button, 1);
- gtk_widget_set_sensitive (helper->align_picker, TRUE);
- break;
+ for (node = helper->format_group; node != NULL; node = g_slist_next (node)) {
+ GtkToggleButton *node_button = (GtkToggleButton *) node->data;
+ if ((node_button != button) &&
+ gtk_toggle_button_get_active (node_button)) {
+ gtk_toggle_button_set_active (node_button, FALSE);
+ }
+ }
+ if (old_format != (ModestMsgEditFormat) g_object_get_data (G_OBJECT (button), "format")) {
+ modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (helper->window),
+ GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "file-format")));
+ }
+
+ } else {
+ gboolean found = FALSE;
+ /* If no one is active, activate it again */
+ for (node = helper->format_group; node != NULL; node = g_slist_next (node)) {
+ GtkToggleButton *node_button = (GtkToggleButton *) node->data;
+ if (gtk_toggle_button_get_active (node_button)) {
+ found = TRUE;
+ break;
+ }
+ }
+ if (!found) {
+ gtk_toggle_button_set_active (button, TRUE);
}
- }
-}
-
-static void
-on_align_picker_value_changed (HildonPickerButton *button,
- MessageSettingsHelper *helper)
-{
- GtkJustification new_justify;
- ModestMsgEditFormatState *format_state = NULL;
-
- switch (hildon_picker_button_get_active (button)) {
- case 1:
- new_justify = GTK_JUSTIFY_CENTER;
- break;
- case 2:
- new_justify = GTK_JUSTIFY_RIGHT;
- break;
- case 0:
- default:
- new_justify = GTK_JUSTIFY_LEFT;
- break;
}
- format_state = modest_msg_edit_window_get_format_state (helper->window);
- if (format_state->justification != new_justify)
- format_state->justification = new_justify;
- modest_msg_edit_window_set_format_state (helper->window, format_state);
- g_free (format_state);
}
static void
GtkWidget *high_toggle, *medium_toggle, *low_toggle;
GtkWidget *captioned;
GtkSizeGroup *title_sizegroup, *value_sizegroup;
- GtkWidget *format_picker;
- GtkWidget *format_selector;
- GtkWidget *align_selector;
+ GtkWidget *format_hbox;
+ GtkWidget *html_toggle, *text_toggle;
ModestMsgEditWindowPrivate *priv;
MessageSettingsHelper helper = {0,};
- ModestMsgEditFormatState *format_state = NULL;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
/* Priority toggles */
priority_hbox = gtk_hbox_new (TRUE, 0);
- high_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ high_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label (GTK_BUTTON (high_toggle), _("mcen_me_editor_priority_high"));
helper.priority_group = g_slist_prepend (helper.priority_group, high_toggle);
g_object_set_data (G_OBJECT (high_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_HIGH_PRIORITY));
- medium_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ medium_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label (GTK_BUTTON (medium_toggle), _("mcen_me_editor_priority_normal"));
helper.priority_group = g_slist_prepend (helper.priority_group, medium_toggle);
g_object_set_data (G_OBJECT (medium_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_NORMAL_PRIORITY));
- low_toggle = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ low_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
gtk_button_set_label (GTK_BUTTON (low_toggle), _("mcen_me_editor_priority_low"));
helper.priority_group = g_slist_prepend (helper.priority_group, low_toggle);
g_object_set_data (G_OBJECT (low_toggle), "priority", GINT_TO_POINTER (TNY_HEADER_FLAG_LOW_PRIORITY));
- gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priority_hbox), low_toggle, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priority_hbox), medium_toggle, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priority_hbox), high_toggle, TRUE, TRUE, 0);
gtk_widget_show_all (priority_hbox);
captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
- _("mcen_me_editor_message_priority"), priority_hbox);
+ _("mcen_me_editor_message_priority"), FALSE, priority_hbox);
gtk_widget_show (captioned);
gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
- /* format selector */
- format_selector = hildon_touch_selector_new_text ();
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_plain_text"));
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (format_selector), _("mcen_me_editor_formatted_text"));
- format_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (format_picker), HILDON_TOUCH_SELECTOR (format_selector));
- modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
- _("mcen_me_editor_format"), format_picker);
- gtk_widget_show_all (format_picker);
- gtk_box_pack_start (GTK_BOX (vbox), format_picker, FALSE, FALSE, 0);
-
- /* alignment selector */
- align_selector = hildon_touch_selector_new_text ();
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_left"));
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_centred"));
- hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (align_selector), _("mcen_me_editor_align_right"));
- helper.align_picker = hildon_picker_button_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (helper.align_picker), HILDON_TOUCH_SELECTOR (align_selector));
- modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
- _("mcen_me_editor_align"), helper.align_picker);
- gtk_widget_show_all (helper.align_picker);
- gtk_box_pack_start (GTK_BOX (vbox), helper.align_picker, FALSE, FALSE, 0);
-
+ /* format toggles */
+ format_hbox = gtk_hbox_new (TRUE, 0);
+ html_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ gtk_button_set_label (GTK_BUTTON (html_toggle), _("mcen_me_editor_formatted_text"));
+ helper.format_group = g_slist_prepend (helper.format_group, html_toggle);
+ g_object_set_data (G_OBJECT (html_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_HTML));
+ g_object_set_data (G_OBJECT (html_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_FORMATTED_TEXT));
+ text_toggle = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ gtk_button_set_label (GTK_BUTTON (text_toggle), _("mcen_me_editor_plain_text"));
+ helper.format_group = g_slist_prepend (helper.format_group, text_toggle);
+ g_object_set_data (G_OBJECT (text_toggle), "format", GINT_TO_POINTER (MODEST_MSG_EDIT_FORMAT_TEXT));
+ g_object_set_data (G_OBJECT (text_toggle), "file-format", GINT_TO_POINTER (MODEST_FILE_FORMAT_PLAIN_TEXT));
+ gtk_box_pack_start (GTK_BOX (format_hbox), html_toggle, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (format_hbox), text_toggle, TRUE, TRUE, 0);
+ gtk_widget_show_all (format_hbox);
+ captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
+ _("mcen_me_editor_format"), FALSE, format_hbox);
+ gtk_widget_show (captioned);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
+
+
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
- gtk_window_set_title (GTK_WINDOW (dialog), _("TODO: Message settings"));
-
+ gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_me_message_settings"));
+
/* Set current values */
switch (priv->priority_flags) {
case TNY_HEADER_FLAG_HIGH_PRIORITY:
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (high_toggle), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (high_toggle), TRUE);
break;
case TNY_HEADER_FLAG_LOW_PRIORITY:
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (low_toggle), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (low_toggle), TRUE);
break;
default:
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (medium_toggle), TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (medium_toggle), TRUE);
break;
}
switch (modest_msg_edit_window_get_format (window)) {
case MODEST_MSG_EDIT_FORMAT_TEXT:
- hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 0);
- gtk_widget_set_sensitive (helper.align_picker, FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (text_toggle), TRUE);
break;
case MODEST_MSG_EDIT_FORMAT_HTML:
default:
- hildon_picker_button_set_active (HILDON_PICKER_BUTTON (format_picker), 1);
- gtk_widget_set_sensitive (helper.align_picker, TRUE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (html_toggle), TRUE);
break;
}
- format_state = modest_msg_edit_window_get_format_state (window);
- switch (format_state->justification) {
- case GTK_JUSTIFY_RIGHT:
- hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 2);
- break;
- case GTK_JUSTIFY_CENTER:
- hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 1);
- break;
- default:
- hildon_picker_button_set_active (HILDON_PICKER_BUTTON (helper.align_picker), 0);
- break;
-
- }
- g_free (format_state);
-
/* Signal connects */
g_signal_connect (G_OBJECT (high_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
g_signal_connect (G_OBJECT (medium_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
g_signal_connect (G_OBJECT (low_toggle), "toggled", G_CALLBACK (on_priority_toggle), &helper);
- g_signal_connect (G_OBJECT (format_picker), "value-changed", G_CALLBACK (on_format_picker_value_changed), &helper);
- g_signal_connect (G_OBJECT (helper.align_picker), "value-changed",
- G_CALLBACK (on_align_picker_value_changed), &helper);
+ g_signal_connect (G_OBJECT (html_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper);
+ g_signal_connect (G_OBJECT (text_toggle), "toggled", G_CALLBACK (on_format_toggle), &helper);
gtk_dialog_run (GTK_DIALOG (dialog));
modest_msg_edit_window_show_msg_settings_dialog (window);
}
-
-static void add_button_to_menu (ModestMsgEditWindow *self,
- HildonAppMenu *menu,
- GtkButton *button,
- ModestDimmingRulesGroup *group,
- GCallback dimming_callback)
-{
- if (dimming_callback)
- modest_dimming_rules_group_add_widget_rule (group,
- GTK_WIDGET (button),
- dimming_callback,
- MODEST_WINDOW (self));
- hildon_app_menu_append (menu, GTK_BUTTON (button));
-}
-
-static void add_to_menu (ModestMsgEditWindow *self,
- HildonAppMenu *menu,
- gchar *label,
- GCallback callback,
- ModestDimmingRulesGroup *group,
- GCallback dimming_callback)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_label (label);
- g_signal_connect_after (G_OBJECT (button), "clicked",
- callback, (gpointer) self);
- add_button_to_menu (self, menu, GTK_BUTTON (button), group, dimming_callback);
-}
-
static void
on_cc_button_toggled (HildonCheckButton *button,
ModestMsgEditWindow *window)
hildon_check_button_get_active (button));
}
-static void
-on_find_toolbar_button_toggled (HildonCheckButton *button,
- ModestMsgEditWindow *window)
-{
- g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
- modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window),
- hildon_check_button_get_active (button));
-
-}
-
static void
-setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
+setup_menu (ModestMsgEditWindow *self)
{
ModestMsgEditWindowPrivate *priv = NULL;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
- priv->app_menu = hildon_app_menu_new ();
-
/* Settings menu buttons */
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_checknames"),
- G_CALLBACK (modest_ui_actions_on_check_names),
- group, NULL);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_undo"),
- G_CALLBACK (modest_ui_actions_on_undo),
- group, G_CALLBACK (modest_ui_dimming_rules_on_undo));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_check_names),
+ NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
+ APP_MENU_CALLBACK (modest_ui_actions_on_undo),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
priv->cc_button = hildon_check_button_new (0);
gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
FALSE);
- add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->cc_button),
- group, NULL);
+ modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->cc_button),
+ NULL);
g_signal_connect (G_OBJECT (priv->cc_button), "toggled",
G_CALLBACK (on_cc_button_toggled), (gpointer) self);
priv->bcc_button = hildon_check_button_new (0);
gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc"));
hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button),
FALSE);
- add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->bcc_button),
- group, NULL);
+ modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->bcc_button),
+ NULL);
g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_attach_inlineimage"),
- G_CALLBACK (modest_ui_actions_on_insert_image),
- group, G_CALLBACK (modest_ui_dimming_rules_on_set_style));
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_remove_attachments"),
- G_CALLBACK (modest_ui_actions_on_remove_attachments),
- group, G_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
- add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: Message settings..."),
- G_CALLBACK (on_message_settings),
- group, NULL);
- priv->find_toolbar_button = hildon_check_button_new (0);
- gtk_button_set_label (GTK_BUTTON (priv->find_toolbar_button), _("mcen_me_viewer_find"));
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button),
- FALSE);
- add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->find_toolbar_button),
- group, NULL);
- g_signal_connect (G_OBJECT (priv->find_toolbar_button), "toggled",
- G_CALLBACK (on_find_toolbar_button_toggled), (gpointer) self);
-
- hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self),
- HILDON_APP_MENU (priv->app_menu));
-}
-
-static gboolean
-modest_msg_edit_window_toggle_menu (HildonWindow *window,
- guint button,
- guint32 time)
-{
- ModestMsgEditWindowPrivate *priv = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
-
- gtk_widget_queue_resize (priv->app_menu);
-
- return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_insert_image),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_message_settings"), NULL,
+ APP_MENU_CALLBACK (on_message_settings),
+ NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
+ APP_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
+ NULL);
}