Revision 530daf82
b/ui/gtk.c | ||
---|---|---|
1066 | 1066 |
g_signal_connect(vc->menu_item, "activate", |
1067 | 1067 |
G_CALLBACK(gd_menu_switch_vc), s); |
1068 | 1068 |
|
1069 |
gtk_menu_append(GTK_MENU(s->view_menu), vc->menu_item);
|
|
1069 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), vc->menu_item);
|
|
1070 | 1070 |
|
1071 | 1071 |
qemu_chr_generic_open(vc->chr); |
1072 | 1072 |
if (vc->chr->init) { |
... | ... | |
1148 | 1148 |
s->machine_menu_item = gtk_menu_item_new_with_mnemonic(_("_Machine")); |
1149 | 1149 |
|
1150 | 1150 |
s->pause_item = gtk_check_menu_item_new_with_mnemonic(_("_Pause")); |
1151 |
gtk_menu_append(GTK_MENU(s->machine_menu), s->pause_item);
|
|
1151 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), s->pause_item);
|
|
1152 | 1152 |
|
1153 | 1153 |
separator = gtk_separator_menu_item_new(); |
1154 |
gtk_menu_append(GTK_MENU(s->machine_menu), separator);
|
|
1154 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), separator);
|
|
1155 | 1155 |
|
1156 | 1156 |
s->reset_item = gtk_image_menu_item_new_with_mnemonic(_("_Reset")); |
1157 |
gtk_menu_append(GTK_MENU(s->machine_menu), s->reset_item);
|
|
1157 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), s->reset_item);
|
|
1158 | 1158 |
|
1159 | 1159 |
s->powerdown_item = gtk_image_menu_item_new_with_mnemonic(_("Power _Down")); |
1160 |
gtk_menu_append(GTK_MENU(s->machine_menu), s->powerdown_item);
|
|
1160 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), s->powerdown_item);
|
|
1161 | 1161 |
|
1162 | 1162 |
separator = gtk_separator_menu_item_new(); |
1163 |
gtk_menu_append(GTK_MENU(s->machine_menu), separator);
|
|
1163 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), separator);
|
|
1164 | 1164 |
|
1165 | 1165 |
s->quit_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL); |
1166 | 1166 |
gtk_stock_lookup(GTK_STOCK_QUIT, &item); |
1167 | 1167 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->quit_item), |
1168 | 1168 |
"<QEMU>/Machine/Quit"); |
1169 | 1169 |
gtk_accel_map_add_entry("<QEMU>/Machine/Quit", item.keyval, item.modifier); |
1170 |
gtk_menu_append(GTK_MENU(s->machine_menu), s->quit_item);
|
|
1170 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->machine_menu), s->quit_item);
|
|
1171 | 1171 |
|
1172 | 1172 |
s->view_menu = gtk_menu_new(); |
1173 | 1173 |
gtk_menu_set_accel_group(GTK_MENU(s->view_menu), accel_group); |
... | ... | |
1178 | 1178 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->full_screen_item), |
1179 | 1179 |
"<QEMU>/View/Full Screen"); |
1180 | 1180 |
gtk_accel_map_add_entry("<QEMU>/View/Full Screen", GDK_KEY_f, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1181 |
gtk_menu_append(GTK_MENU(s->view_menu), s->full_screen_item);
|
|
1181 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->full_screen_item);
|
|
1182 | 1182 |
|
1183 | 1183 |
separator = gtk_separator_menu_item_new(); |
1184 |
gtk_menu_append(GTK_MENU(s->view_menu), separator);
|
|
1184 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), separator);
|
|
1185 | 1185 |
|
1186 | 1186 |
s->zoom_in_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_IN, NULL); |
1187 | 1187 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_in_item), |
1188 | 1188 |
"<QEMU>/View/Zoom In"); |
1189 | 1189 |
gtk_accel_map_add_entry("<QEMU>/View/Zoom In", GDK_KEY_plus, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1190 |
gtk_menu_append(GTK_MENU(s->view_menu), s->zoom_in_item);
|
|
1190 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->zoom_in_item);
|
|
1191 | 1191 |
|
1192 | 1192 |
s->zoom_out_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_OUT, NULL); |
1193 | 1193 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_out_item), |
1194 | 1194 |
"<QEMU>/View/Zoom Out"); |
1195 | 1195 |
gtk_accel_map_add_entry("<QEMU>/View/Zoom Out", GDK_KEY_minus, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1196 |
gtk_menu_append(GTK_MENU(s->view_menu), s->zoom_out_item);
|
|
1196 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->zoom_out_item);
|
|
1197 | 1197 |
|
1198 | 1198 |
s->zoom_fixed_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_100, NULL); |
1199 | 1199 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_fixed_item), |
1200 | 1200 |
"<QEMU>/View/Zoom Fixed"); |
1201 | 1201 |
gtk_accel_map_add_entry("<QEMU>/View/Zoom Fixed", GDK_KEY_0, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1202 |
gtk_menu_append(GTK_MENU(s->view_menu), s->zoom_fixed_item);
|
|
1202 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->zoom_fixed_item);
|
|
1203 | 1203 |
|
1204 | 1204 |
s->zoom_fit_item = gtk_check_menu_item_new_with_mnemonic(_("Zoom To _Fit")); |
1205 |
gtk_menu_append(GTK_MENU(s->view_menu), s->zoom_fit_item);
|
|
1205 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->zoom_fit_item);
|
|
1206 | 1206 |
|
1207 | 1207 |
separator = gtk_separator_menu_item_new(); |
1208 |
gtk_menu_append(GTK_MENU(s->view_menu), separator);
|
|
1208 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), separator);
|
|
1209 | 1209 |
|
1210 | 1210 |
s->grab_on_hover_item = gtk_check_menu_item_new_with_mnemonic(_("Grab On _Hover")); |
1211 |
gtk_menu_append(GTK_MENU(s->view_menu), s->grab_on_hover_item);
|
|
1211 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->grab_on_hover_item);
|
|
1212 | 1212 |
|
1213 | 1213 |
s->grab_item = gtk_check_menu_item_new_with_mnemonic(_("_Grab Input")); |
1214 | 1214 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->grab_item), |
1215 | 1215 |
"<QEMU>/View/Grab Input"); |
1216 | 1216 |
gtk_accel_map_add_entry("<QEMU>/View/Grab Input", GDK_KEY_g, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1217 |
gtk_menu_append(GTK_MENU(s->view_menu), s->grab_item);
|
|
1217 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->grab_item);
|
|
1218 | 1218 |
|
1219 | 1219 |
separator = gtk_separator_menu_item_new(); |
1220 |
gtk_menu_append(GTK_MENU(s->view_menu), separator);
|
|
1220 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), separator);
|
|
1221 | 1221 |
|
1222 | 1222 |
s->vga_item = gtk_radio_menu_item_new_with_mnemonic(group, "_VGA"); |
1223 | 1223 |
group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(s->vga_item)); |
1224 | 1224 |
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->vga_item), |
1225 | 1225 |
"<QEMU>/View/VGA"); |
1226 | 1226 |
gtk_accel_map_add_entry("<QEMU>/View/VGA", GDK_KEY_1, GDK_CONTROL_MASK | GDK_MOD1_MASK); |
1227 |
gtk_menu_append(GTK_MENU(s->view_menu), s->vga_item);
|
|
1227 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->vga_item);
|
|
1228 | 1228 |
|
1229 | 1229 |
for (i = 0; i < nb_vcs; i++) { |
1230 | 1230 |
VirtualConsole *vc = &s->vc[i]; |
... | ... | |
1234 | 1234 |
} |
1235 | 1235 |
|
1236 | 1236 |
separator = gtk_separator_menu_item_new(); |
1237 |
gtk_menu_append(GTK_MENU(s->view_menu), separator);
|
|
1237 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), separator);
|
|
1238 | 1238 |
|
1239 | 1239 |
s->show_tabs_item = gtk_check_menu_item_new_with_mnemonic(_("Show _Tabs")); |
1240 |
gtk_menu_append(GTK_MENU(s->view_menu), s->show_tabs_item);
|
|
1240 |
gtk_menu_shell_append(GTK_MENU_SHELL(s->view_menu), s->show_tabs_item);
|
|
1241 | 1241 |
|
1242 | 1242 |
g_object_set_data(G_OBJECT(s->window), "accel_group", accel_group); |
1243 | 1243 |
gtk_window_add_accel_group(GTK_WINDOW(s->window), accel_group); |
Also available in: Unified diff