Updating branch refs/heads/master to 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb (commit) from f452d76e6cbf4c378d74f3130be88323a26a5494 (commit)
commit 9cd5285a18a68edf68e76992fcb13fa8a8d67dbb Author: Juha <j...@xfce.org> Date: Thu Feb 7 13:03:55 2013 +0200 4.9.3.0 Fixed bug 9014 rename 'Execute' to 'Postpone' Thanks to Øyvind Ingvaldsen for this fix. configure.in.in | 2 +- src/functions.c | 12 ++++++++++++ src/functions.h | 2 ++ src/reminder.c | 3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 2574b41..d88c37b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org> dnl dnl Version information -m4_define([orage_version], [4.9.2.0-git]) +m4_define([orage_version], [4.9.3.0-git]) m4_define([gtk_minimum_version], [2.14.0]) m4_define([xfce_minimum_version], [4.8.0]) diff --git a/src/functions.c b/src/functions.c index 823a60b..bc06c37 100644 --- a/src/functions.c +++ b/src/functions.c @@ -524,6 +524,18 @@ GtkWidget *orage_create_framebox_with_content(const gchar *title return(framebox); } +GtkWidget *orage_create_custom_stock_button(const gchar *stock_id + , const gchar *label_text) { + GtkWidget *button; + GtkWidget *image; + + image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON); + button = gtk_button_new_with_label(label_text); + gtk_button_set_image((GtkButton*)button, image); + + return(button); +} + /******************************************************* * time convert and manipulation functions *******************************************************/ diff --git a/src/functions.h b/src/functions.h index 727dfb8..73d707e 100644 --- a/src/functions.h +++ b/src/functions.h @@ -139,6 +139,8 @@ gint orage_error_dialog(GtkWindow *parent , char *primary_text, char *secondary_text); GtkWidget *orage_create_framebox_with_content(const gchar *title , GtkWidget *content); +GtkWidget *orage_create_custom_stock_button(const gchar *stock_id + , const gchar *label_text); /* NOTE: the following is in main.c */ void orage_toggle_visible(void); diff --git a/src/reminder.c b/src/reminder.c index 0dbc916..0bc4b03 100644 --- a/src/reminder.c +++ b/src/reminder.c @@ -799,7 +799,8 @@ static void create_orage_reminder(alarm_struct *l_alarm) G_CALLBACK(on_btStopNoiseReminder_clicked), l_alarm); } - btRecreateReminder = gtk_button_new_from_stock("gtk-execute"); + btRecreateReminder = orage_create_custom_stock_button("gtk-ok" + , _("Postpone")); gtk_widget_set_tooltip_text(btRecreateReminder , _("Remind me again after the specified time")); gtk_dialog_add_action_widget(GTK_DIALOG(wReminder) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits