From 9e2c3cffdea5f1fc9827070613cec7fd96863ffb Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Wed, 24 Sep 2008 11:35:22 +0000 Subject: [PATCH] 2008-09-24 Claudio Saavedra * src/hildon-note.c: (hildon_note_rebuild): Update logical IDs. Ensure "Cancel" button is shown. Do not display an icon in confirmation notes nor information notes. (hildon_note_set_button_text): Update logical ID for cancel button. Fixes: NB#88850 (Update HildonNote button strings + signals) --- ChangeLog | 9 +++++++++ src/hildon-note.c | 15 +++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ffab36..ab936ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-09-24 Claudio Saavedra + + * src/hildon-note.c: + (hildon_note_rebuild): Update logical IDs. Ensure "Cancel" button is shown. + Do not display an icon in confirmation notes nor information notes. + (hildon_note_set_button_text): Update logical ID for cancel button. + + Fixes: NB#88850 (Update HildonNote button strings + signals) + 2008-09-24 Alberto Garcia * src/hildon-stackable-window.c diff --git a/src/hildon-note.c b/src/hildon-note.c index 0981dd8..f4d97f4 100644 --- a/src/hildon-note.c +++ b/src/hildon-note.c @@ -484,11 +484,12 @@ hildon_note_rebuild (HildonNote *note) { case HILDON_NOTE_TYPE_CONFIRMATION: priv->okButton = gtk_dialog_add_button (dialog, - _("ecdg_bd_confirmation_note_ok"), GTK_RESPONSE_OK); + _("wdgt_bd_yes"), GTK_RESPONSE_OK); priv->cancelButton = gtk_dialog_add_button (dialog, - _("ecdg_bd_confirmation_note_cancel"), GTK_RESPONSE_CANCEL); + _("wdgt_bd_no"), GTK_RESPONSE_CANCEL); + gtk_widget_set_no_show_all (priv->cancelButton, FALSE); + break; - /* Fall through */ case HILDON_NOTE_TYPE_CONFIRMATION_BUTTON: gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), HILDON_NOTE_CONFIRMATION_ICON, @@ -496,15 +497,17 @@ hildon_note_rebuild (HildonNote *note) break; case HILDON_NOTE_TYPE_INFORMATION_THEME: - case HILDON_NOTE_TYPE_INFORMATION: gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), HILDON_NOTE_INFORMATION_ICON, HILDON_ICON_SIZE_BIG_NOTE); break; + case HILDON_NOTE_TYPE_INFORMATION: + break; + case HILDON_NOTE_TYPE_PROGRESSBAR: priv->cancelButton = gtk_dialog_add_button (dialog, - _("ecdg_bd_cancel_note_cancel"), GTK_RESPONSE_CANCEL); + _("wdgt_bd_stop"), GTK_RESPONSE_CANCEL); IsHorizontal = FALSE; break; @@ -786,7 +789,7 @@ hildon_note_set_button_text (HildonNote *note, if (priv->okButton) { gtk_button_set_label (GTK_BUTTON (priv->okButton), text); gtk_button_set_label (GTK_BUTTON (priv->cancelButton), - _("ecdg_bd_confirmation_note_cancel")); + _("wdgt_bd_no")); } else { gtk_button_set_label (GTK_BUTTON (priv->cancelButton), text); } -- 1.7.9.5