changeset a33567165405 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a33567165405
description: Put in button that starts new widget. Changed widget so it takes
in gajim.connection[self.account].
diffstat:
data/glade/message_window.glade | 23 +++++++++++++++++++++++
src/chat_control.py | 24 +++++++++++++++---------
src/whiteboardwidget.py | 2 +-
3 files changed, 39 insertions(+), 10 deletions(-)
diffs (84 lines):
diff -r f7147f583a98 -r a33567165405 data/glade/message_window.glade
--- a/data/glade/message_window.glade Fri Jun 26 00:25:32 2009 -0700
+++ b/data/glade/message_window.glade Sun Jun 28 04:56:25 2009 -0700
@@ -332,6 +332,29 @@
<property name="expand">False</property>
<property name="position">4</property>
</packing>
+ </child> <child>
+ <widget class="GtkButton"
id="start_whiteboard_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Start
using Whiteboard</property>
+ <property name="relief">none</property>
+ <property name="focus_on_click">False</property>
+ <child>
+ <widget class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-info</property>
+ <property name="icon-size">2</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">4</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="convert_to_gc_button">
diff -r f7147f583a98 -r a33567165405 src/chat_control.py
--- a/src/chat_control.py Fri Jun 26 00:25:32 2009 -0700
+++ b/src/chat_control.py Sun Jun 28 04:56:25 2009 -0700
@@ -292,14 +292,11 @@
self.smooth = True
self.msg_textview.grab_focus()
- # Whiteboard
- whiteboard = Whiteboard()
- hbox = self.xml.get_widget('chat_child_hbox')
- try:
- hbox.pack_start(whiteboard)
- except:
- pass # It is a group chat, do it later
-
+ # Hook up whiteboard button
+ widget = self.xml.get_widget('start_whiteboard_button')
+ id_ = widget.connect('clicked',
self._on_whiteboard_button_clicked)
+ self.handlers[id_] = widget
+
def set_speller(self):
try:
lang = gajim.config.get('speller_language')
@@ -2749,5 +2746,14 @@
self.print_conversation(' (', 'status', simple=True)
self.print_conversation('%s' % (status), 'status',
simple=True)
self.print_conversation(')', 'status', simple=True)
-
+
+ def _on_whiteboard_button_clicked(self, widget):
+ whiteboard = Whiteboard(gajim.connections[self.account])
+ hbox = self.xml.get_widget('chat_child_hbox')
+ try:
+ hbox.pack_start(whiteboard)
+ whiteboard.show()
+ except:
+ pass # TODO: Fix problem with groupchat?
+
# vim: se ts=3:
diff -r f7147f583a98 -r a33567165405 src/whiteboardwidget.py
--- a/src/whiteboardwidget.py Fri Jun 26 00:25:32 2009 -0700
+++ b/src/whiteboardwidget.py Sun Jun 28 04:56:25 2009 -0700
@@ -9,7 +9,7 @@
"""
class Whiteboard(goocanvas.Canvas):
- def __init__(self):
+ def __init__(self, connection):
goocanvas.Canvas.__init__(self)
self.set_flags(gtk.CAN_FOCUS)
self.root = self.get_root_item()
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
