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 <[email protected]>
Message-id: 1361561614[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/po/de_DE.po b/po/de_DE.po
index cb74d7cfecab03957ed37aa00d69ed74981c9b24..875578349d4c33d6228ab7cbcbe3fa339a2cc662 100644 (file)
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -24,10 +24,6 @@ msgstr "_Datei"
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../ui/gtk.c:1002
-msgid "_Full Screen"
-msgstr "Voll_bild"
-
 #: ../ui/gtk.c:1029
 msgid "Zoom To _Fit"
 msgstr "Auf _Fenstergröße skalieren"

diff --git a/po/it.po b/po/it.po
index 2b23491aba6b006134eea3f946dcb17c995580ce..7d77fff2d3ef38d375ced0c66144a2b7131fe3fc 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -24,10 +24,6 @@ msgstr "_File"
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../ui/gtk.c:1002
-msgid "_Full Screen"
-msgstr "_Schermo intero"
-
 #: ../ui/gtk.c:1029
 msgid "Zoom To _Fit"
 msgstr "Adatta alla _finestra"

diff --git a/po/messages.po b/po/messages.po
index a90cd6ff9b3151cbfb7ae4f856884e609cc84b36..191e81cc7ca662d3f427431c27c32a54096a0444 100644 (file)
--- a/po/messages.po
+++ b/po/messages.po
@@ -24,10 +24,6 @@ msgstr ""
 msgid "_View"
 msgstr ""
 
-#: ../ui/gtk.c:1002
-msgid "_Full Screen"
-msgstr ""
-
 #: ../ui/gtk.c:1029
 msgid "Zoom To _Fit"
 msgstr ""

diff --git a/ui/gtk.c b/ui/gtk.c
index bc8bdfd6b286c9415057dfee316fc89d7567c368..0384f269886a871c812515aa4f872e34e173b816 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -633,7 +633,7 @@ static void gd_menu_full_screen(GtkMenuItem *item, void *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_widget_set_size_request(s->menu_bar, 0, 0);
         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);
     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),
                                  "<QEMU>/View/Full Screen");
     gtk_accel_map_add_entry("<QEMU>/View/Full Screen", GDK_KEY_f, GDK_CONTROL_MASK | GDK_MOD1_MASK);