Skip to contentSkip to conversation

gconf: Unify exit dialog with the one from qconf

PATCH In review Leonid V. Fedorenchik 2 participants 2 messages May 21, 2015 – May 27, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gconf: Unify exit dialog with the one from qconf

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

---
 scripts/kconfig/gconf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
scripts/kconfig/gconf.c +5 -5
index 26d208b..9348c9f 100644
@@ -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);
 
Signature · 1 line
2.4.1.217.g6c1249c
#1 lore raw

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

Quoted 2 lines · Leonid V. Fedorenchik

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.)

Quoted 25 lines
---
 scripts/kconfig/gconf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
scripts/kconfig/gconf.c +3 -3
index 26d208b..9348c9f 100644
@@ -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,

scripts/kconfig/gconf.c gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event, · line 441

Quoted 10 lines
scripts/kconfig/gconf.c +2 -2
-					     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