From 942a25d86a034df1700d6d00e040fdc727b42d6c Mon Sep 17 00:00:00 2001 From: David Lehman Date: Wed, 13 Aug 2008 20:45:21 -0500 Subject: Allow specification of a device string for display in passphrase dialog. --- gui.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gui.py') diff --git a/gui.py b/gui.py index 40af16435..888f99cae 100755 --- a/gui.py +++ b/gui.py @@ -623,7 +623,7 @@ class InstallKeyWindow: self.win.destroy() class luksPassphraseWindow: - def __init__(self, passphrase=None, parent = None): + def __init__(self, passphrase=None, device = "", parent = None): luksxml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), domain="anaconda", root="luksPassphraseDialog") @@ -641,6 +641,15 @@ class luksPassphraseWindow: else: self.initialPassphrase = "" + if device: + deviceStr = " (%s)" % (device,) + else: + deviceStr = "" + txt = _("Choose a passphrase for this encrypted device%s. " + "You will be prompted for the passphrase during system " + "boot.") % (deviceStr,) + luksxml.get_widget("mainLabel").set_text(txt) + if parent: self.win.set_transient_for(parent) @@ -1221,13 +1230,13 @@ class InstallInterface: d.destroy() return ret - def getLuksPassphrase(self, passphrase = ""): + def getLuksPassphrase(self, passphrase = "", device = ""): if self.icw: parent = self.icw.window else: parent = None - d = luksPassphraseWindow(passphrase, parent = parent) + d = luksPassphraseWindow(passphrase, device = device, parent = parent) rc = d.run() passphrase = d.getPassphrase() d.destroy() -- cgit