openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove all code and hidden UI for accessing help docs 

Those docs were removed a few commits back
This commit is contained in:
Cole Robinson 2012-11-09 09:49:29 +01:00
parent eac0f93da7
commit d9112f9d54
24 changed files with 1 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/virtManager/addhardware.py
View File

@ -21,7 +21,6 @@
import logging import logging
import traceback import traceback
from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
@ -65,10 +64,6 @@ char_widget_mappings = {
class vmmAddHardware(vmmGObjectUI): class vmmAddHardware(vmmGObjectUI):
__gsignals__ = {
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
}
def __init__(self, vm): def __init__(self, vm):
vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware") vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware")
@ -86,7 +81,6 @@ class vmmAddHardware(vmmGObjectUI):
"on_create_cancel_clicked" : self.close, "on_create_cancel_clicked" : self.close,
"on_vmm_create_delete_event" : self.close, "on_vmm_create_delete_event" : self.close,
"on_create_finish_clicked" : self.finish, "on_create_finish_clicked" : self.finish,
"on_create_help_clicked": self.show_help,
"on_config_storage_browse_clicked": self.browse_storage, "on_config_storage_browse_clicked": self.browse_storage,
"on_config_storage_select_toggled": self.toggle_storage_select, "on_config_storage_select_toggled": self.toggle_storage_select,
@ -117,10 +111,6 @@ class vmmAddHardware(vmmGObjectUI):
}) })
self.bind_escape_key_close() self.bind_escape_key_close()
# XXX: Help docs useless/out of date
self.widget("create-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("create-finish").set_image(finish_img) self.widget("create-finish").set_image(finish_img)
@ -1574,13 +1564,3 @@ class vmmAddHardware(vmmGObjectUI):
self.storage_browser.set_browse_reason(reason) self.storage_browser.set_browse_reason(reason)
self.storage_browser.show(self.topwin, conn) self.storage_browser.show(self.topwin, conn)
def show_help(self, src_ignore):
# help to show depends on the notebook page, yahoo
page = self.widget("create-pages").get_current_page()
if page == PAGE_ERROR:
self.emit("action-show-help", "virt-manager-create-wizard")
elif page == PAGE_DISK:
self.emit("action-show-help", "virt-manager-storage-space")
elif page == PAGE_NETWORK:
self.emit("action-show-help", "virt-manager-network")

12
src/virtManager/clone.py
View File

@ -21,7 +21,6 @@
import logging import logging
import os import os
from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
@ -121,10 +120,6 @@ def do_we_default(conn, vol, path, ro, shared, devtype):
return (not info, info) return (not info, info)
class vmmCloneVM(vmmGObjectUI): class vmmCloneVM(vmmGObjectUI):
__gsignals__ = {
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
}
def __init__(self, orig_vm): def __init__(self, orig_vm):
vmmGObjectUI.__init__(self, "vmm-clone.ui", "vmm-clone") vmmGObjectUI.__init__(self, "vmm-clone.ui", "vmm-clone")
self.orig_vm = orig_vm self.orig_vm = orig_vm
@ -150,7 +145,6 @@ class vmmCloneVM(vmmGObjectUI):
"on_clone_delete_event" : self.close, "on_clone_delete_event" : self.close,
"on_clone_cancel_clicked" : self.close, "on_clone_cancel_clicked" : self.close,
"on_clone_ok_clicked" : self.finish, "on_clone_ok_clicked" : self.finish,
"on_clone_help_clicked" : self.show_help,
# Change mac dialog # Change mac dialog
"on_vmm_change_mac_delete_event": self.change_mac_close, "on_vmm_change_mac_delete_event": self.change_mac_close,
@ -167,8 +161,6 @@ class vmmCloneVM(vmmGObjectUI):
}) })
self.bind_escape_key_close() self.bind_escape_key_close()
# XXX: Help docs useless/out of date
self.widget("clone-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_NEW,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("clone-ok").set_image(finish_img) self.widget("clone-ok").set_image(finish_img)
@ -845,7 +837,3 @@ class vmmCloneVM(vmmGObjectUI):
self.storage_browser.connect("storage-browse-finish", callback) self.storage_browser.connect("storage-browse-finish", callback)
self.storage_browser.show(self.topwin, self.conn) self.storage_browser.show(self.topwin, self.conn)
def show_help(self, ignore1=None):
# Nothing yet
return

8
src/virtManager/create.py
View File

@ -63,7 +63,6 @@ RHEL6_OS_SUPPORT = [
class vmmCreate(vmmGObjectUI): class vmmCreate(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {
"action-show-vm": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-show-vm": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
} }
def __init__(self, engine): def __init__(self, engine):
@ -108,7 +107,6 @@ class vmmCreate(vmmGObjectUI):
"on_create_back_clicked" : self.back, "on_create_back_clicked" : self.back,
"on_create_forward_clicked" : self.forward, "on_create_forward_clicked" : self.forward,
"on_create_finish_clicked" : self.finish, "on_create_finish_clicked" : self.finish,
"on_create_help_clicked": self.show_help,
"on_create_pages_switch_page": self.page_changed, "on_create_pages_switch_page": self.page_changed,
"on_create_vm_name_activate": self.forward, "on_create_vm_name_activate": self.forward,
@ -231,8 +229,6 @@ class vmmCreate(vmmGObjectUI):
self.widget("create-pages").set_show_tabs(False) self.widget("create-pages").set_show_tabs(False)
self.widget("install-method-pages").set_show_tabs(False) self.widget("install-method-pages").set_show_tabs(False)
# FIXME: Unhide this when we make some documentation
self.widget("create-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("create-finish").set_image(finish_img) self.widget("create-finish").set_image(finish_img)
@ -2135,7 +2131,3 @@ class vmmCreate(vmmGObjectUI):
self.storage_browser.set_finish_cb(callback) self.storage_browser.set_finish_cb(callback)
self.storage_browser.set_browse_reason(reason) self.storage_browser.set_browse_reason(reason)
self.storage_browser.show(self.topwin, self.conn) self.storage_browser.show(self.topwin, self.conn)
def show_help(self, ignore):
# No help available yet.
pass

11
src/virtManager/createinterface.py
View File

@ -58,9 +58,7 @@ IP_STATIC = 1
IP_NONE = 2 IP_NONE = 2
class vmmCreateInterface(vmmGObjectUI): class vmmCreateInterface(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {}
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str])
}
def __init__(self, conn): def __init__(self, conn):
vmmGObjectUI.__init__(self, vmmGObjectUI.__init__(self,
@ -87,7 +85,6 @@ class vmmCreateInterface(vmmGObjectUI):
"on_back_clicked" : self.back, "on_back_clicked" : self.back,
"on_forward_clicked" : self.forward, "on_forward_clicked" : self.forward,
"on_finish_clicked" : self.finish, "on_finish_clicked" : self.finish,
"on_help_clicked": self.show_help,
"on_pages_switch_page": self.page_changed, "on_pages_switch_page": self.page_changed,
"on_bridge_config_button_clicked": self.show_bridge_config, "on_bridge_config_button_clicked": self.show_bridge_config,
@ -171,8 +168,6 @@ class vmmCreateInterface(vmmGObjectUI):
self.widget("pages").set_show_tabs(False) self.widget("pages").set_show_tabs(False)
self.widget("bond-pages").set_show_tabs(False) self.widget("bond-pages").set_show_tabs(False)
# FIXME: Unhide this when we make some documentation
self.widget("help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("finish").set_image(finish_img) self.widget("finish").set_image(finish_img)
@ -1137,7 +1132,3 @@ class vmmCreateInterface(vmmGObjectUI):
self.interface.install(meter, create=activate) self.interface.install(meter, create=activate)
logging.debug("Install completed") logging.debug("Install completed")
def show_help(self, ignore):
# No help available yet.
pass

24
src/virtManager/createnet.py
View File

@ -23,7 +23,6 @@ import re
from IPy import IP from IPy import IP
from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
@ -39,10 +38,6 @@ PAGE_SUMMARY = 5
class vmmCreateNetwork(vmmGObjectUI): class vmmCreateNetwork(vmmGObjectUI):
__gsignals__ = {
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
}
def __init__(self, conn): def __init__(self, conn):
vmmGObjectUI.__init__(self, "vmm-create-net.ui", "vmm-create-net") vmmGObjectUI.__init__(self, "vmm-create-net.ui", "vmm-create-net")
self.conn = conn self.conn = conn
@ -61,12 +56,9 @@ class vmmCreateNetwork(vmmGObjectUI):
"on_net_dhcp_enable_toggled": self.change_dhcp_enable, "on_net_dhcp_enable_toggled": self.change_dhcp_enable,
"on_net_dhcp_start_changed": self.change_dhcp_start, "on_net_dhcp_start_changed": self.change_dhcp_start,
"on_net_dhcp_end_changed": self.change_dhcp_end, "on_net_dhcp_end_changed": self.change_dhcp_end,
"on_create_help_clicked": self.show_help,
}) })
self.bind_escape_key_close() self.bind_escape_key_close()
# XXX: Help docs useless/out of date
self.widget("create-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("create-finish").set_image(finish_img) self.widget("create-finish").set_image(finish_img)
@ -440,19 +432,3 @@ class vmmCreateNetwork(vmmGObjectUI):
elif page_num == PAGE_FORWARDING: elif page_num == PAGE_FORWARDING:
return self.validate_forwarding() return self.validate_forwarding()
return True return True
def show_help(self, src_ignore):
# help to show depends on the notebook page, yahoo
page = self.widget("create-pages").get_current_page()
if page == PAGE_INTRO:
self.emit("action-show-help", "virt-manager-create-net-intro")
elif page == PAGE_NAME:
self.emit("action-show-help", "virt-manager-create-net-name")
elif page == PAGE_IPV4:
self.emit("action-show-help", "virt-manager-create-net-ipv4")
elif page == PAGE_DHCP:
self.emit("action-show-help", "virt-manager-create-net-dhcp")
elif page == PAGE_FORWARDING:
self.emit("action-show-help", "virt-manager-create-net-forwarding")
elif page == PAGE_SUMMARY:
self.emit("action-show-help", "virt-manager-create-net-sumary")

2
src/virtManager/createpool.py
View File

@ -96,8 +96,6 @@ class vmmCreatePool(vmmGObjectUI):
}) })
self.bind_escape_key_close() self.bind_escape_key_close()
# XXX: Help docs useless/out of date
self.widget("pool-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("pool-finish").set_image(finish_img) self.widget("pool-finish").set_image(finish_img)

2
src/virtManager/createvol.py
View File

@ -67,8 +67,6 @@ class vmmCreateVolume(vmmGObjectUI):
self.widget("vol-info-view").modify_bg(Gtk.StateType.NORMAL, self.widget("vol-info-view").modify_bg(Gtk.StateType.NORMAL,
Gdk.Color.parse("grey")[1]) Gdk.Color.parse("grey")[1])
# XXX: Help docs useless/out of date
self.widget("pool-help").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_QUIT,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("vol-create").set_image(finish_img) self.widget("vol-create").set_image(finish_img)

8
src/virtManager/details.py
View File

@ -311,7 +311,6 @@ class vmmDetails(vmmGObjectUI):
"action-shutdown-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-shutdown-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-reset-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-reset-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-reboot-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-reboot-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []), "action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []),
"action-view-manager": (GObject.SignalFlags.RUN_FIRST, None, []), "action-view-manager": (GObject.SignalFlags.RUN_FIRST, None, []),
"action-migrate-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-migrate-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
@ -486,8 +485,6 @@ class vmmDetails(vmmGObjectUI):
"on_config_apply_clicked": self.config_apply, "on_config_apply_clicked": self.config_apply,
"on_config_cancel_clicked": self.config_cancel, "on_config_cancel_clicked": self.config_cancel,
"on_details_help_activate": self.show_help,
"on_config_cdrom_connect_clicked": self.toggle_storage_media, "on_config_cdrom_connect_clicked": self.toggle_storage_media,
"on_config_remove_clicked": self.remove_xml_dev, "on_config_remove_clicked": self.remove_xml_dev,
"on_add_hardware_button_clicked": self.add_hardware, "on_add_hardware_button_clicked": self.add_hardware,
@ -664,8 +661,6 @@ class vmmDetails(vmmGObjectUI):
self.console.send_key) self.console.send_key)
self.widget("details-menu-send-key").set_submenu(self.keycombo_menu) self.widget("details-menu-send-key").set_submenu(self.keycombo_menu)
# XXX: Help docs useless/out of date
self.widget("help_menuitem").hide()
def init_graphs(self): def init_graphs(self):
graph_table = self.widget("graph-table") graph_table = self.widget("graph-table")
@ -1457,9 +1452,6 @@ class vmmDetails(vmmGObjectUI):
# External action listeners # # External action listeners #
############################# #############################
def show_help(self, src_ignore):
self.emit("action-show-help", "virt-manager-details-window")
def view_manager(self, src_ignore): def view_manager(self, src_ignore):
self.emit("action-view-manager") self.emit("action-view-manager")

