# Patch made by Alexey Maximov (amax@fantoo.org)
diff -ruN evms-2.5.4.orig/ui/gtk/about.c evms-2.5.4/ui/gtk/about.c
--- evms-2.5.4.orig/ui/gtk/about.c 2004-07-29 05:32:11.000000000 +0700
+++ evms-2.5.4/ui/gtk/about.c 2006-02-11 06:59:27.555135184 +0600
@@ -43,7 +43,7 @@
accel_group = gtk_accel_group_new();
- about_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ about_window = gtk_window_new(GTK_WINDOW_POPUP);
gtk_widget_set_name(about_window, "about_window");
gtk_object_set_data(GTK_OBJECT(about_window), "about_window", about_window);
gtk_window_set_title(GTK_WINDOW(about_window), _("About"));
@@ -77,7 +77,7 @@
name_label =
gtk_label_new(_
- ("EVMSGUI\nEnterprise Volume Management System Graphical User Interface"));
+ ("EVMSGUI\nEnterprise Volume Management System Graphical User Interface (GTK2 version)"));
gtk_widget_set_name(name_label, "name_label");
gtk_widget_ref(name_label);
gtk_object_set_data_full(GTK_OBJECT(about_window), "name_label", name_label,
@@ -106,7 +106,7 @@
description_label =
gtk_label_new(_
- ("(C) Copyright IBM Corp. 2001, 2003\n\nevmsgui is a graphical user interface to the Enterprise Volume Management System written using the GTK+ widget library."));
+ ("(C) Copyright IBM Corp. 2001, 2003\n\nevmsgui is a graphical user interface to the Enterprise Volume Management System ported to the GTK2+ widget library by Alexey Maximov (amax@fantoo.org)."));
gtk_widget_set_name(description_label, "description_label");
gtk_widget_ref(description_label);
gtk_object_set_data_full(GTK_OBJECT(about_window), "description_label", description_label,
@@ -143,7 +143,7 @@
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(credits_text);
gtk_container_add(GTK_CONTAINER(credits_scrolledwindow), credits_text);
- gtk_text_insert(GTK_TEXT(credits_text), NULL, NULL, NULL,
+ gtk_text_insert(GTK_TEXT_VIEW(credits_text), NULL, NULL, NULL,
"Steven Pratt\nMark A. Peloquin\nBen Rafanello \nKevin Corry\nSteve Dobbelstein\nDon Mulvey\nMarty Ridgeway\nMike Tran\nJohn C. Stiles\nMatt Zimmerman\nAndrew Clausen\nRamachandra N. Pai\nLuciano Chavez",
-1);
diff -ruN evms-2.5.4.orig/ui/gtk/backup.c evms-2.5.4/ui/gtk/backup.c
--- evms-2.5.4.orig/ui/gtk/backup.c 2004-12-16 23:48:41.000000000 +0600
+++ evms-2.5.4/ui/gtk/backup.c 2006-02-10 23:16:47.000000000 +0600
@@ -118,7 +118,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -130,7 +130,7 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -233,12 +233,12 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- cannot_backup_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ cannot_backup_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(cannot_backup_window),
_("Cannot Backup Metadata"));
gtk_window_set_position(GTK_WINDOW(cannot_backup_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(cannot_backup_window));
-
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(cannot_backup_window));
+
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("The metadata cannot be backed up because metadata are scheduled to be written."));
hbuttonbox = gtk_hbutton_box_new();
@@ -364,11 +364,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- backup_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ backup_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(backup_confirmation_window),
_("Backup Metadata Confirmation"));
gtk_window_set_position(GTK_WINDOW(backup_confirmation_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(backup_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(backup_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("Do you wish to backup the metadata now or cancel?"));
diff -ruN evms-2.5.4.orig/ui/gtk/commit.c evms-2.5.4/ui/gtk/commit.c
--- evms-2.5.4.orig/ui/gtk/commit.c 2004-12-16 02:54:27.000000000 +0600
+++ evms-2.5.4/ui/gtk/commit.c 2006-02-10 23:17:44.000000000 +0600
@@ -438,7 +438,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -450,8 +450,8 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
-
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
+
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -555,10 +555,10 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- commit_changes_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_changes_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_changes_window), _("Unsaved Changes Detected"));
gtk_window_set_position(GTK_WINDOW(commit_changes_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_changes_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_changes_window));
vbox = gtk_vbox_new(FALSE, 0);
label = gtk_label_new(_("Save changes before quitting?"));
@@ -679,11 +679,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- commit_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_confirmation_window),
_("Save Changes Confirmation"));
gtk_window_set_position(GTK_WINDOW(commit_confirmation_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(_("Do you wish to save changes now or cancel?"));
@@ -809,11 +809,11 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- commit_confirmation_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ commit_confirmation_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(commit_confirmation_window),
_("Save Changes Confirmation"));
gtk_window_set_position(GTK_WINDOW(commit_confirmation_window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(commit_confirmation_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(commit_confirmation_window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(prompt);
diff -ruN evms-2.5.4.orig/ui/gtk/interfaces/about.glade evms-2.5.4/ui/gtk/interfaces/about.glade
--- evms-2.5.4.orig/ui/gtk/interfaces/about.glade 2003-08-28 02:18:53.000000000 +0700
+++ evms-2.5.4/ui/gtk/interfaces/about.glade 2006-02-11 06:51:01.000000000 +0600
@@ -150,7 +150,7 @@
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<widget>
- <class>GtkText</class>
+ <class>GtkTextView</class>
<name>credits_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
diff -ruN evms-2.5.4.orig/ui/gtk/main.c evms-2.5.4/ui/gtk/main.c
--- evms-2.5.4.orig/ui/gtk/main.c 2004-08-05 04:05:06.000000000 +0700
+++ evms-2.5.4/ui/gtk/main.c 2006-02-10 23:43:51.000000000 +0600
@@ -202,7 +202,7 @@
*/
void display_startup_window(void)
{
- startup_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ startup_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_position(GTK_WINDOW(startup_window), GTK_WIN_POS_CENTER);
startup_label = gtk_label_new(_("EVMS is examining your system. Please wait..."));
@@ -461,6 +461,7 @@
if (geteuid() == 0) {
g_thread_init(NULL);
+ gdk_threads_init();
gtk_init(&argc, &argv);
rc = parse_options(argc, argv);
diff -ruN evms-2.5.4.orig/ui/gtk/main_window.c evms-2.5.4/ui/gtk/main_window.c
--- evms-2.5.4.orig/ui/gtk/main_window.c 2004-12-16 23:48:41.000000000 +0600
+++ evms-2.5.4/ui/gtk/main_window.c 2006-02-11 06:49:28.000000000 +0600
@@ -1,4 +1,4 @@
-/*
+/*8
*
* (C) Copyright IBM Corp. 2001, 2004
*
@@ -42,13 +42,10 @@
GtkWidget *main_window_vbox;
GtkWidget *menubar_handlebox;
GtkWidget *main_menubar;
- guint tmp_key;
GtkWidget *actions_menu_item;
GtkWidget *actions_menu_item_menu;
- GtkAccelGroup *actions_menu_item_menu_accels;
GtkWidget *create_submenu;
GtkWidget *create_submenu_menu;
- GtkAccelGroup *create_submenu_menu_accels;
GtkWidget *create_evms_volume_menu_item;
GtkWidget *create_compatibility_volume_menu_item;
GtkWidget *create_object_menu_item;
@@ -57,59 +54,49 @@
GtkWidget *create_segment_menu_item;
GtkWidget *delete_submenu;
GtkWidget *delete_submenu_menu;
- GtkAccelGroup *delete_submenu_menu_accels;
GtkWidget *delete_volume_menu_item;
GtkWidget *delete_object_menu_item;
GtkWidget *delete_container_menu_item;
GtkWidget *expand_submenu;
GtkWidget *expand_submenu_menu;
- GtkAccelGroup *expand_submenu_menu_accels;
GtkWidget *expand_volume_menu_item;
GtkWidget *expand_object_menu_item;
GtkWidget *expand_container_menu_item;
GtkWidget *shrink_submenu;
GtkWidget *shrink_submenu_menu;
- GtkAccelGroup *shrink_submenu_menu_accels;
GtkWidget *shrink_volume_menu_item;
GtkWidget *shrink_object_menu_item;
GtkWidget *shrink_container_menu_item;
GtkWidget *add_submenu;
GtkWidget *add_submenu_menu;
- GtkAccelGroup *add_submenu_menu_accels;
GtkWidget *add_feature_to_volume_menu_item;
GtkWidget *assign_segment_manager_to_storage_object;
GtkWidget *remove_submenu;
GtkWidget *remove_submenu_menu;
- GtkAccelGroup *remove_submenu_menu_accels;
GtkWidget *remove_object_from_container_menu_item;
GtkWidget *separator5;
GtkWidget *remove_segment_manager_menu_item;
GtkWidget *modify_submenu;
GtkWidget *modify_submenu_menu;
- GtkAccelGroup *modify_submenu_menu_accels;
GtkWidget *modify_volume_menu_item;
GtkWidget *modify_object_menu_item;
GtkWidget *modify_container_menu_item;
GtkWidget *view_submenu;
GtkWidget *view_submenu_menu;
- GtkAccelGroup *view_submenu_menu_accels;
GtkWidget *view_messages_menu_item;
GtkWidget *view_log_menu_item;
GtkWidget *convert_submenu;
GtkWidget *convert_submenu_menu;
- GtkAccelGroup *convert_submenu_menu_accels;
GtkWidget *convert_to_evms_volume_menu_item;
GtkWidget *convert_to_compatibility_volume_menu_item;
GtkWidget *activation_submenu;
GtkWidget *activation_submenu_menu;
- GtkAccelGroup *activation_submenu_menu_accels;
GtkWidget *activate_menu_item;
GtkWidget *deactivate_menu_item;
GtkWidget *replace_menu_item;
GtkWidget *separator2;
GtkWidget *other_tasks_submenu;
GtkWidget *other_tasks_submenu_menu;
- GtkAccelGroup *other_tasks_submenu_menu_accels;
GtkWidget *volume_tasks_menu_item;
GtkWidget *object_tasks_menu_item;
GtkWidget *container_tasks_menu_item;
@@ -117,7 +104,6 @@
GtkWidget *separator6;
GtkWidget *file_system_submenu;
GtkWidget *file_system_submenu_menu;
- GtkAccelGroup *file_system_submenu_menu_accels;
GtkWidget *mkfs_menu_item;
GtkWidget *fsck_menu_item;
GtkWidget *mount_menu_item;
@@ -130,14 +116,10 @@
GtkWidget *exit_menu_item;
GtkWidget *evmsgui_settings;
GtkWidget *evmsgui_settings_menu;
- GtkAccelGroup *evmsgui_settings_menu_accels;
GtkWidget *admin_node_menu_item;
GtkWidget *set_log_level_submenu;
GtkWidget *set_log_level_submenu_menu;
- GtkAccelGroup *set_log_level_submenu_menu_accels;
-/* GtkWidget *engine_log_level_submenu; */
GtkWidget *engine_log_level_submenu_menu;
- GtkAccelGroup *engine_log_level_submenu_menu_accels;
GSList *engine_debug_levels_group = NULL;
GtkWidget *critical_engine_level_menuitem;
GtkWidget *serious_engine_level_menuitem;
@@ -149,23 +131,8 @@
GtkWidget *debug_engine_level_menuitem;
GtkWidget *extra_engine_level_menuitem;
GtkWidget *everything_engine_level_menuitem;
-/* GtkWidget *kernel_info_level_submenu;
- GtkWidget *kernel_info_level_submenu_menu;
- GtkAccelGroup *kernel_info_level_submenu_menu_accels;
- GSList *kernel_debug_levels_group = NULL;
- GtkWidget *critical_kernel_level_menuitem;
- GtkWidget *serious_kernel_level_menuitem;
- GtkWidget *error_kernel_level_menuitem;
- GtkWidget *warning_kernel_level_menuitem;
- GtkWidget *default_kernel_level_menuitem;
- GtkWidget *details_kernel_level_menuitem;
- GtkWidget *debug_kernel_level_menuitem;
- GtkWidget *extra_kernel_level_menuitem;
- GtkWidget *entry_exit_kernel_level_menuitem;
- GtkWidget *everything_kernel_level_menuitem; */
GtkWidget *help_menu_item;
GtkWidget *help_menu_item_menu;
- GtkAccelGroup *help_menu_item_menu_accels;
GtkWidget *web_links_menu_item;
GtkWidget *help_separator;
GtkWidget *about_menu_item;
@@ -276,7 +243,6 @@
accel_group = gtk_accel_group_new();
main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_name(main_window, "main_window");
gtk_object_set_data(GTK_OBJECT(main_window), "main_window", main_window);
gtk_window_set_title(GTK_WINDOW(main_window), _("EVMS Administration Utility"));
gtk_window_set_position(GTK_WINDOW(main_window), GTK_WIN_POS_CENTER);
@@ -284,1357 +250,591 @@
gtk_window_set_policy(GTK_WINDOW(main_window), TRUE, TRUE, FALSE);
main_window_vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_set_name(main_window_vbox, "main_window_vbox");
- gtk_widget_ref(main_window_vbox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "main_window_vbox", main_window_vbox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(main_window_vbox);
gtk_container_add(GTK_CONTAINER(main_window), main_window_vbox);
menubar_handlebox = gtk_handle_box_new();
- gtk_widget_set_name(menubar_handlebox, "menubar_handlebox");
- gtk_widget_ref(menubar_handlebox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "menubar_handlebox", menubar_handlebox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(menubar_handlebox);
gtk_box_pack_start(GTK_BOX(main_window_vbox), menubar_handlebox, FALSE, FALSE, 0);
main_menubar = gtk_menu_bar_new();
- gtk_widget_set_name(main_menubar, "main_menubar");
- gtk_widget_ref(main_menubar);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "main_menubar", main_menubar,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(main_menubar);
gtk_container_add(GTK_CONTAINER(menubar_handlebox), main_menubar);
- actions_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(actions_menu_item)->child),
- _("_Actions"));
- gtk_widget_add_accelerator(actions_menu_item, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(actions_menu_item, "actions_menu_item");
- gtk_widget_ref(actions_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "actions_menu_item", actions_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(actions_menu_item);
- gtk_container_add(GTK_CONTAINER(main_menubar), actions_menu_item);
+ actions_menu_item = gtk_menu_item_new_with_mnemonic ("_Action");
+ gtk_widget_show(actions_menu_item);
+ gtk_container_add(GTK_CONTAINER(main_menubar), actions_menu_item);
+
+
actions_menu_item_menu = gtk_menu_new();
- gtk_widget_set_name(actions_menu_item_menu, "actions_menu_item_menu");
- gtk_widget_ref(actions_menu_item_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "actions_menu_item_menu",
- actions_menu_item_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(actions_menu_item), actions_menu_item_menu);
- actions_menu_item_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(actions_menu_item_menu));
- create_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_submenu)->child), _("_Create"));
- gtk_widget_add_accelerator(create_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(create_submenu, "create_submenu");
- gtk_widget_ref(create_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_submenu", create_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_submenu);
- gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), create_submenu);
+
+
+
+ create_submenu = gtk_menu_item_new_with_mnemonic ("_Create");
+ gtk_widget_show(create_submenu);
+ gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), create_submenu);
+
+
create_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(create_submenu_menu, "create_submenu_menu");
- gtk_widget_ref(create_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_submenu_menu",
- create_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(create_submenu), create_submenu_menu);
- create_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(create_submenu_menu));
- create_evms_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_evms_volume_menu_item)->child),
- _("_EVMS Volume..."));
- gtk_widget_add_accelerator(create_evms_volume_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_evms_volume_menu_item, "create_evms_volume_menu_item");
- gtk_widget_ref(create_evms_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_evms_volume_menu_item",
- create_evms_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_evms_volume_menu_item);
+
+ create_evms_volume_menu_item = gtk_menu_item_new_with_mnemonic ("_EVMS Volume...");
+ gtk_widget_show(create_evms_volume_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_evms_volume_menu_item);
- create_compatibility_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_compatibility_volume_menu_item)->child),
- _("Compatibility _Volume..."));
- gtk_widget_add_accelerator(create_compatibility_volume_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_compatibility_volume_menu_item,
- "create_compatibility_volume_menu_item");
- gtk_widget_ref(create_compatibility_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_compatibility_volume_menu_item",
- create_compatibility_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(create_compatibility_volume_menu_item);
+
+
+ create_compatibility_volume_menu_item = gtk_menu_item_new_with_mnemonic ("Compatibility _Volume...");
gtk_container_add(GTK_CONTAINER(create_submenu_menu),
create_compatibility_volume_menu_item);
- create_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_object_menu_item)->child),
- _("_Feature Object..."));
- gtk_widget_add_accelerator(create_object_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_object_menu_item, "create_object_menu_item");
- gtk_widget_ref(create_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_object_menu_item",
- create_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+
+ create_object_menu_item = gtk_menu_item_new_with_mnemonic ("_Feature Object...");
gtk_widget_show(create_object_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_object_menu_item);
- create_region_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_region_menu_item)->child),
- _("_Region..."));
- gtk_widget_add_accelerator(create_region_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_region_menu_item, "create_region_menu_item");
- gtk_widget_ref(create_region_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_region_menu_item",
- create_region_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+
+
+ create_region_menu_item = gtk_menu_item_new_with_mnemonic("_Region...");
gtk_widget_show(create_region_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_region_menu_item);
- create_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(create_container_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_container_menu_item, "create_container_menu_item");
- gtk_widget_ref(create_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_container_menu_item",
- create_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ create_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(create_container_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_container_menu_item);
- create_segment_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(create_segment_menu_item)->child),
- _("_Segment..."));
- gtk_widget_add_accelerator(create_segment_menu_item, "activate_item",
- create_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(create_segment_menu_item, "create_segment_menu_item");
- gtk_widget_ref(create_segment_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "create_segment_menu_item",
- create_segment_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ create_segment_menu_item = gtk_menu_item_new_with_mnemonic("_Segment...");
gtk_widget_show(create_segment_menu_item);
gtk_container_add(GTK_CONTAINER(create_submenu_menu), create_segment_menu_item);
- delete_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_submenu)->child), _("_Delete"));
- gtk_widget_add_accelerator(delete_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(delete_submenu, "delete_submenu");
- gtk_widget_ref(delete_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_submenu", delete_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+ delete_submenu = gtk_menu_item_new_with_mnemonic("_Delete");
gtk_widget_show(delete_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), delete_submenu);
+
delete_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(delete_submenu_menu, "delete_submenu_menu");
- gtk_widget_ref(delete_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_submenu_menu",
- delete_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(delete_submenu), delete_submenu_menu);
- delete_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(delete_submenu_menu));
- delete_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(delete_volume_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_volume_menu_item, "delete_volume_menu_item");
- gtk_widget_ref(delete_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_volume_menu_item",
- delete_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ delete_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(delete_volume_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_volume_menu_item);
+
- delete_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(delete_object_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_object_menu_item, "delete_object_menu_item");
- gtk_widget_ref(delete_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_object_menu_item",
- delete_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ delete_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(delete_object_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_object_menu_item);
- delete_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(delete_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(delete_container_menu_item, "activate_item",
- delete_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(delete_container_menu_item, "delete_container_menu_item");
- gtk_widget_ref(delete_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "delete_container_menu_item",
- delete_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ delete_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(delete_container_menu_item);
gtk_container_add(GTK_CONTAINER(delete_submenu_menu), delete_container_menu_item);
- activation_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(activation_submenu)->child), _("Ac_tivation"));
- gtk_widget_add_accelerator(activation_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(activation_submenu, "activation_submenu");
- gtk_widget_ref(activation_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activation_submenu", activation_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ activation_submenu = gtk_menu_item_new_with_mnemonic("Ac_tivation");
gtk_widget_show(activation_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), activation_submenu);
+
activation_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(activation_submenu_menu, "activation_submenu_menu");
- gtk_widget_ref(activation_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activation_submenu_menu",
- activation_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(activation_submenu), activation_submenu_menu);
- activation_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(activation_submenu_menu));
- activate_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(activate_menu_item)->child),
- _("_Activate..."));
- gtk_widget_add_accelerator(activate_menu_item, "activate_item",
- activation_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(activate_menu_item, "activate_menu_item");
- gtk_widget_ref(activate_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "activate_menu_item",
- activate_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ activate_menu_item = gtk_menu_item_new_with_mnemonic("_Activate...");
gtk_widget_show(activate_menu_item);
gtk_container_add(GTK_CONTAINER(activation_submenu_menu), activate_menu_item);
- deactivate_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(deactivate_menu_item)->child),
- _("_Deactivate..."));
- gtk_widget_add_accelerator(deactivate_menu_item, "activate_item",
- activation_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(deactivate_menu_item,
- "deactivate_menu_item");
- gtk_widget_ref(deactivate_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "deactivate_menu_item",
- deactivate_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ deactivate_menu_item = gtk_menu_item_new_with_mnemonic("_Deactivate...");
gtk_widget_show(deactivate_menu_item);
gtk_container_add(GTK_CONTAINER(activation_submenu_menu),
deactivate_menu_item);
- expand_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_submenu)->child), _("_Expand"));
- gtk_widget_add_accelerator(expand_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(expand_submenu, "expand_submenu");
- gtk_widget_ref(expand_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_submenu", expand_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+ expand_submenu = gtk_menu_item_new_with_mnemonic("_Expand");
gtk_widget_show(expand_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), expand_submenu);
+
expand_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(expand_submenu_menu, "expand_submenu_menu");
- gtk_widget_ref(expand_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_submenu_menu",
- expand_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(expand_submenu), expand_submenu_menu);
- expand_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(expand_submenu_menu));
- expand_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(expand_volume_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_volume_menu_item, "expand_volume_menu_item");
- gtk_widget_ref(expand_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_volume_menu_item",
- expand_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(expand_volume_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_volume_menu_item);
- expand_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(expand_object_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_object_menu_item, "expand_object_menu_item");
- gtk_widget_ref(expand_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_object_menu_item",
- expand_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(expand_object_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_object_menu_item);
- expand_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(expand_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(expand_container_menu_item, "activate_item",
- expand_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(expand_container_menu_item, "expand_container_menu_item");
- gtk_widget_ref(expand_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "expand_container_menu_item",
- expand_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ expand_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(expand_container_menu_item);
gtk_container_add(GTK_CONTAINER(expand_submenu_menu), expand_container_menu_item);
- shrink_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_submenu)->child), _("S_hrink"));
- gtk_widget_add_accelerator(shrink_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(shrink_submenu, "shrink_submenu");
- gtk_widget_ref(shrink_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_submenu", shrink_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_submenu = gtk_menu_item_new_with_mnemonic("S_hrink");
gtk_widget_show(shrink_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), shrink_submenu);
+
shrink_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(shrink_submenu_menu, "shrink_submenu_menu");
- gtk_widget_ref(shrink_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_submenu_menu",
- shrink_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(shrink_submenu), shrink_submenu_menu);
- shrink_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(shrink_submenu_menu));
- shrink_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(shrink_volume_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_volume_menu_item, "shrink_volume_menu_item");
- gtk_widget_ref(shrink_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_volume_menu_item",
- shrink_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ shrink_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(shrink_volume_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_volume_menu_item);
- shrink_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(shrink_object_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_object_menu_item, "shrink_object_menu_item");
- gtk_widget_ref(shrink_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_object_menu_item",
- shrink_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(shrink_object_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_object_menu_item);
- shrink_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(shrink_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(shrink_container_menu_item, "activate_item",
- shrink_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(shrink_container_menu_item, "shrink_container_menu_item");
- gtk_widget_ref(shrink_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "shrink_container_menu_item",
- shrink_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ shrink_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(shrink_container_menu_item);
gtk_container_add(GTK_CONTAINER(shrink_submenu_menu), shrink_container_menu_item);
- add_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(add_submenu)->child), _("_Add"));
- gtk_widget_add_accelerator(add_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(add_submenu, "add_submenu");
- gtk_widget_ref(add_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "add_submenu", add_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ add_submenu = gtk_menu_item_new_with_mnemonic("_Add");
gtk_widget_show(add_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), add_submenu);
+
add_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(add_submenu_menu, "add_submenu_menu");
- gtk_widget_ref(add_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "add_submenu_menu", add_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(add_submenu), add_submenu_menu);
- add_submenu_menu_accels = gtk_menu_ensure_uline_accel_group(GTK_MENU(add_submenu_menu));
- add_feature_to_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(add_feature_to_volume_menu_item)->child),
- _("_Feature to Volume..."));
- gtk_widget_add_accelerator(add_feature_to_volume_menu_item, "activate_item",
- add_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(add_feature_to_volume_menu_item, "add_feature_to_volume_menu_item");
- gtk_widget_ref(add_feature_to_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "add_feature_to_volume_menu_item",
- add_feature_to_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ add_feature_to_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Feature to Volume...");
gtk_widget_show(add_feature_to_volume_menu_item);
gtk_container_add(GTK_CONTAINER(add_submenu_menu), add_feature_to_volume_menu_item);
- assign_segment_manager_to_storage_object = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(assign_segment_manager_to_storage_object)->child),
- _("_Segment Manager to Storage Object..."));
- gtk_widget_add_accelerator(assign_segment_manager_to_storage_object, "activate_item",
- add_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(assign_segment_manager_to_storage_object,
- "assign_segment_manager_to_storage_object");
- gtk_widget_ref(assign_segment_manager_to_storage_object);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "assign_segment_manager_to_storage_object",
- assign_segment_manager_to_storage_object,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ assign_segment_manager_to_storage_object = gtk_menu_item_new_with_mnemonic("_Segment Manager to Storage Object...");
gtk_widget_show(assign_segment_manager_to_storage_object);
gtk_container_add(GTK_CONTAINER(add_submenu_menu),
assign_segment_manager_to_storage_object);
- remove_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_submenu)->child), _("_Remove"));
- gtk_widget_add_accelerator(remove_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(remove_submenu, "remove_submenu");
- gtk_widget_ref(remove_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_submenu", remove_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_submenu = gtk_menu_item_new_with_mnemonic("_Remove");
gtk_widget_show(remove_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), remove_submenu);
+
remove_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(remove_submenu_menu, "remove_submenu_menu");
- gtk_widget_ref(remove_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_submenu_menu",
- remove_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(remove_submenu), remove_submenu_menu);
- remove_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(remove_submenu_menu));
- remove_object_from_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_object_from_container_menu_item)->child),
- _("Storage _Object from Container..."));
- gtk_widget_add_accelerator(remove_object_from_container_menu_item, "activate_item",
- remove_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(remove_object_from_container_menu_item,
- "remove_object_from_container_menu_item");
- gtk_widget_ref(remove_object_from_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_object_from_container_menu_item",
- remove_object_from_container_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_object_from_container_menu_item = gtk_menu_item_new_with_mnemonic("Storage _Object from Container...");
gtk_widget_show(remove_object_from_container_menu_item);
gtk_container_add(GTK_CONTAINER(remove_submenu_menu),
remove_object_from_container_menu_item);
+
separator5 = gtk_menu_item_new();
- gtk_widget_set_name(separator5, "separator5");
- gtk_widget_ref(separator5);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator5", separator5,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator5);
gtk_container_add(GTK_CONTAINER(remove_submenu_menu), separator5);
gtk_widget_set_sensitive(separator5, FALSE);
- remove_segment_manager_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(remove_segment_manager_menu_item)->child),
- _("Seg_ment Manager from Storage Object..."));
- gtk_widget_add_accelerator(remove_segment_manager_menu_item, "activate_item",
- remove_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(remove_segment_manager_menu_item, "remove_segment_manager_menu_item");
- gtk_widget_ref(remove_segment_manager_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "remove_segment_manager_menu_item",
- remove_segment_manager_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ remove_segment_manager_menu_item = gtk_menu_item_new_with_mnemonic("Seg_ment Manager from Storage Object...");
gtk_widget_show(remove_segment_manager_menu_item);
gtk_container_add(GTK_CONTAINER(remove_submenu_menu), remove_segment_manager_menu_item);
- modify_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_submenu)->child), _("_Modify"));
- gtk_widget_add_accelerator(modify_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(modify_submenu, "modify_submenu");
- gtk_widget_ref(modify_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_submenu", modify_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_submenu = gtk_menu_item_new_with_mnemonic("_Modify");
gtk_widget_show(modify_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), modify_submenu);
+
modify_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(modify_submenu_menu, "modify_submenu_menu");
- gtk_widget_ref(modify_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_submenu_menu",
- modify_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(modify_submenu), modify_submenu_menu);
- modify_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(modify_submenu_menu));
- modify_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_volume_menu_item)->child),
- _("_Volume..."));
- gtk_widget_add_accelerator(modify_volume_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_volume_menu_item, "modify_volume_menu_item");
- gtk_widget_ref(modify_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_volume_menu_item",
- modify_volume_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ modify_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Volume...");
gtk_widget_show(modify_volume_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_volume_menu_item);
- modify_object_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_object_menu_item)->child),
- _("_Storage Object..."));
- gtk_widget_add_accelerator(modify_object_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_object_menu_item, "modify_object_menu_item");
- gtk_widget_ref(modify_object_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_object_menu_item",
- modify_object_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_object_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object...");
gtk_widget_show(modify_object_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_object_menu_item);
- modify_container_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(modify_container_menu_item)->child),
- _("_Container..."));
- gtk_widget_add_accelerator(modify_container_menu_item, "activate_item",
- modify_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(modify_container_menu_item, "modify_container_menu_item");
- gtk_widget_ref(modify_container_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "modify_container_menu_item",
- modify_container_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ modify_container_menu_item = gtk_menu_item_new_with_mnemonic("_Container...");
gtk_widget_show(modify_container_menu_item);
gtk_container_add(GTK_CONTAINER(modify_submenu_menu), modify_container_menu_item);
- view_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_submenu)->child), _("_View"));
- gtk_widget_add_accelerator(view_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(view_submenu, "view_submenu");
- gtk_widget_ref(view_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_submenu", view_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ view_submenu = gtk_menu_item_new_with_mnemonic("_View");
gtk_widget_show(view_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), view_submenu);
+
view_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(view_submenu_menu, "view_submenu_menu");
- gtk_widget_ref(view_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_submenu_menu", view_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(view_submenu), view_submenu_menu);
- view_submenu_menu_accels = gtk_menu_ensure_uline_accel_group(GTK_MENU(view_submenu_menu));
- view_messages_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_messages_menu_item)->child),
- _("_Messages..."));
- gtk_widget_add_accelerator(view_messages_menu_item, "activate_item",
- view_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(view_messages_menu_item, "view_messages_menu_item");
- gtk_widget_ref(view_messages_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_messages_menu_item",
- view_messages_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ view_messages_menu_item = gtk_menu_item_new_with_mnemonic("_Messages...");
gtk_widget_show(view_messages_menu_item);
gtk_container_add(GTK_CONTAINER(view_submenu_menu), view_messages_menu_item);
- view_log_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(view_log_menu_item)->child),
- _("_Log File..."));
- gtk_widget_add_accelerator(view_log_menu_item, "activate_item", view_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(view_log_menu_item, "view_log_menu_item");
- gtk_widget_ref(view_log_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "view_log_menu_item", view_log_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ view_log_menu_item = gtk_menu_item_new_with_mnemonic("_Log File...");
gtk_widget_show(view_log_menu_item);
gtk_container_add(GTK_CONTAINER(view_submenu_menu), view_log_menu_item);
gtk_widget_set_sensitive(view_log_menu_item, FALSE);
- convert_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(convert_submenu)->child), _("C_onvert"));
- gtk_widget_add_accelerator(convert_submenu, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(convert_submenu, "convert_submenu");
- gtk_widget_ref(convert_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "convert_submenu", convert_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_submenu = gtk_menu_item_new_with_mnemonic("C_onvert");
gtk_widget_show(convert_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), convert_submenu);
+
convert_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(convert_submenu_menu, "convert_submenu_menu");
- gtk_widget_ref(convert_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "convert_submenu_menu",
- convert_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(convert_submenu), convert_submenu_menu);
- convert_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(convert_submenu_menu));
- convert_to_evms_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(convert_to_evms_volume_menu_item)->child),
- _("_Compatibility Volume to EVMS Volume..."));
- gtk_widget_add_accelerator(convert_to_evms_volume_menu_item, "activate_item",
- convert_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(convert_to_evms_volume_menu_item, "convert_to_evms_volume_menu_item");
- gtk_widget_ref(convert_to_evms_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "convert_to_evms_volume_menu_item",
- convert_to_evms_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_to_evms_volume_menu_item = gtk_menu_item_new_with_mnemonic("_Compatibility Volume to EVMS Volume...");
gtk_widget_show(convert_to_evms_volume_menu_item);
gtk_container_add(GTK_CONTAINER(convert_submenu_menu), convert_to_evms_volume_menu_item);
- convert_to_compatibility_volume_menu_item = gtk_menu_item_new_with_label("");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL
- (GTK_BIN(convert_to_compatibility_volume_menu_item)->child),
- _("_EVMS Volume to Compatibility Volume..."));
- gtk_widget_add_accelerator(convert_to_compatibility_volume_menu_item, "activate_item",
- convert_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(convert_to_compatibility_volume_menu_item,
- "convert_to_compatibility_volume_menu_item");
- gtk_widget_ref(convert_to_compatibility_volume_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window),
- "convert_to_compatibility_volume_menu_item",
- convert_to_compatibility_volume_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ convert_to_compatibility_volume_menu_item = gtk_menu_item_new_with_mnemonic("_EVMS Volume to Compatibility Volume...");
gtk_widget_show(convert_to_compatibility_volume_menu_item);
gtk_container_add(GTK_CONTAINER(convert_submenu_menu),
convert_to_compatibility_volume_menu_item);
- replace_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(replace_menu_item)->child),
- _("Re_place..."));
- gtk_widget_add_accelerator(replace_menu_item, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(replace_menu_item, "replace_menu_item");
- gtk_widget_ref(replace_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "replace_menu_item", replace_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ replace_menu_item = gtk_menu_item_new_with_mnemonic("Re_place...");
gtk_widget_show(replace_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), replace_menu_item);
+
separator2 = gtk_menu_item_new();
- gtk_widget_set_name(separator2, "separator2");
- gtk_widget_ref(separator2);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator2", separator2,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator2);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator2);
gtk_widget_set_sensitive(separator2, FALSE);
- other_tasks_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(other_tasks_submenu)->child),
- _("O_ther"));
- gtk_widget_add_accelerator(other_tasks_submenu, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(other_tasks_submenu, "other_tasks_submenu");
- gtk_widget_ref(other_tasks_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "other_tasks_submenu",
- other_tasks_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ other_tasks_submenu = gtk_menu_item_new_with_mnemonic("O_ther");
gtk_widget_show(other_tasks_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), other_tasks_submenu);
+
other_tasks_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(other_tasks_submenu_menu, "other_tasks_submenu_menu");
- gtk_widget_ref(other_tasks_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "other_tasks_submenu_menu",
- other_tasks_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(other_tasks_submenu), other_tasks_submenu_menu);
- other_tasks_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(other_tasks_submenu_menu));
- volume_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(volume_tasks_menu_item)->child),
- _("_Volume Tasks..."));
- gtk_widget_add_accelerator(volume_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(volume_tasks_menu_item, "volume_tasks_menu_item");
- gtk_widget_ref(volume_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "volume_tasks_menu_item",
- volume_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ volume_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Volume Tasks...");
gtk_widget_show(volume_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), volume_tasks_menu_item);
- object_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(object_tasks_menu_item)->child),
- _("_Storage Object Tasks..."));
- gtk_widget_add_accelerator(object_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(object_tasks_menu_item, "object_tasks_menu_item");
- gtk_widget_ref(object_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "object_tasks_menu_item",
- object_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ object_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Storage Object Tasks...");
gtk_widget_show(object_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), object_tasks_menu_item);
- container_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(container_tasks_menu_item)->child),
- _("_Container Tasks..."));
- gtk_widget_add_accelerator(container_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(container_tasks_menu_item, "container_tasks_menu_item");
- gtk_widget_ref(container_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "container_tasks_menu_item",
- container_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ container_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Container Tasks...");
gtk_widget_show(container_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), container_tasks_menu_item);
- plugin_tasks_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(plugin_tasks_menu_item)->child),
- _("_Plugin Tasks..."));
- gtk_widget_add_accelerator(plugin_tasks_menu_item, "activate_item",
- other_tasks_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(plugin_tasks_menu_item, "plugin_tasks_menu_item");
- gtk_widget_ref(plugin_tasks_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "plugin_tasks_menu_item",
- plugin_tasks_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ plugin_tasks_menu_item = gtk_menu_item_new_with_mnemonic("_Plugin Tasks...");
gtk_widget_show(plugin_tasks_menu_item);
gtk_container_add(GTK_CONTAINER(other_tasks_submenu_menu), plugin_tasks_menu_item);
+
separator6 = gtk_menu_item_new();
- gtk_widget_set_name(separator6, "separator6");
- gtk_widget_ref(separator6);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator6", separator6,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator6);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator6);
gtk_widget_set_sensitive(separator6, FALSE);
- file_system_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(file_system_submenu)->child),
- _("_File System"));
- gtk_widget_add_accelerator(file_system_submenu, "activate_item",
- actions_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(file_system_submenu, "file_system_submenu");
- gtk_widget_ref(file_system_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "file_system_submenu",
- file_system_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ file_system_submenu = gtk_menu_item_new_with_mnemonic("_File System");
gtk_widget_show(file_system_submenu);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), file_system_submenu);
+
file_system_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(file_system_submenu_menu, "file_system_submenu_menu");
- gtk_widget_ref(file_system_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "file_system_submenu_menu",
- file_system_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(file_system_submenu), file_system_submenu_menu);
- file_system_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(file_system_submenu_menu));
- mkfs_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(mkfs_menu_item)->child), _("_Make..."));
- gtk_widget_add_accelerator(mkfs_menu_item, "activate_item", file_system_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(mkfs_menu_item, "mkfs_menu_item");
- gtk_widget_ref(mkfs_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "mkfs_menu_item", mkfs_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ mkfs_menu_item = gtk_menu_item_new_with_mnemonic("_Make...");
gtk_widget_show(mkfs_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), mkfs_menu_item);
- fsck_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(fsck_menu_item)->child),
- _("_Check/Repair..."));
- gtk_widget_add_accelerator(fsck_menu_item, "activate_item", file_system_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(fsck_menu_item, "fsck_menu_item");
- gtk_widget_ref(fsck_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "fsck_menu_item", fsck_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ fsck_menu_item = gtk_menu_item_new_with_mnemonic("_Check/Repair...");
gtk_widget_show(fsck_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), fsck_menu_item);
- obliterate_filesystem_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(obliterate_filesystem_menu_item)->child),
- _("_Remove..."));
- gtk_widget_add_accelerator(obliterate_filesystem_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(obliterate_filesystem_menu_item, "obliterate_filesystem_menu_item");
- gtk_widget_ref(obliterate_filesystem_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "obliterate_filesystem_menu_item",
- obliterate_filesystem_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ obliterate_filesystem_menu_item = gtk_menu_item_new_with_mnemonic("_Remove...");
gtk_widget_show(obliterate_filesystem_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), obliterate_filesystem_menu_item);
- mount_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(mount_menu_item)->child), _("M_ount..."));
- gtk_widget_add_accelerator(mount_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(mount_menu_item, "mount_menu_item");
- gtk_widget_ref(mount_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "mount_menu_item", mount_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ mount_menu_item = gtk_menu_item_new_with_mnemonic("M_ount...");
gtk_widget_show(mount_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), mount_menu_item);
- unmount_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(unmount_menu_item)->child),
- _("_Unmount..."));
- gtk_widget_add_accelerator(unmount_menu_item, "activate_item",
- file_system_submenu_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(unmount_menu_item, "unmount_menu_item");
- gtk_widget_ref(unmount_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "unmount_menu_item", unmount_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ unmount_menu_item = gtk_menu_item_new_with_mnemonic("_Unmount...");
gtk_widget_show(unmount_menu_item);
gtk_container_add(GTK_CONTAINER(file_system_submenu_menu), unmount_menu_item);
+
separator3 = gtk_menu_item_new();
- gtk_widget_set_name(separator3, "separator3");
- gtk_widget_ref(separator3);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator3", separator3,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator3);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator3);
gtk_widget_set_sensitive(separator3, FALSE);
- commit_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(commit_menu_item)->child), _("_Save..."));
- gtk_widget_add_accelerator(commit_menu_item, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(commit_menu_item, "commit_menu_item");
- gtk_widget_ref(commit_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "commit_menu_item", commit_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ commit_menu_item = gtk_menu_item_new_with_mnemonic("_Save...");
gtk_widget_show(commit_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), commit_menu_item);
gtk_widget_add_accelerator(commit_menu_item, "activate", accel_group,
GDK_S, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- backup_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(backup_menu_item)->child), _("_Backup..."));
- gtk_widget_add_accelerator(backup_menu_item, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(backup_menu_item, "backup_menu_item");
- gtk_widget_ref(backup_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "backup_menu_item", backup_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ backup_menu_item = gtk_menu_item_new_with_mnemonic("_Backup...");
gtk_widget_show(backup_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), backup_menu_item);
+
separator1 = gtk_menu_item_new();
- gtk_widget_set_name(separator1, "separator1");
- gtk_widget_ref(separator1);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "separator1", separator1,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(separator1);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), separator1);
gtk_widget_set_sensitive(separator1, FALSE);
- exit_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(exit_menu_item)->child), _("_Quit"));
- gtk_widget_add_accelerator(exit_menu_item, "activate_item", actions_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(exit_menu_item, "exit_menu_item");
- gtk_widget_ref(exit_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "exit_menu_item", exit_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ exit_menu_item = gtk_menu_item_new_with_mnemonic("_Quit");
gtk_widget_show(exit_menu_item);
gtk_container_add(GTK_CONTAINER(actions_menu_item_menu), exit_menu_item);
gtk_widget_add_accelerator(exit_menu_item, "activate", accel_group,
GDK_Q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- evmsgui_settings = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(evmsgui_settings)->child),
- _("_Settings"));
- gtk_widget_add_accelerator(evmsgui_settings, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(evmsgui_settings, "evmsgui_settings");
- gtk_widget_ref(evmsgui_settings);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "evmsgui_settings", evmsgui_settings,
- (GtkDestroyNotify) gtk_widget_unref);
+
+ evmsgui_settings = gtk_menu_item_new_with_mnemonic("_Settings");
gtk_widget_show(evmsgui_settings);
gtk_container_add(GTK_CONTAINER(main_menubar), evmsgui_settings);
+
evmsgui_settings_menu = gtk_menu_new();
- gtk_widget_set_name(evmsgui_settings_menu, "evmsgui_settings_menu");
- gtk_widget_ref(evmsgui_settings_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "evmsgui_settings_menu",
- evmsgui_settings_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(evmsgui_settings), evmsgui_settings_menu);
- evmsgui_settings_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(evmsgui_settings_menu));
- set_log_level_submenu = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(set_log_level_submenu)->child),
- _("_Log Level"));
- gtk_widget_add_accelerator(set_log_level_submenu, "activate_item",
- evmsgui_settings_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(set_log_level_submenu, "set_log_level_submenu");
- gtk_widget_ref(set_log_level_submenu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "set_log_level_submenu",
- set_log_level_submenu, (GtkDestroyNotify) gtk_widget_unref);
+
+ set_log_level_submenu = gtk_menu_item_new_with_mnemonic("_Log Level");
gtk_widget_show(set_log_level_submenu);
gtk_container_add(GTK_CONTAINER(evmsgui_settings_menu), set_log_level_submenu);
- admin_node_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(admin_node_menu_item)->child),
- _("_Node Administered..."));
- gtk_widget_add_accelerator(admin_node_menu_item, "activate_item",
- evmsgui_settings_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(admin_node_menu_item, "admin_node_menu_item");
- gtk_widget_ref(admin_node_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "admin_node_menu_item",
- admin_node_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+
+ admin_node_menu_item = gtk_menu_item_new_with_mnemonic("_Node Administered...");
gtk_widget_show(admin_node_menu_item);
gtk_container_add(GTK_CONTAINER(evmsgui_settings_menu), admin_node_menu_item);
if (get_number_of_nodes() <= 1) {
gtk_widget_set_sensitive(admin_node_menu_item, FALSE);
}
+
set_log_level_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(set_log_level_submenu_menu, "set_log_level_submenu_menu");
- gtk_widget_ref(set_log_level_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "set_log_level_submenu_menu",
- set_log_level_submenu_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu), set_log_level_submenu_menu);
- set_log_level_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(set_log_level_submenu_menu));
-/*
- engine_log_level_submenu = gtk_menu_item_new_with_label ("");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (engine_log_level_submenu)->child),
- _("_Engine"));
- gtk_widget_add_accelerator (engine_log_level_submenu, "activate_item", set_log_level_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name (engine_log_level_submenu, "engine_log_level_submenu");
- gtk_widget_ref (engine_log_level_submenu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "engine_log_level_submenu", engine_log_level_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (engine_log_level_submenu);
- gtk_container_add (GTK_CONTAINER (set_log_level_submenu_menu), engine_log_level_submenu);
-*/
+
engine_log_level_submenu_menu = gtk_menu_new();
- gtk_widget_set_name(engine_log_level_submenu_menu, "engine_log_level_submenu_menu");
- gtk_widget_ref(engine_log_level_submenu_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "engine_log_level_submenu_menu",
- engine_log_level_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu),
- engine_log_level_submenu_menu);
- engine_log_level_submenu_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(engine_log_level_submenu_menu));
-
- critical_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(critical_engine_level_menuitem)->child),
- _("_Critical (Least Information)"));
- gtk_widget_add_accelerator(critical_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(critical_engine_level_menuitem));
- gtk_widget_set_name(critical_engine_level_menuitem, "critical_engine_level_menuitem");
- gtk_widget_ref(critical_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "critical_engine_level_menuitem",
- critical_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(critical_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- critical_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(critical_engine_level_menuitem),
- TRUE);
-
- serious_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(serious_engine_level_menuitem)->child),
- _("_Serious"));
- gtk_widget_add_accelerator(serious_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(serious_engine_level_menuitem));
- gtk_widget_set_name(serious_engine_level_menuitem, "serious_engine_level_menuitem");
- gtk_widget_ref(serious_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "serious_engine_level_menuitem",
- serious_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(serious_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- serious_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(serious_engine_level_menuitem),
- TRUE);
-
- error_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(error_engine_level_menuitem)->child),
- _("_Error"));
- gtk_widget_add_accelerator(error_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(error_engine_level_menuitem));
- gtk_widget_set_name(error_engine_level_menuitem, "error_engine_level_menuitem");
- gtk_widget_ref(error_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "error_engine_level_menuitem",
- error_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(error_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- error_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(error_engine_level_menuitem), TRUE);
-
- warning_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(warning_engine_level_menuitem)->child),
- _("_Warning"));
- gtk_widget_add_accelerator(warning_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(warning_engine_level_menuitem));
- gtk_widget_set_name(warning_engine_level_menuitem, "warning_engine_level_menuitem");
- gtk_widget_ref(warning_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "warning_engine_level_menuitem",
- warning_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(warning_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- warning_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(warning_engine_level_menuitem),
- TRUE);
-
- default_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(default_engine_level_menuitem)->child),
- _("_Default"));
- gtk_widget_add_accelerator(default_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(default_engine_level_menuitem));
- gtk_widget_set_name(default_engine_level_menuitem, "default_engine_level_menuitem");
- gtk_widget_ref(default_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "default_engine_level_menuitem",
- default_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(default_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- default_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(default_engine_level_menuitem),
- TRUE);
-
- details_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(details_engine_level_menuitem)->child),
- _("De_tails"));
- gtk_widget_add_accelerator(details_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(details_engine_level_menuitem));
- gtk_widget_set_name(details_engine_level_menuitem, "details_engine_level_menuitem");
- gtk_widget_ref(details_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "details_engine_level_menuitem",
- details_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(details_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- details_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(details_engine_level_menuitem),
- TRUE);
-
- entry_exit_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(entry_exit_engine_level_menuitem)->child),
- _("E_ntry/Exit"));
- gtk_widget_add_accelerator(entry_exit_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(entry_exit_engine_level_menuitem));
- gtk_widget_set_name(entry_exit_engine_level_menuitem, "entry_exit_engine_level_menuitem");
- gtk_widget_ref(entry_exit_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "entry_exit_engine_level_menuitem",
- entry_exit_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(entry_exit_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- entry_exit_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(entry_exit_engine_level_menuitem),
- TRUE);
-
- debug_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(debug_engine_level_menuitem)->child),
- _("De_bug"));
- gtk_widget_add_accelerator(debug_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(debug_engine_level_menuitem));
- gtk_widget_set_name(debug_engine_level_menuitem, "debug_engine_level_menuitem");
- gtk_widget_ref(debug_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "debug_engine_level_menuitem",
- debug_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(debug_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- debug_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(debug_engine_level_menuitem), TRUE);
-
- extra_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(extra_engine_level_menuitem)->child),
- _("E_xtra"));
- gtk_widget_add_accelerator(extra_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(extra_engine_level_menuitem));
- gtk_widget_set_name(extra_engine_level_menuitem, "extra_engine_level_menuitem");
- gtk_widget_ref(extra_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "extra_engine_level_menuitem",
- extra_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(extra_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- extra_engine_level_menuitem);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(extra_engine_level_menuitem), TRUE);
-
- everything_engine_level_menuitem =
- gtk_radio_menu_item_new_with_label(engine_debug_levels_group, "");
- tmp_key =
- gtk_label_parse_uline(GTK_LABEL(GTK_BIN(everything_engine_level_menuitem)->child),
- _("E_verything (Most Information)"));
- gtk_widget_add_accelerator(everything_engine_level_menuitem, "activate_item",
- engine_log_level_submenu_menu_accels, tmp_key, 0, 0);
- engine_debug_levels_group =
- gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(everything_engine_level_menuitem));
- gtk_widget_set_name(everything_engine_level_menuitem, "everything_engine_level_menuitem");
- gtk_widget_ref(everything_engine_level_menuitem);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "everything_engine_level_menuitem",
- everything_engine_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show(everything_engine_level_menuitem);
- gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
- everything_engine_level_menuitem);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem), TRUE);
- gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem),
- TRUE);
-
-/*
- kernel_info_level_submenu = gtk_menu_item_new_with_label ("");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (kernel_info_level_submenu)->child),
- _("_Kernel"));
- gtk_widget_add_accelerator (kernel_info_level_submenu, "activate_item", set_log_level_submenu_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name (kernel_info_level_submenu, "kernel_info_level_submenu");
- gtk_widget_ref (kernel_info_level_submenu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "kernel_info_level_submenu", kernel_info_level_submenu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (kernel_info_level_submenu);
- gtk_container_add (GTK_CONTAINER (set_log_level_submenu_menu), kernel_info_level_submenu);
-
- kernel_info_level_submenu_menu = gtk_menu_new ();
- gtk_widget_set_name (kernel_info_level_submenu_menu, "kernel_info_level_submenu_menu");
- gtk_widget_ref (kernel_info_level_submenu_menu);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "kernel_info_level_submenu_menu", kernel_info_level_submenu_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (kernel_info_level_submenu), kernel_info_level_submenu_menu);
- kernel_info_level_submenu_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (kernel_info_level_submenu_menu));
-
- critical_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (critical_kernel_level_menuitem)->child),
- _("_Critical (Least Information)"));
- gtk_widget_add_accelerator (critical_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (critical_kernel_level_menuitem));
- gtk_widget_set_name (critical_kernel_level_menuitem, "critical_kernel_level_menuitem");
- gtk_widget_ref (critical_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "critical_kernel_level_menuitem", critical_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (critical_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), critical_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (critical_kernel_level_menuitem), TRUE);
-
- serious_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (serious_kernel_level_menuitem)->child),
- _("_Serious"));
- gtk_widget_add_accelerator (serious_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (serious_kernel_level_menuitem));
- gtk_widget_set_name (serious_kernel_level_menuitem, "serious_kernel_level_menuitem");
- gtk_widget_ref (serious_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "serious_kernel_level_menuitem", serious_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (serious_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), serious_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (serious_kernel_level_menuitem), TRUE);
-
- error_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (error_kernel_level_menuitem)->child),
- _("_Error"));
- gtk_widget_add_accelerator (error_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (error_kernel_level_menuitem));
- gtk_widget_set_name (error_kernel_level_menuitem, "error_kernel_level_menuitem");
- gtk_widget_ref (error_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "error_kernel_level_menuitem", error_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (error_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), error_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (error_kernel_level_menuitem), TRUE);
-
- warning_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (warning_kernel_level_menuitem)->child),
- _("_Warning"));
- gtk_widget_add_accelerator (warning_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (warning_kernel_level_menuitem));
- gtk_widget_set_name (warning_kernel_level_menuitem, "warning_kernel_level_menuitem");
- gtk_widget_ref (warning_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "warning_kernel_level_menuitem", warning_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (warning_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), warning_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (warning_kernel_level_menuitem), TRUE);
-
- default_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (default_kernel_level_menuitem)->child),
- _("_Default"));
- gtk_widget_add_accelerator (default_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (default_kernel_level_menuitem));
- gtk_widget_set_name (default_kernel_level_menuitem, "default_kernel_level_menuitem");
- gtk_widget_ref (default_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "default_kernel_level_menuitem", default_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (default_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), default_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (default_kernel_level_menuitem), TRUE);
-
- details_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (details_kernel_level_menuitem)->child),
- _("De_tails"));
- gtk_widget_add_accelerator (details_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (details_kernel_level_menuitem));
- gtk_widget_set_name (details_kernel_level_menuitem, "details_kernel_level_menuitem");
- gtk_widget_ref (details_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "details_kernel_level_menuitem", details_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (details_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), details_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (details_kernel_level_menuitem), TRUE);
-
- debug_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (debug_kernel_level_menuitem)->child),
- _("De_bug"));
- gtk_widget_add_accelerator (debug_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (debug_kernel_level_menuitem));
- gtk_widget_set_name (debug_kernel_level_menuitem, "debug_kernel_level_menuitem");
- gtk_widget_ref (debug_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "debug_kernel_level_menuitem", debug_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (debug_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), debug_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (debug_kernel_level_menuitem), TRUE);
-
- extra_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (extra_kernel_level_menuitem)->child),
- _("E_xtra"));
- gtk_widget_add_accelerator (extra_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (extra_kernel_level_menuitem));
- gtk_widget_set_name (extra_kernel_level_menuitem, "extra_kernel_level_menuitem");
- gtk_widget_ref (extra_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "extra_kernel_level_menuitem", extra_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (extra_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), extra_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (extra_kernel_level_menuitem), TRUE);
-
- entry_exit_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (entry_exit_kernel_level_menuitem)->child),
- _("E_ntry/Exit"));
- gtk_widget_add_accelerator (entry_exit_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (entry_exit_kernel_level_menuitem));
- gtk_widget_set_name (entry_exit_kernel_level_menuitem, "entry_exit_kernel_level_menuitem");
- gtk_widget_ref (entry_exit_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "entry_exit_kernel_level_menuitem", entry_exit_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (entry_exit_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), entry_exit_kernel_level_menuitem);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (entry_exit_kernel_level_menuitem), TRUE);
-
- everything_kernel_level_menuitem = gtk_radio_menu_item_new_with_label (kernel_debug_levels_group, "");
- tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (everything_kernel_level_menuitem)->child),
- _("E_verything (Most Information)"));
- gtk_widget_add_accelerator (everything_kernel_level_menuitem, "activate_item", kernel_info_level_submenu_menu_accels,
- tmp_key, 0, 0);
- kernel_debug_levels_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (everything_kernel_level_menuitem));
- gtk_widget_set_name (everything_kernel_level_menuitem, "everything_kernel_level_menuitem");
- gtk_widget_ref (everything_kernel_level_menuitem);
- gtk_object_set_data_full (GTK_OBJECT (main_window), "everything_kernel_level_menuitem", everything_kernel_level_menuitem,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (everything_kernel_level_menuitem);
- gtk_container_add (GTK_CONTAINER (kernel_info_level_submenu_menu), everything_kernel_level_menuitem);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (everything_kernel_level_menuitem), TRUE);
- gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (everything_kernel_level_menuitem), TRUE);
-*/
- help_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(help_menu_item)->child), _("_Help"));
- gtk_widget_add_accelerator(help_menu_item, "activate_item", accel_group,
- tmp_key, GDK_MOD1_MASK, (GtkAccelFlags) 0);
- gtk_widget_set_name(help_menu_item, "help_menu_item");
- gtk_widget_ref(help_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_menu_item", help_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(set_log_level_submenu), engine_log_level_submenu_menu);
+
+
+
+
+ critical_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "_Critical (Least Information)");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(critical_engine_level_menuitem));
+ gtk_widget_ref(critical_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "critical_engine_level_menuitem",
+ critical_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(critical_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ critical_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(critical_engine_level_menuitem),
+ TRUE);
+
+
+
+ serious_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "_Serious");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(serious_engine_level_menuitem));
+ gtk_widget_ref(serious_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "serious_engine_level_menuitem",
+ serious_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(serious_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ serious_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(serious_engine_level_menuitem),
+ TRUE);
+
+ error_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "_Error");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(error_engine_level_menuitem));
+ gtk_widget_ref(error_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "error_engine_level_menuitem",
+ error_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(error_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ error_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(error_engine_level_menuitem), TRUE);
+
+
+
+
+
+ warning_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "_Warning");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(warning_engine_level_menuitem));
+ gtk_widget_ref(warning_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "warning_engine_level_menuitem",
+ warning_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(warning_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ warning_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(warning_engine_level_menuitem),
+ TRUE);
+
+
+ default_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "_Default");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(default_engine_level_menuitem));
+ gtk_widget_ref(default_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "default_engine_level_menuitem",
+ default_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(default_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ default_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(default_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ details_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "De_tails");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(details_engine_level_menuitem));
+ gtk_widget_ref(details_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "details_engine_level_menuitem",
+ details_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(details_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ details_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(details_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ entry_exit_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "E_ntry/Exit");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(entry_exit_engine_level_menuitem));
+ gtk_widget_ref(entry_exit_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "entry_exit_engine_level_menuitem",
+ entry_exit_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(entry_exit_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ entry_exit_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(entry_exit_engine_level_menuitem),
+ TRUE);
+
+
+
+ debug_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "De_bug");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(debug_engine_level_menuitem));
+ gtk_widget_ref(debug_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "debug_engine_level_menuitem",
+ debug_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(debug_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ debug_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(debug_engine_level_menuitem), TRUE);
+
+
+
+ extra_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "E_xtra");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(extra_engine_level_menuitem));
+ gtk_widget_ref(extra_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "extra_engine_level_menuitem",
+ extra_engine_level_menuitem, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(extra_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ extra_engine_level_menuitem);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(extra_engine_level_menuitem), TRUE);
+
+
+
+ everything_engine_level_menuitem =
+ gtk_radio_menu_item_new_with_mnemonic(engine_debug_levels_group, "E_verything (Most Information)");
+ engine_debug_levels_group =
+ gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(everything_engine_level_menuitem));
+ gtk_widget_ref(everything_engine_level_menuitem);
+ gtk_object_set_data_full(GTK_OBJECT(main_window), "everything_engine_level_menuitem",
+ everything_engine_level_menuitem,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show(everything_engine_level_menuitem);
+ gtk_container_add(GTK_CONTAINER(engine_log_level_submenu_menu),
+ everything_engine_level_menuitem);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem), TRUE);
+ gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(everything_engine_level_menuitem),
+ TRUE);
+
+
+
+
+ help_menu_item = gtk_menu_item_new_with_mnemonic("_Help");
gtk_widget_show(help_menu_item);
gtk_container_add(GTK_CONTAINER(main_menubar), help_menu_item);
help_menu_item_menu = gtk_menu_new();
- gtk_widget_set_name(help_menu_item_menu, "help_menu_item_menu");
- gtk_widget_ref(help_menu_item_menu);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_menu_item_menu",
- help_menu_item_menu, (GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(help_menu_item), help_menu_item_menu);
- help_menu_item_menu_accels =
- gtk_menu_ensure_uline_accel_group(GTK_MENU(help_menu_item_menu));
- web_links_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(web_links_menu_item)->child),
- _("_Web links"));
- gtk_widget_add_accelerator(web_links_menu_item, "activate_item",
- help_menu_item_menu_accels, tmp_key, 0, 0);
- gtk_widget_set_name(web_links_menu_item, "web_links_menu_item");
- gtk_widget_ref(web_links_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "web_links_menu_item",
- web_links_menu_item, (GtkDestroyNotify) gtk_widget_unref);
+ web_links_menu_item = gtk_menu_item_new_with_mnemonic("_Web links");
gtk_widget_show(web_links_menu_item);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), web_links_menu_item);
help_separator = gtk_menu_item_new();
- gtk_widget_set_name(help_separator, "help_separator");
- gtk_widget_ref(help_separator);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "help_separator", help_separator,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(help_separator);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), help_separator);
gtk_widget_set_sensitive(help_separator, FALSE);
- about_menu_item = gtk_menu_item_new_with_label("");
- tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(about_menu_item)->child), _("_About"));
- gtk_widget_add_accelerator(about_menu_item, "activate_item", help_menu_item_menu_accels,
- tmp_key, 0, 0);
- gtk_widget_set_name(about_menu_item, "about_menu_item");
- gtk_widget_ref(about_menu_item);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "about_menu_item", about_menu_item,
- (GtkDestroyNotify) gtk_widget_unref);
+ about_menu_item = gtk_menu_item_new_with_mnemonic("_About");
gtk_widget_show(about_menu_item);
gtk_container_add(GTK_CONTAINER(help_menu_item_menu), about_menu_item);
toolbar_handlebox = gtk_handle_box_new();
- gtk_widget_set_name(toolbar_handlebox, "toolbar_handlebox");
- gtk_widget_ref(toolbar_handlebox);
- gtk_object_set_data_full(GTK_OBJECT(main_window), "toolbar_handlebox", toolbar_handlebox,
- (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show(toolbar_handlebox);
gtk_box_pack_start(GTK_BOX(main_window_vbox), toolbar_handlebox, FALSE, FALSE, 0);
- icon_button_toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+ icon_button_toolbar = gtk_toolbar_new();
gtk_widget_set_name(icon_button_toolbar, "icon_button_toolbar");
gtk_widget_ref(icon_button_toolbar);
gtk_object_set_data_full(GTK_OBJECT(main_window), "icon_button_toolbar",
@@ -1642,8 +842,7 @@
gtk_widget_show(icon_button_toolbar);
gtk_container_add(GTK_CONTAINER(toolbar_handlebox), icon_button_toolbar);
gtk_container_set_border_width(GTK_CONTAINER(icon_button_toolbar), 5);
- gtk_toolbar_set_space_size(GTK_TOOLBAR(icon_button_toolbar), 8);
- gtk_toolbar_set_button_relief(GTK_TOOLBAR(icon_button_toolbar), GTK_RELIEF_NONE);
+
tmp_toolbar_icon = create_pixmap(main_window, "commit.xpm");
toolbar_commit_button = gtk_toolbar_append_element(GTK_TOOLBAR(icon_button_toolbar),
@@ -2914,6 +2113,7 @@
GTK_SIGNAL_FUNC(on_engine_log_level_submenu_menu_realize), NULL);
gtk_signal_connect(GTK_OBJECT(engine_log_level_submenu_menu), "map",
GTK_SIGNAL_FUNC(on_engine_log_level_submenu_menu_map), NULL);
+
gtk_signal_connect(GTK_OBJECT(critical_engine_level_menuitem), "activate",
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(CRITICAL));
gtk_signal_connect(GTK_OBJECT(serious_engine_level_menuitem), "activate",
@@ -2934,44 +2134,7 @@
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(EXTRA));
gtk_signal_connect(GTK_OBJECT(everything_engine_level_menuitem), "activate",
GTK_SIGNAL_FUNC(set_engine_log_level), GUINT_TO_POINTER(EVERYTHING));
-/*
- gtk_signal_connect (GTK_OBJECT (kernel_info_level_submenu_menu), "realize",
- GTK_SIGNAL_FUNC (on_kernel_info_level_submenu_menu_realize),
- NULL);
- gtk_signal_connect (GTK_OBJECT (kernel_info_level_submenu_menu), "map",
- GTK_SIGNAL_FUNC (on_kernel_info_level_submenu_menu_map),
- NULL);
- gtk_signal_connect (GTK_OBJECT (critical_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(CRITICAL));
- gtk_signal_connect (GTK_OBJECT (serious_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(SERIOUS));
- gtk_signal_connect (GTK_OBJECT (error_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(ERROR));
- gtk_signal_connect (GTK_OBJECT (warning_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(WARNING));
- gtk_signal_connect (GTK_OBJECT (default_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DEFAULT));
- gtk_signal_connect (GTK_OBJECT (details_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DETAILS));
- gtk_signal_connect (GTK_OBJECT (debug_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(DEBUG));
- gtk_signal_connect (GTK_OBJECT (extra_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(EXTRA));
- gtk_signal_connect (GTK_OBJECT (entry_exit_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(ENTRY_EXIT));
- gtk_signal_connect (GTK_OBJECT (everything_kernel_level_menuitem), "activate",
- GTK_SIGNAL_FUNC (set_kernel_log_level),
- GUINT_TO_POINTER(EVERYTHING));
-*/
+
gtk_signal_connect(GTK_OBJECT(web_links_menu_item), "activate",
GTK_SIGNAL_FUNC(on_web_links_menu_item_activate), NULL);
gtk_signal_connect(GTK_OBJECT(about_menu_item), "activate",
diff -ruN evms-2.5.4.orig/ui/gtk/message.c evms-2.5.4/ui/gtk/message.c
--- evms-2.5.4.orig/ui/gtk/message.c 2004-04-02 06:08:04.000000000 +0700
+++ evms-2.5.4/ui/gtk/message.c 2006-02-11 06:50:54.000000000 +0600
@@ -178,20 +178,20 @@
/*
*
- * void on_message_clear_button_clicked (GtkButton *, GtkText *)
+ * void on_message_clear_button_clicked (GtkButton *, GtkTextView *)
*
* Description:
* This routine
*
* Entry:
* button - address of the GtkButton widget
- * text - address of the GtkText widget
+ * text - address of the GtkTextView widget
*
* Exit:
* Clears the text in the message window.
*
*/
-void on_message_clear_button_clicked(GtkButton * button, GtkText * text)
+void on_message_clear_button_clicked(GtkButton * button, GtkTextView * text)
{
gtk_text_backward_delete(text, gtk_text_get_length(text));
}
@@ -358,7 +358,7 @@
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
label = gtk_label_new(_("Alert messages received from plug-ins are shown below:"));
- gtk_accel_group_attach(accel_group, GTK_OBJECT(message_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(message_window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(ok_button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -448,7 +448,7 @@
connect_info_ok_button_clicked_handler(GTK_BUTTON(ok_button), args);
}
- gtk_text_insert(GTK_TEXT(text_box), NULL, NULL, NULL, timestamped_text, -1);
+ gtk_text_insert(GTK_TEXT_VIEW(text_box), NULL, NULL, NULL, timestamped_text, -1);
gtk_widget_grab_default(ok_button);
g_free(timestamped_text);
@@ -533,7 +533,7 @@
gtk_box_reorder_child(box, button, g_list_length(box->children) - 1);
accel_group = gtk_accel_group_new();
- gtk_accel_group_attach(accel_group,
+ gtk_window_add_accel_group(accel_group,
GTK_OBJECT(gtk_widget_get_toplevel(button)));
get_cancel_pixmap(&gdk_pixmap, &mask);
@@ -712,7 +712,7 @@
ok_button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(ok_button, gdk_pixmap, mask, _("_OK"), accel_group);
diff -ruN evms-2.5.4.orig/ui/gtk/modify_volume.c evms-2.5.4/ui/gtk/modify_volume.c
--- evms-2.5.4.orig/ui/gtk/modify_volume.c 2004-07-29 05:32:11.000000000 +0700
+++ evms-2.5.4/ui/gtk/modify_volume.c 2006-02-10 22:54:48.000000000 +0600
@@ -53,7 +53,7 @@
tooltips = gtk_tooltips_new();
- modify_volume_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ modify_volume_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(modify_volume_window, "modify_volume_window");
gtk_object_set_data(GTK_OBJECT(modify_volume_window), "modify_volume_window",
modify_volume_window);
diff -ruN evms-2.5.4.orig/ui/gtk/results.c evms-2.5.4/ui/gtk/results.c
--- evms-2.5.4.orig/ui/gtk/results.c 2004-07-29 05:32:11.000000000 +0700
+++ evms-2.5.4/ui/gtk/results.c 2006-02-10 22:55:01.000000000 +0600
@@ -35,7 +35,7 @@
accel_group = gtk_accel_group_new();
- results_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ results_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(results_window, "results_window");
gtk_object_set_data(GTK_OBJECT(results_window), "results_window", results_window);
gtk_widget_set_usize(results_window, 470, 410);
diff -ruN evms-2.5.4.orig/ui/gtk/selection.c evms-2.5.4/ui/gtk/selection.c
--- evms-2.5.4.orig/ui/gtk/selection.c 2004-07-29 05:32:11.000000000 +0700
+++ evms-2.5.4/ui/gtk/selection.c 2006-02-10 22:55:10.000000000 +0600
@@ -62,7 +62,7 @@
accel_group = gtk_accel_group_new();
- selection_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ selection_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(selection_window, "selection_window");
gtk_object_set_data(GTK_OBJECT(selection_window), "selection_window", selection_window);
gtk_widget_set_usize(selection_window, 630, 475);
diff -ruN evms-2.5.4.orig/ui/gtk/support.c evms-2.5.4/ui/gtk/support.c
--- evms-2.5.4.orig/ui/gtk/support.c 2003-11-13 02:44:01.000000000 +0600
+++ evms-2.5.4/ui/gtk/support.c 2006-02-10 23:25:15.000000000 +0600
@@ -161,14 +161,14 @@
GdkBitmap *mask;
GtkAccelGroup *accel_group;
- popup = gtk_window_new(GTK_WINDOW_DIALOG);
+ popup = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 10);
label = gtk_label_new(message);
button = gtk_button_new();
separator = gtk_hseparator_new();
accel_group = gtk_accel_group_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(popup));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(popup));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -229,7 +229,7 @@
get_dialog_pixmap(INFO_PIXMAP, &gdk_pixmap, &mask);
- help_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ help_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
top_vbox = gtk_vbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 10);
frame = gtk_frame_new(NULL);
@@ -240,7 +240,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(help_window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(help_window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -282,8 +282,8 @@
gtk_container_add(GTK_CONTAINER(hbuttonbox), button);
gtk_container_set_border_width(GTK_CONTAINER(button), 10);
- gtk_text_insert(GTK_TEXT(help_text), NULL, NULL, NULL, text, -1);
- gtk_text_insert(GTK_TEXT(help_text), NULL, NULL, NULL, get_key_navigation_help_text(), -1);
+ gtk_text_insert(GTK_TEXT_VIEW(help_text), NULL, NULL, NULL, text, -1);
+ gtk_text_insert(GTK_TEXT_VIEW(help_text), NULL, NULL, NULL, get_key_navigation_help_text(), -1);
gtk_tooltips_set_tip(tooltips, button, _("Close the help window"), NULL);
@@ -1325,7 +1325,7 @@
label = gtk_label_new("");
key = gtk_label_parse_uline(GTK_LABEL(label), text);
- gtk_widget_add_accelerator(button, "clicked", accel_group, key, GDK_NONE, GDK_NONE);
+ gtk_widget_add_accelerator(button, "clicked", accel_group, key, 0, 0);
} else
label = gtk_label_new(text);
diff -ruN evms-2.5.4.orig/ui/gtk/task.c evms-2.5.4/ui/gtk/task.c
--- evms-2.5.4.orig/ui/gtk/task.c 2004-09-21 23:54:00.000000000 +0700
+++ evms-2.5.4/ui/gtk/task.c 2006-02-10 23:18:47.000000000 +0600
@@ -308,7 +308,7 @@
if (range->timer) {
gtk_timeout_remove(range->timer);
range->timer = 0;
- range->need_timer = FALSE;
+// range->need_timer = FALSE;
}
}
@@ -974,7 +974,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -986,7 +986,7 @@
hbuttonbox = gtk_hbutton_box_new();
button = gtk_button_new();
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
@@ -1085,7 +1085,7 @@
accel_group = gtk_accel_group_new();
tooltips = gtk_tooltips_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 10);
frame = gtk_frame_new(NULL);
@@ -1099,7 +1099,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -2280,10 +2280,10 @@
get_dialog_pixmap(QUESTION_PIXMAP, &gdk_pixmap, &mask);
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), title);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
vbox = gtk_vbox_new(FALSE, 0);
question_label = gtk_label_new(question);
diff -ruN evms-2.5.4.orig/ui/gtk/task_window.c evms-2.5.4/ui/gtk/task_window.c
--- evms-2.5.4.orig/ui/gtk/task_window.c 2004-07-29 05:32:11.000000000 +0700
+++ evms-2.5.4/ui/gtk/task_window.c 2006-02-10 23:03:55.000000000 +0600
@@ -60,7 +60,7 @@
accel_group = gtk_accel_group_new();
- task_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ task_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(task_window, "task_window");
gtk_object_set_data(GTK_OBJECT(task_window), "task_window", task_window);
gtk_widget_set_usize(task_window, 630, 475);
diff -ruN evms-2.5.4.orig/ui/gtk/thing.c evms-2.5.4/ui/gtk/thing.c
--- evms-2.5.4.orig/ui/gtk/thing.c 2004-09-21 23:54:00.000000000 +0700
+++ evms-2.5.4/ui/gtk/thing.c 2006-02-10 23:18:42.000000000 +0600
@@ -236,7 +236,7 @@
button = gtk_button_new();
pixmap = gtk_pixmap_new(gdk_pixmap, mask);
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&gdk_pixmap, &mask);
add_pixmap_label_to_button(button, gdk_pixmap, mask, _("_OK"), accel_group);
@@ -562,7 +562,7 @@
tooltips = gtk_tooltips_new();
accel_group = gtk_accel_group_new();
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
vbox = gtk_vbox_new(FALSE, 0);
text_box_frame = gtk_frame_new(NULL);
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
@@ -575,7 +575,7 @@
button = gtk_button_new();
*rclist = (GtkCList *) clist;
- gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+ gtk_window_add_accel_group(accel_group, GTK_OBJECT(window));
get_ok_pixmap(&pixmap, &mask);
add_pixmap_label_to_button(button, pixmap, mask, _("_OK"), accel_group);
diff -ruN evms-2.5.4.orig/ui/gtk/weblinks.c evms-2.5.4/ui/gtk/weblinks.c
--- evms-2.5.4.orig/ui/gtk/weblinks.c 2004-05-05 05:13:12.000000000 +0700
+++ evms-2.5.4/ui/gtk/weblinks.c 2006-02-10 23:04:16.000000000 +0600
@@ -173,7 +173,7 @@
accel_group = gtk_accel_group_new();
- web_links_window = gtk_window_new(GTK_WINDOW_DIALOG);
+ web_links_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(web_links_window, "web_links_window");
gtk_object_set_data(GTK_OBJECT(web_links_window), "web_links_window", web_links_window);
gtk_window_set_title(GTK_WINDOW(web_links_window), _("Web Links"));
