diff options
| author | David Lehman <dlehman@redhat.com> | 2008-02-05 10:40:30 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2008-02-05 10:41:24 -0600 |
| commit | 7208116a72ab0b207b4fb5d917a556fd518e062d (patch) | |
| tree | 12c3877e7ede8f0ba17c673fe8a72021b36306b7 | |
| parent | db2e0bbe682f6b5ae6fe21dc2224cf57d7fbb46d (diff) | |
| download | anaconda-7208116a72ab0b207b4fb5d917a556fd518e062d.tar.gz anaconda-7208116a72ab0b207b4fb5d917a556fd518e062d.tar.xz anaconda-7208116a72ab0b207b4fb5d917a556fd518e062d.zip | |
Fix a few bugs in the new passphrase prompting code.
| -rwxr-xr-x | gui.py | 18 | ||||
| -rw-r--r-- | ui/lukspassphrase.glade | 6 |
2 files changed, 15 insertions, 9 deletions
@@ -627,7 +627,9 @@ class InstallKeyWindow: class luksPassphraseWindow: def __init__(self, passphrase=None): - luksxml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), domain="anaconda") + luksxml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), + domain="anaconda", + root="luksPassphraseDialog") self.passphraseEntry = luksxml.get_widget("passphraseEntry") self.passphraseEntry.set_visibility(False) self.confirmEntry = luksxml.get_widget("confirmEntry") @@ -685,26 +687,30 @@ class luksPassphraseWindow: class PassphraseEntryWindow: def __init__(self, device): - xml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), domain="anaconda") + xml = gtk.glade.XML(findGladeFile("lukspassphrase.glade"), + domain="anaconda", + root="passphraseEntryDialog") self.txt = _("Device %s is encrypted. In order to " "access the device's contents during " "installation you must enter the device's " "passphrase below.") % (device,) self.win = xml.get_widget("passphraseEntryDialog") self.passphraseLabel = xml.get_widget("passphraseLabel") - self.passphraseEntry = xml.get_widget("passphraseEntry") - self.globalcheckbox = xml.get_widget("globalcheckbox") + self.passphraseEntry = xml.get_widget("passphraseEntry2") + self.globalcheckbutton = xml.get_widget("globalcheckbutton") + + addFrame(self.win) def run(self): self.win.show() - self.passphraseLabel.set_text(txt) + self.passphraseLabel.set_text(self.txt) self.passphraseEntry.grab_focus() rc = self.win.run() passphrase = None isglobal = False if rc == gtk.RESPONSE_OK: passphrase = self.passphraseEntry.get_text().strip() - isglobal = self.globalcheckbox.get_active() + isglobal = self.globalcheckbutton.get_active() self.rc = (passphrase, isglobal) return self.rc diff --git a/ui/lukspassphrase.glade b/ui/lukspassphrase.glade index 31f08b3fd..7daee2055 100644 --- a/ui/lukspassphrase.glade +++ b/ui/lukspassphrase.glade @@ -295,7 +295,7 @@ <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -314,12 +314,12 @@ </child> <child> - <widget class="GtkEntry" id="passphraseEntry"> + <widget class="GtkEntry" id="passphraseEntry2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> <property name="visibility">False</property> - <property name="max_length">0</property> + <property name="max_length">500</property> <property name="text" translatable="yes"></property> <property name="has_frame">True</property> <property name="invisible_char">•</property> |