qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 09/22] gtk: use device type as label
Date: Tue,  6 May 2014 14:05:45 +0200	[thread overview]
Message-ID: <1399377958-20076-10-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1399377958-20076-1-git-send-email-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 0756432..a8393dd 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -67,6 +67,7 @@
 #include "x_keymap.h"
 #include "keymaps.h"
 #include "sysemu/char.h"
+#include "qom/object.h"
 
 #define MAX_VCS 10
 
@@ -1457,6 +1458,15 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
                               QemuConsole *con, int idx,
                               GSList *group, GtkWidget *view_menu)
 {
+    const char *label = "VGA";
+    Error *local_err = NULL;
+    Object *obj;
+
+    obj = object_property_get_link(OBJECT(con), "device", &local_err);
+    if (obj) {
+        label = object_get_typename(obj);
+    }
+
     vc->s = s;
     vc->gfx.scale_x = 1.0;
     vc->gfx.scale_y = 1.0;
@@ -1477,10 +1487,10 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
     vc->type = GD_VC_GFX;
     vc->tab_item = vc->gfx.drawing_area;
     gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook),
-                             vc->tab_item, gtk_label_new("VGA"));
+                             vc->tab_item, gtk_label_new(label));
     gd_connect_vc_gfx_signals(vc);
 
-    group = gd_vc_menu_init(s, vc, "VGA", idx, group, view_menu);
+    group = gd_vc_menu_init(s, vc, label, idx, group, view_menu);
 
     vc->gfx.dcl.ops = &dcl_ops;
     vc->gfx.dcl.con = con;
-- 
1.8.3.1

  parent reply	other threads:[~2014-05-06 12:06 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-06 12:05 [Qemu-devel] [PATCH 00/22] gtk: ui overhaul Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 01/22] gtk: zap scrolled_window Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 02/22] gtk: zap vte size requests Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 03/22] gtk: cleanup CONFIG_VTE ifdef a bit Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 04/22] gtk: Add a scrollbar for text consoles Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 05/22] gtk: remove page numbering assumtions from the code Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 06/22] gtk: VirtualConsole restruction Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 07/22] gtk: move vga state into VirtualGfxConsole Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 08/22] gtk: support multiple gfx displays Gerd Hoffmann
2014-05-06 12:05 ` Gerd Hoffmann [this message]
2014-05-06 12:05 ` [Qemu-devel] [PATCH 10/22] gtk: simplify resize Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 11/22] gtk: allow moving tabs to windows and back Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 12/22] gtk: add tab to trace events Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 13/22] gtk: add gd_grab trace event Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 14/22] gtk: keep track of grab owner Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 15/22] gtk: skip keyboard grab when hover autograb is active Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 16/22] gtk: update gd_update_caption Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 17/22] gtk: fix grab checks Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 18/22] gtk: update all windows on mouse mode changes Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 19/22] gtk: enable window pointer grabs Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 20/22] gtk: enable untabify for gfx Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 21/22] gtk: Add handling for the xfree86 keycodes Gerd Hoffmann
2014-05-06 12:05 ` [Qemu-devel] [PATCH 22/22] gtk: zap unused global_state Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399377958-20076-10-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).