766768c9d2
opensuse13.img for SLE-Server virtinst-detect-suse-distros.patch - bnc#881549 - virt-manager/xen: Error changing VM configuration: 'NoneType' object has no attribute 'split' virtinst-xenbus-disk-index-fix.patch - Upstream bug fix 538edb3b-manpage-fix-incorrect-description.patch - Upstream bug fixes 536677aa-better-handling-of-keyboard-input-type.patch 5385d602-lxc-no-default-disk.patch 53869170-virt-install-add-events-support.patch 538a11dc-raise-error-if-populating-summary-page-fails.patch 538a3609-virtconv-fix-use-of-relative-OVF-file.patch 538a3ba9-diskbackend-start-pool-if-not-running.patch 538ca3f3-use-correct-dictionary-keys-for-old-pool-net-polling.patch 538d00a4-xen-keyboard-cant-be-removed.patch 538e2f74-fix-pool-create-call.patch - Dropped 531e0a82-reverse-keyboard-grab-commit.patch. Fixed instead with this patch. 538a6862-vnc-dont-force-keyboard-grab-before-widget-is-realized.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=182
122 lines
6.7 KiB
Diff
122 lines
6.7 KiB
Diff
Subject: details: Better handling for <input type=keyboard>
|
|
From: Cole Robinson crobinso@redhat.com Sun May 4 13:23:54 2014 -0400
|
|
Date: Sun May 4 13:23:54 2014 -0400:
|
|
Git: 9fd0ef5c8876ded12d9356cb38db29dace261084
|
|
|
|
|
|
Index: virt-manager-1.0.1/ui/details.ui
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/ui/details.ui
|
|
+++ virt-manager-1.0.1/ui/details.ui
|
|
@@ -4208,14 +4208,12 @@
|
|
<property name="top_padding">3</property>
|
|
<property name="left_padding">12</property>
|
|
<child>
|
|
- <object class="GtkTable" id="table33">
|
|
+ <object class="GtkGrid" id="table33">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">False</property>
|
|
<property name="border_width">3</property>
|
|
- <property name="n_rows">2</property>
|
|
- <property name="n_columns">2</property>
|
|
- <property name="column_spacing">8</property>
|
|
<property name="row_spacing">4</property>
|
|
+ <property name="column_spacing">8</property>
|
|
<child>
|
|
<object class="GtkLabel" id="label402">
|
|
<property name="visible">True</property>
|
|
@@ -4225,8 +4223,10 @@
|
|
<property name="use_underline">True</property>
|
|
</object>
|
|
<packing>
|
|
- <property name="x_options">GTK_FILL</property>
|
|
- <property name="y_options"/>
|
|
+ <property name="left_attach">0</property>
|
|
+ <property name="top_attach">0</property>
|
|
+ <property name="width">1</property>
|
|
+ <property name="height">1</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
@@ -4237,10 +4237,10 @@
|
|
<property name="label" translatable="yes">Mode:</property>
|
|
</object>
|
|
<packing>
|
|
+ <property name="left_attach">0</property>
|
|
<property name="top_attach">1</property>
|
|
- <property name="bottom_attach">2</property>
|
|
- <property name="x_options">GTK_FILL</property>
|
|
- <property name="y_options"/>
|
|
+ <property name="width">1</property>
|
|
+ <property name="height">1</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
@@ -4253,11 +4253,9 @@
|
|
</object>
|
|
<packing>
|
|
<property name="left_attach">1</property>
|
|
- <property name="right_attach">2</property>
|
|
<property name="top_attach">1</property>
|
|
- <property name="bottom_attach">2</property>
|
|
- <property name="x_options">GTK_FILL</property>
|
|
- <property name="y_options"/>
|
|
+ <property name="width">1</property>
|
|
+ <property name="height">1</property>
|
|
</packing>
|
|
</child>
|
|
<child>
|
|
@@ -4270,8 +4268,9 @@
|
|
</object>
|
|
<packing>
|
|
<property name="left_attach">1</property>
|
|
- <property name="right_attach">2</property>
|
|
- <property name="y_options"/>
|
|
+ <property name="top_attach">0</property>
|
|
+ <property name="width">1</property>
|
|
+ <property name="height">1</property>
|
|
</packing>
|
|
</child>
|
|
</object>
|
|
Index: virt-manager-1.0.1/virtManager/details.py
|
|
===================================================================
|
|
--- virt-manager-1.0.1.orig/virtManager/details.py
|
|
+++ virt-manager-1.0.1/virtManager/details.py
|
|
@@ -349,6 +349,8 @@ def _label_for_device(dev):
|
|
return _("Tablet")
|
|
elif dev.type == "mouse":
|
|
return _("Mouse")
|
|
+ elif dev.type == "keyboard":
|
|
+ return _("Keyboard")
|
|
return _("Input")
|
|
|
|
if devtype in ["serial", "parallel", "console"]:
|
|
@@ -2746,19 +2748,24 @@ class vmmDetails(vmmGObjectUI):
|
|
dev = _("Xen Mouse")
|
|
elif ident == "mouse:ps2":
|
|
dev = _("PS/2 Mouse")
|
|
+ elif ident == "keyboard:ps2":
|
|
+ dev = _("PS/2 Keyboard")
|
|
else:
|
|
dev = inp.bus + " " + inp.type
|
|
|
|
+ mode = None
|
|
if inp.type == "tablet":
|
|
mode = _("Absolute Movement")
|
|
- else:
|
|
+ elif inp.type == "mouse":
|
|
mode = _("Relative Movement")
|
|
|
|
self.widget("input-dev-type").set_text(dev)
|
|
- self.widget("input-dev-mode").set_text(mode)
|
|
+ self.widget("input-dev-mode").set_text(mode or "")
|
|
+ uiutil.set_grid_row_visible(self.widget("input-dev-mode"), bool(mode))
|
|
|
|
# Can't remove primary Xen or PS/2 mice
|
|
- if inp.type == "mouse" and inp.bus in ("xen", "ps2"):
|
|
+ if ((inp.type == "mouse" and inp.bus in ("xen", "ps2")) or
|
|
+ (inp.type == "keyboard" and inp.bus == "ps2")):
|
|
self.widget("config-remove").set_sensitive(False)
|
|
else:
|
|
self.widget("config-remove").set_sensitive(True)
|