Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: Pathing works! For some reason only one person can draw b...
by Ummu 25 Jul '09

25 Jul '09

changeset d9eaf9d3d532 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d9eaf9d3d532 description: Pathing works! For some reason only one person can draw because the other loses self.control. Does not yet add to self.items. diffstat: src/common/jingle.py | 10 ++- src/whiteboardwidget.py | 123 ++++++++++++++++++++++++++++++++++------- 2 files changed, 110 insertions(+), 23 deletions(-) diffs (205 lines): diff -r 654f48289543 -r d9eaf9d3d532 src/common/jingle.py --- a/src/common/jingle.py Fri Jul 24 03:45:23 2009 -0700 +++ b/src/common/jingle.py Fri Jul 24 18:52:13 2009 -0700 @@ -356,8 +356,14 @@ callback(stanza, content, error, action) def __editCB(self, stanza, content, error, action): - log.debug('got a whiteboard edit') - #TODO: extract data, draw it. We have self.control which point to the ChatControl + new_edits = content.getTags('new') + + # Process new elements + for new in new_edits: + if new.getAttr('type') == 'element': + self.control.whiteboard.recieve_element(new) + elif new.getAttr('type') == 'attr': + self.control.whiteboard.recieve_attr(new) def __sessionAcceptCB(self, stanza, content, error, action): log.debug('session accepted') diff -r 654f48289543 -r d9eaf9d3d532 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 03:45:23 2009 -0700 +++ b/src/whiteboardwidget.py Fri Jul 24 18:52:13 2009 -0700 @@ -12,7 +12,6 @@ class Whiteboard(object): def __init__(self, account, contact, session): - print 'init' xml = gtkgui_helpers.get_glade('whiteboard_widget.glade', 'whiteboard_hbox') self.hbox = xml.get_widget('whiteboard_hbox') @@ -30,17 +29,20 @@ self.canevas.connect('motion-notify-event', self.motion_notify_event) # Config - self.draw_tool = 'oval' + self.draw_tool = 'brush' self.line_width = 2 # SVG Storage - # TODO: get height width info self.image = SVGObject(self.root, session) # Temporary Variables for items self.item_temp = None self.item_temp_coords = (0,0) self.item_data = None + + # Recieving item storage, format is + # {parent rid: [element, [child, child,]} + self.recieving = {} def on_brush_button_clicked(self, widget): self.draw_tool = 'brush' @@ -122,6 +124,73 @@ self.item_temp.remove() self.item_temp = None + def recieve_element(self, element): + self.recieving[element.getAttr('rid')] = [element,[]] + + + def recieve_attr(self, element): + self.recieving[element.getAttr('parent')][1].append(element) + + # put the element up regardless if it is completed or not + self.image.del_item(element.getAttr('parent')) + + if self.recieving[element.getAttr('parent')][0].getAttr('name') == 'path': + d = None + line_width = None + + for x in self.recieving[element.getAttr('parent')][1]: + if x.getAttr('name') == 'd': + d = x.getAttr('chdata') + elif x.getAttr('name') == 'stroke-width': + line_width = x.getAttr('chdata') + # TODO: the other attributes + if d is None: + d = 'M 0,0' + if line_width is None: + line_width = self.line_width + + goocanvas.Path(parent=self.root, data=d, + line_width=int(line_width)) + + if self.recieving[element.getAttr('parent')][0].getAttr('name') == 'ellipse': + cx = None + cy = None + rx = None + ry = None + line_width = None + + for x in self.recieving[element.getAttr('parent')][1]: + if x.getAttr('name') == 'cx': + cx = float(x.getAttr('chdata')) + elif x.getAttr('name') == 'cy': + cy = float(x.getAttr('chdata')) + elif x.getAttr('name') == 'rx': + rx = float(x.getAttr('chdata')) + elif x.getAttr('name') == 'ry': + ry = float(x.getAttr('chdata')) + elif x.getAttr('name') == 'stroke-width': + line_width = int(x.getAttr('chdata')) + # TODO: the other attributes + if cx is None: + cx = 0 + if cy is None: + cy = 0 + if ry is None: + ry = 0 + if rx is None: + rx = 0 + if line_width is None: + line_width = self.line_width + + goocanvas.Ellipse(parent=self.root, + center_x=cx, + center_y=cy, + radius_x=rx, + radius_y=ry, + stroke_color='black', + line_width=int(line_width)) + + class SVGObject(): ''' A class to store the svg document and make changes to it.''' @@ -144,28 +213,36 @@ self.g.setAttr('fill', 'none') self.g.setAttr('stroke-linecap', 'round') - def add_path(self, data, line_width): + def add_path(self, data, line_width, send = True, node = None): ''' adds the path to the items listing, both minidom node and goocanvas object in a tuple ''' goocanvas_obj = goocanvas.Path(parent=self.root, data=data, line_width=line_width) - node = self.g.addChild(name='path') - node.setAttr('d', data) - node.setAttr('stroke-width', str(line_width)) - node.setAttr('stroke', 'black') - self.g.addChild(node=node) - - rids = self.session.generate_rids(4) - self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj]} - self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} - self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} - self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} - - self.session.send_items(self.items, rids) - - def add_ellipse(self, cx, cy, rx, ry, line_width): + if send: + node = self.g.addChild(name='path') + node.setAttr('d', data) + node.setAttr('stroke-width', str(line_width)) + node.setAttr('stroke', 'black') + self.g.addChild(node=node) + + rids = self.session.generate_rids(4) + self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} + self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} + self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} + self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} + + self.session.send_items(self.items, rids) + else: + rids = self.session.generate_rids(4) + self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} + self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} + self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} + self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} + + + def add_ellipse(self, cx, cy, rx, ry, line_width, send = True): ''' adds the ellipse to the items listing, both minidom node and goocanvas object in a tuple ''' @@ -187,7 +264,7 @@ self.g.addChild(node=node) rids = self.session.generate_rids(7) - self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj]} + self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} self.items[rids[1]] = {'type':'attr', 'data':'cx', 'parent':node} self.items[rids[2]] = {'type':'attr', 'data':'cy', 'parent':node} self.items[rids[3]] = {'type':'attr', 'data':'rx', 'parent':node} @@ -195,9 +272,13 @@ self.items[rids[5]] = {'type':'attr', 'data':'stroke-width', 'parent':node} self.items[rids[6]] = {'type':'attr', 'data':'stroke', 'parent':node} - self.session.send_items(self.items, rids) + if send: + self.session.send_items(self.items, rids) def print_xml(self): file = open('whiteboardtest.svg','w') file.writelines(str(self.svg)) file.close() + + def del_item(self, rid): + pass

