GtkWidget *priority_icon;
GtkWidget *subject_box;
GtkWidget *send_button;
- GtkWidget *bottom_send_button;
- GtkWidget *bottom_send_button_container;
GtkWidget *cc_caption;
GtkWidget *bcc_caption;
MODEST_TYPE_MSG_EDIT_WINDOW, \
ModestMsgEditWindowPrivate))
/* globals */
-static GtkWindowClass *parent_class = NULL;
+static ModestWindowParentClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
/* static guint signals[LAST_SIGNAL] = {0}; */
GtkRequisition *req,
gpointer user_data)
{
- ModestMsgEditWindowPrivate *priv;
- GtkAdjustment *vadj;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(user_data);
-
/* Make sure the body always get at least 70 pixels */
if (req->height < 70)
req->height = 70;
-
- vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
- if (priv->header_box->allocation.height + req->height > GTK_WIDGET (user_data)->allocation.height) {
- if (!GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
- gtk_widget_show (priv->bottom_send_button_container);
- }
- } else {
- if (GTK_WIDGET_VISIBLE (priv->bottom_send_button_container)) {
- gtk_widget_hide (priv->bottom_send_button_container);
- }
- }
}
static void
g_signal_connect (G_OBJECT (priv->send_button), "clicked",
G_CALLBACK (modest_ui_actions_on_send), obj);
- g_signal_connect (G_OBJECT (priv->bottom_send_button), "clicked",
- G_CALLBACK (modest_ui_actions_on_send), obj);
-
if (GTK_IS_COMBO_BOX (priv->from_field)) {
g_signal_connect (G_OBJECT (priv->from_field), "changed",
G_CALLBACK (from_field_changed), obj);
* that uses it, because the ModestSelectorPicker uses the ID opaquely,
* so it can't know how to manage its memory. */
priv->from_field = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
- NULL, g_str_equal);
+ NULL, g_str_equal, FALSE);
modest_selector_set_value_max_chars (priv->from_field, MAX_FROM_VALUE);
if (GTK_IS_COMBO_BOX (priv->from_field)) {
from_caption = modest_toolkit_utils_create_captioned (title_size_group, NULL,
gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon);
gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1);
- priv->bottom_send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
- send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER);
- gtk_container_add (GTK_CONTAINER (priv->bottom_send_button), send_icon);
- gtk_widget_set_size_request (GTK_WIDGET (priv->bottom_send_button), 148, -1);
-
- priv->bottom_send_button_container = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (priv->bottom_send_button_container);
- gtk_box_pack_end (GTK_BOX (priv->bottom_send_button_container), priv->bottom_send_button, FALSE, FALSE, 0);
- gtk_widget_show (priv->bottom_send_button_container);
-
g_object_unref (title_size_group);
g_object_unref (value_size_group);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), priv->bottom_send_button_container, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER (window_align), main_vbox);
modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align);
modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->send_button,
G_CALLBACK (modest_ui_dimming_rules_on_send),
MODEST_WINDOW (obj));
- modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->bottom_send_button,
- G_CALLBACK (modest_ui_dimming_rules_on_send),
- MODEST_WINDOW (obj));
/* Insert dimming rules group for this window */
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);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
/* Settings menu buttons */
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names),
- NULL);
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_undo"), "<Ctrl>z",
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
-
priv->cc_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
_("mcen_me_editor_showcc"));
modest_togglable_set_active (priv->cc_button,
g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
+ priv->show_toolbar_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
+ _("mcen_bd_show_toolbar"));
+ modest_togglable_set_active (priv->show_toolbar_button,
+ FALSE);
+ modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->show_toolbar_button,
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar));
+ gtk_widget_show (priv->show_toolbar_button);
+ g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled",
+ G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self);
+
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (on_message_settings),
+ NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_checknames"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_check_names),
+ NULL);
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_set_style));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_remove_attachments),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_message_settings"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (on_message_settings),
- NULL);
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
+
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), "<Ctrl>f",
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_toggle_find_in_page),
NULL);
- priv->show_toolbar_button = modest_toolkit_factory_create_check_menu (modest_runtime_get_toolkit_factory (),
- _("mcen_bd_show_toolbar"));
- modest_togglable_set_active (priv->show_toolbar_button,
- FALSE);
- modest_window_add_item_to_menu (MODEST_WINDOW (self), priv->show_toolbar_button,
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_editor_show_toolbar));
- gtk_widget_show (priv->show_toolbar_button);
- g_signal_connect (G_OBJECT (priv->show_toolbar_button), "toggled",
- G_CALLBACK (on_show_toolbar_button_toggled), (gpointer) self);
-
}
static void
}
static GtkWidget *
-_create_addressbook_box (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group,
- const gchar *label, GtkWidget *control)
+_create_addressbook_box (GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group,
+ const gchar *label,
+ GtkWidget *control)
{
GtkWidget *abook_button;
GtkWidget *align;
GtkWidget *box;
- GtkWidget *label_widget;
+ GtkWidget *label_widget;
box = gtk_hbox_new (FALSE, 0);
- align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+#ifndef MODEST_TOOLKIT_HILDON2
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+#else
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT);
+#endif
#ifdef MODEST_TOOLKIT_HILDON2
- abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+ abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
#else
- abook_button = gtk_button_new ();
+ abook_button = gtk_button_new ();
#endif
label_widget = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
- gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
- gtk_container_add (GTK_CONTAINER (align), abook_button);
- gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+ gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
+
+ gtk_container_add (GTK_CONTAINER (align), abook_button);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_widget_set_size_request (label_widget, 148 - MODEST_MARGIN_DOUBLE, -1);
+#endif
gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0);
if (title_size_group)
+#ifdef MODEST_TOOLKIT_HILDON2
gtk_size_group_add_widget (title_size_group, label_widget);
+#else
+ gtk_size_group_add_widget (title_size_group, abook_button);
+#endif
if (value_size_group)
gtk_size_group_add_widget (value_size_group, control);
- g_signal_connect (G_OBJECT (abook_button), "clicked",
- G_CALLBACK (emit_open_addressbook), control);
-
- return box;
+ g_signal_connect (G_OBJECT (abook_button), "clicked",
+ G_CALLBACK (emit_open_addressbook), control);
+
+ return box;
}
static void