17
src/virtManager/engine.py
View File

@ -499,23 +499,11 @@ class vmmEngine(vmmGObject):
except Exception, e: except Exception, e:
src.err.show_err(_("Error launching 'About' dialog: %s") % str(e)) src.err.show_err(_("Error launching 'About' dialog: %s") % str(e))
def _do_show_help(self, src, index):
try:
uri = "ghelp:%s" % self.config.get_appname()
if index:
uri += "#%s" % index
logging.debug("Showing help for %s", uri)
Gtk.show_uri(None, uri, Gtk.get_current_event_time())
except Exception, e:
src.err.show_err(_("Unable to display documentation: %s") % e)
def _get_preferences(self): def _get_preferences(self):
if self.windowPreferences: if self.windowPreferences:
return self.windowPreferences return self.windowPreferences
obj = vmmPreferences() obj = vmmPreferences()
obj.connect("action-show-help", self._do_show_help)
self.windowPreferences = obj self.windowPreferences = obj
return self.windowPreferences return self.windowPreferences
@ -532,7 +520,6 @@ class vmmEngine(vmmGObject):
con = self._lookup_conn(uri) con = self._lookup_conn(uri)
obj = vmmHost(con) obj = vmmHost(con)
obj.connect("action-show-help", self._do_show_help)
obj.connect("action-exit-app", self.exit_app) obj.connect("action-exit-app", self.exit_app)
obj.connect("action-view-manager", self._do_show_manager) obj.connect("action-view-manager", self._do_show_manager)
obj.connect("action-restore-domain", self._do_restore_domain) obj.connect("action-restore-domain", self._do_restore_domain)
@ -584,7 +571,6 @@ class vmmEngine(vmmGObject):
obj.connect("action-save-domain", self._do_save_domain) obj.connect("action-save-domain", self._do_save_domain)
obj.connect("action-destroy-domain", self._do_destroy_domain) obj.connect("action-destroy-domain", self._do_destroy_domain)
obj.connect("action-reset-domain", self._do_reset_domain) obj.connect("action-reset-domain", self._do_reset_domain)
obj.connect("action-show-help", self._do_show_help)
obj.connect("action-suspend-domain", self._do_suspend_domain) obj.connect("action-suspend-domain", self._do_suspend_domain)
obj.connect("action-resume-domain", self._do_resume_domain) obj.connect("action-resume-domain", self._do_resume_domain)
obj.connect("action-run-domain", self._do_run_domain) obj.connect("action-run-domain", self._do_run_domain)
@ -640,7 +626,6 @@ class vmmEngine(vmmGObject):
obj.connect("action-show-vm", self._do_show_vm) obj.connect("action-show-vm", self._do_show_vm)
obj.connect("action-show-preferences", self._do_show_preferences) obj.connect("action-show-preferences", self._do_show_preferences)
obj.connect("action-show-create", self._do_show_create) obj.connect("action-show-create", self._do_show_create)
obj.connect("action-show-help", self._do_show_help)
obj.connect("action-show-about", self._do_show_about) obj.connect("action-show-about", self._do_show_about)
obj.connect("action-show-host", self._do_show_host) obj.connect("action-show-host", self._do_show_host)
obj.connect("action-show-connect", self._do_show_connect) obj.connect("action-show-connect", self._do_show_connect)
@ -678,7 +663,6 @@ class vmmEngine(vmmGObject):
obj = vmmCreate(self) obj = vmmCreate(self)
obj.connect("action-show-vm", self._do_show_vm) obj.connect("action-show-vm", self._do_show_vm)
obj.connect("action-show-help", self._do_show_help)
self.windowCreate = obj self.windowCreate = obj
return self.windowCreate return self.windowCreate
@ -709,7 +693,6 @@ class vmmEngine(vmmGObject):
try: try:
if clone_window is None: if clone_window is None:
clone_window = vmmCloneVM(orig_vm) clone_window = vmmCloneVM(orig_vm)
clone_window.connect("action-show-help", self._do_show_help)
self.conns[uri]["windowClone"] = clone_window self.conns[uri]["windowClone"] = clone_window
else: else:
clone_window.set_orig_vm(orig_vm) clone_window.set_orig_vm(orig_vm)

