merge-requests/14/head
Ordissimo 2024-10-25 20:41:20 +02:00
rodzic b2115c51dd
commit fd75012e92
1 zmienionych plików z 2 dodań i 11 usunięć

Wyświetl plik

@ -1467,16 +1467,11 @@ files_build_menu (void)
// g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_quit));
menu = g_menu_new ();
section = g_menu_new ();
menu_item_quit = g_menu_item_new ("Exit", "app.quit");
g_menu_append_item (section, menu_item_quit);
g_object_unref (menu_item_quit);
g_menu_append_section (menu, NULL, G_MENU_MODEL (section));
g_object_unref (menu_item_quit);
DBG (DBG_debug, "files_build_menu: finished\n");
return menu;
}
@ -1884,15 +1879,12 @@ device_dialog (void)
gtk_window_set_title (GTK_WINDOW (scan_win.shell), (char *) devname);
gtk_window_set_resizable (GTK_WINDOW (scan_win.shell), TRUE);
gtk_window_set_default_size (GTK_WINDOW (scan_win.shell), 400, 400);
g_signal_connect (G_OBJECT (scan_win.shell), "delete_event",
G_CALLBACK (scan_win_delete), NULL);
//g_signal_connect (G_OBJECT (scan_win.shell), "delete_event", G_CALLBACK (scan_win_delete), NULL);
/* create the main vbox */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
if (GTK_IS_WINDOW(scan_win.shell))
gtk_window_set_child(GTK_WINDOW(scan_win.shell), vbox);
else
g_message("%d) %s\n", __LINE__, __FUNCTION__);
/* "Files" submenu: */
@ -2028,6 +2020,7 @@ device_dialog (void)
pref_device_restore (); /* restore device-settings */
gtk_window_present(GTK_WINDOW(scan_win.shell));
DBG (DBG_debug, "device_dialog: finished\n");
}
static void
@ -2068,8 +2061,6 @@ choose_device (void)
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
if (GTK_IS_WINDOW(choose_device_dialog))
gtk_window_set_child (GTK_WINDOW (choose_device_dialog), main_vbox);
else
g_message("%d) %s\n", __LINE__, __FUNCTION__);
/* The list of drivers */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);