clean, clean, clean privacy list "patch"
This commit is contained in:
Nikos Kouremenos
parent
9dbc502b54
commit
2439915136
|
|
@ -1733,7 +1733,7 @@ class PrivacyListWindow:
|
|||
'''Window that is used for creating NEW or EDITING already there privacy
|
||||
lists'''
|
||||
def __init__(self, account, privacy_list_name, action):
|
||||
'''action is 'edit' or 'new' depending on if we create a new priv list
|
||||
'''action is 'EDIT' or 'NEW' depending on if we create a new priv list
|
||||
or edit an already existing one'''
|
||||
self.account = account
|
||||
self.privacy_list_name = privacy_list_name
|
||||
|
|
@ -1785,7 +1785,7 @@ class PrivacyListWindow:
|
|||
self.privacy_list_active_checkbutton.set_sensitive(False)
|
||||
self.privacy_list_default_checkbutton.set_sensitive(False)
|
||||
|
||||
if action == 'edit':
|
||||
if action == 'EDIT':
|
||||
self.refresh_rules()
|
||||
|
||||
count = 0
|
||||
|
|
@ -1804,11 +1804,9 @@ class PrivacyListWindow:
|
|||
self.xml.signal_autoconnect(self)
|
||||
|
||||
def on_privacy_list_edit_window_destroy(self, widget):
|
||||
'''close window'''
|
||||
if gajim.interface.instances[self.account].has_key('privacy_list_%s' % \
|
||||
self.privacy_list_name):
|
||||
del gajim.interface.instances[self.account]['privacy_list_%s' % \
|
||||
self.privacy_list_name]
|
||||
key_name = 'privacy_list_%s' % self.privacy_list_name
|
||||
if key_name in gajim.interface.instances[self.account]:
|
||||
del gajim.interface.instances[self.account][key_name]
|
||||
|
||||
def check_active_default(self, a_d_dict):
|
||||
if a_d_dict['active'] == self.privacy_list_name:
|
||||
|
|
@ -1825,11 +1823,10 @@ class PrivacyListWindow:
|
|||
self.global_rules = {}
|
||||
for rule in rules:
|
||||
if rule.has_key('type'):
|
||||
text_item = 'Order: %s, action: %s, type: %s, value: %s' % \
|
||||
(rule['order'], rule['action'], rule['type'],
|
||||
rule['value'])
|
||||
text_item = _('Order: %s, action: %s, type: %s, value: %s') % \
|
||||
(rule['order'], rule['action'], rule['type'], rule['value'])
|
||||
else:
|
||||
text_item = 'Order: %s, action: %s' % (rule['order'],
|
||||
text_item = _('Order: %s, action: %s') % (rule['order'],
|
||||
rule['action'])
|
||||
self.global_rules[text_item] = rule
|
||||
self.list_of_rules_combobox.append_text(text_item)
|
||||
|
|
@ -1857,8 +1854,7 @@ class PrivacyListWindow:
|
|||
def on_delete_rule_button_clicked(self, widget):
|
||||
tags = []
|
||||
for rule in self.global_rules:
|
||||
if rule != \
|
||||
self.list_of_rules_combobox.get_active_text().decode('utf-8'):
|
||||
if rule != self.list_of_rules_combobox.get_active_text():
|
||||
tags.append(self.global_rules[rule])
|
||||
gajim.connections[self.account].set_privacy_list(
|
||||
self.privacy_list_name, tags)
|
||||
|
|
@ -1867,7 +1863,7 @@ class PrivacyListWindow:
|
|||
|
||||
def on_open_rule_button_clicked(self, widget):
|
||||
self.add_edit_rule_label.set_label(
|
||||
_('<b>Edit a rule</b>'))
|
||||
_('<b>Edit a rule</b>'))
|
||||
active_num = self.list_of_rules_combobox.get_active()
|
||||
if active_num == -1:
|
||||
self.active_rule = ''
|
||||
|
|
@ -1918,20 +1914,22 @@ class PrivacyListWindow:
|
|||
self.edit_send_messages_checkbutton.set_active(True)
|
||||
|
||||
if rule_info['action'] == 'allow':
|
||||
self.edit_allow_radiobutton.set_active(True)
|
||||
self.edit_allow_radiobutton.set_active(True)
|
||||
else:
|
||||
self.edit_deny_radiobutton.set_active(True)
|
||||
self.edit_deny_radiobutton.set_active(True)
|
||||
self.add_edit_vbox.show()
|
||||
|
||||
def on_privacy_list_active_checkbutton_toggled(self, widget):
|
||||
if widget.get_active():
|
||||
gajim.connections[self.account].set_active_list(self.privacy_list_name)
|
||||
gajim.connections[self.account].set_active_list(
|
||||
self.privacy_list_name)
|
||||
else:
|
||||
gajim.connections[self.account].set_active_list(None)
|
||||
|
||||
def on_privacy_list_default_checkbutton_toggled(self, widget):
|
||||
if widget.get_active():
|
||||
gajim.connections[self.account].set_default_list(self.privacy_list_name)
|
||||
gajim.connections[self.account].set_default_list(
|
||||
self.privacy_list_name)
|
||||
else:
|
||||
gajim.connections[self.account].set_default_list(None)
|
||||
|
||||
|
|
@ -1957,12 +1955,10 @@ class PrivacyListWindow:
|
|||
def get_current_tags(self):
|
||||
if self.edit_type_jabberid_radiobutton.get_active():
|
||||
edit_type = 'jid'
|
||||
edit_value = \
|
||||
self.edit_type_jabberid_entry.get_text().decode('utf-8')
|
||||
edit_value = self.edit_type_jabberid_entry.get_text()
|
||||
elif self.edit_type_group_radiobutton.get_active():
|
||||
edit_type = 'group'
|
||||
edit_value = \
|
||||
self.edit_type_group_combobox.get_active_text().decode('utf-8')
|
||||
edit_value = self.edit_type_group_combobox.get_active_text()
|
||||
elif self.edit_type_subscription_radiobutton.get_active():
|
||||
edit_type = 'subscription'
|
||||
subs = ['none', 'both', 'from', 'to']
|
||||
|
|
@ -2001,7 +1997,8 @@ class PrivacyListWindow:
|
|||
else:
|
||||
tags.append(current_tags)
|
||||
|
||||
gajim.connections[self.account].set_privacy_list(self.privacy_list_name, tags)
|
||||
gajim.connections[self.account].set_privacy_list(
|
||||
self.privacy_list_name, tags)
|
||||
self.privacy_list_received(tags)
|
||||
self.add_edit_vbox.hide()
|
||||
|
||||
|
|
@ -2031,19 +2028,18 @@ class PrivacyListsWindow:
|
|||
or edit an already there one'''
|
||||
def __init__(self, account):
|
||||
self.account = account
|
||||
|
||||
self.privacy_lists = []
|
||||
|
||||
self.privacy_lists_save = []
|
||||
|
||||
self.xml = gtkgui_helpers.get_glade('privacy_lists_window.glade')
|
||||
|
||||
self.window = self.xml.get_widget('privacy_lists_first_window')
|
||||
for widget_to_add in ['list_of_privacy_lists_combobox',
|
||||
'delete_privacy_list_button', 'open_privacy_list_button',
|
||||
'new_privacy_list_button', 'new_privacy_list_entry', 'buttons_hbox',
|
||||
'privacy_lists_refresh_button', 'close_privacy_lists_window_button']:
|
||||
self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
|
||||
'delete_privacy_list_button', 'open_privacy_list_button',
|
||||
'new_privacy_list_button', 'new_privacy_list_entry', 'buttons_hbox',
|
||||
'privacy_lists_refresh_button', 'close_privacy_lists_window_button']:
|
||||
self.__dict__[widget_to_add] = self.xml.get_widget(
|
||||
widget_to_add)
|
||||
|
||||
self.draw_privacy_lists_in_combobox()
|
||||
self.privacy_lists_refresh()
|
||||
|
|
@ -2062,8 +2058,7 @@ class PrivacyListsWindow:
|
|||
self.xml.signal_autoconnect(self)
|
||||
|
||||
def on_privacy_lists_first_window_destroy(self, widget):
|
||||
'''close window'''
|
||||
if gajim.interface.instances[self.account].has_key('privacy_lists'):
|
||||
if 'privacy_lists' in gajim.interface.instances[self.account]:
|
||||
del gajim.interface.instances[self.account]['privacy_lists']
|
||||
|
||||
def draw_privacy_lists_in_combobox(self):
|
||||
|
|
@ -2109,14 +2104,13 @@ class PrivacyListsWindow:
|
|||
gajim.connections[self.account].get_privacy_lists()
|
||||
|
||||
def on_new_privacy_list_button_clicked(self, widget):
|
||||
name = self.new_privacy_list_entry.get_text().decode('utf-8')
|
||||
if gajim.interface.instances[self.account].has_key(
|
||||
'privacy_list_%s' % name):
|
||||
gajim.interface.instances[self.account]['privacy_list_%s' % name].\
|
||||
window.present()
|
||||
name = self.new_privacy_list_entry.get_text()
|
||||
key_name = 'privacy_list_%s' % name
|
||||
if gajim.interface.instances[self.account].has_key(key_name):
|
||||
gajim.interface.instances[self.account][key_name].window.present()
|
||||
else:
|
||||
gajim.interface.instances[self.account]['privacy_list_%s' % name] = \
|
||||
PrivacyListWindow(self.account, name, 'new')
|
||||
gajim.interface.instances[self.account][key_name] = \
|
||||
PrivacyListWindow(self.account, name, 'NEW')
|
||||
self.new_privacy_list_entry.set_text('')
|
||||
|
||||
def on_privacy_lists_refresh_button_clicked(self, widget):
|
||||
|
|
@ -2125,16 +2119,17 @@ class PrivacyListsWindow:
|
|||
def on_open_privacy_list_button_clicked(self, widget):
|
||||
name = self.privacy_lists_save[
|
||||
self.list_of_privacy_lists_combobox.get_active()]
|
||||
key_name = 'privacy_list_%s' % name
|
||||
if gajim.interface.instances[self.account].has_key(
|
||||
'privacy_list_%s' % name):
|
||||
gajim.interface.instances[self.account]['privacy_list_%s' % name].\
|
||||
window.present()
|
||||
key_name):
|
||||
gajim.interface.instances[self.account][key_name].window.present()
|
||||
else:
|
||||
gajim.interface.instances[self.account]['privacy_list_%s' % name] = \
|
||||
PrivacyListWindow(self.account, name, 'edit')
|
||||
gajim.interface.instances[self.account][key_name] = \
|
||||
PrivacyListWindow(self.account, name, 'EDIT')
|
||||
|
||||
class InvitationReceivedDialog:
|
||||
def __init__(self, account, room_jid, contact_jid, password = None, comment = None):
|
||||
def __init__(self, account, room_jid, contact_jid, password = None,
|
||||
comment = None):
|
||||
|
||||
self.room_jid = room_jid
|
||||
self.account = account
|
||||
|
|
|
|||
Loading…
Reference in New Issue