Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: fix some GUI stuff
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 77f805b84006 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77f805b84006 description: fix some GUI stuff diffstat: data/glade/whiteboard_widget.glade | 27 +++++++++++++++++++-------- src/chat_control.py | 12 +++--------- src/whiteboardwidget.py | 30 +++++++++++++++++++++++------- 3 files changed, 45 insertions(+), 24 deletions(-) diffs (154 lines): diff -r f655e1974784 -r 77f805b84006 data/glade/whiteboard_widget.glade --- a/data/glade/whiteboard_widget.glade Tue Jul 21 05:49:29 2009 -0700 +++ b/data/glade/whiteboard_widget.glade Tue Jul 21 15:58:30 2009 +0200 @@ -6,51 +6,62 @@ <child> <widget class="GtkHBox" id="whiteboard_hbox"> <property name="visible">True</property> + <property name="spacing">6</property> <child> <placeholder/> </child> <child> - <widget class="GtkVBox" id="whiteboard_menu_vbox"> + <widget class="GtkVButtonBox" id="vbuttonbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <widget class="GtkButton" id="whiteboard_brush_button"> + <widget class="GtkButton" id="brush_button"> <property name="label" translatable="yes">Brush Tool</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="whiteboard.tool_brush"/> + <signal name="clicked" handler="on_brush_button_clicked"/> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkButton" id="whiteboard_oval_tool"> + <widget class="GtkButton" id="oval_button"> <property name="label" translatable="yes">Oval Tool</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="whiteboard.tool_oval"/> + <signal name="clicked" handler="on_oval_button_clicked"/> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="whiteboard_export_button"> + <widget class="GtkButton" id="export_button"> <property name="label" translatable="yes">Export XML</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <signal name="clicked" handler="whiteboard.export"/> + <signal name="clicked" handler="on_export_button_clicked"/> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> diff -r f655e1974784 -r 77f805b84006 src/chat_control.py --- a/src/chat_control.py Tue Jul 21 05:49:29 2009 -0700 +++ b/src/chat_control.py Tue Jul 21 15:58:30 2009 +0200 @@ -2751,17 +2751,11 @@ def _on_whiteboard_button_clicked(self, widget): hbox = self.xml.get_widget('chat_child_hbox') if len(hbox.get_children()) == 1: - whiteboard_xml = gtkgui_helpers.get_glade('whiteboard_widget.glade') - whiteboard_container = whiteboard_xml.get_widget('whiteboard_hbox') whiteboard = Whiteboard(self.account, self.contact) - whiteboard_xml.signal_autoconnect(self) try: - whiteboard_container.pack_start(hbox) - whiteboard_container.show() - - whiteboard.set_size_request(300, 0) - whiteboard_container.pack_start(whiteboard, expand=False, fill=False) - whiteboard.show() + 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? diff -r f655e1974784 -r 77f805b84006 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Tue Jul 21 05:49:29 2009 -0700 +++ b/src/whiteboardwidget.py Tue Jul 21 15:58:30 2009 +0200 @@ -1,4 +1,5 @@ import gtk +import gtkgui_helpers import goocanvas from common.xmpp import Node from common import gajim @@ -14,17 +15,24 @@ - Ummu ''' -class Whiteboard(goocanvas.Canvas): +class Whiteboard(object): def __init__(self, account, contact): - goocanvas.Canvas.__init__(self) - self.set_flags(gtk.CAN_FOCUS) - self.root = self.get_root_item() + xml = gtkgui_helpers.get_glade('whiteboard_widget.glade', + 'whiteboard_hbox') + self.hbox = xml.get_widget('whiteboard_hbox') + self.canevas = goocanvas.Canvas() + self.hbox.pack_start(self.canevas) + self.hbox.reorder_child(self.canevas, 0) + self.canevas.set_flags(gtk.CAN_FOCUS) + xml.signal_autoconnect(self) + + self.root = self.canevas.get_root_item() session = SXESession(account, contact) # Events - self.connect('button-press-event', self.button_press_event) - self.connect('button-release-event', self.button_release_event) - self.connect('motion-notify-event', self.motion_notify_event) + self.canevas.connect('button-press-event', self.button_press_event) + self.canevas.connect('button-release-event', self.button_release_event) + self.canevas.connect('motion-notify-event', self.motion_notify_event) # Config self.draw_tool = 'oval' @@ -39,6 +47,14 @@ self.item_temp_coords = (0,0) self.item_data = None + def on_brush_button_clicked(self, widget): + print 'on_brush_button_clicked' + + def on_oval_button_clicked(self, widget): + print 'on_oval_button_clicked' + + def on_export_button_clicked(self, widget): + print 'on_export_button_clicked' def button_press_event(self, widget, event): x = event.x

1 0

gajim: Fixed some errors in chat_control for the right-hand butt...
by Ummu 21 Jul '09

21 Jul '09

changeset f655e1974784 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f655e1974784 description: Fixed some errors in chat_control for the right-hand buttons, but still errors diffstat: data/glade/whiteboard_widget.glade | 3 +++ src/chat_control.py | 26 ++++++-------------------- src/whiteboardwidget.py | 7 +++++-- 3 files changed, 14 insertions(+), 22 deletions(-) diffs (87 lines): diff -r b97defc178c9 -r f655e1974784 data/glade/whiteboard_widget.glade --- a/data/glade/whiteboard_widget.glade Tue Jul 21 04:49:26 2009 -0700 +++ b/data/glade/whiteboard_widget.glade Tue Jul 21 05:49:29 2009 -0700 @@ -19,6 +19,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <signal name="clicked" handler="whiteboard.tool_brush"/> </widget> <packing> <property name="position">0</property> @@ -30,6 +31,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <signal name="clicked" handler="whiteboard.tool_oval"/> </widget> <packing> <property name="position">1</property> @@ -41,6 +43,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <signal name="clicked" handler="whiteboard.export"/> </widget> <packing> <property name="position">2</property> diff -r b97defc178c9 -r f655e1974784 src/chat_control.py --- a/src/chat_control.py Tue Jul 21 04:49:26 2009 -0700 +++ b/src/chat_control.py Tue Jul 21 05:49:29 2009 -0700 @@ -2750,32 +2750,18 @@ def _on_whiteboard_button_clicked(self, widget): hbox = self.xml.get_widget('chat_child_hbox') - if 1 == 1: - whiteboard_container = self.xml.get_widget('whiteboard_hbox') + if len(hbox.get_children()) == 1: + whiteboard_xml = gtkgui_helpers.get_glade('whiteboard_widget.glade') + whiteboard_container = whiteboard_xml.get_widget('whiteboard_hbox') whiteboard = Whiteboard(self.account, self.contact) + whiteboard_xml.signal_autoconnect(self) try: - hbox.pack_start(whiteboard_container) + whiteboard_container.pack_start(hbox) whiteboard_container.show() - + whiteboard.set_size_request(300, 0) whiteboard_container.pack_start(whiteboard, expand=False, fill=False) whiteboard.show() - - widget = self.xml.get_widget('whiteboard_brush_button') - if widget is not None: - id_ = widget.connect('clicked', whiteboard.tool_change, 'brush') - self.handlers[id_] = widget - - widget = self.xml.get_widget('whiteboard_oval_button') - if widget is not None: - id_ = widget.connect('clicked', whiteboard.tool_change, 'oval') - self.handlers[id_] = widget - - widget = self.xml.get_widget('whiteboard_export_button') - if widget is not None: - id_ = widget.connect('clicked', whiteboard.export) - self.handlers[id_] = widget - except: pass # TODO: Fix problem with groupchat? diff -r b97defc178c9 -r f655e1974784 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Tue Jul 21 04:49:26 2009 -0700 +++ b/src/whiteboardwidget.py Tue Jul 21 05:49:29 2009 -0700 @@ -113,9 +113,12 @@ def export(self, widget): self.image.print_xml() + + def tool_brush(self,widget): + self.draw_tool = 'brush' - def tool_change(self, widget, tool): - self.draw_tool = tool + def tool_oval(self, widget): + self.draw_tool = 'oval' class SVGObject(): ''' A class to store the svg document and make changes to it.'''

1 0

gajim: here goes
by Ummu 21 Jul '09

21 Jul '09

changeset b97defc178c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b97defc178c9 description: here goes diffstat: data/glade/whiteboard_widget.glade | 57 ++++++++++++++++++++++++++++ src/chat_control.py | 29 ++++++++++++-- src/whiteboardwidget.py | 12 +++--- 3 files changed, 87 insertions(+), 11 deletions(-) diffs (139 lines): diff -r 19f0ee88d090 -r b97defc178c9 data/glade/whiteboard_widget.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/whiteboard_widget.glade Tue Jul 21 04:49:26 2009 -0700 @@ -0,0 +1,57 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkWindow" id="window1"> + <child> + <widget class="GtkHBox" id="whiteboard_hbox"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <widget class="GtkVBox" id="whiteboard_menu_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <widget class="GtkButton" id="whiteboard_brush_button"> + <property name="label" translatable="yes">Brush Tool</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="whiteboard_oval_tool"> + <property name="label" translatable="yes">Oval Tool</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="whiteboard_export_button"> + <property name="label" translatable="yes">Export XML</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> diff -r 19f0ee88d090 -r b97defc178c9 src/chat_control.py --- a/src/chat_control.py Thu Jul 16 03:27:32 2009 -0700 +++ b/src/chat_control.py Tue Jul 21 04:49:26 2009 -0700 @@ -2750,14 +2750,33 @@ def _on_whiteboard_button_clicked(self, widget): hbox = self.xml.get_widget('chat_child_hbox') - if len(hbox.get_children()) == 1: + if 1 == 1: + whiteboard_container = self.xml.get_widget('whiteboard_hbox') whiteboard = Whiteboard(self.account, self.contact) try: - hbox.pack_start(whiteboard) + hbox.pack_start(whiteboard_container) + whiteboard_container.show() + + whiteboard.set_size_request(300, 0) + whiteboard_container.pack_start(whiteboard, expand=False, fill=False) whiteboard.show() - # set minimum size - whiteboard.set_size_request(300, 0) - hbox.pack_start(whiteboard, expand=False, fill=False) + + widget = self.xml.get_widget('whiteboard_brush_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.tool_change, 'brush') + self.handlers[id_] = widget + + widget = self.xml.get_widget('whiteboard_oval_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.tool_change, 'oval') + self.handlers[id_] = widget + + widget = self.xml.get_widget('whiteboard_export_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.export) + self.handlers[id_] = widget + + except: pass # TODO: Fix problem with groupchat? diff -r 19f0ee88d090 -r b97defc178c9 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Thu Jul 16 03:27:32 2009 -0700 +++ b/src/whiteboardwidget.py Tue Jul 21 04:49:26 2009 -0700 @@ -25,7 +25,6 @@ self.connect('button-press-event', self.button_press_event) self.connect('button-release-event', self.button_release_event) self.connect('motion-notify-event', self.motion_notify_event) - self.connect('key-press-event', self.key_press_event) # Config self.draw_tool = 'oval' @@ -57,6 +56,7 @@ fill_color='black', line_width=self.line_width) self.item_data = 'M %s,%s L ' % (x, y) + elif self.draw_tool == 'oval': self.item_data = True @@ -111,11 +111,11 @@ self.item_temp.remove() self.item_temp = None - # TODO: get keypresses working - def key_press_event(self, widget, event): - print 'test' - if event.keyval == 'p': - self.image.print_xml() + def export(self, widget): + self.image.print_xml() + + def tool_change(self, widget, tool): + self.draw_tool = tool class SVGObject(): ''' A class to store the svg document and make changes to it.'''

1 0

gajim: whiteboard still does not show, glade made
by Ummu 21 Jul '09

21 Jul '09

changeset e08557899421 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e08557899421 description: whiteboard still does not show, glade made diffstat: data/emoticons/static/emoticons.pyo | data/glade/message_window.glade | 2 +- src/chat_control.py | 29 +- src/chat_control2.py | 2753 +++++++++++++++++++++++ src/common/connection.py.orig | 1995 +++++++++++++++++ src/common/xmpp/__init__.pyc | src/common/xmpp/__init__.pyo | src/common/xmpp/auth_nb.pyc | src/common/xmpp/auth_nb.pyo | src/common/xmpp/bosh.pyc | src/common/xmpp/bosh.pyo | src/common/xmpp/c14n.pyo | src/common/xmpp/client_nb.pyc | src/common/xmpp/client_nb.pyo | src/common/xmpp/dispatcher_nb.pyc | src/common/xmpp/dispatcher_nb.pyo | src/common/xmpp/features_nb.pyc | src/common/xmpp/features_nb.pyo | src/common/xmpp/idlequeue.pyc | src/common/xmpp/idlequeue.pyo | src/common/xmpp/plugin.pyc | src/common/xmpp/plugin.pyo | src/common/xmpp/protocol.pyc | src/common/xmpp/protocol.pyo | src/common/xmpp/proxy_connectors.pyc | src/common/xmpp/proxy_connectors.pyo | src/common/xmpp/roster_nb.pyc | src/common/xmpp/roster_nb.pyo | src/common/xmpp/simplexml.pyc | src/common/xmpp/simplexml.pyo | src/common/xmpp/tls_nb.pyc | src/common/xmpp/tls_nb.pyo | src/common/xmpp/transports_nb.pyc | src/common/xmpp/transports_nb.pyo | src/common/zeroconf/__init__.pyo | src/common/zeroconf/client_zeroconf.pyo | src/common/zeroconf/connection_handlers_zeroconf.pyo | src/common/zeroconf/connection_zeroconf.pyo | src/common/zeroconf/roster_zeroconf.pyo | src/common/zeroconf/zeroconf.pyo | src/osx/__init__.pyo | src/whiteboardtest.svg | 1 + src/whiteboardwidget.py | 12 +- src/whiteboardwidget.py.orig | 197 + 44 files changed, 4977 insertions(+), 12 deletions(-) diffs (truncated from 5127 to 300 lines): diff -r 19f0ee88d090 -r e08557899421 data/emoticons/static/emoticons.pyo Binary file data/emoticons/static/emoticons.pyo has changed diff -r 19f0ee88d090 -r e08557899421 data/glade/message_window.glade --- a/data/glade/message_window.glade Thu Jul 16 03:27:32 2009 -0700 +++ b/data/glade/message_window.glade Tue Jul 21 04:13:47 2009 -0700 @@ -534,7 +534,7 @@ </packing> </child> <child> - <placeholder/> + <placeholder /> </child> </widget> </child> diff -r 19f0ee88d090 -r e08557899421 src/chat_control.py --- a/src/chat_control.py Thu Jul 16 03:27:32 2009 -0700 +++ b/src/chat_control.py Tue Jul 21 04:13:47 2009 -0700 @@ -2750,14 +2750,33 @@ def _on_whiteboard_button_clicked(self, widget): hbox = self.xml.get_widget('chat_child_hbox') - if len(hbox.get_children()) == 1: + if 1 == 1: + whiteboard_container = self.xml.get_widget('whiteboard_hbox') whiteboard = Whiteboard(self.account, self.contact) try: - hbox.pack_start(whiteboard) + hbox.pack_start(whiteboard_container) + whiteboard_container.show() + + whiteboard.set_size_request(300, 0) + whiteboard_container.pack_start(whiteboard, expand=False, fill=False) whiteboard.show() - # set minimum size - whiteboard.set_size_request(300, 0) - hbox.pack_start(whiteboard, expand=False, fill=False) + + widget = self.xml.get_widget('whiteboard_brush_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.tool_change, 'brush') + self.handlers[id_] = widget + + widget = self.xml.get_widget('whiteboard_oval_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.tool_change, 'oval') + self.handlers[id_] = widget + + widget = self.xml.get_widget('whiteboard_export_button') + if widget is not None: + id_ = widget.connect('clicked', whiteboard.export) + self.handlers[id_] = widget + + except: pass # TODO: Fix problem with groupchat? diff -r 19f0ee88d090 -r e08557899421 src/chat_control2.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/chat_control2.py Tue Jul 21 04:13:47 2009 -0700 @@ -0,0 +1,2753 @@ +# -*- coding:utf-8 -*- +## src/chat_control.py +## +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> +## Jean-Marie Traissard <jim AT lapin.org> +## Nikos Kouremenos <kourem AT gmail.com> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +## Julien Pivotto <roidelapluie AT gmail.com> +## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +import os +import time +import gtk +import pango +import gobject +import gtkgui_helpers +import message_control +import dialogs +import history_window +import notify +import re + +from common import gajim +from common import helpers +from common import exceptions +from message_control import MessageControl +from conversation_textview import ConversationTextview +from message_textview import MessageTextView +from common.contacts import GC_Contact +from common.logger import constants +from common.pep import MOODS, ACTIVITIES +from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC +from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION +from whiteboardwidget import Whiteboard + +try: + import gtkspell + HAS_GTK_SPELL = True +except ImportError: + HAS_GTK_SPELL = False + +# the next script, executed in the "po" directory, +# generates the following list. +##!/bin/sh +#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) +#echo "{_('en'):'en'",$LANG"}" +langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} + +################################################################################ +class ChatControlBase(MessageControl): + '''A base class containing a banner, ConversationTextview, MessageTextView + ''' + def make_href(self, match): + url_color = gajim.config.get('urlmsgcolor') + return '<a href="%s"><span color="%s">%s</span></a>' % (match.group(), + url_color, match.group()) + + def get_font_attrs(self): + ''' get pango font attributes for banner from theme settings ''' + theme = gajim.config.get('roster_theme') + bannerfont = gajim.config.get_per('themes', theme, 'bannerfont') + bannerfontattrs = gajim.config.get_per('themes', theme, 'bannerfontattrs') + + if bannerfont: + font = pango.FontDescription(bannerfont) + else: + font = pango.FontDescription('Normal') + if bannerfontattrs: + # B attribute is set by default + if 'B' in bannerfontattrs: + font.set_weight(pango.WEIGHT_HEAVY) + if 'I' in bannerfontattrs: + font.set_style(pango.STYLE_ITALIC) + + font_attrs = 'font_desc="%s"' % font.to_string() + + # in case there is no font specified we use x-large font size + if font.get_size() == 0: + font_attrs = '%s size="x-large"' % font_attrs + font.set_weight(pango.WEIGHT_NORMAL) + font_attrs_small = 'font_desc="%s" size="small"' % font.to_string() + return (font_attrs, font_attrs_small) + + def get_nb_unread(self): + jid = self.contact.jid + if self.resource: + jid += '/' + self.resource + type_ = self.type_id + return len(gajim.events.get_events(self.account, jid, ['printed_' + type_, + type_])) + + def draw_banner(self): + '''Draw the fat line at the top of the window that + houses the icon, jid, ... + ''' + self.draw_banner_text() + self._update_banner_state_image() + # Derived types MAY implement this + + def draw_banner_text(self): + pass # Derived types SHOULD implement this + + def update_ui(self): + self.draw_banner() + # Derived types SHOULD implement this + + def repaint_themed_widgets(self): + self._paint_banner() + self.draw_banner() + # Derived classes MAY implement this + + def _update_banner_state_image(self): + pass # Derived types MAY implement this + + def handle_message_textview_mykey_press(self, widget, event_keyval, + event_keymod): + # Derived should implement this rather than connecting to the event + # itself. + pass + + def status_url_clicked(self, widget, url): + helpers.launch_browser_mailer('url', url) + + def __init__(self, type_id, parent_win, widget_name, contact, acct, + resource = None): + if resource is None: + # We very likely got a contact with a random resource. + # This is bad, we need the highest for caps etc. + c = gajim.contacts.get_contact_with_highest_priority( + acct, contact.jid) + if c and not isinstance(c, GC_Contact): + contact = c + + MessageControl.__init__(self, type_id, parent_win, widget_name, + contact, acct, resource = resource) + + widget = self.xml.get_widget('history_button') + id_ = widget.connect('clicked', self._on_history_menuitem_activate) + self.handlers[id_] = widget + + # when/if we do XHTML we will put formatting buttons back + widget = self.xml.get_widget('emoticons_button') + id_ = widget.connect('clicked', self.on_emoticons_button_clicked) + self.handlers[id_] = widget + + # Create banner and connect signals + widget = self.xml.get_widget('banner_eventbox') + id_ = widget.connect('button-press-event', + self._on_banner_eventbox_button_press_event) + self.handlers[id_] = widget + + self.urlfinder = re.compile( + r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") + + if gajim.HAVE_PYSEXY: + import sexy + self.banner_status_label = sexy.UrlLabel() + self.banner_status_label.connect('url_activated', + self.status_url_clicked) + else: + self.banner_status_label = gtk.Label() + self.banner_status_label.set_selectable(True) + self.banner_status_label.set_alignment(0,0.5) + self.banner_status_label.connect('populate_popup', + self.on_banner_label_populate_popup) + + banner_vbox = self.xml.get_widget('banner_vbox') + banner_vbox.pack_start(self.banner_status_label) + self.banner_status_label.show() + + # Init DND + self.TARGET_TYPE_URI_LIST = 80 + self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ), + ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)] + id_ = self.widget.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id_] = self.widget + self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) + + # Create textviews and connect signals + self.conv_textview = ConversationTextview(self.account) + id_ = self.conv_textview.connect('quote', self.on_quote) + self.handlers[id_] = self.conv_textview.tv + id_ = self.conv_textview.tv.connect('key_press_event', + self._conv_textview_key_press_event) + self.handlers[id_] = self.conv_textview.tv + # FIXME: DND on non editable TextView, find a better way + self.drag_entered = False + id_ = self.conv_textview.tv.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id_] = self.conv_textview.tv + id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) + self.handlers[id_] = self.conv_textview.tv + id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) + self.handlers[id_] = self.conv_textview.tv + self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) + + self.conv_scrolledwindow = self.xml.get_widget( + 'conversation_scrolledwindow') + self.conv_scrolledwindow.add(self.conv_textview.tv) + widget = self.conv_scrolledwindow.get_vadjustment() + id_ = widget.connect('value-changed', + self.on_conversation_vadjustment_value_changed) + self.handlers[id_] = widget + id_ = widget.connect('changed', + self.on_conversation_vadjustment_changed) + self.handlers[id_] = widget + self.scroll_to_end_id = None + self.was_at_the_end = True + + # add MessageTextView to UI and connect signals + self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow') + self.msg_textview = MessageTextView() + id_ = self.msg_textview.connect('mykeypress', + self._on_message_textview_mykeypress_event)

1 0

gajim: fix using change nick button in groupchats
by Yann Leboulanger 20 Jul '09

20 Jul '09

changeset 7f7118c375a1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f7118c375a1 description: fix using change nick button in groupchats diffstat: src/dialogs.py | 32 ++++++++++++++++---------------- src/gajim.py | 10 ++++++++-- src/groupchat_control.py | 11 ++++++++--- 3 files changed, 32 insertions(+), 21 deletions(-) diffs (119 lines): diff -r 44fb9b10259e -r 7f7118c375a1 src/dialogs.py --- a/src/dialogs.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/dialogs.py Tue Jul 21 00:30:43 2009 +0200 @@ -1639,9 +1639,10 @@ self.input_entry.set_text(input_str) self.input_entry.select_region(0, -1) # select all - self.checkbutton = gtk.CheckButton(checktext) - self.vbox.pack_start(self.checkbutton, expand=False, fill=True) - self.checkbutton.show() + if checktext: + self.checkbutton = gtk.CheckButton(checktext) + self.vbox.pack_start(self.checkbutton, expand=False, fill=True) + self.checkbutton.show() def on_okbutton_clicked(self, widget): user_input = self.get_text() @@ -1659,16 +1660,18 @@ def is_checked(self): ''' Get active state of the checkbutton ''' - return self.checkbutton.get_active() + try: + return self.checkbutton.get_active() + except Exception: + # There is no checkbutton + return False class ChangeNickDialog(InputDialogCheck): '''Class for changing room nickname in case of conflict''' - def __init__(self, account, room_jid): - title = _('Unable to join group chat') - check_text = _('Always use this nickname when there is a conflict') + def __init__(self, account, room_jid, title, prompt, check_text=None): InputDialogCheck.__init__(self, title, '', checktext=check_text, input_str='', is_modal=True, ok_handler=None, cancel_handler=None) - self.room_queue = [(account, room_jid)] + self.room_queue = [(account, room_jid, prompt)] self.check_next() def on_input_dialog_delete_event(self, widget, event): @@ -1686,10 +1689,7 @@ self.check_next() return label = self.xml.get_widget('label') - prompt = _('Your desired nickname in group chat %s is in use or ' - 'registered by another occupant.\nPlease specify another nickname ' - 'below:') % self.room_jid - label.set_markup(prompt) + label.set_markup(self.prompt) self.set_entry(self.gc_control.nick + \ gajim.config.get('gc_proposed_nick_char')) @@ -1699,7 +1699,7 @@ self.dialog.destroy() del gajim.interface.instances['change_nick_dialog'] return - self.account, self.room_jid = self.room_queue.pop(0) + self.account, self.room_jid, self.prompt = self.room_queue.pop(0) self.setup_dialog() if gajim.new_room_nick is not None and not gajim.gc_connected[ @@ -1743,9 +1743,9 @@ self.gc_control.new_nick = '' self.check_next() - def add_room(self, account, room_jid): - if (account, room_jid) not in self.room_queue: - self.room_queue.append((account, room_jid)) + def add_room(self, account, room_jid, pompt): + if (account, room_jid, prompt) not in self.room_queue: + self.room_queue.append((account, room_jid, prompt)) class InputTextDialog(CommonInputDialog): '''Class for multilines Input dialog (more place than InputDialog)''' diff -r 44fb9b10259e -r 7f7118c375a1 src/gajim.py --- a/src/gajim.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/gajim.py Tue Jul 21 00:30:43 2009 +0200 @@ -506,11 +506,17 @@ def handle_event_ask_new_nick(self, account, data): #('ASK_NEW_NICK', account, (room_jid,)) room_jid = data[0] + title = _('Unable to join group chat') + prompt = _('Your desired nickname in group chat %s is in use or ' + 'registered by another occupant.\nPlease specify another nickname ' + 'below:') % room_jid + check_text = _('Always use this nickname when there is a conflict') if 'change_nick_dialog' in self.instances: - self.instances['change_nick_dialog'].add_room(account, room_jid) + self.instances['change_nick_dialog'].add_room(account, room_jid, + prompt) else: self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( - account, room_jid) + account, room_jid, title, prompt) def handle_event_http_auth(self, account, data): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) diff -r 44fb9b10259e -r 7f7118c375a1 src/groupchat_control.py --- a/src/groupchat_control.py Tue Jul 21 00:13:55 2009 +0200 +++ b/src/groupchat_control.py Tue Jul 21 00:30:43 2009 +0200 @@ -1939,9 +1939,14 @@ ok_handler=on_ok) def _on_change_nick_menuitem_activate(self, widget): - title = _('Changing Nickname') - prompt = _('Please specify the new nickname you want to use:') - self.show_change_nick_input_dialog(title, prompt) + if 'change_nick_dialog' in gajim.interface.instances: + gajim.interface.instances['change_nick_dialog'].present() + else: + title = _('Changing Nickname') + prompt = _('Please specify the new nickname you want to use:') + gajim.interface.instances['change_nick_dialog'] = \ + dialogs.ChangeNickDialog(self.account, self.room_jid, title, + prompt) def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick)

1 0

gajim: copy list before iterating on it in case we modify it.
by Yann Leboulanger 20 Jul '09

20 Jul '09

changeset 44fb9b10259e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44fb9b10259e description: copy list before iterating on it in case we modify it. diffstat: src/common/contacts.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 65e55d533cbc -r 44fb9b10259e src/common/contacts.py --- a/src/common/contacts.py Mon Jul 20 23:51:17 2009 +0200 +++ b/src/common/contacts.py Tue Jul 21 00:13:55 2009 +0200 @@ -292,7 +292,7 @@ def iter_contacts(self, account): if account in self._contacts: for jid in self._contacts[account].keys(): - for contact in self._contacts[account][jid]: + for contact in self._contacts[account][jid][:]: yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: stupid me, calling .keys() on a dict ...
by Yann Leboulanger 20 Jul '09

20 Jul '09

changeset 65e55d533cbc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=65e55d533cbc description: stupid me, calling .keys() on a dict ... diffstat: src/common/contacts.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c08280b346b5 -r 65e55d533cbc src/common/contacts.py --- a/src/common/contacts.py Mon Jul 20 23:47:59 2009 +0200 +++ b/src/common/contacts.py Mon Jul 20 23:51:17 2009 +0200 @@ -292,7 +292,7 @@ def iter_contacts(self, account): if account in self._contacts: for jid in self._contacts[account].keys(): - for contact in self._contacts[account][jid].keys(): + for contact in self._contacts[account][jid]: yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: prevent traceback when we remove contacts in iter_contact...
by Yann Leboulanger 20 Jul '09

20 Jul '09

changeset c08280b346b5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c08280b346b5 description: prevent traceback when we remove contacts in iter_contacts() loop. diffstat: src/common/contacts.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r d771ec6ea227 -r c08280b346b5 src/common/contacts.py --- a/src/common/contacts.py Mon Jul 20 20:09:39 2009 +0200 +++ b/src/common/contacts.py Mon Jul 20 23:47:59 2009 +0200 @@ -291,8 +291,8 @@ def iter_contacts(self, account): if account in self._contacts: - for jid in self._contacts[account]: - for contact in self._contacts[account][jid]: + for jid in self._contacts[account].keys(): + for contact in self._contacts[account][jid].keys(): yield contact def get_contact_from_full_jid(self, account, fjid):

1 0

gajim: * fixed a bug (when we try to remove a jid from roster wi...
by Anaël Verrier 20 Jul '09

20 Jul '09

changeset d771ec6ea227 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d771ec6ea227 description: * fixed a bug (when we try to remove a jid from roster window) diffstat: src/common/connection_handlers.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 9efe9be81c74 -r d771ec6ea227 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jul 19 23:45:03 2009 +0200 +++ b/src/common/connection_handlers.py Mon Jul 20 20:09:39 2009 +0200 @@ -2577,8 +2577,8 @@ if received_from_server: for contact in gajim.contacts.iter_contacts(self.name): if not contact.is_groupchat() and contact.jid not in roster: - self.dispatch('ROSTER_INFO', (self.name, - (contact.jid, None, None, None, ()))) + self.dispatch('ROSTER_INFO', (contact.jid, None, None, None, + ())) for jid in roster: self.dispatch('ROSTER_INFO', (jid, roster[jid]['name'], roster[jid]['subscription'], roster[jid]['ask'],

1 0

gajim: remove old out of date file
by Yann Leboulanger 19 Jul '09

19 Jul '09

changeset 9efe9be81c74 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9efe9be81c74 description: remove old out of date file diffstat: TODO.pep | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diffs (12 lines): diff -r fc18891cb167 -r 9efe9be81c74 TODO.pep --- a/TODO.pep Sun Jul 19 22:09:09 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -• configure access model when changing it in the combobox -• PEP in status change - -Tune use cases: -• on disconnection of an account set Tune to None - -Tooltips use cases: -• Show PEP in GC tooltips

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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