This reverts commit 5b08388cbad175e2f466971d0d04c82df1894680.
Revert adding markup argument which caused problems with text installs.
Resolves: rhbz#671143
---
gui.py | 8 +++-----
storage/__init__.py | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/gui.py b/gui.py
index 76c3514..3dfbddb 100755
--- a/gui.py
+++ b/gui.py
@@ -685,7 +685,7 @@ class MessageWindow:
def getrc (self):
return self.rc
- def __init__ (self, title, text, type="ok", default=None, custom_buttons=None, custom_icon=None, run = True, parent = None, destroyAfterRun = True, markup=False):
+ def __init__ (self, title, text, type="ok", default=None, custom_buttons=None, custom_icon=None, run = True, parent = None, destroyAfterRun = True):
self.debugRid = None
self.title = title
if flags.autostep:
@@ -723,8 +723,6 @@ class MessageWindow:
style = gtk.MESSAGE_INFO
self.dialog = gtk.MessageDialog(mainWindow, 0, style, buttons, str(text))
- if markup:
- self.dialog.set_property("use-markup", True)
if parent:
self.dialog.set_transient_for(parent)
@@ -1114,14 +1112,14 @@ class InstallInterface(InstallInterfaceBase):
return ProgressWindow (title, text, total, updpct, pulse = pulse)
def messageWindow(self, title, text, type="ok", default = None,
- custom_buttons=None, custom_icon=None, markup=False):
+ custom_buttons=None, custom_icon=None):
if self.icw:
parent = self.icw.window
else:
parent = None
rc = MessageWindow (title, text, type, default,
- custom_buttons, custom_icon, run=True, parent=parent, markup=markup).getrc()
+ custom_buttons, custom_icon, run=True, parent=parent).getrc()
return rc
def reinitializeWindow(self, title, path, size, description, details):
diff --git a/storage/__init__.py b/storage/__init__.py
index 00053ce..2c10003 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -179,7 +179,7 @@ def storageComplete(anaconda):
if not iutil.isEfi() and bootdisk and bootdisk.format \
and bootdisk.format.type == 'disklabel' \
and bootdisk.format.labelType == 'gpt':
- warning = _("\n\n<b>WARNING:</b>\n"
+ warning = _("\n\nWARNING:\n"
"You are using a GPT bootdisk on a non-EFI "
"system. This may not work, depending on you BIOS's "
"support for booting from GPT disks.")
@@ -197,7 +197,7 @@ def storageComplete(anaconda):
type = "custom", custom_icon="warning",
custom_buttons=[_("Go _back"),
_("_Write changes to disk")],
- default = 0, markup=True)
+ default = 0)
# Make sure that all is down, even the disks that we setup after popluate.
anaconda.id.storage.devicetree.teardownAll()
--
1.7.3.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
