[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/24] gtk: use device type as label
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 09/24] gtk: use device type as label |
Date: |
Mon, 26 May 2014 10:14:04 +0200 |
IMO useful than showing VGA for any graphic device
even in case it is something completely different.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/24] gtk: zap scrolled_window, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/24] gtk: cleanup CONFIG_VTE ifdef a bit., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 05/24] gtk: remove page numbering assumtions from the code, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/24] gtk: Add a scrollbar for text consoles, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/24] gtk: use device type as label,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 21/24] gtk: Add handling for the xfree86 keycodes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/24] gtk: simplify resize, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/24] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/26