X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-signature-editor-dialog.c;h=7a8ee602a01401143906b384037a8c75405a4f40;hb=3d6c2eb07bcd2c9063d9c73c27d6ead2264598af;hp=2eb606904fe5a318f52627675bcc7366513611fa;hpb=71af7294c7147e8a1acf8b8e655e7005127fc2bd;p=modest diff --git a/src/hildon2/modest-signature-editor-dialog.c b/src/hildon2/modest-signature-editor-dialog.c index 2eb6069..7a8ee60 100644 --- a/src/hildon2/modest-signature-editor-dialog.c +++ b/src/hildon2/modest-signature-editor-dialog.c @@ -33,15 +33,16 @@ #include "widgets/modest-validating-entry.h" #include "modest-runtime.h" #include -#include #include #include #include #include -#include +#include #include #include #include +#include "modest-text-utils.h" +#include G_DEFINE_TYPE (ModestSignatureEditorDialog, modest_signature_editor_dialog, GTK_TYPE_DIALOG); @@ -54,7 +55,7 @@ struct _ModestSignatureEditorDialogPrivate { GtkWidget *checkbox_use; GtkWidget *label; - GtkWidget *scrolledwindow; + GtkWidget *pannable; GtkWidget *textview; }; @@ -110,9 +111,9 @@ enable_widgets (ModestSignatureEditorDialog *self) ModestSignatureEditorDialogPrivate *priv = SIGNATURE_EDITOR_DIALOG_GET_PRIVATE (self); - const gboolean enable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->checkbox_use)); + const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_use)); gtk_widget_set_sensitive (priv->label, enable); - gtk_widget_set_sensitive (priv->scrolledwindow, enable); + gtk_widget_set_sensitive (priv->pannable, enable); gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->textview), enable); } @@ -133,48 +134,43 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self) GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */ gtk_container_set_border_width (GTK_CONTAINER (box), MODEST_MARGIN_HALF); - - priv->checkbox_use = gtk_check_button_new_with_label ( - _("mcen_fi_email_signatures_use_signature")); + + priv->checkbox_use = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT); + gtk_button_set_label (GTK_BUTTON (priv->checkbox_use), + _("mcen_fi_email_signatures_use_signature")); + gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_use), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (box), priv->checkbox_use, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (priv->checkbox_use); g_signal_connect (G_OBJECT (priv->checkbox_use), "toggled", - G_CALLBACK (on_toggle_button_changed), self); - + G_CALLBACK (on_toggle_button_changed), self); priv->label = gtk_label_new (""); /* Set in modest_signature_editor_dialog_set_settings(). */ + gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.0); gtk_box_pack_start (GTK_BOX (box), priv->label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (priv->label); - priv->scrolledwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (priv->scrolledwindow), MODEST_MARGIN_DEFAULT); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolledwindow), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolledwindow), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (box), priv->scrolledwindow, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (priv->scrolledwindow); + priv->pannable = hildon_pannable_area_new (); + gtk_box_pack_start (GTK_BOX (box), priv->pannable, TRUE, TRUE, MODEST_MARGIN_HALF); + gtk_widget_show (priv->pannable); - priv->textview = gtk_text_view_new (); - gtk_container_add (GTK_CONTAINER (priv->scrolledwindow), priv->textview); + priv->textview = hildon_text_view_new (); + gtk_container_add (GTK_CONTAINER (priv->pannable), priv->textview); gtk_widget_show (priv->textview); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->textview)); - gtk_text_buffer_set_text (buffer, "--\n", -1); /* Default, as per the UI spec. */ + GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->textview)); + gtk_text_buffer_set_text (buffer, _("mcen_va_default_signature_tablet"), -1); /* Default, as per the UI spec. */ /* Add the buttons: */ - gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK); - gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK); gtk_widget_show (box); - gtk_widget_set_size_request (GTK_WIDGET (self), 480, -1); + gtk_widget_set_size_request (GTK_WIDGET (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT); /* When this window is shown, hibernation should not be possible, * because there is no sensible way to save the state: */ modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_signatureeditor", - modest_maemo_utils_get_osso_context()); } ModestSignatureEditorDialog* @@ -198,13 +194,13 @@ modest_signature_editor_dialog_set_settings ( gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END); g_free (label_text); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_use), use_signature); + hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_use), use_signature); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->textview)); - if (signature) + GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->textview)); + if (signature && signature[0] != '\0') gtk_text_buffer_set_text (buffer, signature, -1); else - gtk_text_buffer_set_text (buffer, "--\n", -1); /* Default, as per the UI spec. */ + gtk_text_buffer_set_text (buffer, _("mcen_va_default_signature_tablet"), -1); /* Default, as per the UI spec. */ enable_widgets (window); } @@ -220,9 +216,9 @@ modest_signature_editor_dialog_get_settings ( g_assert(use_signature); - *use_signature = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->checkbox_use)); + *use_signature = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_use)); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->textview)); + GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->textview)); GtkTextIter start, end; gtk_text_buffer_get_bounds (buffer, &start, &end);