1 0

gajim: prevent traceback
by Yann Leboulanger 24 Jul '09

24 Jul '09

changeset c3f3423c5920 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3f3423c5920 description: prevent traceback diffstat: src/roster_window.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (25 lines): diff -r ff48d7c48416 -r c3f3423c5920 src/roster_window.py --- a/src/roster_window.py Thu Jul 23 22:57:33 2009 +0200 +++ b/src/roster_window.py Fri Jul 24 16:17:49 2009 +0200 @@ -763,13 +763,14 @@ # Remove contact before redrawing, otherwise the old # numbers will still be show gajim.contacts.remove_jid(account, jid, remove_meta=True) - rest_of_family = [data for data in family - if account != data['account'] or jid != data['jid']] - if iters and rest_of_family: - # reshow the rest of the family - brothers = self._add_metacontact_family(rest_of_family, account) - for c, acc in brothers: - self.draw_completely(c.jid, acc) + if iters: + rest_of_family = [data for data in family + if account != data['account'] or jid != data['jid']] + if rest_of_family: + # reshow the rest of the family + brothers = self._add_metacontact_family(rest_of_family, account) + for c, acc in brothers: + self.draw_completely(c.jid, acc) if iters: # Draw all groups of the contact

1 0

gajim: Made whiteboard into self.whiteboard, fixed export functi...
by Ummu 24 Jul '09

24 Jul '09

