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

use emoticons_theme, instead of useemoticons 

( #1715 )
This commit is contained in:
Dimitur Kirov 2006-03-17 11:11:45 +00:00
parent 98b18a74a1
commit 4abd0a9d42
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat_control.py
View File

@ -207,7 +207,7 @@ class ChatControlBase(MessageControl):
return True
elif event.keyval == gtk.keysyms.m and \
(event.state & gtk.gdk.MOD1_MASK): # alt + m opens emoticons menu
if gajim.config.get('useemoticons'):
if gajim.config.get('emoticons_theme'):
msg_tv = self.msg_textview
def set_emoticons_menu_position(w, msg_tv = self.msg_textview):
window = msg_tv.get_window(gtk.TEXT_WINDOW_WIDGET)
@ -412,7 +412,7 @@ class ChatControlBase(MessageControl):
'''hide show emoticons_button and make sure emoticons_menu is always there
when needed'''
emoticons_button = self.xml.get_widget('emoticons_button')
if gajim.config.get('useemoticons'):
if gajim.config.get('emoticons_theme'):
self.emoticons_menu = self.prepare_emoticons_menu()
emoticons_button.show()
emoticons_button.set_no_show_all(False)

4
src/conversation_textview.py
View File

@ -418,7 +418,7 @@ class ConversationTextview(gtk.TextView):
index = 0
# basic: links + mail + formatting is always checked (we like that)
if gajim.config.get('useemoticons'): # search for emoticons & urls
if gajim.config.get('emoticons_theme'): # search for emoticons & urls
iterator = gajim.interface.emot_and_basic_re.finditer(otext)
else: # search for just urls + mail + formatting
iterator = gajim.interface.basic_pattern_re.finditer(otext)
@ -448,7 +448,7 @@ class ConversationTextview(gtk.TextView):
buffer = self.get_buffer()
possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS
if gajim.config.get('useemoticons') and \
if gajim.config.get('emoticons_theme') and \
possible_emot_ascii_caps in gajim.interface.emoticons.keys():
#it's an emoticon
emot_ascii = possible_emot_ascii_caps

4
src/gajim.py
View File

@ -1357,7 +1357,7 @@ class Interface:
self.basic_pattern_re = sre.compile(basic_pattern, sre.IGNORECASE)
emoticons_pattern = ''
if gajim.config.get('useemoticons'):
if gajim.config.get('emoticons_theme'):
# When an emoticon is bordered by an alpha-numeric character it is NOT
# expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc.
# We still allow multiple emoticons side-by-side like :P:P:P
@ -1408,7 +1408,7 @@ class Interface:
helpers.launch_browser_mailer(kind, url)
def init_emoticons(self):
if not gajim.config.get('useemoticons'):
if not gajim.config.get('emoticons_theme'):
return
#initialize emoticons dictionary and unique images list