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

login
register
mail settings
Submitter Stefan Weil
Date Feb. 22, 2013, 5:40 p.m.
Message ID <1361554844-21054-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/222603/
State Superseded
Headers show

Comments

Stefan Weil - Feb. 22, 2013, 5:40 p.m.
This reduces the required translations and gives a nicer menu
with an icon.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 po/de_DE.po    |    4 ----
 po/it.po       |    4 ----
 po/messages.po |    4 ----
 ui/gtk.c       |    3 ++-
 4 files changed, 2 insertions(+), 13 deletions(-)
Anthony Liguori - Feb. 22, 2013, 7:11 p.m.
Stefan Weil <sw@weilnetz.de> writes:

> This reduces the required translations and gives a nicer menu
> with an icon.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  po/de_DE.po    |    4 ----
>  po/it.po       |    4 ----
>  po/messages.po |    4 ----
>  ui/gtk.c       |    3 ++-
>  4 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/po/de_DE.po b/po/de_DE.po
> index cb74d7c..8755783 100644
> --- 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 2b23491..7d77fff 100644
> --- 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 a90cd6f..191e81c 100644
> --- 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 57553b2..237f7ad 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -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

>      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);
> -- 
> 1.7.10.4

Patch

diff --git a/po/de_DE.po b/po/de_DE.po
index cb74d7c..8755783 100644
--- 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 2b23491..7d77fff 100644
--- 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 a90cd6f..191e81c 100644
--- 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 57553b2..237f7ad 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -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);