From 33919f79c49266067d3ab649aa55a1328d2ac107 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Wed, 30 May 2007 07:09:55 +0000 Subject: [PATCH] enc stuff --- encryption/src/dialogs.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/encryption/src/dialogs.py b/encryption/src/dialogs.py index 78ba21e6c..6cc15b941 100644 --- a/encryption/src/dialogs.py +++ b/encryption/src/dialogs.py @@ -38,30 +38,30 @@ class PreferencesDlg: def show(self): # Load settings into dialog try: - if (self.preferences.get("chk_encin_disabled", bool, True)): + if (self.preferences.get("encin_disabled", bool, True)): self.glade.get_widget("chk_encin_enabled").set_active(False) self.glade.get_widget("chk_encin_forced").set_active(False) - elif not(self.glade.get_widget("chk_encin_enabled", bool, False)): + elif not(self.preferences.get("encin_enabled", bool, False)): self.glade.get_widget("chk_encin_disabled").set_active(False) self.glade.get_widget("chk_encin_forced").set_active(False) - elif not(self.glade.get_widget("chk_encin_forced", bool, False)): + elif not(self.preferences.get("chk_encin_forced", bool, False)): self.glade.get_widget("chk_encin_enabled").set_active(False) self.glade.get_widget("chk_encin_disabled").set_active(False) - if(self.preferences.get("chk_encout_disabled", bool, True)): + if(self.preferences.get("encout_disabled", bool, True)): self.glade.get_widget("chk_encout_enabled").set_active(False) self.glade.get_widget("chk_encout_forced").set_active(False) - elif not(self.glade.get_widget("chk_encout_enabled", bool, False)): + elif not(self.preferences.get("encout_enabled", bool, False)): self.glade.get_widget("chk_encout_disabled").set_active(False) self.glade.get_widget("chk_encout_forced").set_active(False) - elif not(self.glade.get_widget("chk_encout_forced", bool, False)): + elif not(self.preferences.get("encout_forced", bool, False)): self.glade.get_widget("chk_encout_enabled").set_active(False) - if(self.preferences.get("chk_level_plaintext", bool, True)): + if(self.preferences.get("level_plaintext", bool, True)): self.glade.get_widget("chk_level_rc4").set_active(False) self.glade.get_widget("chk_level_both").set_active(False) - elif not(self.glade.get_widget("chk_level_both", bool, False)): + elif not(self.preferences.get("level_both", bool, False)): self.glade.get_widget("chk_level_plaintext").set_active(False) self.glade.get_widget("chk_level_rc4").set_active(False) - elif not(self.glade.get_widget("chk_level_both", bool, False)): + elif not(self.preferences.get("level_both", bool, False)): self.glade.get_widget("chk_level_rc4").set_active(False) self.glade.get_widget("chk_level_plaintext").set_active(False) self.glade.get_widget("chk_prefer_rc4").set_active(self.preferences.get("prefer_rc4", bool, default=True)) @@ -95,7 +95,7 @@ class PreferencesDlg: self.dialog.hide() # Now, get the settings from the dialog if r == 1: - self.preferences.set("enable_system_tray", self.glade.get_widget("chk_use_tray").get_active()) + self.preferences.set("system_tray", self.glade.get_widget("chk_use_tray").get_active()) self.preferences.set("close_to_tray", self.glade.get_widget("chk_min_on_close").get_active()) self.preferences.set("lock_tray", self.glade.get_widget("chk_lock_tray").get_active()) self.preferences.set("tray_passwd", self.glade.get_widget("txt_tray_passwd").get_text())