changeset 654f48289543 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=654f48289543 description: Made whiteboard into self.whiteboard, fixed export function error diffstat: src/chat_control.py | 6 +++--- src/whiteboardwidget.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (26 lines): diff -r 2ffded3ed32d -r 654f48289543 src/chat_control.py --- a/src/chat_control.py Fri Jul 24 03:41:34 2009 -0700 +++ b/src/chat_control.py Fri Jul 24 03:45:23 2009 -0700 @@ -2758,9 +2758,9 @@ self.whiteboard = Whiteboard(self.account, self.contact, session) try: # set minimum size - whiteboard.hbox.set_size_request(300, 0) - hbox.pack_start(whiteboard.hbox, expand=False, fill=False) - whiteboard.hbox.show_all() + self.whiteboard.hbox.set_size_request(300, 0) + hbox.pack_start(self.whiteboard.hbox, expand=False, fill=False) + self.whiteboard.hbox.show_all() except: pass # TODO: Fix problem with groupchat diff -r 2ffded3ed32d -r 654f48289543 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 03:41:34 2009 -0700 +++ b/src/whiteboardwidget.py Fri Jul 24 03:45:23 2009 -0700 @@ -199,5 +199,5 @@ def print_xml(self): file = open('whiteboardtest.svg','w') - file.writelines(str(self.svg, True)) + file.writelines(str(self.svg)) file.close()

1 0

gajim: merges
by Ummu 24 Jul '09

24 Jul '09

changeset 2ffded3ed32d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ffded3ed32d description: merges diffstat: src/chat_control.py | 4 ++-- src/dialogs.py | 2 +- src/whiteboardwidget.py | 9 ++------- 3 files changed, 5 insertions(+), 10 deletions(-) diffs (59 lines): diff -r b5dce2643ce2 -r 2ffded3ed32d src/chat_control.py --- a/src/chat_control.py Fri Jul 24 11:26:37 2009 +0200 +++ b/src/chat_control.py Fri Jul 24 03:41:34 2009 -0700 @@ -2755,13 +2755,13 @@ def draw_whiteboard(self, session): hbox = self.xml.get_widget('chat_child_hbox') if len(hbox.get_children()) == 1: - whiteboard = Whiteboard(self.account, self.contact, session) + self.whiteboard = Whiteboard(self.account, self.contact, session) try: # set minimum size whiteboard.hbox.set_size_request(300, 0) hbox.pack_start(whiteboard.hbox, expand=False, fill=False) whiteboard.hbox.show_all() except: - pass # TODO: Fix problem with groupchat? + pass # TODO: Fix problem with groupchat # vim: se ts=3: diff -r b5dce2643ce2 -r 2ffded3ed32d src/dialogs.py --- a/src/dialogs.py Fri Jul 24 11:26:37 2009 +0200 +++ b/src/dialogs.py Fri Jul 24 03:41:34 2009 -0700 @@ -4083,7 +4083,7 @@ dialog.show_all() def on_voip_call_received_messagedialog_close(self, dialog): - return self.on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) + return self .on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) def on_voip_call_received_messagedialog_response(self, dialog, response): # we've got response from user, either stop connecting or accept the call session = gajim.connections[self.account].getJingleSession(self.jid, self.sid) diff -r b5dce2643ce2 -r 2ffded3ed32d src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 11:26:37 2009 +0200 +++ b/src/whiteboardwidget.py Fri Jul 24 03:41:34 2009 -0700 @@ -4,11 +4,6 @@ from common.xmpp import Node from common import gajim -#for sxe session -from random import choice -import string -import urllib - ''' A whiteboard widget made for Gajim. Only has basic line tool that draws SVG Paths. @@ -48,10 +43,10 @@ self.item_data = None def on_brush_button_clicked(self, widget): - print 'on_brush_button_clicked' + self.draw_tool = 'brush' def on_oval_button_clicked(self, widget): - print 'on_oval_button_clicked' + self.draw_tool = 'oval' def on_export_button_clicked(self, widget): self.image.print_xml()

1 0

gajim: some cleanup, need to commit before I merge
by Ummu 24 Jul '09

24 Jul '09

