NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "error: new helper function to embed customized widget into dialog"

Browse Source 
This reverts commit ee7794a616.

Was accidentally applied while patches are still in review.
This commit is contained in:
Cole Robinson 2013-06-28 11:11:28 -04:00
parent 6b8d4753f6
commit 555b2d960d
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
virtManager/error.py
View File

@ -28,15 +28,11 @@ from virtManager.baseclass import vmmGObject
def _launch_dialog(dialog, primary_text, secondary_text, title, def _launch_dialog(dialog, primary_text, secondary_text, title,
widget=None, sync=True): sync=True):
dialog.set_property("text", primary_text) dialog.set_property("text", primary_text)
dialog.format_secondary_text(secondary_text or None) dialog.format_secondary_text(secondary_text or None)
dialog.set_title(title) dialog.set_title(title)
if widget:
# widget is of type Gtk.VBox
dialog.get_content_area().add(widget)
res = False res = False
if sync: if sync:
res = dialog.run() res = dialog.run()
@ -96,7 +92,7 @@ class vmmErrorDialog(vmmGObject):
################################### ###################################
def _simple_dialog(self, dialog_type, buttons, text1, def _simple_dialog(self, dialog_type, buttons, text1,
text2, title, widget=None, async=False): text2, title, async=False):
dialog = Gtk.MessageDialog(self.get_parent(), dialog = Gtk.MessageDialog(self.get_parent(),
flags=Gtk.DialogFlags.DESTROY_WITH_PARENT, flags=Gtk.DialogFlags.DESTROY_WITH_PARENT,
@ -108,7 +104,6 @@ class vmmErrorDialog(vmmGObject):
return _launch_dialog(self._simple, return _launch_dialog(self._simple,
text1, text2 or "", title or "", text1, text2 or "", title or "",
widget=widget,
sync=not async) sync=not async)
def val_err(self, text1, text2=None, title=_("Input Error"), async=True): def val_err(self, text1, text2=None, title=_("Input Error"), async=True):
@ -126,19 +121,13 @@ class vmmErrorDialog(vmmGObject):
self._simple_dialog(dtype, buttons, self._simple_dialog(dtype, buttons,
str(text1), str(text1),
text2 and str(text2) or "", text2 and str(text2) or "",
str(title), None, async) str(title), async)
return False return False
def show_info(self, text1, text2=None, title="", async=True): def show_info(self, text1, text2=None, title="", async=True):
dtype = Gtk.MessageType.INFO dtype = Gtk.MessageType.INFO
buttons = Gtk.ButtonsType.OK buttons = Gtk.ButtonsType.OK
self._simple_dialog(dtype, buttons, text1, text2, title, None, async) self._simple_dialog(dtype, buttons, text1, text2, title, async)
return False
def show_info_with_widget(self, text1, widget, text2=None, title="", async=True):
dtype = Gtk.MessageType.INFO
buttons = Gtk.ButtonsType.OK
self._simple_dialog(dtype, buttons, text1, text2, title, widget, async)
return False return False
def yes_no(self, text1, text2=None, title=None): def yes_no(self, text1, text2=None, title=None):