From 70f1c0f483c365ed6138dcdb71da324c3db521d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Tue, 19 Nov 2019 22:45:21 +0100
Subject: [PATCH] PrivacyLists: Refactor code
- Make handler private
- Fix pylint errors
- Access widgets directly via builder
---
gajim/data/gui/privacy_list_window.ui | 10 +-
gajim/data/gui/privacy_lists_window.ui | 10 +-
gajim/gtk/privacy_list.py | 338 ++++++++++++-------------
3 files changed, 169 insertions(+), 189 deletions(-)
diff --git a/gajim/data/gui/privacy_list_window.ui b/gajim/data/gui/privacy_list_window.ui
index eb88e3131f..09a08b1978 100644
--- a/gajim/data/gui/privacy_list_window.ui
+++ b/gajim/data/gui/privacy_list_window.ui
@@ -46,7 +46,7 @@
<property name="border_width">6</property>
<property name="title" translatable="yes">Privacy List</property>
<property name="type_hint">dialog</property>
- <signal name="destroy" handler="on_privacy_list_edit_window_destroy" swapped="no"/>
+ <signal name="destroy" handler="_on_edit_window_destroy" swapped="no"/>
<signal name="key-press-event" handler="on_key_press_event" swapped="no"/>
<child>
<object class="GtkBox" id="main_vbox">
@@ -81,7 +81,7 @@
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_privacy_list_active_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled" handler="_on_privacy_list_active_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -98,7 +98,7 @@
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_privacy_list_default_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled" handler="_on_privacy_list_default_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -144,7 +144,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststore3</property>
- <signal name="changed" handler="on_list_of_rules_combobox_changed" swapped="no"/>
+ <signal name="changed" handler="_on_list_of_rules_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
@@ -679,7 +679,7 @@
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
+ <signal name="clicked" handler="_on_close_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/gajim/data/gui/privacy_lists_window.ui b/gajim/data/gui/privacy_lists_window.ui
index c3ec727b89..d29c6cfe45 100644
--- a/gajim/data/gui/privacy_lists_window.ui
+++ b/gajim/data/gui/privacy_lists_window.ui
@@ -14,7 +14,7 @@
<property name="border_width">12</property>
<property name="title">window1</property>
<property name="type_hint">dialog</property>
- <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/>
+ <signal name="destroy" handler="_on_privacy_lists_first_destroy" swapped="no"/>
<signal name="key-press-event" handler="on_key_press_event" swapped="no"/>
<child>
<object class="GtkBox" id="vbox1">
@@ -84,7 +84,7 @@
<property name="receives_default">False</property>
<property name="border_width">5</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_delete_privacy_list_button_clicked" swapped="no"/>
+ <signal name="clicked" handler="_on_delete_privacy_list_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -100,7 +100,7 @@
<property name="receives_default">False</property>
<property name="border_width">5</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_open_privacy_list_button_clicked" swapped="no"/>
+ <signal name="clicked" handler="_on_open_privacy_list_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -138,7 +138,7 @@
<property name="receives_default">False</property>
<property name="border_width">5</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_new_privacy_list_button_clicked" swapped="no"/>
+ <signal name="clicked" handler="_on_new_privacy_list_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -173,7 +173,7 @@
<property name="receives_default">False</property>
<property name="border_width">5</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
+ <signal name="clicked" handler="_on_close_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/gajim/gtk/privacy_list.py b/gajim/gtk/privacy_list.py
index 57d61fc9a6..b2edb21601 100644
--- a/gajim/gtk/privacy_list.py
+++ b/gajim/gtk/privacy_list.py
@@ -46,29 +46,10 @@ def __init__(self, account, privacy_list_name, action):
self.allow_deny = 'allow'
# Connect to gtk builder
- self.xml = get_builder('privacy_list_window.ui')
- self.window = self.xml.get_object('privacy_list_edit_window')
-
- # Add Widgets
-
- for widget_to_add in ('title_hbox', 'privacy_lists_title_label',
- 'list_of_rules_label', 'add_edit_rule_label', 'delete_open_buttons_hbox',
- 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton',
- 'list_of_rules_combobox', 'delete_open_buttons_hbox',
- 'delete_rule_button', 'open_rule_button', 'edit_allow_radiobutton',
- 'edit_deny_radiobutton', 'edit_type_jabberid_radiobutton',
- 'edit_type_jabberid_entry', 'edit_type_group_radiobutton',
- 'edit_type_group_combobox', 'edit_type_subscription_radiobutton',
- 'edit_type_subscription_combobox', 'edit_type_select_all_radiobutton',
- 'edit_queries_send_checkbutton', 'edit_send_messages_checkbutton',
- 'edit_view_status_checkbutton', 'edit_all_checkbutton',
- 'edit_order_spinbutton', 'new_rule_button', 'save_rule_button',
- 'privacy_list_refresh_button', 'privacy_list_close_button',
- 'edit_send_status_checkbutton', 'add_edit_vbox',
- 'privacy_list_active_checkbutton', 'privacy_list_default_checkbutton'):
- self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add)
-
- self.privacy_lists_title_label.set_label(
+ self._ui = get_builder('privacy_list_window.ui')
+ self.window = self._ui.get_object('privacy_list_edit_window')
+
+ self._ui.privacy_lists_title_label.set_label(
_('Privacy List <b><i>%s</i></b>') %
GLib.markup_escape_text(self.privacy_list_name))
@@ -77,11 +58,11 @@ def __init__(self, account, privacy_list_name, action):
else:
title = _('Privacy List')
- self.delete_rule_button.set_sensitive(False)
- self.open_rule_button.set_sensitive(False)
- self.privacy_list_active_checkbutton.set_sensitive(False)
- self.privacy_list_default_checkbutton.set_sensitive(False)
- self.list_of_rules_combobox.set_sensitive(False)
+ self._ui.delete_rule_button.set_sensitive(False)
+ self._ui.open_rule_button.set_sensitive(False)
+ self._ui.privacy_list_active_checkbutton.set_sensitive(False)
+ self._ui.privacy_list_default_checkbutton.set_sensitive(False)
+ self._ui.list_of_rules_combobox.set_sensitive(False)
# set jabber id completion
jids_list_store = Gtk.ListStore(GObject.TYPE_STRING)
@@ -91,17 +72,17 @@ def __init__(self, account, privacy_list_name, action):
jid_entry_completion.set_text_column(0)
jid_entry_completion.set_model(jids_list_store)
jid_entry_completion.set_popup_completion(True)
- self.edit_type_jabberid_entry.set_completion(jid_entry_completion)
+ self._ui.edit_type_jabberid_entry.set_completion(jid_entry_completion)
if action == 'EDIT':
self.refresh_rules()
- model = self.edit_type_group_combobox.get_model()
+ model = self._ui.edit_type_group_combobox.get_model()
count = 0
for group in app.groups[self.account]:
self.list_of_groups[group] = count
count += 1
model.append([group])
- self.edit_type_group_combobox.set_active(0)
+ self._ui.edit_type_group_combobox.set_active(0)
self.window.set_title(title)
@@ -113,15 +94,15 @@ def __init__(self, account, privacy_list_name, action):
# pylint: enable=line-too-long
self.window.show_all()
- self.add_edit_vbox.hide()
+ self._ui.add_edit_vbox.hide()
- self.xml.connect_signals(self)
+ self._ui.connect_signals(self)
- def on_key_press_event(self, widget, event):
+ def on_key_press_event(self, _widget, event):
if event.keyval == Gdk.KEY_Escape:
self.window.destroy()
- def on_privacy_list_edit_window_destroy(self, widget):
+ def _on_edit_window_destroy(self, _widget):
key_name = 'privacy_list_%s' % self.privacy_list_name
if key_name in app.interface.instances[self.account]:
del app.interface.instances[self.account][key_name]
@@ -131,23 +112,26 @@ def _nec_privacy_lists_received(self, obj):
if obj.conn.name != self.account:
return
if obj.active_list == self.privacy_list_name:
- self.privacy_list_active_checkbutton.set_active(True)
+ self._ui.privacy_list_active_checkbutton.set_active(True)
else:
- self.privacy_list_active_checkbutton.set_active(False)
+ self._ui.privacy_list_active_checkbutton.set_active(False)
if obj.default_list == self.privacy_list_name:
- self.privacy_list_default_checkbutton.set_active(True)
+ self._ui.privacy_list_default_checkbutton.set_active(True)
else:
- self.privacy_list_default_checkbutton.set_active(False)
+ self._ui.privacy_list_default_checkbutton.set_active(False)
def privacy_list_received(self, rules):
- model = self.list_of_rules_combobox.get_model()
+ model = self._ui.list_of_rules_combobox.get_model()
model.clear()
self.global_rules = {}
for rule in rules:
if 'type' in rule:
- text_item = _('Order: %(order)s, action: %(action)s, type: %(type)s'
- ', value: %(value)s') % {'order': rule['order'],
- 'action': rule['action'], 'type': rule['type'],
+ text_item = _(
+ 'Order: %(order)s, action: %(action)s, type: %(type)s'
+ ', value: %(value)s') % {
+ 'order': rule['order'],
+ 'action': rule['action'],
+ 'type': rule['type'],
'value': rule['value']}
else:
text_item = _('Order: %(order)s, action: %(action)s') % \
@@ -157,20 +141,20 @@ def privacy_list_received(self, rules):
self.global_rules[text_item] = rule
model.append([text_item])
if not rules:
- self.title_hbox.set_sensitive(False)
- self.list_of_rules_combobox.set_sensitive(False)
- self.delete_rule_button.set_sensitive(False)
- self.open_rule_button.set_sensitive(False)
- self.privacy_list_active_checkbutton.set_sensitive(False)
- self.privacy_list_default_checkbutton.set_sensitive(False)
+ self._ui.title_hbox.set_sensitive(False)
+ self._ui.list_of_rules_combobox.set_sensitive(False)
+ self._ui.delete_rule_button.set_sensitive(False)
+ self._ui.open_rule_button.set_sensitive(False)
+ self._ui.privacy_list_active_checkbutton.set_sensitive(False)
+ self._ui.privacy_list_default_checkbutton.set_sensitive(False)
else:
- self.list_of_rules_combobox.set_active(0)
- self.title_hbox.set_sensitive(True)
- self.list_of_rules_combobox.set_sensitive(True)
- self.delete_rule_button.set_sensitive(True)
- self.open_rule_button.set_sensitive(True)
- self.privacy_list_active_checkbutton.set_sensitive(True)
- self.privacy_list_default_checkbutton.set_sensitive(True)
+ self._ui.list_of_rules_combobox.set_active(0)
+ self._ui.title_hbox.set_sensitive(True)
+ self._ui.list_of_rules_combobox.set_sensitive(True)
+ self._ui.delete_rule_button.set_sensitive(True)
+ self._ui.open_rule_button.set_sensitive(True)
+ self._ui.privacy_list_active_checkbutton.set_sensitive(True)
+ self._ui.privacy_list_default_checkbutton.set_sensitive(True)
self.reset_fields()
con = app.connections[self.account]
con.get_module('PrivacyLists').get_privacy_lists()
@@ -186,9 +170,9 @@ def refresh_rules(self):
con = app.connections[self.account]
con.get_module('PrivacyLists').get_privacy_list(self.privacy_list_name)
- def on_delete_rule_button_clicked(self, widget):
- model = self.list_of_rules_combobox.get_model()
- iter_ = self.list_of_rules_combobox.get_active_iter()
+ def on_delete_rule_button_clicked(self, _widget):
+ model = self._ui.list_of_rules_combobox.get_model()
+ iter_ = self._ui.list_of_rules_combobox.get_active_iter()
_rule = model[iter_][0]
tags = []
for rule in self.global_rules:
@@ -198,95 +182,96 @@ def on_delete_rule_button_clicked(self, widget):
con.get_module('PrivacyLists').set_privacy_list(
self.privacy_list_name, tags)
self.privacy_list_received(tags)
- self.add_edit_vbox.hide()
+ self._ui.add_edit_vbox.hide()
if not tags: # we removed latest rule
if 'privacy_lists' in app.interface.instances[self.account]:
win = app.interface.instances[self.account]['privacy_lists']
- win.remove_privacy_list_from_combobox(self.privacy_list_name)
+ win.remove_privacy_list(self.privacy_list_name)
win.draw_widgets()
- def on_open_rule_button_clicked(self, widget):
- self.add_edit_rule_label.set_label(_('<b>Edit a rule</b>'))
- active_num = self.list_of_rules_combobox.get_active()
+ def on_open_rule_button_clicked(self, _widget):
+ self._ui.add_edit_rule_label.set_label(_('<b>Edit a rule</b>'))
+ active_num = self._ui.list_of_rules_combobox.get_active()
if active_num == -1:
self.active_rule = ''
else:
- model = self.list_of_rules_combobox.get_model()
- iter_ = self.list_of_rules_combobox.get_active_iter()
+ model = self._ui.list_of_rules_combobox.get_model()
+ iter_ = self._ui.list_of_rules_combobox.get_active_iter()
self.active_rule = model[iter_][0]
if self.active_rule != '':
rule_info = self.global_rules[self.active_rule]
- self.edit_order_spinbutton.set_value(int(rule_info['order']))
+ self._ui.edit_order_spinbutton.set_value(int(rule_info['order']))
if 'type' in rule_info:
if rule_info['type'] == 'jid':
- self.edit_type_jabberid_radiobutton.set_active(True)
- self.edit_type_jabberid_entry.set_text(rule_info['value'])
+ self._ui.edit_type_jabberid_radiobutton.set_active(True)
+ self._ui.edit_type_jabberid_entry.set_text(
+ rule_info['value'])
elif rule_info['type'] == 'group':
- self.edit_type_group_radiobutton.set_active(True)
+ self._ui.edit_type_group_radiobutton.set_active(True)
if rule_info['value'] in self.list_of_groups:
- self.edit_type_group_combobox.set_active(
+ self._ui.edit_type_group_combobox.set_active(
self.list_of_groups[rule_info['value']])
else:
- self.edit_type_group_combobox.set_active(0)
+ self._ui.edit_type_group_combobox.set_active(0)
elif rule_info['type'] == 'subscription':
- self.edit_type_subscription_radiobutton.set_active(True)
+ self._ui.edit_type_subscription_radiobutton.set_active(True)
sub_value = rule_info['value']
if sub_value == 'none':
- self.edit_type_subscription_combobox.set_active(0)
+ self._ui.edit_type_subscription_combobox.set_active(0)
elif sub_value == 'both':
- self.edit_type_subscription_combobox.set_active(1)
+ self._ui.edit_type_subscription_combobox.set_active(1)
elif sub_value == 'from':
- self.edit_type_subscription_combobox.set_active(2)
+ self._ui.edit_type_subscription_combobox.set_active(2)
elif sub_value == 'to':
- self.edit_type_subscription_combobox.set_active(3)
+ self._ui.edit_type_subscription_combobox.set_active(3)
else:
- self.edit_type_select_all_radiobutton.set_active(True)
+ self._ui.edit_type_select_all_radiobutton.set_active(True)
else:
- self.edit_type_select_all_radiobutton.set_active(True)
- self.edit_send_messages_checkbutton.set_active(False)
- self.edit_queries_send_checkbutton.set_active(False)
- self.edit_view_status_checkbutton.set_active(False)
- self.edit_send_status_checkbutton.set_active(False)
- self.edit_all_checkbutton.set_active(False)
+ self._ui.edit_type_select_all_radiobutton.set_active(True)
+ self._ui.edit_send_messages_checkbutton.set_active(False)
+ self._ui.edit_queries_send_checkbutton.set_active(False)
+ self._ui.edit_view_status_checkbutton.set_active(False)
+ self._ui.edit_send_status_checkbutton.set_active(False)
+ self._ui.edit_all_checkbutton.set_active(False)
if not rule_info['child']:
- self.edit_all_checkbutton.set_active(True)
+ self._ui.edit_all_checkbutton.set_active(True)
else:
if 'presence-out' in rule_info['child']:
- self.edit_send_status_checkbutton.set_active(True)
+ self._ui.edit_send_status_checkbutton.set_active(True)
if 'presence-in' in rule_info['child']:
- self.edit_view_status_checkbutton.set_active(True)
+ self._ui.edit_view_status_checkbutton.set_active(True)
if 'iq' in rule_info['child']:
- self.edit_queries_send_checkbutton.set_active(True)
+ self._ui.edit_queries_send_checkbutton.set_active(True)
if 'message' in rule_info['child']:
- self.edit_send_messages_checkbutton.set_active(True)
+ self._ui.edit_send_messages_checkbutton.set_active(True)
if rule_info['action'] == 'allow':
- self.edit_allow_radiobutton.set_active(True)
+ self._ui.edit_allow_radiobutton.set_active(True)
else:
- self.edit_deny_radiobutton.set_active(True)
- self.add_edit_vbox.show()
+ self._ui.edit_deny_radiobutton.set_active(True)
+ self._ui.add_edit_vbox.show()
def on_edit_all_checkbutton_toggled(self, widget):
if widget.get_active():
- self.edit_send_messages_checkbutton.set_active(True)
- self.edit_queries_send_checkbutton.set_active(True)
- self.edit_view_status_checkbutton.set_active(True)
- self.edit_send_status_checkbutton.set_active(True)
- self.edit_send_messages_checkbutton.set_sensitive(False)
- self.edit_queries_send_checkbutton.set_sensitive(False)
- self.edit_view_status_checkbutton.set_sensitive(False)
- self.edit_send_status_checkbutton.set_sensitive(False)
+ self._ui.edit_send_messages_checkbutton.set_active(True)
+ self._ui.edit_queries_send_checkbutton.set_active(True)
+ self._ui.edit_view_status_checkbutton.set_active(True)
+ self._ui.edit_send_status_checkbutton.set_active(True)
+ self._ui.edit_send_messages_checkbutton.set_sensitive(False)
+ self._ui.edit_queries_send_checkbutton.set_sensitive(False)
+ self._ui.edit_view_status_checkbutton.set_sensitive(False)
+ self._ui.edit_send_status_checkbutton.set_sensitive(False)
else:
- self.edit_send_messages_checkbutton.set_active(False)
- self.edit_queries_send_checkbutton.set_active(False)
- self.edit_view_status_checkbutton.set_active(False)
- self.edit_send_status_checkbutton.set_active(False)
- self.edit_send_messages_checkbutton.set_sensitive(True)
- self.edit_queries_send_checkbutton.set_sensitive(True)
- self.edit_view_status_checkbutton.set_sensitive(True)
- self.edit_send_status_checkbutton.set_sensitive(True)
-
- def on_privacy_list_active_checkbutton_toggled(self, widget):
+ self._ui.edit_send_messages_checkbutton.set_active(False)
+ self._ui.edit_queries_send_checkbutton.set_active(False)
+ self._ui.edit_view_status_checkbutton.set_active(False)
+ self._ui.edit_send_status_checkbutton.set_active(False)
+ self._ui.edit_send_messages_checkbutton.set_sensitive(True)
+ self._ui.edit_queries_send_checkbutton.set_sensitive(True)
+ self._ui.edit_view_status_checkbutton.set_sensitive(True)
+ self._ui.edit_send_status_checkbutton.set_sensitive(True)
+
+ def _on_privacy_list_active_toggled(self, widget):
name = None
if widget.get_active():
name = self.privacy_list_name
@@ -294,7 +279,7 @@ def on_privacy_list_active_checkbutton_toggled(self, widget):
con = app.connections[self.account]
con.get_module('PrivacyLists').set_active_list(name)
- def on_privacy_list_default_checkbutton_toggled(self, widget):
+ def _on_privacy_list_default_toggled(self, widget):
name = None
if widget.get_active():
name = self.privacy_list_name
@@ -302,62 +287,63 @@ def on_privacy_list_default_checkbutton_toggled(self, widget):
con = app.connections[self.account]
con.get_module('PrivacyLists').set_default_list(name)
- def on_new_rule_button_clicked(self, widget):
+ def on_new_rule_button_clicked(self, _widget):
self.reset_fields()
- self.add_edit_vbox.show()
+ self._ui.add_edit_vbox.show()
def reset_fields(self):
- self.edit_type_jabberid_entry.set_text('')
- self.edit_allow_radiobutton.set_active(True)
- self.edit_type_jabberid_radiobutton.set_active(True)
+ self._ui.edit_type_jabberid_entry.set_text('')
+ self._ui.edit_allow_radiobutton.set_active(True)
+ self._ui.edit_type_jabberid_radiobutton.set_active(True)
self.active_rule = ''
- self.edit_send_messages_checkbutton.set_active(False)
- self.edit_queries_send_checkbutton.set_active(False)
- self.edit_view_status_checkbutton.set_active(False)
- self.edit_send_status_checkbutton.set_active(False)
- self.edit_all_checkbutton.set_active(False)
- self.edit_order_spinbutton.set_value(self.max_order + 1)
- self.edit_type_group_combobox.set_active(0)
- self.edit_type_subscription_combobox.set_active(0)
- self.add_edit_rule_label.set_label(_('<b>Add a rule</b>'))
+ self._ui.edit_send_messages_checkbutton.set_active(False)
+ self._ui.edit_queries_send_checkbutton.set_active(False)
+ self._ui.edit_view_status_checkbutton.set_active(False)
+ self._ui.edit_send_status_checkbutton.set_active(False)
+ self._ui.edit_all_checkbutton.set_active(False)
+ self._ui.edit_order_spinbutton.set_value(self.max_order + 1)
+ self._ui.edit_type_group_combobox.set_active(0)
+ self._ui.edit_type_subscription_combobox.set_active(0)
+ self._ui.add_edit_rule_label.set_label(_('<b>Add a rule</b>'))
def get_current_tags(self):
- if self.edit_type_jabberid_radiobutton.get_active():
+ if self._ui.edit_type_jabberid_radiobutton.get_active():
edit_type = 'jid'
- edit_value = self.edit_type_jabberid_entry.get_text()
- elif self.edit_type_group_radiobutton.get_active():
+ edit_value = self._ui.edit_type_jabberid_entry.get_text()
+ elif self._ui.edit_type_group_radiobutton.get_active():
edit_type = 'group'
- model = self.edit_type_group_combobox.get_model()
- iter_ = self.edit_type_group_combobox.get_active_iter()
+ model = self._ui.edit_type_group_combobox.get_model()
+ iter_ = self._ui.edit_type_group_combobox.get_active_iter()
edit_value = model[iter_][0]
- elif self.edit_type_subscription_radiobutton.get_active():
+ elif self._ui.edit_type_subscription_radiobutton.get_active():
edit_type = 'subscription'
subs = ['none', 'both', 'from', 'to']
- edit_value = subs[self.edit_type_subscription_combobox.get_active()]
- elif self.edit_type_select_all_radiobutton.get_active():
+ edit_value = subs[
+ self._ui.edit_type_subscription_combobox.get_active()]
+ elif self._ui.edit_type_select_all_radiobutton.get_active():
edit_type = ''
edit_value = ''
- edit_order = str(self.edit_order_spinbutton.get_value_as_int())
- if self.edit_allow_radiobutton.get_active():
+ edit_order = str(self._ui.edit_order_spinbutton.get_value_as_int())
+ if self._ui.edit_allow_radiobutton.get_active():
edit_deny = 'allow'
else:
edit_deny = 'deny'
child = []
- if not self.edit_all_checkbutton.get_active():
- if self.edit_send_messages_checkbutton.get_active():
+ if not self._ui.edit_all_checkbutton.get_active():
+ if self._ui.edit_send_messages_checkbutton.get_active():
child.append('message')
- if self.edit_queries_send_checkbutton.get_active():
+ if self._ui.edit_queries_send_checkbutton.get_active():
child.append('iq')
- if self.edit_send_status_checkbutton.get_active():
+ if self._ui.edit_send_status_checkbutton.get_active():
child.append('presence-out')
- if self.edit_view_status_checkbutton.get_active():
+ if self._ui.edit_view_status_checkbutton.get_active():
child.append('presence-in')
if edit_type != '':
return {'order': edit_order, 'action': edit_deny,
'type': edit_type, 'value': edit_value, 'child': child}
return {'order': edit_order, 'action': edit_deny, 'child': child}
- def on_save_rule_button_clicked(self, widget):
+ def on_save_rule_button_clicked(self, _widget):
tags = []
current_tags = self.get_current_tags()
if int(current_tags['order']) > self.max_order:
@@ -375,26 +361,26 @@ def on_save_rule_button_clicked(self, widget):
con.get_module('PrivacyLists').set_privacy_list(
self.privacy_list_name, tags)
self.refresh_rules()
- self.add_edit_vbox.hide()
+ self._ui.add_edit_vbox.hide()
if 'privacy_lists' in app.interface.instances[self.account]:
win = app.interface.instances[self.account]['privacy_lists']
win.add_privacy_list_to_combobox(self.privacy_list_name)
win.draw_widgets()
- def on_list_of_rules_combobox_changed(self, widget):
- self.add_edit_vbox.hide()
+ def _on_list_of_rules_changed(self, _widget):
+ self._ui.add_edit_vbox.hide()
- def on_edit_type_radiobutton_changed(self, widget, radiobutton):
+ def _on_edit_type_changed(self, widget, radiobutton):
active_bool = widget.get_active()
if active_bool:
self.edit_rule_type = radiobutton
- def on_edit_allow_radiobutton_changed(self, widget, radiobutton):
+ def _on_edit_allow_changed(self, widget, radiobutton):
active_bool = widget.get_active()
if active_bool:
self.allow_deny = radiobutton
- def on_close_button_clicked(self, widget):
+ def _on_close_clicked(self, _widget):
self.window.destroy()
@@ -408,15 +394,9 @@ def __init__(self, account):
self.account = account
self.privacy_lists_save = []
- self.xml = get_builder('privacy_lists_window.ui')
+ self._ui = get_builder('privacy_lists_window.ui')
- self.window = self.xml.get_object('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', 'privacy_lists_refresh_button',
- 'close_privacy_lists_window_button'):
- self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add)
+ self.window = self._ui.get_object('privacy_lists_first_window')
self.draw_privacy_lists_in_combobox([])
self.privacy_lists_refresh()
@@ -439,22 +419,22 @@ def __init__(self, account):
self.window.show_all()
- self.xml.connect_signals(self)
+ self._ui.connect_signals(self)
- def on_key_press_event(self, widget, event):
+ def on_key_press_event(self, _widget, event):
if event.keyval == Gdk.KEY_Escape:
self.window.destroy()
- def on_privacy_lists_first_window_destroy(self, widget):
+ def _on_privacy_lists_first_destroy(self, _widget):
if 'privacy_lists' in app.interface.instances[self.account]:
del app.interface.instances[self.account]['privacy_lists']
self.unregister_events()
- def remove_privacy_list_from_combobox(self, privacy_list):
+ def remove_privacy_list(self, privacy_list):
if privacy_list not in self.privacy_lists_save:
return
- model = self.list_of_privacy_lists_combobox.get_model()
+ model = self._ui.list_of_privacy_lists_combobox.get_model()
for entry in model:
if entry[0] == privacy_list:
model.remove(entry.iter)
@@ -464,13 +444,13 @@ def remove_privacy_list_from_combobox(self, privacy_list):
def add_privacy_list_to_combobox(self, privacy_list):
if privacy_list in self.privacy_lists_save:
return
- model = self.list_of_privacy_lists_combobox.get_model()
+ model = self._ui.list_of_privacy_lists_combobox.get_model()
model.append([privacy_list])
self.privacy_lists_save.append(privacy_list)
def draw_privacy_lists_in_combobox(self, privacy_lists):
- self.list_of_privacy_lists_combobox.set_active(-1)
- self.list_of_privacy_lists_combobox.get_model().clear()
+ self._ui.list_of_privacy_lists_combobox.set_active(-1)
+ self._ui.list_of_privacy_lists_combobox.get_model().clear()
self.privacy_lists_save = []
for add_item in privacy_lists:
self.add_privacy_list_to_combobox(add_item)
@@ -478,21 +458,21 @@ def draw_privacy_lists_in_combobox(self, privacy_lists):
def draw_widgets(self):
if not self.privacy_lists_save:
- self.list_of_privacy_lists_combobox.set_sensitive(False)
- self.open_privacy_list_button.set_sensitive(False)
- self.delete_privacy_list_button.set_sensitive(False)
+ self._ui.list_of_privacy_lists_combobox.set_sensitive(False)
+ self._ui.open_privacy_list_button.set_sensitive(False)
+ self._ui.delete_privacy_list_button.set_sensitive(False)
else:
- self.list_of_privacy_lists_combobox.set_sensitive(True)
- self.list_of_privacy_lists_combobox.set_active(0)
- self.open_privacy_list_button.set_sensitive(True)
- self.delete_privacy_list_button.set_sensitive(True)
+ self._ui.list_of_privacy_lists_combobox.set_sensitive(True)
+ self._ui.list_of_privacy_lists_combobox.set_active(0)
+ self._ui.open_privacy_list_button.set_sensitive(True)
+ self._ui.delete_privacy_list_button.set_sensitive(True)
- def on_close_button_clicked(self, widget):
+ def _on_close_clicked(self, _widget):
self.window.destroy()
- def on_delete_privacy_list_button_clicked(self, widget):
+ def _on_delete_privacy_list_clicked(self, _widget):
active_list = self.privacy_lists_save[
- self.list_of_privacy_lists_combobox.get_active()]
+ self._ui.list_of_privacy_lists_combobox.get_active()]
con = app.connections[self.account]
con.get_module('PrivacyLists').del_privacy_list(active_list)
@@ -520,8 +500,8 @@ def privacy_lists_refresh(self):
con = app.connections[self.account]
con.get_module('PrivacyLists').get_privacy_lists()
- def on_new_privacy_list_button_clicked(self, widget):
- name = self.new_privacy_list_entry.get_text()
+ def _on_new_privacy_list_clicked(self, _widget):
+ name = self._ui.new_privacy_list_entry.get_text()
if not name:
ErrorDialog(
_('Invalid List Name'),
@@ -534,14 +514,14 @@ def on_new_privacy_list_button_clicked(self, widget):
else:
app.interface.instances[self.account][key_name] = \
PrivacyListWindow(self.account, name, 'NEW')
- self.new_privacy_list_entry.set_text('')
+ self._ui.new_privacy_list_entry.set_text('')
- def on_privacy_lists_refresh_button_clicked(self, widget):
+ def _on_privacy_lists_refresh_clicked(self, _widget):
self.privacy_lists_refresh()
- def on_open_privacy_list_button_clicked(self, widget):
+ def _on_open_privacy_list_clicked(self, _widget):
name = self.privacy_lists_save[
- self.list_of_privacy_lists_combobox.get_active()]
+ self._ui.list_of_privacy_lists_combobox.get_active()]
key_name = 'privacy_list_%s' % name
if key_name in app.interface.instances[self.account]:
app.interface.instances[self.account][key_name].window.present()
--
GitLab