virt-manager/virtman-keycombo.diff
Charles Arnold 7c80d66ba1 - Fixes in virtman-keycombo.diff to match virt-viewer's 'Send Key'
menu options.  See bnc#553633

- bnc#597235 - virt-manager does not start complaining about a
  broken icon.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=25
2010-04-26 19:22:49 +00:00

157 lines
9.2 KiB
Diff

Index: virt-manager-0.8.4/src/vmm-details.glade
===================================================================
--- virt-manager-0.8.4.orig/src/vmm-details.glade
+++ virt-manager-0.8.4/src/vmm-details.glade
@@ -339,11 +339,93 @@
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="details-menu-send-css">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ctrl+_Scroll+Scroll</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_css_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkSeparatorMenuItem" id="separator9">
<property name="visible">True</property>
</widget>
</child>
<child>
+ <widget class="GtkMenuItem" id="details-menu-send-af10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">A_lt+F10</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_af10_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-atab">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+_Tab</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_atab_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-aesc">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Alt+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_aesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-cesc">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Ctrl+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_cesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-caesc">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ctrl+Alt+_Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_caesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-assesc">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Alt+Sh_ift+Shift+Esc</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_assesc_activate" last_modification_time="Wed, 14 Oct 2009 12:06:25 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator10">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-f8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_F8</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_f8_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkMenuItem" id="details-menu-send-f10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">F1_0</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_details_menu_send_f10_activate" last_modification_time="Wed, 09 Jan 2008 19:20:40 GMT"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator13">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkMenuItem" id="details-menu-send-caf1">
<property name="visible">True</property>
<property name="label">Ctrl+Alt+F_1</property>
@@ -440,7 +522,7 @@
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="separator10">
+ <widget class="GtkSeparatorMenuItem" id="separator14">
<property name="visible">True</property>
</widget>
</child>
Index: virt-manager-0.8.4/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -288,6 +288,15 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key,
+ "on_details_menu_send_css_activate": self.console.send_key,
+ "on_details_menu_send_af10_activate": self.console.send_key,
+ "on_details_menu_send_atab_activate": self.console.send_key,
+ "on_details_menu_send_aesc_activate": self.console.send_key,
+ "on_details_menu_send_cesc_activate": self.console.send_key,
+ "on_details_menu_send_caesc_activate": self.console.send_key,
+ "on_details_menu_send_assesc_activate": self.console.send_key,
+ "on_details_menu_send_f8_activate": self.console.send_key,
+ "on_details_menu_send_f10_activate": self.console.send_key,
"on_details_menu_send_caf1_activate": self.console.send_key,
"on_details_menu_send_caf2_activate": self.console.send_key,
"on_details_menu_send_caf3_activate": self.console.send_key,
Index: virt-manager-0.8.4/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.4.orig/src/virtManager/console.py
+++ virt-manager-0.8.4/src/virtManager/console.py
@@ -325,6 +325,24 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab":
keys = ["Control_L", "Alt_L", "BackSpace"]
+ elif src.get_name() == "details-menu-send-css":
+ keys = ["Control_L", "Scroll", "Scroll"]
+ elif src.get_name() == "details-menu-send-af10":
+ keys = ["Alt_L", "F10"]
+ elif src.get_name() == "details-menu-send-atab":
+ keys = ["Alt_L", "Tab"]
+ elif src.get_name() == "details-menu-send-aesc":
+ keys = ["Alt_L", "Escape"]
+ elif src.get_name() == "details-menu-send-cesc":
+ keys = ["Control_L", "Escape"]
+ elif src.get_name() == "details-menu-send-caesc":
+ keys = ["Control_L", "Alt_L", "Escape"]
+ elif src.get_name() == "details-menu-send-assesc":
+ keys = ["Alt_R", "Shift_R", "Shift_L", "Escape"]
+ elif src.get_name() == "details-menu-send-f8":
+ keys = ["F8"]
+ elif src.get_name() == "details-menu-send-f10":
+ keys = ["F10"]
elif src.get_name() == "details-menu-send-caf1":
keys = ["Control_L", "Alt_L", "F1"]
elif src.get_name() == "details-menu-send-caf2":