changeset 6d5cd13ac5e0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6d5cd13ac5e0 description: some cleanup, need to commit before I merge diffstat: src/chat_control.py | 4 ++-- src/dialogs.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 7bf8ce36abcf -r 6d5cd13ac5e0 src/chat_control.py --- a/src/chat_control.py Fri Jul 24 01:22:56 2009 -0700 +++ b/src/chat_control.py Fri Jul 24 01:54:03 2009 -0700 @@ -2755,13 +2755,13 @@ def draw_whiteboard(self, session): hbox = self.xml.get_widget('chat_child_hbox') if len(hbox.get_children()) == 1: - whiteboard = Whiteboard(self.account, self.contact, session) + self.whiteboard = Whiteboard(self.account, self.contact, session) try: # set minimum size whiteboard.hbox.set_size_request(300, 0) hbox.pack_start(whiteboard.hbox, expand=False, fill=False) whiteboard.hbox.show_all() except: - pass # TODO: Fix problem with groupchat? + pass # TODO: Fix problem with groupchat # vim: se ts=3: diff -r 7bf8ce36abcf -r 6d5cd13ac5e0 src/dialogs.py --- a/src/dialogs.py Fri Jul 24 01:22:56 2009 -0700 +++ b/src/dialogs.py Fri Jul 24 01:54:03 2009 -0700 @@ -4083,7 +4083,7 @@ dialog.show_all() def on_voip_call_received_messagedialog_close(self, dialog): - return self.on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) + return self .on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) def on_voip_call_received_messagedialog_response(self, dialog, response): # we've got response from user, either stop connecting or accept the call session = gajim.connections[self.account].getJingleSession(self.jid, self.sid)

1 0

gajim: Removed useless imports
by Ummu 24 Jul '09

24 Jul '09

changeset 7bf8ce36abcf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7bf8ce36abcf description: Removed useless imports diffstat: src/whiteboardwidget.py | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diffs (15 lines): diff -r 19d935da3b4e -r 7bf8ce36abcf src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 00:40:46 2009 -0700 +++ b/src/whiteboardwidget.py Fri Jul 24 01:22:56 2009 -0700 @@ -4,11 +4,6 @@ from common.xmpp import Node from common import gajim -#for sxe session -from random import choice -import string -import urllib - ''' A whiteboard widget made for Gajim. Only has basic line tool that draws SVG Paths.

1 0

gajim: Linked the other buttons to tools too, did not save properly
by Ummu 24 Jul '09

24 Jul '09

changeset 19d935da3b4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19d935da3b4e description: Linked the other buttons to tools too, did not save properly diffstat: src/whiteboardwidget.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 32fe0483a8ec -r 19d935da3b4e src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 00:36:26 2009 -0700 +++ b/src/whiteboardwidget.py Fri Jul 24 00:40:46 2009 -0700 @@ -48,10 +48,10 @@ self.item_data = None def on_brush_button_clicked(self, widget): - print 'on_brush_button_clicked' + self.draw_tool = 'brush' def on_oval_button_clicked(self, widget): - print 'on_oval_button_clicked' + self.draw_tool = 'oval' def on_export_button_clicked(self, widget): self.image.print_xml()

1 0

gajim: merge unwanted branch
by Yann Leboulanger 24 Jul '09

24 Jul '09

changeset b5dce2643ce2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5dce2643ce2 description: merge unwanted branch

1 0

gajim: prevent a traceback
by Yann Leboulanger 24 Jul '09

24 Jul '09

changeset 5552388e55a0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5552388e55a0 description: prevent a traceback diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 32fe0483a8ec -r 5552388e55a0 src/gajim.py --- a/src/gajim.py Fri Jul 24 00:36:26 2009 -0700 +++ b/src/gajim.py Fri Jul 24 10:49:47 2009 +0200 @@ -2578,6 +2578,7 @@ peerjid, sid = event.parameters session = gajim.connections[account].getJingleSession(peerjid, sid) def on_ok(): + session = gajim.connections[account].getJingleSession(peerjid, sid) session.approveSession() jid = gajim.get_jid_without_resource(peerjid) for _jid in [peerjid, jid]:

1 0

gajim: prevent a traceback
by Yann Leboulanger 24 Jul '09

24 Jul '09

changeset 0abef318c28b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0abef318c28b description: prevent a traceback diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 33412ebb9476 -r 0abef318c28b src/gajim.py --- a/src/gajim.py Tue Jul 21 18:11:50 2009 +0200 +++ b/src/gajim.py Fri Jul 24 10:49:47 2009 +0200 @@ -2578,6 +2578,7 @@ peerjid, sid = event.parameters session = gajim.connections[account].getJingleSession(peerjid, sid) def on_ok(): + session = gajim.connections[account].getJingleSession(peerjid, sid) session.approveSession() jid = gajim.get_jid_without_resource(peerjid) for _jid in [peerjid, jid]:

1 0

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009