Don't use stock buttons
This commit is contained in:
committed by
Stéphane Lesimple
parent
4f8a5479ac
commit
e5f1eb1bd0
@@ -148,7 +148,15 @@ LabelWithOnlineHelp* GuiCreateLabelWithOnlineHelp(char *title, char *ascii_text)
|
||||
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
|
||||
|
||||
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
|
||||
button = gtk_button_new();
|
||||
GtkWidget *button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_container_add(GTK_CONTAINER(button), button_box);
|
||||
|
||||
GtkWidget *icon = gtk_image_new_from_icon_name("close", GTK_ICON_SIZE_SMALL_TOOLBAR);
|
||||
gtk_box_pack_start(GTK_BOX(button_box), icon, FALSE, FALSE, 2);
|
||||
GtkWidget *lab = gtk_label_new(_("Close"));
|
||||
gtk_box_pack_start(GTK_BOX(button_box), lab, FALSE, FALSE, 0);
|
||||
|
||||
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
|
||||
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(close_cb), lwoh);
|
||||
|
||||
@@ -548,7 +556,7 @@ GtkWidget* GuiShowTextfile(char *title, char *explanation, char *file,
|
||||
|
||||
utf = g_locale_to_utf8(title, -1, NULL, NULL, NULL);
|
||||
dialog = gtk_dialog_new_with_buttons(utf, Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
|
||||
_("Close"), GTK_RESPONSE_ACCEPT, NULL);
|
||||
g_free(utf);
|
||||
gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 600);
|
||||
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
|
||||
@@ -731,7 +739,7 @@ void GuiAboutDialog()
|
||||
|
||||
about = gtk_dialog_new_with_buttons(_utf("windowtitle|About dvdisaster"),
|
||||
Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
|
||||
_("Close"), GTK_RESPONSE_ACCEPT, NULL);
|
||||
|
||||
g_signal_connect_swapped(about, "response", G_CALLBACK(gtk_widget_destroy), about);
|
||||
|
||||
|
||||
@@ -217,8 +217,8 @@ ssize_t LargeRead(LargeFile *lf, void *buf, size_t count)
|
||||
static void insert_buttons(GtkDialog *dialog)
|
||||
{
|
||||
gtk_dialog_add_buttons(dialog,
|
||||
GTK_STOCK_REDO , 1,
|
||||
GTK_STOCK_CANCEL, 0, NULL);
|
||||
_("Redo") , 1,
|
||||
_("Cancel"), 0, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -330,7 +330,7 @@ void GuiCreateMediumInfoWindow()
|
||||
|
||||
dialog = gtk_dialog_new_with_buttons(_utf("windowtitle|Medium info"),
|
||||
Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
|
||||
_("Close"), GTK_RESPONSE_ACCEPT, NULL);
|
||||
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog);
|
||||
|
||||
Closure->mediumInfoContext = mi = g_malloc0(sizeof(medium_info));
|
||||
|
||||
@@ -1183,7 +1183,15 @@ void GuiCreatePreferencesWindow(void)
|
||||
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_box_pack_start(GTK_BOX(outer_box), hbox, FALSE, FALSE, 0);
|
||||
|
||||
button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
|
||||
button = gtk_button_new();
|
||||
GtkWidget *button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
|
||||
gtk_container_add(GTK_CONTAINER(button), button_box);
|
||||
|
||||
GtkWidget *icon = gtk_image_new_from_icon_name("close", GTK_ICON_SIZE_SMALL_TOOLBAR);
|
||||
gtk_box_pack_start(GTK_BOX(button_box), icon, FALSE, FALSE, 2);
|
||||
lab = gtk_label_new(_("Close"));
|
||||
gtk_box_pack_start(GTK_BOX(button_box), lab, FALSE, FALSE, 0);
|
||||
|
||||
gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
|
||||
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(close_cb), NULL);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user