Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflavio <fdanesse@gmail.com>2012-07-31 21:04:01 (GMT)
committer flavio <fdanesse@gmail.com>2012-07-31 21:04:01 (GMT)
commit94e71e0bb0314aeeb26effacc95be8bc9b11cdfb (patch)
tree38fb0365d4b020f2255a851bb10eab3211cd3a32
parent37cc8ed1be82569982626f757be6eaaca83c8cf6 (diff)
Chat Corrections
-rw-r--r--chat.py10
-rw-r--r--chatbox.py4
-rw-r--r--roundbox.py2
3 files changed, 8 insertions, 8 deletions
diff --git a/chat.py b/chat.py
index c6af775..8f8bb28 100644
--- a/chat.py
+++ b/chat.py
@@ -54,14 +54,14 @@ class View(Gtk.EventBox):
self._buddies = {}
# buddies box
-
self._buddies_list = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
self._buddies_list.set_homogeneous(False)
self._buddies_list.props.spacing = ENTRY_YPAD
self._buddies_box = Gtk.ScrolledWindow()
self._buddies_box.set_policy(Gtk.PolicyType.ALWAYS,
- Gtk.PolicyType.NEVER)
+ Gtk.PolicyType.NEVER)
+
evbox = Gtk.EventBox()
evbox.modify_bg(Gtk.StateType.NORMAL, BUDDIES_COLOR.get_gdk_color())
evbox.add(self._buddies_list)
@@ -69,7 +69,6 @@ class View(Gtk.EventBox):
self._buddies_box.add_with_viewport(evbox)
# chat entry
-
self._chat = ChatBox()
self.me, my_face_widget = self._new_face(self._chat.owner,
ENTRY_COLOR)
@@ -107,12 +106,13 @@ class View(Gtk.EventBox):
evbox.add(chat_box)
# desk
-
self._desk = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
self._desk.pack_start(evbox, True, True, 0)
self._desk.show_all()
self.add(self._desk)
+
+ self.show_all()
def update(self, status):
self.me.update(status)
@@ -135,8 +135,6 @@ class View(Gtk.EventBox):
if text:
self._chat.add_text(buddy, text)
if not self.quiet:
- # and self.props.window \
- # and self.props.window.is_visible():
face.say(text)
def farewell(self, buddy):
diff --git a/chatbox.py b/chatbox.py
index c61c3c1..ebaaf70 100644
--- a/chatbox.py
+++ b/chatbox.py
@@ -221,12 +221,14 @@ class ChatBox(Gtk.ScrolledWindow):
self._conversation.set_homogeneous(False)
self._conversation.props.spacing = style.LINE_WIDTH
self._conversation.props.border_width = style.LINE_WIDTH
+
evbox = Gtk.EventBox()
evbox.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
evbox.add(self._conversation)
self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS)
self.add_with_viewport(evbox)
+
vadj = self.get_vadjustment()
vadj.connect('changed', self._scroll_changed_cb)
vadj.connect('value-changed', self._scroll_value_changed_cb)
@@ -272,7 +274,7 @@ class ChatBox(Gtk.ScrolledWindow):
# Select text color based on fill color:
color_fill_rgba = style.Color(color_fill_html).get_rgba()
color_fill_gray = (color_fill_rgba[0] + color_fill_rgba[1] +
- color_fill_rgba[2]) / 3
+ color_fill_rgba[2]) / 3
color_stroke = style.Color(color_stroke_html)
color_fill = style.Color(color_fill_html)
if color_fill_gray < 0.5:
diff --git a/roundbox.py b/roundbox.py
index c34a7db..744f621 100644
--- a/roundbox.py
+++ b/roundbox.py
@@ -10,7 +10,7 @@ class RoundBox(Gtk.Box):
_BORDER_DEFAULT = style.LINE_WIDTH
def __init__(self):
- Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
+ Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL)
self._x = None
self._y = None