NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-10 23:45:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

baseclass: Clean up non-standard __init__

Browse Source 
Only used by console.py, make it more explicit.
This commit is contained in:
Cole Robinson 2013-06-08 19:25:36 -04:00
parent e407c2eac9
commit 0f8ea6eaa6
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
virtManager/baseclass.py
View File

@ -165,25 +165,21 @@ class vmmGObject(GObject.GObject):
class vmmGObjectUI(vmmGObject):
def __init__(self, filename, windowname):
def __init__(self, filename, windowname, builder=None, topwin=None):
vmmGObject.__init__(self)
self.windowname = windowname
self.builder = None
self.topwin = None
self.uifile = None
self.err = None
if filename:
self.uifile = os.path.join(self.config.get_ui_dir(), filename)
uifile = os.path.join(self.config.get_ui_dir(), filename)
self.builder = Gtk.Builder()
self.builder.set_translation_domain("virt-manager")
self.builder.add_from_string(
file(self.uifile).read())
self.builder.add_from_string(file(uifile).read())
self.topwin = self.widget(self.windowname)
self.topwin = self.widget(windowname)
self.topwin.hide()
else:
self.builder = builder
self.topwin = topwin
self.err = virtManager.error.vmmErrorDialog(self.topwin)
@ -196,7 +192,6 @@ class vmmGObjectUI(vmmGObject):
self.builder = None
self.topwin.destroy()
self.topwin = None
self.uifile = None
self.err = None
def _cleanup(self):

9
virtManager/console.py
View File

@ -39,7 +39,6 @@ import logging
import virtManager.uihelpers as uihelpers
from virtManager.autodrawer import AutoDrawer
from virtManager.baseclass import vmmGObjectUI, vmmGObject
from virtManager.error import vmmErrorDialog
# Console pages
PAGE_UNAVAILABLE = 0
@ -598,15 +597,9 @@ class SpiceViewer(Viewer):
class vmmConsolePages(vmmGObjectUI):
def __init__(self, vm, builder, topwin):
vmmGObjectUI.__init__(self, None, None)
vmmGObjectUI.__init__(self, None, None, builder=builder, topwin=topwin)
self.vm = vm
self.windowname = "vmm-details"
self.builder = builder
self.topwin = topwin
self.err = vmmErrorDialog(self.topwin)
self.pointer_is_grabbed = False
self.change_title()
self.vm.connect("config-changed", self.change_title)