openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui/gtk: Use menu item from stock for full screen 

This reduces the required translations and gives a nicer menu
with an icon.

The full screen menu item is no longer a check menu item.
A checked item is not visible in full screen mode,
so it is not needed for this special menu item.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 1361561614-11180-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Stefan Weil 2013-02-22 20:33:34 +01:00 committed by Anthony Liguori
parent 28d2e5b27d
commit 104092825a
4 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
po/de_DE.po
View File

@ -24,10 +24,6 @@ msgstr "_Datei"
msgid "_View" msgid "_View"
msgstr "_Ansicht" msgstr "_Ansicht"
#: ../ui/gtk.c:1002
msgid "_Full Screen"
msgstr "Voll_bild"
#: ../ui/gtk.c:1029 #: ../ui/gtk.c:1029
msgid "Zoom To _Fit" msgid "Zoom To _Fit"
msgstr "Auf _Fenstergröße skalieren" msgstr "Auf _Fenstergröße skalieren"

4
po/it.po
View File

@ -24,10 +24,6 @@ msgstr "_File"
msgid "_View" msgid "_View"
msgstr "_Visualizza" msgstr "_Visualizza"
#: ../ui/gtk.c:1002
msgid "_Full Screen"
msgstr "_Schermo intero"
#: ../ui/gtk.c:1029 #: ../ui/gtk.c:1029
msgid "Zoom To _Fit" msgid "Zoom To _Fit"
msgstr "Adatta alla _finestra" msgstr "Adatta alla _finestra"

4
po/messages.po
View File

@ -24,10 +24,6 @@ msgstr ""
msgid "_View" msgid "_View"
msgstr "" msgstr ""
#: ../ui/gtk.c:1002
msgid "_Full Screen"
msgstr ""
#: ../ui/gtk.c:1029 #: ../ui/gtk.c:1029
msgid "Zoom To _Fit" msgid "Zoom To _Fit"
msgstr "" msgstr ""

5
ui/gtk.c
View File

@ -633,7 +633,7 @@ static void gd_menu_full_screen(GtkMenuItem *item, void *opaque)
{ {
GtkDisplayState *s = opaque; GtkDisplayState *s = opaque;
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->full_screen_item))) { if (!s->full_screen) {
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(s->notebook), FALSE); gtk_notebook_set_show_tabs(GTK_NOTEBOOK(s->notebook), FALSE);
gtk_widget_set_size_request(s->menu_bar, 0, 0); gtk_widget_set_size_request(s->menu_bar, 0, 0);
gtk_widget_set_size_request(s->drawing_area, -1, -1); gtk_widget_set_size_request(s->drawing_area, -1, -1);
@ -1015,7 +1015,8 @@ static void gd_create_menus(GtkDisplayState *s)
gtk_menu_set_accel_group(GTK_MENU(s->view_menu), accel_group); gtk_menu_set_accel_group(GTK_MENU(s->view_menu), accel_group);
s->view_menu_item = gtk_menu_item_new_with_mnemonic(_("_View")); s->view_menu_item = gtk_menu_item_new_with_mnemonic(_("_View"));
s->full_screen_item = gtk_check_menu_item_new_with_mnemonic(_("_Full Screen")); s->full_screen_item =
gtk_image_menu_item_new_from_stock(GTK_STOCK_FULLSCREEN, NULL);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->full_screen_item), gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->full_screen_item),
"<QEMU>/View/Full Screen"); "<QEMU>/View/Full Screen");
gtk_accel_map_add_entry("<QEMU>/View/Full Screen", GDK_KEY_f, GDK_CONTROL_MASK | GDK_MOD1_MASK); gtk_accel_map_add_entry("<QEMU>/View/Full Screen", GDK_KEY_f, GDK_CONTROL_MASK | GDK_MOD1_MASK);