diff --git a/ui/gfxdetails.ui b/ui/gfxdetails.ui index 7647ac4b8..4d15c8748 100644 --- a/ui/gfxdetails.ui +++ b/ui/gfxdetails.ui @@ -1,5 +1,5 @@ - + @@ -213,54 +213,6 @@ 3 - - - True - False - end - Display: - - - 0 - 7 - - - - - True - False - end - XAuth: - - - 0 - 8 - - - - - True - False - start - label - - - 1 - 7 - - - - - True - False - start - label - - - 1 - 8 - - True @@ -309,7 +261,7 @@ 0 - 9 + 7 @@ -436,8 +388,20 @@ 1 - 9 + 7 + + + + + + + + + + + + diff --git a/virtManager/device/gfxdetails.py b/virtManager/device/gfxdetails.py index 5475de265..813abe1e7 100644 --- a/virtManager/device/gfxdetails.py +++ b/virtManager/device/gfxdetails.py @@ -121,9 +121,6 @@ class vmmGraphicsDetails(vmmGObjectUI): ############## def reset_state(self): - uiutil.set_grid_row_visible(self.widget("graphics-display"), False) - uiutil.set_grid_row_visible(self.widget("graphics-xauth"), False) - self.widget("graphics-type").set_active(0) self.widget("graphics-listen-type").set_active(0) self.widget("graphics-address").set_active(0) @@ -176,7 +173,6 @@ class vmmGraphicsDetails(vmmGObjectUI): gtype = gfx.type is_vnc = (gtype == "vnc") - is_sdl = (gtype == "sdl") is_spice = (gtype == "spice") pretty_type = vmmGraphicsDetails.graphics_pretty_type_simple(gtype) title = (_("%(graphicstype)s Server") % {"graphicstype": pretty_type}) @@ -260,14 +256,6 @@ class vmmGraphicsDetails(vmmGObjectUI): self.widget("graphics-rendernode-warn").set_visible( bool(rendernode_warning)) - if is_sdl: - title = _("Local SDL Window") - - self.widget("graphics-display").set_text( - gfx.display or _("Unknown")) - self.widget("graphics-xauth").set_text( - gfx.xauth or _("Unknown")) - uiutil.set_list_selection(self.widget("graphics-type"), gtype) return title @@ -277,13 +265,13 @@ class vmmGraphicsDetails(vmmGObjectUI): ############# def _show_rows_from_type(self): - hide_all = ["graphics-xauth", "graphics-display", "graphics-address", - "graphics-password-box", "graphics-port-box", "graphics-opengl-box"] + hide_all = ["graphics-address", + "graphics-password-box", "graphics-port-box", + "graphics-opengl-box"] gtype = uiutil.get_list_selection(self.widget("graphics-type")) listen = uiutil.get_list_selection(self.widget("graphics-listen-type")) - sdl_rows = ["graphics-xauth", "graphics-display"] vnc_rows = ["graphics-password-box"] if listen == 'address': vnc_rows.extend(["graphics-port-box", "graphics-address"]) @@ -291,9 +279,7 @@ class vmmGraphicsDetails(vmmGObjectUI): spice_rows.extend(["graphics-opengl-box"]) rows = [] - if gtype == "sdl": - rows = sdl_rows - elif gtype == "vnc": + if gtype == "vnc": rows = vnc_rows elif gtype == "spice": rows = spice_rows