From 41b38c4856e86eb59f5af76a260ea10a9b7b5d08 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 20 Dec 2010 12:48:14 -0500 Subject: [PATCH] details: Explicitly list some SPICE values This also allows changing the keymap, like with VNC displays. --- src/virtManager/details.py | 34 ++++++++++++++++++---------- src/vmm-details.glade | 45 ++++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/virtManager/details.py b/src/virtManager/details.py index ba3f919ea..3421e4c6a 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -2245,28 +2245,40 @@ class vmmDetails(vmmGObjectUI): show_row(widget_name) self.window.get_widget("gfx-" + widget_name).set_text(text) + def port_to_string(port): + if port is None: + return "-" + return (port == -1 and _("Automatically allocated") or str(port)) + gtype = gfx.type is_vnc = (gtype == "vnc") is_sdl = (gtype == "sdl") + is_spice = (gtype == "spice") + is_other = not any([is_vnc, is_sdl, is_spice]) - if is_vnc: - set_title(_("VNC Display")) + set_title(_("%(graphicstype)s Server") % + {"graphicstype" : str(gtype).upper()}) - port = (gfx.port == -1 and - _("Automatically allocated") or - str(gfx.port)) + if is_vnc or is_spice: + port = port_to_string(gfx.port) address = (gfx.listen or "127.0.0.1") - passwd = gfx.passwd or "" keymap = (gfx.keymap or None) show_text("port", port) show_text("address", address) - show_text("password", passwd) show_row("keymap", "-box") self.set_combo_label("gfx-keymap", 0, keymap) - elif is_sdl: + if is_vnc: + passwd = gfx.passwd or "" + show_text("password", passwd) + + if is_spice: + tlsport = port_to_string(gfx.tlsPort) + show_text("tlsport", tlsport) + + if is_sdl: set_title(_("Local SDL Window")) display = gfx.display or _("Unknown") @@ -2275,10 +2287,8 @@ class vmmDetails(vmmGObjectUI): show_text("display", display) show_text("xauth", xauth) - else: - gtype = str(gtype).upper() - set_title(_("%s Display") % gtype) - show_text("type", gtype) + if is_other: + show_text("type", str(gtype).upper()) def refresh_sound_page(self): sound = self.get_hw_selection(HW_LIST_COL_DEVICE) diff --git a/src/vmm-details.glade b/src/vmm-details.glade index 2e159313d..fff5e1310 100644 --- a/src/vmm-details.glade +++ b/src/vmm-details.glade @@ -4005,7 +4005,7 @@ I/O: True 3 - 7 + 8 2 8 @@ -4078,8 +4078,8 @@ I/O: True - 5 - 6 + 6 + 7 GTK_FILL @@ -4094,8 +4094,8 @@ I/O: gfx-keymap-combo - 6 - 7 + 7 + 8 GTK_FILL @@ -4126,8 +4126,8 @@ I/O: 1 2 - 6 - 7 + 7 + 8 GTK_FILL @@ -4213,8 +4213,8 @@ I/O: 1 2 - 5 - 6 + 6 + 7 GTK_FILL @@ -4228,6 +4228,33 @@ I/O: GTK_FILL + + + True + 1 + 2 + TLS Port: + + + 5 + 6 + GTK_FILL + + + + + True + 0 + label + + + 1 + 2 + 5 + 6 + GTK_FILL + +