From patchwork Fri Feb 22 09:56:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 222513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2F5C72C02A2 for ; Fri, 22 Feb 2013 22:07:23 +1100 (EST) Received: from localhost ([::1]:44509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8qTJ-0000bj-7z for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 06:07:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8pNB-0003xn-OX for qemu-devel@nongnu.org; Fri, 22 Feb 2013 04:56:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8pN9-0007Y2-N2 for qemu-devel@nongnu.org; Fri, 22 Feb 2013 04:56:57 -0500 Received: from david.siemens.de ([192.35.17.14]:30250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8pN9-0007Xw-5k for qemu-devel@nongnu.org; Fri, 22 Feb 2013 04:56:55 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id r1M9usr9027796; Fri, 22 Feb 2013 10:56:54 +0100 Received: from mchn199C.mchp.siemens.de ([139.22.36.29]) by mail1.siemens.de (8.13.6/8.13.6) with SMTP id r1M9ur6h019462; Fri, 22 Feb 2013 10:56:53 +0100 Message-ID: <512740E5.4060706@siemens.com> Date: Fri, 22 Feb 2013 10:56:53 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 192.35.17.14 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] gtk: Replace bogus term "VGA" with "display" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org VGA is a misnomer, only some of our targets have it. Use the more generic term "display" instead. Signed-off-by: Jan Kiszka --- No translation updates yet as I do not know how you like to handle them. ui/gtk.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 29156be..e9faf15 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -93,7 +93,7 @@ typedef struct GtkDisplayState GtkWidget *zoom_fit_item; GtkWidget *grab_item; GtkWidget *grab_on_hover_item; - GtkWidget *vga_item; + GtkWidget *display_item; int nb_vcs; VirtualConsole vc[MAX_VCS]; @@ -133,7 +133,7 @@ static bool gd_grab_on_hover(GtkDisplayState *s) return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->grab_on_hover_item)); } -static bool gd_on_vga(GtkDisplayState *s) +static bool gd_on_display(GtkDisplayState *s) { return gtk_notebook_get_current_page(GTK_NOTEBOOK(s->notebook)) == 0; } @@ -141,13 +141,13 @@ static bool gd_on_vga(GtkDisplayState *s) static void gd_update_cursor(GtkDisplayState *s, gboolean override) { GdkWindow *window; - bool on_vga; + bool on_display; window = gtk_widget_get_window(GTK_WIDGET(s->drawing_area)); - on_vga = gd_on_vga(s); + on_display = gd_on_display(s); - if ((override || on_vga) && + if ((override || on_display) && (s->full_screen || kbd_mouse_is_absolute() || gd_is_grab_active(s))) { gdk_window_set_cursor(window, s->null_cursor); } else { @@ -593,7 +593,7 @@ static void gd_menu_switch_vc(GtkMenuItem *item, void *opaque) { GtkDisplayState *s = opaque; - if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->vga_item))) { + if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->display_item))) { gtk_notebook_set_current_page(GTK_NOTEBOOK(s->notebook), 0); } else { int i; @@ -627,7 +627,7 @@ static void gd_menu_full_screen(GtkMenuItem *item, void *opaque) gtk_widget_set_size_request(s->menu_bar, 0, 0); gtk_widget_set_size_request(s->drawing_area, -1, -1); gtk_window_fullscreen(GTK_WINDOW(s->window)); - if (gd_on_vga(s)) { + if (gd_on_display(s)) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item), TRUE); } s->full_screen = TRUE; @@ -744,7 +744,7 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, { GtkDisplayState *s = data; guint last_page; - gboolean on_vga; + gboolean on_display; if (!gtk_widget_get_realized(s->notebook)) { return; @@ -756,9 +756,9 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, gtk_widget_set_size_request(s->vc[last_page - 1].terminal, -1, -1); } - on_vga = arg2 == 0; + on_display = arg2 == 0; - if (!on_vga) { + if (!on_display) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item), FALSE); } else if (s->full_screen) { @@ -767,7 +767,8 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, } if (arg2 == 0) { - gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->vga_item), TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->display_item), + TRUE); } else { VirtualConsole *vc = &s->vc[arg2 - 1]; VteTerminal *term = VTE_TERMINAL(vc->terminal); @@ -780,7 +781,7 @@ static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, gtk_widget_set_size_request(vc->terminal, width, height); } - gtk_widget_set_sensitive(s->grab_item, on_vga); + gtk_widget_set_sensitive(s->grab_item, on_display); gd_update_cursor(s, TRUE); } @@ -964,7 +965,7 @@ static void gd_connect_signals(GtkDisplayState *s) G_CALLBACK(gd_menu_zoom_fixed), s); g_signal_connect(s->zoom_fit_item, "activate", G_CALLBACK(gd_menu_zoom_fit), s); - g_signal_connect(s->vga_item, "activate", + g_signal_connect(s->display_item, "activate", G_CALLBACK(gd_menu_switch_vc), s); g_signal_connect(s->grab_item, "activate", G_CALLBACK(gd_menu_grab_input), s); @@ -1044,12 +1045,15 @@ static void gd_create_menus(GtkDisplayState *s) separator = gtk_separator_menu_item_new(); gtk_menu_append(GTK_MENU(s->view_menu), separator); - s->vga_item = gtk_radio_menu_item_new_with_mnemonic(group, "_VGA"); - group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(s->vga_item)); - gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->vga_item), - "/View/VGA"); - gtk_accel_map_add_entry("/View/VGA", GDK_KEY_1, GDK_CONTROL_MASK | GDK_MOD1_MASK); - gtk_menu_append(GTK_MENU(s->view_menu), s->vga_item); + s->display_item = gtk_radio_menu_item_new_with_mnemonic(group, + _("_Display")); + group = gtk_radio_menu_item_get_group( + GTK_RADIO_MENU_ITEM(s->display_item)); + gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->display_item), + "/View/Display"); + gtk_accel_map_add_entry("/View/Display", GDK_KEY_1, + GDK_CONTROL_MASK | GDK_MOD1_MASK); + gtk_menu_append(GTK_MENU(s->view_menu), s->display_item); for (i = 0; i < nb_vcs; i++) { VirtualConsole *vc = &s->vc[i]; @@ -1108,7 +1112,8 @@ void gtk_display_init(DisplayState *ds) qemu_add_mouse_mode_change_notifier(&s->mouse_mode_notifier); qemu_add_vm_change_state_handler(gd_change_runstate, s); - gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), s->drawing_area, gtk_label_new("VGA")); + gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), s->drawing_area, + gtk_label_new("Display")); gd_create_menus(s);