diff --git a/src/closure.c b/src/closure.c index f47125c..925f72e 100644 --- a/src/closure.c +++ b/src/closure.c @@ -668,7 +668,6 @@ void FreeClosure() cond_free(Closure->redMarkup); cond_free(Closure->greenMarkup); - cond_free(Closure->invisibleDash); GuiFreeCurve(Closure->readLinearCurve); GuiFreeSpiral(Closure->readLinearSpiral); diff --git a/src/dvdisaster.h b/src/dvdisaster.h index ca0737c..454e8a2 100644 --- a/src/dvdisaster.h +++ b/src/dvdisaster.h @@ -393,7 +393,6 @@ typedef struct _GlobalClosure /*** Common stuff for drawing curves and spirals */ - gboolean colors_initialized; GdkRGBA *redText; char *redMarkup; GdkRGBA *greenText; @@ -407,7 +406,6 @@ typedef struct _GlobalClosure GdkRGBA *blueSector; GdkRGBA *whiteSector; GdkRGBA *darkSector; - char *invisibleDash; /*** Widgets for the linear reading/scanning action */ diff --git a/src/welcome-window.c b/src/welcome-window.c index a34b1a1..be0fd4c 100644 --- a/src/welcome-window.c +++ b/src/welcome-window.c @@ -40,50 +40,12 @@ static void toggle_cb(GtkWidget *widget, gpointer data) Closure->welcomeMessage = state; } -static gboolean draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data) -{ GtkWidget *box = (GtkWidget*)data; - - if(!Closure->colors_initialized) - { - Closure->colors_initialized = TRUE; - - /* Dirty trick for indenting the list: - draw an invisible dash before each indented line */ - - if(Closure->welcomeMessage || Closure->version != Closure->dotFileVersion) - { GtkWidget *button; - - Closure->invisibleDash = g_strdup_printf("-", - 0xff, 0xff, 0xff); // FIXME - - GuiAboutTextWithLink(box, _("This is v0.79.10-pl3. The [patchlevel series] are enhanced from the last upstream release.\n" - "We add support for BD-R TL/QL, Windows and MacOS builds, an option to produce bigger BD-R RS03,\n" - "images, support for stripping ECC from ISOs, re-enabled adaptive reading (except for RS03), and more.\n" - "\n" - "Please refer to the Help > Change log menu for all the details."), "https://github.com/speed47/dvdisaster"); - - gtk_box_pack_start(GTK_BOX(box), gtk_hseparator_new(), FALSE, FALSE, 10); - - button = gtk_check_button_new_with_label(_utf("Show this message again")); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), Closure->welcomeMessage); - g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), NULL); - gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); - - gtk_widget_show_all(box); - } - } - - Closure->dotFileVersion = Closure->version; - - return FALSE; -} - /* * Create the window */ void GuiCreateWelcomePage(GtkNotebook *notebook) -{ GtkWidget *box,*align,*ignore; +{ GtkWidget *box,*button,*align,*ignore; int show_msg; show_msg = Closure->welcomeMessage || Closure->version != Closure->dotFileVersion; @@ -92,7 +54,6 @@ void GuiCreateWelcomePage(GtkNotebook *notebook) ignore = gtk_label_new("welcome_tab"); box = show_msg ? gtk_vbox_new(FALSE, 0) : gtk_hbox_new(FALSE, 10); - g_signal_connect(G_OBJECT(align), "draw", G_CALLBACK(draw_cb), box); gtk_notebook_append_page(notebook, align, ignore); gtk_container_add(GTK_CONTAINER(align), box); @@ -120,7 +81,21 @@ void GuiCreateWelcomePage(GtkNotebook *notebook) GuiAboutText(box, _("New in this Version:")); - /* actual list is generated in the expose event handler */ + GuiAboutTextWithLink(box, _("This is v0.79.10-pl3. The [patchlevel series] are enhanced from the last upstream release.\n" + "We add support for BD-R TL/QL, Windows and MacOS builds, an option to produce bigger BD-R RS03,\n" + "images, support for stripping ECC from ISOs, re-enabled adaptive reading (except for RS03), and more.\n" + "\n" + "Please refer to the Help > Change log menu for all the details."), "https://github.com/speed47/dvdisaster"); + gtk_box_pack_start(GTK_BOX(box), gtk_hseparator_new(), FALSE, FALSE, 10); + + button = gtk_check_button_new_with_label(_utf("Show this message again")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), Closure->welcomeMessage); + g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(toggle_cb), NULL); + gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); + + gtk_widget_show_all(box); + + Closure->dotFileVersion = Closure->version; } #endif /* WITH_GUI_YES */