Skip to contentSkip to conversation

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

PATCH In review Stefan Weil 2 participants 2 messages Feb 22, 2013

lore
Share & tools
lore
#0 lore raw

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

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

---
 po/de_DE.po    |    4 ----
 po/it.po       |    4 ----
 po/messages.po |    4 ----
 ui/gtk.c       |    3 ++-
 4 files changed, 2 insertions(+), 13 deletions(-)
po/de_DE.po +0 -4
index cb74d7c..8755783 100644
@@ -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"
po/it.po +0 -4
index 2b23491..7d77fff 100644
@@ -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"
po/messages.po +0 -4
index a90cd6f..191e81c 100644
@@ -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 ""
ui/gtk.c +2 -1
index 57553b2..237f7ad 100644
@@ -1016,7 +1016,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);
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 61 lines · Stefan Weil

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

---
 po/de_DE.po    |    4 ----
 po/it.po       |    4 ----
 po/messages.po |    4 ----
 ui/gtk.c       |    3 ++-
 4 files changed, 2 insertions(+), 13 deletions(-)
po/de_DE.po +0 -4
index cb74d7c..8755783 100644
@@ -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"
po/it.po +0 -4
index 2b23491..7d77fff 100644
@@ -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"
po/messages.po +0 -4
index a90cd6f..191e81c 100644
@@ -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 ""
ui/gtk.c +0 -0
index 57553b2..237f7ad 100644

ui/gtk.c static void gd_create_menus(GtkDisplayState *s) · line 1021

Quoted 7 lines
ui/gtk.c +2 -1
@@ -1016,7 +1016,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);

Good thinking but it needs to stay a check menu item because of the various calls to gtk_check_menu_item_get_active.

Regards,

Anthony Liguori

Quoted 5 lines
ui/gtk.c +0 -0
     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);
Signature · 1 line
1.7.10.4