xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major GTK4 API fixes: dialogs, dropdowns, message boxes - significant compilation progress

Browse Source 
Co-authored-by: speed47 <218502+speed47@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-09-16 18:51:42 +00:00
parent 1ca5066c63
commit 0c98197036
3 changed files with 113 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/medium-info.c
View File

@@ -258,16 +258,16 @@ static void drive_select_cb(GtkWidget *widget, gpointer data)
if(!Closure->deviceNodes->len) /* No drives available */
return;
n = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
n = gtk_drop_down_get_selected(GTK_DROP_DOWN(widget));
if(n<0)
if(n == GTK_INVALID_LIST_POSITION)
return;
dnode = g_ptr_array_index(Closure->deviceNodes, n);
g_free(Closure->device);
Closure->device = g_strdup(dnode);
gtk_combo_box_set_active(GTK_COMBO_BOX(Closure->driveCombo), n);
gtk_drop_down_set_selected(GTK_DROP_DOWN(Closure->driveCombo), n);
}
/*
@@ -328,17 +328,21 @@ void GuiCreateMediumInfoWindow()
/*** Create the dialog */
dialog = gtk_dialog_new_with_buttons(_utf("windowtitle|Medium info"),
Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
_("Close"), GTK_RESPONSE_ACCEPT, NULL);
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_window_destroy), dialog);
dialog = gtk_window_new();
gtk_window_set_title(GTK_WINDOW(dialog), _utf("windowtitle|Medium info"));
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(Closure->window));
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
Closure->mediumInfoContext = mi = g_malloc0(sizeof(medium_info));
/*** Inner vbox and title */
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_append(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox);
gtk_window_set_child(GTK_WINDOW(dialog), vbox);
/* Add close button */
GtkWidget *close_button = gtk_button_new_with_label(_("Close"));
g_signal_connect_swapped(close_button, "clicked", G_CALLBACK(gtk_window_destroy), dialog);
lab = gtk_label_new(NULL);
@@ -368,25 +372,27 @@ void GuiCreateMediumInfoWindow()
lab = gtk_label_new(" ");
gtk_box_append(GTK_BOX(hbox), lab);
combo_box = gtk_combo_box_text_new();
gtk_box_append(GTK_BOX(hbox), combo_box);
g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(drive_select_cb), NULL);
/* Create string list for dropdown */
GtkStringList *string_list = gtk_string_list_new(NULL);
for(i=0; i<Closure->deviceNames->len; i++)
{
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),
g_ptr_array_index(Closure->deviceNames,i));
gtk_string_list_append(string_list, g_ptr_array_index(Closure->deviceNames,i));
if(!strcmp(Closure->device, g_ptr_array_index(Closure->deviceNodes,i)))
dev_idx = i;
}
if(!Closure->deviceNodes->len)
{ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _utf("No drives found"));
{ gtk_string_list_append(string_list, _utf("No drives found"));
}
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), dev_idx);
combo_box = gtk_drop_down_new(G_LIST_MODEL(string_list), NULL);
gtk_box_append(GTK_BOX(hbox), combo_box);
g_signal_connect(G_OBJECT(combo_box), "notify::selected", G_CALLBACK(drive_select_cb), NULL);
gtk_drop_down_set_selected(GTK_DROP_DOWN(combo_box), dev_idx);
lab = gtk_label_new(_utf(" "));
gtk_box_append(GTK_BOX(hbox), lab);
@@ -561,6 +567,9 @@ void GuiCreateMediumInfoWindow()
/*** Show it */
/* Add close button at the end */
gtk_box_append(GTK_BOX(vbox), close_button);
g_signal_connect(G_OBJECT(dialog), "destroy", G_CALLBACK(mi_destroy_cb), NULL);
Closure->mediumWindow = dialog;
Closure->mediumDrive = combo_box;

100
src/menubar.c
View File

