mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-26 17:25:22 +03:00
virtManager: Move a lot of misc files to lib/
This commit is contained in:
parent
fa3f25dc1c
commit
3062b5ce08
@ -228,9 +228,9 @@ def main():
|
||||
|
||||
if options.trace_libvirt:
|
||||
log.debug("Libvirt tracing requested")
|
||||
import virtManager.module_trace
|
||||
from virtManager.lib import module_trace
|
||||
import libvirt
|
||||
virtManager.module_trace.wrap_module(libvirt,
|
||||
module_trace.wrap_module(libvirt,
|
||||
mainloop=(options.trace_libvirt == "mainloop"),
|
||||
regex=None)
|
||||
|
||||
|
@ -16,7 +16,7 @@ from virtinst import (DeviceChannel, DeviceConsole,
|
||||
DeviceSound, DeviceTpm, DeviceVideo, DeviceVsock, DeviceWatchdog)
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .device.addstorage import vmmAddStorage
|
||||
|
@ -14,7 +14,7 @@ from virtinst import Cloner
|
||||
from virtinst import DeviceInterface
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .storagebrowse import vmmStorageBrowser
|
||||
|
@ -13,8 +13,8 @@ from gi.repository import Gtk
|
||||
from virtinst import DomainCpu
|
||||
from virtinst import log
|
||||
|
||||
from .inspection import vmmInspection
|
||||
from .keyring import vmmKeyring, vmmSecret
|
||||
from .lib.inspection import vmmInspection
|
||||
from .lib.keyring import vmmKeyring, vmmSecret
|
||||
|
||||
|
||||
class _SettingsWrapper(object):
|
||||
|
@ -15,15 +15,15 @@ import virtinst
|
||||
from virtinst import log
|
||||
from virtinst import pollhelpers
|
||||
|
||||
from . import connectauth
|
||||
from .lib import connectauth
|
||||
from .baseclass import vmmGObject
|
||||
from .libvirtenummap import LibvirtEnumMap
|
||||
from .lib.libvirtenummap import LibvirtEnumMap
|
||||
from .object.domain import vmmDomain
|
||||
from .object.interface import vmmInterface
|
||||
from .object.network import vmmNetwork
|
||||
from .object.nodedev import vmmNodeDevice
|
||||
from .object.storagepool import vmmStoragePool
|
||||
from .statsmanager import vmmStatsManager
|
||||
from .lib.statsmanager import vmmStatsManager
|
||||
|
||||
|
||||
class _ObjectList(vmmGObject):
|
||||
|
@ -12,7 +12,7 @@ from gi.repository import Gtk
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .connmanager import vmmConnectionManager
|
||||
|
||||
|
@ -16,7 +16,7 @@ from virtinst import generatename
|
||||
from virtinst import log
|
||||
from virtinst import Network
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .xmleditor import vmmXMLEditor
|
||||
|
@ -12,7 +12,7 @@ from gi.repository import Gtk
|
||||
from virtinst import log
|
||||
from virtinst import StoragePool
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .xmleditor import vmmXMLEditor
|
||||
|
@ -18,7 +18,7 @@ import virtinst
|
||||
import virtinst.generatename
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .connmanager import vmmConnectionManager
|
||||
|
@ -10,7 +10,7 @@ from gi.repository import Gdk
|
||||
from virtinst import log
|
||||
from virtinst import StorageVolume
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .xmleditor import vmmXMLEditor
|
||||
|
@ -18,7 +18,7 @@ from virtinst import xmlutil
|
||||
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
|
||||
STORAGE_ROW_CONFIRM = 0
|
||||
STORAGE_ROW_CANT_DELETE = 1
|
||||
|
@ -14,7 +14,7 @@ import libvirt
|
||||
import virtinst
|
||||
from virtinst import log
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..addhardware import vmmAddHardware
|
||||
from ..baseclass import vmmGObjectUI
|
||||
from ..device.addstorage import vmmAddStorage
|
||||
@ -23,7 +23,7 @@ from ..device.gfxdetails import vmmGraphicsDetails
|
||||
from ..device.mediacombo import vmmMediaCombo
|
||||
from ..device.netlist import vmmNetworkList
|
||||
from ..device.vsockdetails import vmmVsockDetails
|
||||
from ..graphwidgets import Sparkline
|
||||
from ..lib.graphwidgets import Sparkline
|
||||
from ..oslist import vmmOSList
|
||||
from ..storagebrowse import vmmStorageBrowser
|
||||
from ..xmleditor import vmmXMLEditor
|
||||
@ -1147,7 +1147,7 @@ class vmmDetails(vmmGObjectUI):
|
||||
return key
|
||||
|
||||
def inspection_refresh(self, _src):
|
||||
from ..inspection import vmmInspection
|
||||
from ..lib.inspection import vmmInspection
|
||||
inspection = vmmInspection.get_instance()
|
||||
if inspection:
|
||||
inspection.vm_refresh(self.vm)
|
||||
|
@ -19,7 +19,7 @@ from virtinst import generatename
|
||||
from virtinst import log
|
||||
from virtinst import xmlutil
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..asyncjob import vmmAsyncJob
|
||||
from ..baseclass import vmmGObjectUI
|
||||
|
||||
|
@ -10,7 +10,7 @@ from gi.repository import Gtk
|
||||
import virtinst
|
||||
from virtinst import log
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObjectUI
|
||||
|
||||
|
||||
|
@ -9,7 +9,7 @@ from gi.repository import Gtk
|
||||
|
||||
from virtinst import DeviceFilesystem
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObjectUI
|
||||
from ..storagebrowse import vmmStorageBrowser
|
||||
|
||||
|
@ -9,7 +9,7 @@ from gi.repository import Gtk
|
||||
|
||||
import virtinst
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObjectUI
|
||||
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
from gi.repository import Gtk
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObject, vmmGObjectUI
|
||||
|
||||
|
||||
|
@ -10,7 +10,7 @@ from gi.repository import Gtk
|
||||
import virtinst
|
||||
from virtinst import log
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObjectUI
|
||||
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
# This work is licensed under the GNU GPLv2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
from .. import uiutil
|
||||
from ..lib import uiutil
|
||||
from ..baseclass import vmmGObjectUI
|
||||
|
||||
|
||||
|
@ -18,7 +18,7 @@ from virtinst import log
|
||||
from .baseclass import vmmGObject
|
||||
from .createconn import vmmCreateConn
|
||||
from .connmanager import vmmConnectionManager
|
||||
from .inspection import vmmInspection
|
||||
from .lib.inspection import vmmInspection
|
||||
from .systray import vmmSystray
|
||||
|
||||
(PRIO_HIGH,
|
||||
|
@ -6,10 +6,10 @@
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .engine import vmmEngine
|
||||
from .graphwidgets import Sparkline
|
||||
from .lib.graphwidgets import Sparkline
|
||||
from .hostnets import vmmHostNets
|
||||
from .hoststorage import vmmHostStorage
|
||||
|
||||
|
@ -9,7 +9,7 @@ from gi.repository import Pango
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .createnet import vmmCreateNetwork
|
||||
|
@ -11,7 +11,7 @@ from virtinst import DeviceDisk
|
||||
from virtinst import log
|
||||
from virtinst import StoragePool
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .createpool import vmmCreatePool
|
||||
|
0
virtManager/lib/__init__.py
Normal file
0
virtManager/lib/__init__.py
Normal file
@ -17,7 +17,7 @@ import libvirt
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from .baseclass import vmmGObjectUI
|
||||
from ..baseclass import vmmGObjectUI
|
||||
from . import uiutil
|
||||
|
||||
|
@ -8,9 +8,9 @@ import threading
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from .baseclass import vmmGObject
|
||||
from .connmanager import vmmConnectionManager
|
||||
from .object.domain import vmmInspectionApplication, vmmInspectionData
|
||||
from ..baseclass import vmmGObject
|
||||
from ..connmanager import vmmConnectionManager
|
||||
from ..object.domain import vmmInspectionApplication, vmmInspectionData
|
||||
|
||||
|
||||
def _inspection_error(_errstr):
|
@ -10,7 +10,7 @@ import libvirt
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from .baseclass import vmmGObject
|
||||
from ..baseclass import vmmGObject
|
||||
|
||||
|
||||
class _VMStatsRecord(object):
|
@ -13,11 +13,11 @@ from virtinst import log
|
||||
from virtinst import xmlutil
|
||||
|
||||
from . import vmmenu
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .connmanager import vmmConnectionManager
|
||||
from .engine import vmmEngine
|
||||
from .graphwidgets import CellRendererSparkline
|
||||
from .lib.graphwidgets import CellRendererSparkline
|
||||
|
||||
# Number of data points for performance graphs
|
||||
GRAPH_LEN = 40
|
||||
|
@ -13,7 +13,7 @@ from gi.repository import Pango
|
||||
from virtinst import log
|
||||
from virtinst import xmlutil
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .asyncjob import vmmAsyncJob
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .connmanager import vmmConnectionManager
|
||||
|
@ -18,7 +18,7 @@ from virtinst import Guest
|
||||
from virtinst import log
|
||||
|
||||
from .libvirtobject import vmmLibvirtObject
|
||||
from ..libvirtenummap import LibvirtEnumMap
|
||||
from ..lib.libvirtenummap import LibvirtEnumMap
|
||||
|
||||
|
||||
class _SENTINEL(object):
|
||||
|
@ -10,9 +10,9 @@ from gi.repository import Gdk
|
||||
from virtinst import DomainCpu
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .inspection import vmmInspection
|
||||
from .lib.inspection import vmmInspection
|
||||
from .systray import vmmSystray
|
||||
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
from virtinst import log
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
from .hoststorage import vmmHostStorage
|
||||
|
||||
|
@ -6,7 +6,7 @@ import gi
|
||||
gi.require_version('GtkSource', '4')
|
||||
from gi.repository import GtkSource
|
||||
|
||||
from . import uiutil
|
||||
from .lib import uiutil
|
||||
from .baseclass import vmmGObjectUI
|
||||
|
||||
_PAGE_DETAILS = 0
|
||||
|
Loading…
Reference in New Issue
Block a user