copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better varnames; use range()

This commit is contained in:
Nikos Kouremenos 2006-01-25 13:34:02 +00:00
parent 29fef124a2
commit fb4682d0f2
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/config.py
View File

@ -99,16 +99,16 @@ class Config:
'gc_proposed_nick_char': [opt_str, '_'], 'gc_proposed_nick_char': [opt_str, '_'],
'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-width': [opt_int, DEFAULT_WINDOW_WIDTH], 'msgwin-width': [opt_int, 480],
'msgwin-height': [opt_int, DEFAULT_WINDOW_HEIGHT], 'msgwin-height': [opt_int, 440],
'chat-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'chat-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'chat-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'chat-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'chat-msgwin-width': [opt_int, DEFAULT_WINDOW_WIDTH], 'chat-msgwin-width': [opt_int, 480],
'chat-msgwin-height': [opt_int, DEFAULT_WINDOW_HEIGHT], 'chat-msgwin-height': [opt_int, 440],
'gc-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'gc-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'gc-msgwin-width': [opt_int, DEFAULT_WINDOW_WIDTH], 'gc-msgwin-width': [opt_int, 480],
'gc-msgwin-height': [opt_int, DEFAULT_WINDOW_HEIGHT], 'gc-msgwin-height': [opt_int, 440],
'single-msg-x-position': [opt_int, 0], 'single-msg-x-position': [opt_int, 0],
'single-msg-y-position': [opt_int, 0], 'single-msg-y-position': [opt_int, 0],
'single-msg-width': [opt_int, 400], 'single-msg-width': [opt_int, 400],
@ -226,8 +226,8 @@ class Config:
'proxy.jabber.org, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se, proxy.netlab.cz, proxy65.jabber.ccc.de'], 'proxy.jabber.org, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se, proxy.netlab.cz, proxy65.jabber.ccc.de'],
'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-width': [opt_int, DEFAULT_WINDOW_WIDTH], 'msgwin-width': [opt_int, 480],
'msgwin-height': [opt_int, DEFAULT_WINDOW_HEIGHT], 'msgwin-height': [opt_int, 440],
}, {}), }, {}),
'statusmsg': ({ 'statusmsg': ({
'message': [ opt_str, '' ], 'message': [ opt_str, '' ],

54
src/message_window.py
View File

@ -554,19 +554,21 @@ class MessageWindowMgr:
'''A manager and factory for MessageWindow objects''' '''A manager and factory for MessageWindow objects'''
# These constants map to common.config.opt_one_window_types indices # These constants map to common.config.opt_one_window_types indices
CONFIG_NEVER = 0 (
CONFIG_ALWAYS = 1 ONE_MSG_WINDOW_NEVER,
CONFIG_PERACCT = 2 ONE_MSG_WINDOW_ALWAYS,
CONFIG_PERTYPE = 3 ONE_MSG_WINDOW_PERACCT,
ONE_MSG_WINDOW_PERTYPE
) = range(4)
# A key constant for the main window for all messages # A key constant for the main window for all messages
MAIN_WIN = 'main' MAIN_WIN = 'main'
def __init__(self): def __init__(self):
''' A dictionary of windows; the key depends on the config: ''' A dictionary of windows; the key depends on the config:
CONFIG_NEVER: The key is the contact JID ONE_MSG_WINDOW_NEVER: The key is the contact JID
CONFIG_ALWAYS: The key is MessageWindowMgr.MAIN_WIN ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
CONFIG_PERACCT: The key is the account name ONE_MSG_WINDOW_PERACCT: The key is the account name
CONFIG_PERTYPE: The key is a message type constant''' ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
self._windows = {} self._windows = {}
# Map the mode to a int constant for frequent compares # Map the mode to a int constant for frequent compares
mode = gajim.config.get('one_message_window') mode = gajim.config.get('one_message_window')
@ -601,17 +603,17 @@ class MessageWindowMgr:
return False return False
def _size_window(self, win, acct, type): def _size_window(self, win, acct, type):
'''Resizes window from config settings''' '''Resizes window according to config settings'''
if not gajim.config.get('saveposition'): if not gajim.config.get('saveposition'):
return return
if self.mode == self.CONFIG_NEVER or self.mode == self.CONFIG_ALWAYS: if self.mode == self.ONE_MSG_WINDOW_NEVER or self.mode == self.ONE_MSG_WINDOW_ALWAYS:
size = (gajim.config.get('msgwin-width'), size = (gajim.config.get('msgwin-width'),
gajim.config.get('msgwin-height')) gajim.config.get('msgwin-height'))
elif self.mode == self.CONFIG_PERACCT: elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), size = (gajim.config.get_per('accounts', acct, 'msgwin-width'),
gajim.config.get_per('accounts', acct, 'msgwin-height')) gajim.config.get_per('accounts', acct, 'msgwin-height'))
elif self.mode == self.CONFIG_PERTYPE: elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
if type == message_control.TYPE_PM: if type == message_control.TYPE_PM:
type = message_control.TYPE_CHAT type = message_control.TYPE_CHAT
opt_width = type + '-msgwin-width' opt_width = type + '-msgwin-width'
@ -624,18 +626,18 @@ class MessageWindowMgr:
gtkgui_helpers.resize_window(win.window, size[0], size[1]) gtkgui_helpers.resize_window(win.window, size[0], size[1])
def _position_window(self, win, acct, type): def _position_window(self, win, acct, type):
'''Returns the position tuple: (x, y)''' '''Moves window according to config settings'''
if not gajim.config.get('saveposition') or self.mode == self.CONFIG_NEVER: if not gajim.config.get('saveposition') or self.mode == self.ONE_MSG_WINDOW_NEVER:
return return
pos = (-1, -1) # default is left up to the native window manager pos = (-1, -1) # default is left up to the native window manager
if self.mode == self.CONFIG_ALWAYS: if self.mode == self.ONE_MSG_WINDOW_ALWAYS:
pos = (gajim.config.get('msgwin-x-position'), pos = (gajim.config.get('msgwin-x-position'),
gajim.config.get('msgwin-y-position')) gajim.config.get('msgwin-y-position'))
elif self.mode == self.CONFIG_PERACCT: elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
pos = (gajim.config.get_per('accounts', acct, 'msgwin-x-position'), pos = (gajim.config.get_per('accounts', acct, 'msgwin-x-position'),
gajim.config.get_per('accounts', acct, 'msgwin-y-position')) gajim.config.get_per('accounts', acct, 'msgwin-y-position'))
elif self.mode == self.CONFIG_PERTYPE: elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
pos = (gajim.config.get(type + '-msgwin-x-position'), pos = (gajim.config.get(type + '-msgwin-x-position'),
gajim.config.get(type + '-msgwin-y-position')) gajim.config.get(type + '-msgwin-y-position'))
@ -643,13 +645,13 @@ class MessageWindowMgr:
gtkgui_helpers.move_window(win.window, pos[0], pos[1]) gtkgui_helpers.move_window(win.window, pos[0], pos[1])
def _mode_to_key(self, contact, acct, type): def _mode_to_key(self, contact, acct, type):
if self.mode == self.CONFIG_NEVER: if self.mode == self.ONE_MSG_WINDOW_NEVER:
key = acct + contact.jid key = acct + contact.jid
elif self.mode == self.CONFIG_ALWAYS: elif self.mode == self.ONE_MSG_WINDOW_ALWAYS:
key = self.MAIN_WIN key = self.MAIN_WIN
elif self.mode == self.CONFIG_PERACCT: elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
key = acct key = acct
elif self.mode == self.CONFIG_PERTYPE: elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
key = type key = type
return key return key
@ -659,9 +661,9 @@ class MessageWindowMgr:
win_type = None win_type = None
key = self._mode_to_key(contact, acct, type) key = self._mode_to_key(contact, acct, type)
if self.mode == self.CONFIG_PERACCT: if self.mode == self.ONE_MSG_WINDOW_PERACCT:
win_acct = acct win_acct = acct
elif self.mode == self.CONFIG_PERTYPE: elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
win_type = type win_type = type
win = None win = None
@ -737,13 +739,13 @@ class MessageWindowMgr:
if x < 0 or y < 0 or width < 0 or height < 0: if x < 0 or y < 0 or width < 0 or height < 0:
return return
if self.mode == self.CONFIG_NEVER: if self.mode == self.ONE_MSG_WINDOW_NEVER:
# Use whatever is current to not overwrite the 'always' settings # Use whatever is current to not overwrite the 'always' settings
# when going from never->always # when going from never->always
x = y = -1 x = y = -1
elif self.mode == self.CONFIG_PERACCT: elif self.mode == self.ONE_MSG_WINDOW_PERACCT:
acct = msg_win.account acct = msg_win.account
elif self.mode == self.CONFIG_PERTYPE: elif self.mode == self.ONE_MSG_WINDOW_PERTYPE:
type = msg_win.type type = msg_win.type
pos_x_key = type + "-msgwin-x-position" pos_x_key = type + "-msgwin-x-position"
pos_y_key = type + "-msgwin-y-position" pos_y_key = type + "-msgwin-y-position"