diff --git a/GNUmakefile.template b/GNUmakefile.template
index df6c772..dfbd7ff 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -137,7 +137,7 @@ dvdisaster: $(ICONS) $(OFILES)
else $(MAKE) --no-print-directory -C locale; \
fi
-src/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/create.svg icons/fix.svg icons/help.svg icons/log.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan.svg icons/stop.svg icons/strip.svg icons/verify.svg
+src/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/close.svg icons/create.svg icons/fix.svg icons/help.svg icons/log.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan.svg icons/stop.svg icons/strip.svg icons/verify.svg
@echo "Generating:" $(ICONS)
glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml
diff --git a/icons/close.svg b/icons/close.svg
new file mode 100644
index 0000000..08de47d
--- /dev/null
+++ b/icons/close.svg
@@ -0,0 +1,249 @@
+
+
+
diff --git a/icons/icons.gresource.xml b/icons/icons.gresource.xml
index ade7388..d039228 100644
--- a/icons/icons.gresource.xml
+++ b/icons/icons.gresource.xml
@@ -2,6 +2,7 @@
cd.svg
+ close.svg
create.svg
fix.svg
help.svg
diff --git a/src/help-dialogs.c b/src/help-dialogs.c
index cdd9475..cfef103 100644
--- a/src/help-dialogs.c
+++ b/src/help-dialogs.c
@@ -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);
diff --git a/src/large-io.c b/src/large-io.c
index fa8256d..6ccbccd 100644
--- a/src/large-io.c
+++ b/src/large-io.c
@@ -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
diff --git a/src/medium-info.c b/src/medium-info.c
index 9d92382..da696e9 100644
--- a/src/medium-info.c
+++ b/src/medium-info.c
@@ -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));
diff --git a/src/preferences.c b/src/preferences.c
index eb252cf..59626cf 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -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);