7
src/virtManager/host.py
View File

@ -43,7 +43,6 @@ INTERFACE_PAGE_ERROR = 1
class vmmHost(vmmGObjectUI): class vmmHost(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []), "action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []),
"action-view-manager": (GObject.SignalFlags.RUN_FIRST, None, []), "action-view-manager": (GObject.SignalFlags.RUN_FIRST, None, []),
"action-restore-domain": (GObject.SignalFlags.RUN_FIRST, None, [str]), "action-restore-domain": (GObject.SignalFlags.RUN_FIRST, None, [str]),
@ -109,7 +108,6 @@ class vmmHost(vmmGObjectUI):
"on_vmm_host_delete_event": self.close, "on_vmm_host_delete_event": self.close,
"on_menu_restore_saved_activate": self.restore_domain, "on_menu_restore_saved_activate": self.restore_domain,
"on_menu_help_contents_activate": self.show_help,
"on_net_add_clicked": self.add_network, "on_net_add_clicked": self.add_network,
"on_net_delete_clicked": self.delete_network, "on_net_delete_clicked": self.delete_network,
@ -139,8 +137,6 @@ class vmmHost(vmmGObjectUI):
"on_config_autoconnect_toggled": self.toggle_autoconnect, "on_config_autoconnect_toggled": self.toggle_autoconnect,
}) })
# XXX: Help docs useless/out of date
self.widget("help_menuitem").hide()
finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_DELETE, finish_img = Gtk.Image.new_from_stock(Gtk.STOCK_DELETE,
Gtk.IconSize.BUTTON) Gtk.IconSize.BUTTON)
self.widget("vol-delete").set_image(finish_img) self.widget("vol-delete").set_image(finish_img)
@ -346,9 +342,6 @@ class vmmHost(vmmGObjectUI):
self.memory_usage_graph.destroy() self.memory_usage_graph.destroy()
self.memory_usage_graph = None self.memory_usage_graph = None
def show_help(self, src_ignore):
self.emit("action-show-help", "virt-manager-host-window")
def view_manager(self, src_ignore): def view_manager(self, src_ignore):
self.emit("action-view-manager") self.emit("action-view-manager")