@@ -168,10 +168,11 @@ static GtkWidget* add_menu_button(GtkWidget *parent, char *title, int action)
{ char *utf_title = g_locale_to_utf8(title, -1, NULL, NULL, NULL);
GtkWidget *item;
item = gtk_menu_item_new_with_label(utf_title);
/* Menu items are replaced with modern GTK4 approach using buttons */
item = gtk_button_new_with_label(utf_title);
g_free(utf_title);
gtk_menu_shell_append(GTK_MENU_SHELL(parent), item);
g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(menu_cb), GINT_TO_POINTER(action));
gtk_box_append(GTK_BOX(parent), item);
g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(menu_cb), GINT_TO_POINTER(action));
return item;
}
@@ -179,8 +180,9 @@ static GtkWidget* add_menu_button(GtkWidget *parent, char *title, int action)
static void add_menu_separator(GtkWidget *parent)
{ GtkWidget *sep;
sep = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(parent), sep);
/* GTK4: Create a separator widget instead of menu item */
sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_append(GTK_BOX(parent), sep);
}
#if 0
@@ -201,62 +203,66 @@ static void append_sub_menu(GtkWidget *parent, GtkWidget *strip, char *name)
*/
GtkWidget *GuiCreateMenuBar(GtkWidget *parent)
{ GtkWidget *menu_bar, *menu_anchor, *menu_strip, *item;
{ GtkWidget *menu_bar, *file_box, *tools_box, *item;
/* The overall menu bar */
/* The overall menu bar - using a horizontal box instead */
menu_bar = gtk_menu_bar_new();
menu_bar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
// gtk_widget_set_name(menu_bar, "menu-bar");
/* The file menu */
/* The file menu - using a simple box for GTK4 compatibility */
menu_strip = gtk_menu_new();
file_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
Closure->fileMenuImage = add_menu_button(menu_strip, _("menu|Select Image"), MENU_FILE_IMAGE);
Closure->fileMenuEcc = add_menu_button(menu_strip, _("menu|Select Parity File"), MENU_FILE_ECC);
add_menu_button(menu_strip, _("menu|Quit"), MENU_FILE_QUIT);
Closure->fileMenuImage = add_menu_button(file_box, _("menu|Select Image"), MENU_FILE_IMAGE);
Closure->fileMenuEcc = add_menu_button(file_box, _("menu|Select Parity File"), MENU_FILE_ECC);
add_menu_button(file_box, _("menu|Quit"), MENU_FILE_QUIT);
menu_anchor = gtk_menu_item_new_with_label(_utf("menu|File"));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_anchor), menu_strip);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_anchor);
/* Create a simple menu button for file menu */
GtkWidget *file_button = gtk_button_new_with_label(_utf("menu|File"));
gtk_box_append(GTK_BOX(menu_bar), file_button);
/* For simplicity, just pack file menu items directly in menu bar for now */
gtk_box_append(GTK_BOX(menu_bar), file_box);
/* The tools menu */
menu_strip = gtk_menu_new();
item = add_menu_button(menu_strip, _("menu|Medium info"), MENU_TOOLS_MEDIUM_INFO);
tools_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
item = add_menu_button(tools_box, _("menu|Medium info"), MENU_TOOLS_MEDIUM_INFO);
if(!Closure->deviceNodes->len)
gtk_widget_set_sensitive(item, FALSE);
if(Closure->debugMode && !Closure->screenShotMode)
add_menu_button(menu_strip, _("menu|Raw sector editor"), MENU_TOOLS_RAW_EDITOR);
add_menu_button(tools_box, _("menu|Raw sector editor"), MENU_TOOLS_RAW_EDITOR);
Closure->toolMenuAnchor = menu_anchor = gtk_menu_item_new_with_label(_utf("menu|Tools"));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_anchor), menu_strip);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_anchor);
/* Create tools button */
GtkWidget *tools_button = gtk_button_new_with_label(_utf("menu|Tools"));
gtk_box_append(GTK_BOX(menu_bar), tools_button);
gtk_box_append(GTK_BOX(menu_bar), tools_box);
Closure->toolMenuAnchor = tools_button;
/* The help menu */
menu_strip = gtk_menu_new();
GtkWidget *help_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
add_menu_button(menu_strip, _("menu|About"), MENU_HELP_ABOUT);
add_menu_button(menu_strip, _("menu|User manual"), MENU_HELP_MANUAL);
add_menu_button(help_box, _("menu|About"), MENU_HELP_ABOUT);
add_menu_button(help_box, _("menu|User manual"), MENU_HELP_MANUAL);
add_menu_separator(menu_strip);
add_menu_separator(help_box);
add_menu_button(menu_strip, _("menu|Credits"), MENU_HELP_CREDITS);
add_menu_button(menu_strip, _("menu|Licence (GPL)"), MENU_HELP_GPL);
add_menu_button(help_box, _("menu|Credits"), MENU_HELP_CREDITS);
add_menu_button(help_box, _("menu|Licence (GPL)"), MENU_HELP_GPL);
add_menu_separator(menu_strip);
add_menu_separator(help_box);
add_menu_button(menu_strip, _("menu|Change log"), MENU_HELP_CHANGELOG);
add_menu_button(help_box, _("menu|Change log"), MENU_HELP_CHANGELOG);
/* Hide the todo list menu in the patchlevel series, as we're not upstream
* add_menu_button(menu_strip, _("menu|To do list"), MENU_HELP_TODO);
* add_menu_button(help_box, _("menu|To do list"), MENU_HELP_TODO);
*/
menu_anchor = gtk_menu_item_new_with_label(_utf("menu|Help"));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_anchor), menu_strip);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_anchor);
GtkWidget *help_button = gtk_button_new_with_label(_utf("menu|Help"));
gtk_box_append(GTK_BOX(menu_bar), help_button);
gtk_box_append(GTK_BOX(menu_bar), help_box);
return menu_bar;
}
@@ -296,15 +302,15 @@ void GuiAttachTooltip(GtkWidget *widget, char *short_descr, char *long_descr)
*/
static void drive_select_cb(GtkWidget *widget, gpointer data)
{ int n;
{ guint n;
char *dnode;
if(!Closure->deviceNodes->len) /* No drives available */
return;
n = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
n = gtk_drop_down_get_selected(GTK_DROP_DOWN(widget));
if(n<0)
if(n == GTK_INVALID_LIST_POSITION)
return;
dnode = g_ptr_array_index(Closure->deviceNodes, n);
@@ -312,7 +318,7 @@ static void drive_select_cb(GtkWidget *widget, gpointer data)
Closure->device = g_strdup(dnode);
if(Closure->mediumDrive) /* propagate to medium info window */
gtk_combo_box_set_active(GTK_COMBO_BOX(Closure->mediumDrive), n);
gtk_drop_down_set_selected(GTK_DROP_DOWN(Closure->mediumDrive), n);
}
/*
@@ -443,24 +449,26 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent)
icon = gtk_image_new_from_icon_name("cd");
gtk_event_box_set_child(GTK_EVENT_BOX(ebox), icon);
Closure->driveCombo = combo_box = gtk_combo_box_text_new();
g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(drive_select_cb), NULL);
/* Create string list for dropdown */
GtkStringList *string_list = gtk_string_list_new(NULL);
for(i=0; i<Closure->deviceNames->len; i++)
{
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),
g_ptr_array_index(Closure->deviceNames,i));
gtk_string_list_append(string_list, g_ptr_array_index(Closure->deviceNames,i));
if(!strcmp(Closure->device, g_ptr_array_index(Closure->deviceNodes,i)))
dev_idx = i;
}
if(!Closure->deviceNodes->len)
{ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _utf("No drives found"));
{ gtk_string_list_append(string_list, _utf("No drives found"));
}
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), dev_idx);
Closure->driveCombo = combo_box = gtk_drop_down_new(G_LIST_MODEL(string_list), NULL);
g_signal_connect(G_OBJECT(combo_box), "notify::selected", G_CALLBACK(drive_select_cb), NULL);
gtk_drop_down_set_selected(GTK_DROP_DOWN(combo_box), dev_idx);
gtk_widget_set_size_request(combo_box, 200, -1);
gtk_box_append(GTK_BOX(box), combo_box);
GuiAttachTooltip(combo_box, _("tooltip|Drive selection"),
@@ -534,7 +542,7 @@ GtkWidget *GuiCreateToolBar(GtkWidget *parent)
icon = gtk_image_new_from_icon_name("preferences");
Closure->prefsButton = prefs = gtk_button_new();
/* gtk_button_set_relief deprecated in GTK4 */
gtk_container_add(GTK_CONTAINER(prefs), icon);
gtk_button_set_child(GTK_BUTTON(prefs), icon);
g_signal_connect(G_OBJECT(prefs), "clicked", G_CALLBACK(menu_cb), (gpointer)MENU_PREFERENCES);
gtk_box_append(GTK_BOX(box), prefs);
GuiAttachTooltip(prefs,

47
src/misc-gui.c
View File

@@ -343,13 +343,23 @@ static gboolean message_idle_func(gpointer data)
{ message_info *mi = (message_info*)data;
GtkWidget *dialog;
dialog = gtk_message_dialog_new_with_markup(mi->window,
GTK_DIALOG_DESTROY_WITH_PARENT,
mi->type,
GTK_BUTTONS_CLOSE,
mi->msg, NULL);
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_window_destroy), dialog);
/* Create modern GTK4 message dialog replacement */
dialog = gtk_window_new();
gtk_window_set_title(GTK_WINDOW(dialog), "Message");
if(mi->window)
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(mi->window));
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_window_set_child(GTK_WINDOW(dialog), box);
GtkWidget *label = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(label), mi->msg);
gtk_box_append(GTK_BOX(box), label);
GtkWidget *close_button = gtk_button_new_with_label(_("Close"));
g_signal_connect_swapped(close_button, "clicked", G_CALLBACK(gtk_window_destroy), dialog);
gtk_box_append(GTK_BOX(box), close_button);
gtk_widget_set_visible(dialog, TRUE);
g_free(mi->msg);
@@ -390,13 +400,22 @@ GtkWidget* GuiCreateMessage(char *format, GtkMessageType type, ...)
va_end(argp);
utf8 = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
dialog = gtk_message_dialog_new(Closure->window,
GTK_DIALOG_DESTROY_WITH_PARENT,
type,
GTK_BUTTONS_CLOSE,
utf8, NULL);
g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_window_destroy), dialog);
/* Create modern GTK4 dialog replacement */
dialog = gtk_window_new();
gtk_window_set_title(GTK_WINDOW(dialog), "Message");
if(Closure->window)
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(Closure->window));
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
gtk_window_set_child(GTK_WINDOW(dialog), box);
GtkWidget *label = gtk_label_new(utf8);
gtk_box_append(GTK_BOX(box), label);
GtkWidget *close_button = gtk_button_new_with_label(_("Close"));
g_signal_connect_swapped(close_button, "clicked", G_CALLBACK(gtk_window_destroy), dialog);
gtk_box_append(GTK_BOX(box), close_button);
gtk_widget_set_visible(dialog, TRUE);
g_free(text);
g_free(utf8);