diff options
author | Florian Müllner <fmuellner@gnome.org> | 2012-09-18 22:51:08 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2012-09-25 18:46:33 -0400 |
commit | bbcb2a3783de925b93707b8e76110ec9ebaed552 (patch) | |
tree | 1dab6b65841e1e94a6fceec2810fa486b893970d /src/option.c | |
parent | 0628bd3291aad936b6b553366600590cca360bfa (diff) |
msg: Add an option to set a custom dialog icon
The predefined dialog icons work well in many cases, but sometimes
it makes sense to use a more specific icon, so add an option to
specify an icon-name to use instead.
https://bugzilla.gnome.org/show_bug.cgi?id=684329
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index ba4691d..13275d1 100644 --- a/src/option.c +++ b/src/option.c @@ -35,6 +35,7 @@ static gchar *zenity_general_window_icon; static int zenity_general_width; static int zenity_general_height; static gchar *zenity_general_dialog_text; +static gchar *zenity_general_dialog_icon; static gchar *zenity_general_separator; static gboolean zenity_general_multiple; static gboolean zenity_general_editable; @@ -348,6 +349,15 @@ static GOptionEntry error_options[] = { N_("TEXT") }, { + "icon-name", + '\0', + G_OPTION_FLAG_NOALIAS, + G_OPTION_ARG_STRING, + &zenity_general_dialog_icon, + N_("Set the dialog icon"), + N_("ICON-NAME") + }, + { "no-wrap", '\0', G_OPTION_FLAG_NOALIAS, @@ -389,6 +399,15 @@ static GOptionEntry info_options[] = { N_("TEXT") }, { + "icon-name", + '\0', + G_OPTION_FLAG_NOALIAS, + G_OPTION_ARG_STRING, + &zenity_general_dialog_icon, + N_("Set the dialog icon"), + N_("ICON-NAME") + }, + { "no-wrap", '\0', G_OPTION_FLAG_NOALIAS, @@ -732,6 +751,15 @@ static GOptionEntry question_options[] = { N_("TEXT") }, { + "icon-name", + '\0', + G_OPTION_FLAG_NOALIAS, + G_OPTION_ARG_STRING, + &zenity_general_dialog_icon, + N_("Set the dialog icon"), + N_("ICON-NAME") + }, + { "no-wrap", '\0', G_OPTION_FLAG_NOALIAS, @@ -844,6 +872,15 @@ static GOptionEntry warning_options[] = { N_("TEXT") }, { + "icon-name", + '\0', + G_OPTION_FLAG_NOALIAS, + G_OPTION_ARG_STRING, + &zenity_general_dialog_icon, + N_("Set the dialog icon"), + N_("ICON-NAME") + }, + { "no-wrap", '\0', G_OPTION_FLAG_NOALIAS, @@ -1627,6 +1664,7 @@ zenity_error_post_callback (GOptionContext *context, if (results->mode == MODE_ERROR) { results->msg_data->dialog_text = zenity_general_dialog_text; + results->msg_data->dialog_icon = zenity_general_dialog_icon; results->msg_data->mode = ZENITY_MSG_ERROR; results->msg_data->no_wrap = zenity_general_dialog_no_wrap; results->msg_data->no_markup = zenity_general_dialog_no_markup; @@ -1645,6 +1683,7 @@ zenity_info_post_callback (GOptionContext *context, if (results->mode == MODE_INFO) { results->msg_data->dialog_text = zenity_general_dialog_text; + results->msg_data->dialog_icon = zenity_general_dialog_icon; results->msg_data->mode = ZENITY_MSG_INFO; results->msg_data->no_wrap = zenity_general_dialog_no_wrap; results->msg_data->no_markup = zenity_general_dialog_no_markup; @@ -1819,6 +1858,7 @@ zenity_question_post_callback (GOptionContext *context, zenity_option_set_dialog_mode (zenity_question_active, MODE_QUESTION); if (results->mode == MODE_QUESTION) { results->msg_data->dialog_text = zenity_general_dialog_text; + results->msg_data->dialog_icon = zenity_general_dialog_icon; results->msg_data->mode = ZENITY_MSG_QUESTION; results->msg_data->no_wrap = zenity_general_dialog_no_wrap; results->msg_data->no_markup = zenity_general_dialog_no_markup; @@ -1863,6 +1903,7 @@ zenity_warning_post_callback (GOptionContext *context, if (results->mode == MODE_WARNING) { results->msg_data->dialog_text = zenity_general_dialog_text; + results->msg_data->dialog_icon = zenity_general_dialog_icon; results->msg_data->mode = ZENITY_MSG_WARNING; results->msg_data->no_wrap = zenity_general_dialog_no_wrap; results->msg_data->no_markup = zenity_general_dialog_no_markup; |