8
src/virtManager/manager.py
View File

@ -91,7 +91,6 @@ class vmmManager(vmmGObjectUI):
"action-reboot-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-reboot-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-destroy-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-destroy-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-save-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-save-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
"action-migrate-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-migrate-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-clone-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]), "action-clone-domain": (GObject.SignalFlags.RUN_FIRST, None, [str, str]),
"action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []), "action-exit-app": (GObject.SignalFlags.RUN_FIRST, None, []),
@ -160,7 +159,6 @@ class vmmManager(vmmGObjectUI):
"on_menu_edit_preferences_activate": self.show_preferences, "on_menu_edit_preferences_activate": self.show_preferences,
"on_menu_help_about_activate": self.show_about, "on_menu_help_about_activate": self.show_about,
"on_menu_help_activate": self.show_help,
}) })
self.init_vmlist() self.init_vmlist()
@ -168,9 +166,6 @@ class vmmManager(vmmGObjectUI):
self.init_toolbar() self.init_toolbar()
self.init_context_menus() self.init_context_menus()
# XXX: Help docs useless/out of date
self.widget("menu_help").hide()
self.vm_selected() self.vm_selected()
self.widget("vm-list").get_selection().connect("changed", self.widget("vm-list").get_selection().connect("changed",
self.vm_selected) self.vm_selected)
@ -547,9 +542,6 @@ class vmmManager(vmmGObjectUI):
def show_about(self, src_ignore): def show_about(self, src_ignore):
self.emit("action-show-about") self.emit("action-show-about")
def show_help(self, src_ignore):
self.emit("action-show-help", None)
def show_preferences(self, src_ignore): def show_preferences(self, src_ignore):
self.emit("action-show-preferences") self.emit("action-show-preferences")

