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

Merged revisions 5030-5031,5033-5038 via svnmerge from 

svn://svn.gajim.org/gajim/trunk

........
r5030 | asterix | 2006-01-07 10:04:18 -0700 (Sat, 07 Jan 2006) | 2 lines

when we add a bookmark, we add our nick by default

........
r5031 | nicfit | 2006-01-07 10:24:50 -0700 (Sat, 07 Jan 2006) | 2 lines

Grammatical fix

........
r5033 | asterix | 2006-01-07 11:36:56 -0700 (Sat, 07 Jan 2006) | 2 lines

cell_renderer_image now take in argument the index of the column and the index in the model

........
r5034 | asterix | 2006-01-07 11:37:28 -0700 (Sat, 07 Jan 2006) | 2 lines

typo

........
r5035 | asterix | 2006-01-07 11:38:18 -0700 (Sat, 07 Jan 2006) | 2 lines

don't show header in emoticonManager so that cellrenderer correctly compute the area to redraw

........
r5036 | asterix | 2006-01-07 11:39:41 -0700 (Sat, 07 Jan 2006) | 2 lines

prevent a TB

........
r5037 | nicfit | 2006-01-07 13:26:08 -0700 (Sat, 07 Jan 2006) | 2 lines

Increment later

........
r5038 | nicfit | 2006-01-07 13:29:05 -0700 (Sat, 07 Jan 2006) | 2 lines

Fixed syntax error

........
This commit is contained in:
Travis Shirk 2006-01-07 20:47:06 +00:00
parent f66c5c5b95
commit 5c53bdbee6
8 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cell_renderer_image.py
View File

@ -33,9 +33,11 @@ class CellRendererImage(gtk.GenericCellRenderer):
'Image', gobject.PARAM_READWRITE),
}
def __init__(self):
def __init__(self, col_index, tv_index):
self.__gobject_init__()
self.image = None
self.col_index = col_index
self.tv_index = tv_index
self.iters = {}
def do_set_property(self, pspec, value):
@ -45,10 +47,12 @@ class CellRendererImage(gtk.GenericCellRenderer):
return getattr(self, pspec.name)
def func(self, model, path, iter, (image, tree)):
if model.get_value(iter, 0) != image:
if model.get_value(iter, self.tv_index) != image:
return
self.redraw = 1
cell_area = tree.get_cell_area(path, tree.get_column(0))
col = tree.get_column(self.col_index)
cell_area = tree.get_cell_area(path, col)
tree.queue_draw_area(cell_area.x, cell_area.y,
cell_area.width, cell_area.height)
@ -59,6 +63,7 @@ class CellRendererImage(gtk.GenericCellRenderer):
iter = self.iters[image]
iter.advance()
model = tree.get_model()
if model:
model.foreach(self.func, (image, tree))
if self.redraw:
gobject.timeout_add(iter.get_delay_time(),

2
src/common/connection.py
View File

@ -1265,10 +1265,10 @@ class Connection:
dic[i]['options'][j]['values'] = []
for tag in tags:
dic[i]['options'][j]['values'].append(tag.getData())
j += 1
if not label:
label = dic[i]['options'][j]['values'][0]
dic[i]['options'][j]['label'] = label
j += 1
if not dic[i].has_key('values'):
dic[i]['values'] = [dic[i]['options'][0]['values'][0]]
i += 1

22
src/config.py
View File

@ -130,7 +130,7 @@ class PreferencesWindow:
iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets'))
# new model, image in 0, string in 1
model = gtk.ListStore(gtk.Image, str)
renderer_image = cell_renderer_image.CellRendererImage()
renderer_image = cell_renderer_image.CellRendererImage(0, 0)
renderer_text = gtk.CellRendererText()
renderer_text.set_property('xpad', 5)
self.iconset_combobox.pack_start(renderer_image, expand = False)
@ -1928,7 +1928,7 @@ class ManageEmoticonsWindow:
col = gtk.TreeViewColumn(_('Image'))
self.emot_tree.append_column(col)
renderer = cell_renderer_image.CellRendererImage()
renderer = cell_renderer_image.CellRendererImage(1, 2)
col.pack_start(renderer, expand = False)
col.add_attribute(renderer, 'image', 2)
@ -1983,12 +1983,7 @@ class ManageEmoticonsWindow:
continue
img = gtk.Image()
img.show()
if file.find('.gif') != -1:
pix = gtk.gdk.PixbufAnimation(file)
img.set_from_animation(pix)
else:
pix = gtk.gdk.pixbuf_new_from_file(file)
img.set_from_pixbuf(pix)
img.set_from_file(file)
model.set(iter, 2, img)
def on_emot_cell_edited(self, cell, row, new_text):
@ -2081,12 +2076,7 @@ class ManageEmoticonsWindow:
model.set_value(iter, 1, file)
img = gtk.Image()
img.show()
if file.find('.gif') != -1:
pix = gtk.gdk.PixbufAnimation(file)
img.set_from_animation(pix)
else:
pix = gtk.gdk.pixbuf_new_from_file(file)
img.set_from_pixbuf(pix)
img.set_from_file(file)
model.set(iter, 2, img)
def on_button_new_emoticon_clicked(self, widget, data=None):
@ -2288,7 +2278,9 @@ class ManageBookmarksWindow:
add_to = iter
account = model.get_value(add_to, 1)
self.treestore.append(add_to, [account,_('New Room'), '', False, '', ''])
nick = gajim.nicks[account]
self.treestore.append(add_to, [account, _('New Room'), '', False, '',
nick])
self.view.expand_row(model.get_path(add_to), True)

2
src/groupchat_control.py
View File

@ -145,7 +145,7 @@ class GroupchatControl(ChatControlBase):
store = gtk.TreeStore(gtk.Image, str, str, str)
store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING)
column = gtk.TreeViewColumn('contacts')
renderer_image = cell_renderer_image.CellRendererImage()
renderer_image = cell_renderer_image.CellRendererImage(0, 0)
renderer_image.set_property('width', 20)
column.pack_start(renderer_image, expand = False)
column.add_attribute(renderer_image, 'image', 0)

