revert 1607

This commit is contained in:
Marcos Pinto 2007-09-02 22:57:25 +00:00
parent af37e0a361
commit 28dbb279a0
2 changed files with 474 additions and 490 deletions

File diff suppressed because it is too large Load Diff

View File

@ -39,8 +39,7 @@ import pref
PREFS_FILENAME = "prefs.state" PREFS_FILENAME = "prefs.state"
class PreferencesDlg: class PreferencesDlg:
def __init__(self, preferences, active_port, plugins, plugin_tab=False, is_showing_dlg=[False]): def __init__(self, preferences, active_port, plugins, plugin_tab=False):
self.is_showing_dlg = is_showing_dlg
self.glade = gtk.glade.XML(common.get_glade_file("preferences_dialog.glade"), domain='deluge') self.glade = gtk.glade.XML(common.get_glade_file("preferences_dialog.glade"), domain='deluge')
self.dialog = self.glade.get_widget("pref_dialog") self.dialog = self.glade.get_widget("pref_dialog")
if plugin_tab: if plugin_tab:
@ -75,10 +74,6 @@ class PreferencesDlg:
self.plugins = plugins self.plugins = plugins
def show(self, interface, window): def show(self, interface, window):
if self.is_showing_dlg[0]:
return
self.is_showing_dlg[0] = True
# Load settings into dialog # Load settings into dialog
try: try:
self.glade.get_widget("combo_file_manager").set_active(self.preferences.get("file_manager")) self.glade.get_widget("combo_file_manager").set_active(self.preferences.get("file_manager"))
@ -192,9 +187,6 @@ class PreferencesDlg:
def ok_clicked(self, source, interface): def ok_clicked(self, source, interface):
self.dialog.hide() self.dialog.hide()
self.is_showing_dlg[0] = False
return True
self.preferences.set("file_manager", self.glade.get_widget("combo_file_manager").get_active()) self.preferences.set("file_manager", self.glade.get_widget("combo_file_manager").get_active())
self.preferences.set("open_folder_stock", self.glade.get_widget("radio_open_folder_stock").get_active()) self.preferences.set("open_folder_stock", self.glade.get_widget("radio_open_folder_stock").get_active())
self.preferences.set("open_folder_location", self.glade.get_widget("txt_open_folder_location").get_text()) self.preferences.set("open_folder_location", self.glade.get_widget("txt_open_folder_location").get_text())
@ -263,15 +255,9 @@ class PreferencesDlg:
def cancel_clicked(self, source): def cancel_clicked(self, source):
self.dialog.hide() self.dialog.hide()
self.is_showing_dlg[0] = False
return True def close_clicked(self, source):
def close_clicked(self, source, *args):
self.dialog.hide() self.dialog.hide()
self.is_showing_dlg[0] = False
return True
def old_clicked(self, path): def old_clicked(self, path):
return self.plugin_clicked(self.view.get_selection(), self.store, path, False) return self.plugin_clicked(self.view.get_selection(), self.store, path, False)