14
src/virtManager/preferences.py
View File

@ -20,7 +20,6 @@
import logging import logging
from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
@ -30,10 +29,6 @@ PREFS_PAGE_STATS = 0
PREFS_PAGE_VM_PREFS = 1 PREFS_PAGE_VM_PREFS = 1
class vmmPreferences(vmmGObjectUI): class vmmPreferences(vmmGObjectUI):
__gsignals__ = {
"action-show-help": (GObject.SignalFlags.RUN_FIRST, None, [str]),
}
def __init__(self): def __init__(self):
vmmGObjectUI.__init__(self, "vmm-preferences.ui", "vmm-preferences") vmmGObjectUI.__init__(self, "vmm-preferences.ui", "vmm-preferences")
@ -85,7 +80,6 @@ class vmmPreferences(vmmGObjectUI):
"on_prefs_console_scaling_changed": self.change_console_scaling, "on_prefs_console_scaling_changed": self.change_console_scaling,
"on_prefs_close_clicked": self.close, "on_prefs_close_clicked": self.close,
"on_vmm_preferences_delete_event": self.close, "on_vmm_preferences_delete_event": self.close,
"on_prefs_help_clicked": self.show_help,
"on_prefs_sound_local_toggled": self.change_local_sound, "on_prefs_sound_local_toggled": self.change_local_sound,
"on_prefs_sound_remote_toggled": self.change_remote_sound, "on_prefs_sound_remote_toggled": self.change_remote_sound,
"on_prefs_stats_enable_disk_toggled": self.change_disk_poll, "on_prefs_stats_enable_disk_toggled": self.change_disk_poll,
@ -103,9 +97,6 @@ class vmmPreferences(vmmGObjectUI):
}) })
self.bind_escape_key_close() self.bind_escape_key_close()
# XXX: Help docs useless/out of date
self.widget("prefs-help").hide()
def close(self, ignore1=None, ignore2=None): def close(self, ignore1=None, ignore2=None):
logging.debug("Closing preferences") logging.debug("Closing preferences")
self.topwin.hide() self.topwin.hide()
@ -352,8 +343,3 @@ class vmmPreferences(vmmGObjectUI):
if idx >= 0: if idx >= 0:
typ = src.get_model()[idx][0] typ = src.get_model()[idx][0]
self.config.set_storage_format(typ.lower()) self.config.set_storage_format(typ.lower())
def show_help(self, src_ignore):
# From the Preferences window, show the help document from
# the Preferences page
self.emit("action-show-help", "virt-manager-preferences-window")

