[PATCH] gconf: Unify exit dialog with the one from qconf

[PATCH] gconf: Unify exit dialog with the one from qconf

[Leonid V. Fedorenchik]

Make exit dialog more user-friendly and, at the same time, make it
similar to the one from qconf.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
---
 scripts/kconfig/gconf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 26d208b..9348c9f 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -422,21 +422,21 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
 	if (!conf_get_changed())
 		return FALSE;
 
-	dialog = gtk_dialog_new_with_buttons(_("Warning !"),
+	dialog = gtk_dialog_new_with_buttons(_("gconf"),
 					     GTK_WINDOW(main_wnd),
 					     (GtkDialogFlags)
 					     (GTK_DIALOG_MODAL |
 					      GTK_DIALOG_DESTROY_WITH_PARENT),
-					     GTK_STOCK_OK,
+					     _("Save Changes"),
 					     GTK_RESPONSE_YES,
-					     GTK_STOCK_NO,
+					     _("Discard Changes"),
 					     GTK_RESPONSE_NO,
-					     GTK_STOCK_CANCEL,
+					     _("Cancel Exit"),
 					     GTK_RESPONSE_CANCEL, NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog),
 					GTK_RESPONSE_CANCEL);
 
-	label = gtk_label_new(_("\nSave configuration ?\n"));
+	label = gtk_label_new(_("\nSave configuration?\n"));
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
 	gtk_widget_show(label);
 
-- 
2.4.1.217.g6c1249c

Re: [PATCH] gconf: Unify exit dialog with the one from qconf

[Paul Bolle]

[Yann disappeared, but you couldn't know that.]

On Thu, 2015-05-21 at 22:53 +0300, Leonid V. Fedorenchik wrote:
> Make exit dialog more user-friendly and, at the same time, make it
> similar to the one from qconf.

Could you please describe, in the commit explanation, the dialog before
and after this change. Now we have to fire up gconf and qconf to get an
idea of this proposal. (I use neither. I don't know whether these
front-ends are used much.)

> Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
> ---
>  scripts/kconfig/gconf.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
> index 26d208b..9348c9f 100644
> --- a/scripts/kconfig/gconf.c
> +++ b/scripts/kconfig/gconf.c
> @@ -422,21 +422,21 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
>  	if (!conf_get_changed())
>  		return FALSE;
>  
> -	dialog = gtk_dialog_new_with_buttons(_("Warning !"),
> +	dialog = gtk_dialog_new_with_buttons(_("gconf"),
>  					     GTK_WINDOW(main_wnd),
>  					     (GtkDialogFlags)
>  					     (GTK_DIALOG_MODAL |
>  					      GTK_DIALOG_DESTROY_WITH_PARENT),
> -					     GTK_STOCK_OK,
> +					     _("Save Changes"),
>  					     GTK_RESPONSE_YES,
> -					     GTK_STOCK_NO,
> +					     _("Discard Changes"),
>  					     GTK_RESPONSE_NO,
> -					     GTK_STOCK_CANCEL,
> +					     _("Cancel Exit"),
>  					     GTK_RESPONSE_CANCEL, NULL);
>  	gtk_dialog_set_default_response(GTK_DIALOG(dialog),
>  					GTK_RESPONSE_CANCEL);
>  
> -	label = gtk_label_new(_("\nSave configuration ?\n"));
> +	label = gtk_label_new(_("\nSave configuration?\n"));
>  	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
>  	gtk_widget_show(label);

Thanks,


Paul Bolle