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

eugenia colors as default, fix in makeing menus, and better regexp (doesn't detect http://) anymore) [thanks jajcus]

This commit is contained in:
Nikos Kouremenos 2005-03-27 20:30:00 +00:00
parent 2295a319ce
commit a1a2e1e3fc
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/gtkgui/gtkgui.py
View File

@ -741,9 +741,9 @@ class plugin:
# (?!\S) is the same thing but it's a lookahead assertion # (?!\S) is the same thing but it's a lookahead assertion
# basic_pattern is one string literal. # basic_pattern is one string literal.
# I've put spaces to make the regexp look better. # I've put spaces to make the regexp look better.
links = r'\bhttp://\S+|' r'\bhttps://\S+|' r'\bnews://\S+|' r'\bftp://\S+|' r'\bed2k://\S+|' r'\bwww\.\S+|' r'\bftp\.\S+|' links = r'\bhttp://[^)\s]+|' r'\bhttps://[^)\s]+|' r'\bnews://[^)\s]+|' r'\bftp://[^)\s]+|' r'\bed2k://[^)\s]+|' r'\bwww\.[^)\s]+|' r'\bftp\.[^)\s]+|'
#2nd one: at_least_one_char@at_least_one_char.at_least_one_char #2nd one: at_least_one_char@at_least_one_char.at_least_one_char
mail = r'\bmailto:\S+|' r'\b\S+@\S+\.\S+|' mail = r'\bmailto:[^)\s]+|' r'\b[^)\s]+@[^)\s]+\.[^)\s]+|'
#detects eg. *b* *bold* *bold bold* test *bold* #detects eg. *b* *bold* *bold bold* test *bold*
#doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold* #doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold*
@ -767,7 +767,7 @@ class plugin:
def on_launch_browser_mailer(self, widget, url, kind): def on_launch_browser_mailer(self, widget, url, kind):
self.launch_browser_mailer(kind, url) self.launch_browser_mailer(kind, url)
def init_regex(self): def init_regexp(self):
if self.config['useemoticons']: if self.config['useemoticons']:
"""initialize emoticons dictionary""" """initialize emoticons dictionary"""
self.emoticons = dict() self.emoticons = dict()
@ -822,14 +822,14 @@ class plugin:
'outmsgcolor': '#0000ff',\ 'outmsgcolor': '#0000ff',\
'statusmsgcolor':'#1eaa1e',\ 'statusmsgcolor':'#1eaa1e',\
'hiddenlines':'',\ 'hiddenlines':'',\
'accounttextcolor': '#ff0000',\ 'accounttextcolor': '#ffffff',\
#'#ffffff' #ff0000
'accountbgcolor': '#9fdfff',\ 'accountbgcolor': '#94aa8c',\
#'#94aa8c' #9fdfff
'accountfont': 'Sans Bold 10',\ 'accountfont': 'Sans Bold 10',\
'grouptextcolor': '#0000ff',\ 'grouptextcolor': '#0000ff',\
'groupbgcolor': '#ffffff',\ 'groupbgcolor': '##eff3e7',\
#'#eff3e7' #ffffff
'groupfont': 'Sans Italic 10',\ 'groupfont': 'Sans Italic 10',\
'usertextcolor': '#000000',\ 'usertextcolor': '#000000',\
'userbgcolor': '#ffffff',\ 'userbgcolor': '#ffffff',\
@ -915,7 +915,7 @@ class plugin:
if self.config['trayicon']: if self.config['trayicon']:
self.show_systray() self.show_systray()
self.init_regex() self.init_regexp()
# get instances for windows/dialogs that will show_all()/hide() # get instances for windows/dialogs that will show_all()/hide()
self.windows['preferences'] = Preferences_window(self) self.windows['preferences'] = Preferences_window(self)

12
plugins/gtkgui/roster_window.py
View File

@ -259,7 +259,9 @@ class Roster_window:
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
service_disco_menuitem.set_submenu(sub_menu) service_disco_menuitem.set_submenu(sub_menu)
for account in self.plugin.accounts.keys(): for account in self.plugin.accounts.keys():
item = gtk.MenuItem(_('as ') + self.plugin.accounts[account]['jid']) our_jid = self.plugin.accounts[account]['name'] + '@' +\
self.plugin.accounts[account]['hostname']
item = gtk.MenuItem(_('as ') + our_jid)
sub_menu.append(item) sub_menu.append(item)
item.connect('activate', self.on_service_disco_menuitem_activate, account) item.connect('activate', self.on_service_disco_menuitem_activate, account)
sub_menu.show_all() sub_menu.show_all()
@ -267,7 +269,9 @@ class Roster_window:
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
join_gc_menuitem.set_submenu(sub_menu) join_gc_menuitem.set_submenu(sub_menu)
for account in self.plugin.accounts.keys(): for account in self.plugin.accounts.keys():
item = gtk.MenuItem(_('as ') + self.plugin.accounts[account]['jid']) our_jid = self.plugin.accounts[account]['name'] + '@' +\
self.plugin.accounts[account]['hostname']
item = gtk.MenuItem(_('as ') + our_jid)
sub_menu.append(item) sub_menu.append(item)
item.connect("activate", self.on_join_gc_activate, account) item.connect("activate", self.on_join_gc_activate, account)
sub_menu.show_all() sub_menu.show_all()
@ -275,7 +279,9 @@ class Roster_window:
sub_menu = gtk.Menu() sub_menu = gtk.Menu()
new_message_menuitem.set_submenu(sub_menu) new_message_menuitem.set_submenu(sub_menu)
for account in self.plugin.accounts.keys(): for account in self.plugin.accounts.keys():
item = gtk.MenuItem(_('as ') + self.plugin.accounts[account]['jid']) our_jid = self.plugin.accounts[account]['name'] + '@' +\
self.plugin.accounts[account]['hostname']
item = gtk.MenuItem(_('as ') + our_jid)
sub_menu.append(item) sub_menu.append(item)
item.connect('activate', self.on_new_message_menuitem_activate, account) item.connect('activate', self.on_new_message_menuitem_activate, account)
sub_menu.show_all() sub_menu.show_all()

6
plugins/gtkgui/systray.py
View File

@ -141,13 +141,15 @@ class systray:
new_message_menuitem.set_submenu(account_menu_for_new_message) new_message_menuitem.set_submenu(account_menu_for_new_message)
for account in self.plugin.accounts.keys(): for account in self.plugin.accounts.keys():
our_jid = self.plugin.accounts[account]['name'] + '@' +\
self.plugin.accounts[account]['hostname']
#for chat_with #for chat_with
item = gtk.MenuItem(_('as ') + plugin.accounts[account]['jid']) item = gtk.MenuItem(_('as ') + our_jid)
account_menu_for_chat_with.append(item) account_menu_for_chat_with.append(item)
group_menu = self.make_groups_submenus_for_chat_with(account) group_menu = self.make_groups_submenus_for_chat_with(account)
item.set_submenu(group_menu) item.set_submenu(group_menu)
#for new_message #for new_message
item = gtk.MenuItem(_('as ') + plugin.accounts[account]['jid']) item = gtk.MenuItem(_('as ') + our_jid)
item.connect('activate',\ item.connect('activate',\
self.on_new_message_menuitem_activate, account) self.on_new_message_menuitem_activate, account)
account_menu_for_new_message.append(item) account_menu_for_new_message.append(item)