16
src/vmm-add-hardware.ui
View File

@ -2915,22 +2915,6 @@ access in the guest.</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="create-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_create_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="create-cancel"> <object class="GtkButton" id="create-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

16
src/vmm-clone.ui
View File

@ -944,22 +944,6 @@ uses the existing disk image for both the original and the new machine.&lt;/span
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="clone-help">
<property name="label">gtk-help</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_clone_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="clone-cancel"> <object class="GtkButton" id="clone-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

16
src/vmm-create-interface.ui
View File

@ -2037,22 +2037,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="cancel"> <object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

17
src/vmm-create-net.ui
View File

@ -1714,23 +1714,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="create-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_create_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="create-cancel"> <object class="GtkButton" id="create-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

15
src/vmm-create-pool.ui
View File

@ -751,21 +751,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="pool-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="pool-cancel"> <object class="GtkButton" id="pool-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

15
src/vmm-create-vol.ui
View File

@ -473,21 +473,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="pool-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="vol-cancel"> <object class="GtkButton" id="vol-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

16
src/vmm-create.ui
View File

@ -2620,22 +2620,6 @@ is not yet supported.&lt;/small&gt;</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="create-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_create_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="create-cancel"> <object class="GtkButton" id="create-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

25
src/vmm-details.ui
View File

