coding standards

This commit is contained in:
Yann Leboulanger 2008-09-03 11:25:27 +00:00
parent aba6fc2599
commit c8d97aaa17
1 changed files with 33 additions and 34 deletions

View File

@ -188,7 +188,7 @@ class EditGroupsDialog:
self.list.append_column(column)
renderer = gtk.CellRendererText()
column.pack_start(renderer)
column.set_attributes(renderer, text = 0)
column.set_attributes(renderer, text=0)
column = gtk.TreeViewColumn(_('In the group'))
column.set_expand(False)
@ -197,7 +197,7 @@ class EditGroupsDialog:
column.pack_start(renderer)
renderer.set_property('activatable', True)
renderer.connect('toggled', self.group_toggled_cb)
column.set_attributes(renderer, active = 1, inconsistent = 2)
column.set_attributes(renderer, active=1, inconsistent=2)
class PassphraseDialog:
'''Class for Passphrase dialog'''
@ -280,7 +280,7 @@ class ChooseGPGKeyDialog:
col.set_sort_column_id(0)
renderer = gtk.CellRendererText()
col = self.keys_treeview.insert_column_with_attributes(-1,
_('Contact name'), renderer, text = 1)
_('Contact name'), renderer, text=1)
col.set_sort_column_id(1)
self.keys_treeview.set_search_column(1)
self.fill_tree(secret_keys, selected)
@ -529,7 +529,7 @@ class ChangeMoodDialog:
self.window.destroy()
class ChangeStatusMessageDialog:
def __init__(self, on_response, show = None):
def __init__(self, on_response, show=None):
self.show = show
self.on_response = on_response
self.xml = gtkgui_helpers.get_glade('change_status_message_dialog.glade')
@ -673,8 +673,7 @@ class AddNewContactWindow:
'icq': _('ICQ Number:'),
'msn': _('MSN Address:'),
'yahoo': _('Yahoo! Address:')}
def __init__(self, account = None, jid = None, user_nick = None,
group = None):
def __init__(self, account=None, jid=None, user_nick=None, group=None):
self.account = account
if account is None:
# fill accounts with active accounts
@ -1057,7 +1056,7 @@ class AboutDialog:
return None
class Dialog(gtk.Dialog):
def __init__(self, parent, title, buttons, default = None,
def __init__(self, parent, title, buttons, default=None,
on_response_ok=None, on_response_cancel=None):
gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR)
@ -1149,8 +1148,8 @@ class FileChooserDialog(gtk.FileChooserDialog):
select_multiple = False, current_folder = None, on_response_ok = None,
on_response_cancel = None):
gtk.FileChooserDialog.__init__(self, title = title_text,
action = action, buttons = buttons)
gtk.FileChooserDialog.__init__(self, title=title_text, action=action,
buttons=buttons)
self.set_default_response(default_response)
self.set_select_multiple(select_multiple)
@ -1224,8 +1223,8 @@ class ConfirmationDialog(HigDialog):
class NonModalConfirmationDialog(HigDialog):
'''HIG compliant non modal confirmation dialog.'''
def __init__(self, pritext, sectext='', on_response_ok = None,
on_response_cancel = None):
def __init__(self, pritext, sectext='', on_response_ok=None,
on_response_cancel=None):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
HigDialog.__init__(self, None,
@ -1318,8 +1317,8 @@ class YesNoDialog(HigDialog):
class ConfirmationDialogCheck(ConfirmationDialog):
'''HIG compliant confirmation dialog with checkbutton.'''
def __init__(self, pritext, sectext='', checktext = '',
on_response_ok = None, on_response_cancel = None, is_modal = True):
def __init__(self, pritext, sectext='', checktext='',
on_response_ok=None, on_response_cancel=None, is_modal=True):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
@ -1333,7 +1332,7 @@ class ConfirmationDialogCheck(ConfirmationDialog):
ok_button.grab_focus()
self.checkbutton = gtk.CheckButton(checktext)
self.vbox.pack_start(self.checkbutton, expand = False, fill = True)
self.vbox.pack_start(self.checkbutton, expand=False, fill=True)
self.set_modal(is_modal)
self.popup()
@ -1363,8 +1362,8 @@ class ConfirmationDialogCheck(ConfirmationDialog):
class ConfirmationDialogDubbleCheck(ConfirmationDialog):
'''HIG compliant confirmation dialog with 2 checkbuttons.'''
def __init__(self, pritext, sectext='', checktext1 = '', checktext2 = '',
on_response_ok = None, on_response_cancel = None, is_modal = True):
def __init__(self, pritext, sectext='', checktext1='', checktext2='',
on_response_ok=None, on_response_cancel=None, is_modal=True):
self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel
@ -1379,12 +1378,12 @@ class ConfirmationDialogDubbleCheck(ConfirmationDialog):
if checktext1:
self.checkbutton1 = gtk.CheckButton(checktext1)
self.vbox.pack_start(self.checkbutton1, expand = False, fill = True)
self.vbox.pack_start(self.checkbutton1, expand=False, fill=True)
else:
self.checkbutton1 = None
if checktext2:
self.checkbutton2 = gtk.CheckButton(checktext2)
self.vbox.pack_start(self.checkbutton2, expand = False, fill = True)
self.vbox.pack_start(self.checkbutton2, expand=False, fill=True)
else:
self.checkbutton2 = None
@ -1813,10 +1812,10 @@ class SynchroniseSelectAccountDialog:
# columns
renderer = gtk.CellRendererText()
self.accounts_treeview.insert_column_with_attributes(-1,
_('Name'), renderer, text = 0)
_('Name'), renderer, text=0)
renderer = gtk.CellRendererText()
self.accounts_treeview.insert_column_with_attributes(-1,
_('Server'), renderer, text = 1)
_('Server'), renderer, text=1)
self.xml.signal_autoconnect(self)
self.init_accounts()
@ -1874,10 +1873,10 @@ class SynchroniseSelectContactsDialog:
renderer1.set_property('activatable', True)
renderer1.connect('toggled', self.toggled_callback)
self.contacts_treeview.insert_column_with_attributes(-1,
_('Synchronise'), renderer1, active = 0)
_('Synchronise'), renderer1, active=0)
renderer2 = gtk.CellRendererText()
self.contacts_treeview.insert_column_with_attributes(-1,
_('Name'), renderer2, text = 1)
_('Name'), renderer2, text=1)
self.xml.signal_autoconnect(self)
self.init_contacts()
@ -1936,7 +1935,7 @@ class NewChatDialog(InputDialog):
else:
title = _('Start Chat')
prompt_text = _('Fill in the nickname or the Jabber ID of the contact you would like\nto send a chat message to:')
InputDialog.__init__(self, title, prompt_text, is_modal = False)
InputDialog.__init__(self, title, prompt_text, is_modal=False)
self.completion_dict = {}
liststore = gtkgui_helpers.get_completion_liststore(self.input_entry)
@ -2167,7 +2166,7 @@ class SingleMessageWindow:
parent_box = self.xml.get_widget('conversation_scrolledwindow').\
get_parent()
if form_node:
dataform = dataforms.ExtendForm(node = form_node)
dataform = dataforms.ExtendForm(node=form_node)
self.form_widget = dataforms_widget.DataFormWidget(dataform)
self.form_widget.show_all()
parent_box.add(self.form_widget)
@ -2384,9 +2383,9 @@ class SingleMessageWindow:
# add > at the begining of each line
self.message = self.message.replace('\n', '\n> ') + '\n\n'
self.window.destroy()
SingleMessageWindow(self.account, to = self.from_whom,
action = 'send', from_whom = self.from_whom, subject = self.subject,
message = self.message, session = self.session)
SingleMessageWindow(self.account, to=self.from_whom, action='send',
from_whom=self.from_whom, subject=self.subject, message=self.message,
session=self.session)
def on_send_and_close_button_clicked(self, widget):
self.send_single_message()
@ -3169,8 +3168,8 @@ class AddSpecialNotificationDialog:
def on_cancel(widget):
widget.set_active(0) # go back to No Sound
self.dialog = SoundChooserDialog(on_response_ok = on_ok,
on_response_cancel = on_cancel)
self.dialog = SoundChooserDialog(on_response_ok=on_ok,
on_response_cancel=on_cancel)
def on_ok_button_clicked(self, widget):
conditions = ('online', 'chat', 'online_and_chat',
@ -3223,14 +3222,14 @@ class AdvancedNotificationsWindow:
col = gtk.TreeViewColumn(_('#'))
self.conditions_treeview.append_column(col)
renderer = gtk.CellRendererText()
col.pack_start(renderer, expand = False)
col.set_attributes(renderer, text = 0)
col.pack_start(renderer, expand=False)
col.set_attributes(renderer, text=0)
col = gtk.TreeViewColumn(_('Condition'))
self.conditions_treeview.append_column(col)
renderer = gtk.CellRendererText()
col.pack_start(renderer, expand = True)
col.set_attributes(renderer, text = 1)
col.pack_start(renderer, expand=True)
col.set_attributes(renderer, text=1)
self.xml.signal_autoconnect(self)
@ -3787,7 +3786,7 @@ class DataFormWindow(Dialog):
self.set_resizable(True)
gtkgui_helpers.resize_window(self, 600, 400)
self.dataform_widget = dataforms_widget.DataFormWidget()
self.dataform = dataforms.ExtendForm(node = form)
self.dataform = dataforms.ExtendForm(node=form)
self.dataform_widget.set_sensitive(True)
self.dataform_widget.data_form = self.dataform
self.dataform_widget.show_all()