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
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