2
src/groupchat_window.py
View File

@ -1445,7 +1445,7 @@ current room topic.') % command, room_jid)
store = gtk.TreeStore(gtk.Image, str, str, str)
store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING)
column = gtk.TreeViewColumn('contacts')
renderer_image = cell_renderer_image.CellRendererImage()
renderer_image = cell_renderer_image.CellRendererImage(0, 0)
renderer_image.set_property('width', 20)
column.pack_start(renderer_image, expand = False)
column.add_attribute(renderer_image, 'image', 0)

2
src/gtkgui.glade
View File

@ -12415,7 +12415,7 @@ Static</property>
<widget class="GtkTreeView" id="emoticons_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">True</property>
<property name="headers_visible">False</property>
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>

4
src/roster_window.py
View File

@ -2660,7 +2660,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
liststore = gtk.ListStore(str, gtk.Image, str, bool)
self.status_combobox = self.xml.get_widget('status_combobox')
cell = cell_renderer_image.CellRendererImage()
cell = cell_renderer_image.CellRendererImage(0, 1)
self.status_combobox.pack_start(cell, False)
# img to show is in in 2nd column of liststore
@ -2721,7 +2721,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# this col has two cells: first one img, second one text
col = gtk.TreeViewColumn()
render_image = cell_renderer_image.CellRendererImage() # show img or +-
render_image = cell_renderer_image.CellRendererImage(0, 0) # show img or +-
col.pack_start(render_image, expand = False)
col.add_attribute(render_image, 'image', C_IMG)
col.set_cell_data_func(render_image, self.iconCellDataFunc, None)

3
src/tabbed_chat_window.py
View File

@ -234,7 +234,8 @@ class TabbedChatWindow(chat.Chat):
else:
tb.set_sensitive(False)
#we talk about a contact here
tt = _('%s has not broadcasted an OpenPGP key nor you have assigned one') % contact.name
tt = _('%s has not broadcast an OpenPGP key, nor has one neen assigned') %\
contact.name
tip = gtk.Tooltips()
tip.set_tip(self.xmls[jid].get_widget('gpg_eventbox'), tt)