@ -468,31 +468,6 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuItem" id="help_menuitem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="help_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="details_help">
<property name="label">_Contents</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image1</property>
<property name="use_stock">False</property>
<accelerator key="F1" signal="activate"/>
<signal name="activate" handler="on_details_help_activate" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

29
src/vmm-host.ui
View File

@ -2,11 +2,6 @@
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-help</property>
</object>
<object class="GtkImage" id="image3"> <object class="GtkImage" id="image3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -98,30 +93,6 @@
</child> </child>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuItem" id="help_menuitem">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="help_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="menu_help_contents">
<property name="label">_Contents</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image1</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_menu_help_contents_activate" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

17
src/vmm-manager.ui
View File

@ -2,11 +2,6 @@
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAccelGroup" id="accelgroup1"/> <object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-help</property>
</object>
<object class="GtkImage" id="image2"> <object class="GtkImage" id="image2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -231,18 +226,6 @@
<child type="submenu"> <child type="submenu">
<object class="GtkMenu" id="menuitem7_menu"> <object class="GtkMenu" id="menuitem7_menu">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="menu_help">
<property name="label">_Contents</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">image1</property>
<property name="use_stock">False</property>
<accelerator key="F1" signal="activate"/>
<signal name="activate" handler="on_menu_help_activate" swapped="no"/>
</object>
</child>
<child> <child>
<object class="GtkImageMenuItem" id="menu_help_about"> <object class="GtkImageMenuItem" id="menu_help_about">
<property name="label">gtk-about</property> <property name="label">gtk-about</property>

15
src/vmm-migrate.ui
View File

@ -692,21 +692,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="migrate-help">
<property name="label">gtk-help</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="migrate-cancel"> <object class="GtkButton" id="migrate-cancel">
<property name="label">gtk-cancel</property> <property name="label">gtk-cancel</property>

16
src/vmm-preferences.ui
View File

@ -1011,22 +1011,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="prefs-help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_prefs_help_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
<property name="secondary">True</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="prefs-close"> <object class="GtkButton" id="prefs-close">
<property name="label">gtk-close</property> <property name="label">gtk-close</property>