NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

gfxdetails: Remove explicit SDL UI fields

Browse Source 
Users can look at the device XML easy enough, and very few people
are using SDL with libvirt

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-08-20 20:02:04 -04:00
parent deeda106c1
commit d0e725f439
2 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ui/gfxdetails.ui
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment4">
@ -213,54 +213,6 @@
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Display:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">XAuth:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">8</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="graphics-display">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="graphics-xauth">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">8</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="graphics-address">
<property name="visible">True</property>
@ -309,7 +261,7 @@
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">9</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
@ -436,8 +388,20 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">9</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</interface>

22
virtManager/device/gfxdetails.py
View File

@ -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