From 6fcbb80fd1b5268fbedcdb985ffa873a2e475840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 22 Mar 2015 04:57:05 +0000 Subject: Do not use an icon for Cancel/OK buttons GTK+ documentation recommends to not use an icons, but use "_OK"/"_Cancel" labels instead --- src/password.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/password.c') diff --git a/src/password.c b/src/password.c index ff254fd..6d85390 100644 --- a/src/password.c +++ b/src/password.c @@ -45,10 +45,10 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data dialog = gtk_dialog_new (); gtk_dialog_add_button(GTK_DIALOG(dialog), - data->cancel_label != NULL ? data->cancel_label : GTK_STOCK_CANCEL, + data->cancel_label != NULL ? data->cancel_label : _("_Cancel"), GTK_RESPONSE_CANCEL); gtk_dialog_add_button(GTK_DIALOG(dialog), - data->ok_label != NULL ? data->ok_label : GTK_STOCK_OK, + data->ok_label != NULL ? data->ok_label : _("_OK"), GTK_RESPONSE_OK); image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, -- cgit v1.2.1 From c1cf0abc21133e4fa79f412f2e7b0d1a4b6954bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 22 Mar 2015 05:00:48 +0000 Subject: Do not use stock dialog --- src/password.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/password.c') diff --git a/src/password.c b/src/password.c index 6d85390..be3bcf4 100644 --- a/src/password.c +++ b/src/password.c @@ -51,8 +51,8 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data data->ok_label != NULL ? data->ok_label : _("_OK"), GTK_RESPONSE_OK); - image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, - GTK_ICON_SIZE_DIALOG); + image = gtk_image_new_from_icon_name("dialog-password", + GTK_ICON_SIZE_DIALOG); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); hbox = gtk_hbox_new(FALSE, 5); -- cgit v1.2.1 From 1f130a37fac4976687473b951908581612168bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 22 Mar 2015 07:19:56 +0000 Subject: password: Use gtk_box instead gtk_[v|h]box --- src/password.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/password.c') diff --git a/src/password.c b/src/password.c index be3bcf4..32be61e 100644 --- a/src/password.c +++ b/src/password.c @@ -55,7 +55,7 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data GTK_ICON_SIZE_DIALOG); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, @@ -81,10 +81,10 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data TRUE, 5); - vbox_labels = gtk_vbox_new(FALSE, 5); - vbox_entries = gtk_vbox_new(FALSE, 5); + vbox_labels = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); + vbox_entries = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); - hbox = gtk_hbox_new(FALSE, 5); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, -- cgit v1.2.1 From 7c4cd1fc426e4e30a25a390987b139fc1d32a0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 22 Mar 2015 07:25:59 +0000 Subject: src/password.c: Do not use deprecated GtkAlignment widget --- src/password.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/password.c') diff --git a/src/password.c b/src/password.c index 32be61e..c516100 100644 --- a/src/password.c +++ b/src/password.c @@ -38,7 +38,6 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data GtkWidget *vbox_labels; GtkWidget *vbox_entries; GtkWidget *label; - GtkWidget *align; zen_data = data; @@ -103,11 +102,9 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data 12); if(password_data->username) { - align = gtk_alignment_new(0.0, 0.12, 0.0, 0.0); label = gtk_label_new(_("Username:")); - gtk_container_add(GTK_CONTAINER(align), label); gtk_box_pack_start(GTK_BOX(vbox_labels), - align, + label, TRUE, FALSE, 12); @@ -119,12 +116,9 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data 12); } - align = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); label = gtk_label_new(_("Password:")); - gtk_container_add(GTK_CONTAINER(align), label); - gtk_box_pack_start(GTK_BOX(vbox_labels), - align, + label, TRUE, FALSE, 12); -- cgit v1.2.1