mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
Merge heads
This commit is contained in:
commit
0b8f973545
@ -64,32 +64,46 @@ class vmmAsyncJob(gobject.GObject):
|
||||
self.topwin.destroy()
|
||||
|
||||
def pulse_pbar(self, progress="", stage=None):
|
||||
self.is_pulsing = True
|
||||
self.pbar.set_text(progress)
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Processing..."))
|
||||
gtk.gdk.threads_enter()
|
||||
try:
|
||||
self.is_pulsing = True
|
||||
self.pbar.set_text(progress)
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Processing..."))
|
||||
finally:
|
||||
gtk.gdk.threads_leave()
|
||||
|
||||
|
||||
def set_pbar_fraction(self, frac, progress, stage=None):
|
||||
# callback for progress meter when file size is known
|
||||
self.is_pulsing=False
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Processing..."))
|
||||
self.pbar.set_text(progress)
|
||||
self.pbar.set_fraction(frac)
|
||||
gtk.gdk.threads_enter()
|
||||
try:
|
||||
self.is_pulsing=False
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Processing..."))
|
||||
self.pbar.set_text(progress)
|
||||
self.pbar.set_fraction(frac)
|
||||
finally:
|
||||
gtk.gdk.threads_leave()
|
||||
|
||||
|
||||
def set_pbar_done(self, progress, stage=None):
|
||||
#callback for progress meter when progress is done
|
||||
self.is_pulsing=False
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Completed"))
|
||||
self.pbar.set_text(progress)
|
||||
self.pbar.set_fraction(1)
|
||||
gtk.gdk.threads_enter()
|
||||
try:
|
||||
self.is_pulsing=False
|
||||
if stage is not None:
|
||||
self.stage.set_text(stage)
|
||||
else:
|
||||
self.stage.set_text(_("Completed"))
|
||||
self.pbar.set_text(progress)
|
||||
self.pbar.set_fraction(1)
|
||||
finally:
|
||||
gtk.gdk.threads_leave()
|
||||
|
||||
def exit_if_necessary(self):
|
||||
gtk.gdk.threads_enter()
|
||||
|
@ -92,8 +92,9 @@ class vmmCreateNetwork(gobject.GObject):
|
||||
fw_list.pack_start(text, True)
|
||||
fw_list.add_attribute(text, 'text', 0)
|
||||
fw_model.append([_("NAT to any physical device"), True, None])
|
||||
for name in self.conn.list_net_device_names():
|
||||
fw_model.append([_("NAT to physical device %s") % (name), True, name])
|
||||
for path in self.conn.list_net_device_paths():
|
||||
net = self.conn.get_net_device(path)
|
||||
fw_model.append([_("NAT to physical device %s") % (net.get_name()), True, net.get_name()])
|
||||
|
||||
def reset_state(self):
|
||||
notebook = self.window.get_widget("create-pages")
|
||||
|
Loading…
Reference in New Issue
Block a user