<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>amsn2/core/theme_manager.py</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/airplane.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/angel.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/angry.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/ball.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/bat.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/beer.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/big_smile.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/bowl.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/boy.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/brb.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/broken_heart.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/cake.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/camera.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/car.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/cat.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/cigarette.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/clapping_hands.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/clock.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/coffee.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/computer.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/confused.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/cool_glasses.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/crying.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/dead_rose.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/devil.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/disapointed.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/dog.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/dont_know.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/drink.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/email.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/embarrassed.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/eye_rolling.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/film.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/finger_cross.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/gift.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/girl.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/goat.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/handcuffs.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/heart.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/im.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/island.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/kiss.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/left_hug.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/light.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/mobile.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/money.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/moon.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/msn.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/nerd.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/note.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/party.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/phone.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/pizza.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/plate.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/quiet.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/rabbit.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/rain.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/rainbow.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/right_hug.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/rose.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/sad.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/sarcastic.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/secret.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/sheep.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/shock.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/sick.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/smile.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/snail.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/star.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/storm.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/sun.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/teeth.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/think.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/thumb_down.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/thumb_up.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/tired.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/tongue.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/turtle.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/umbrella.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/wink.png</filename>
    </added>
    <added>
      <filename>amsn2/smileys/default/xbox.png</filename>
    </added>
    <added>
      <filename>amsn2/themes/buttons/default/nudge.png</filename>
    </added>
    <added>
      <filename>amsn2/themes/buttons/default/nudge_hover.png</filename>
    </added>
    <added>
      <filename>amsn2/themes/buttons/default/smile.png</filename>
    </added>
    <added>
      <filename>amsn2/themes/buttons/default/smile_hover.png</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -26,6 +26,8 @@ from views import *
 from contactlist_manager import *
 from conversation_manager import *
 from oim_manager import *
+from theme_manager import *
+
 
 class aMSNCore(object):
     def __init__(self, options):
@@ -46,6 +48,7 @@ class aMSNCore(object):
         self._loop = self._gui.gui.aMSNMainLoop(self)
         self._main = self._gui.gui.aMSNMainWindow(self)
         self._skin_manager = self._gui.gui.SkinManager(self)
+        self._theme_manager = aMSNThemeManager()
         self._contactlist_manager = aMSNContactListManager(self)
         self._oim_manager = aMSNOIMManager(self)
         self._conversation_manager = aMSNConversationManager(self)</diff>
      <filename>amsn2/core/amsn.py</filename>
    </modified>
    <modified>
      <diff>@@ -21,6 +21,7 @@
 #
 #===================================================
 
+import gc
 import gtk
 import cgi
 import time
@@ -60,6 +61,8 @@ class aMSNChatWidget(base.aMSNChatWidget, gtk.VBox):
         
         self._parent = parent
         self._amsn_conversation = amsn_conversation
+        self._amsn_core = amsn_conversation._core
+        self._theme_manager = self._amsn_core._theme_manager
         self.padding = 4
         self.lastmsg = ''
         self.last_sender = ''
@@ -90,9 +93,21 @@ class aMSNChatWidget(base.aMSNChatWidget, gtk.VBox):
         escroll.set_shadow_type(gtk.SHADOW_IN)
         escroll.set_size_request(-1, 40)
         escroll.add(self.entry)
+        
+        # Register button icons as stock icons
+        iconfactory = gtk.IconFactory()
+        icons = ['smile', 'nudge']
+        for icon in icons:
+            type, path = self._theme_manager.get_button(icon)
+            pixbuf = gtk.gdk.pixbuf_new_from_file(path)
+            iconset = gtk.IconSet(pixbuf)
+            iconfactory.add(icon, iconset)
+            iconfactory.add_default()
+            del pixbuf
+            gc.collect()
 
-        self.button1 = gtk.ToolButton(gtk.STOCK_INFO)
-        self.button2 = gtk.ToolButton(gtk.STOCK_CANCEL)
+        self.button1 = gtk.ToolButton('smile')
+        self.button2 = gtk.ToolButton('nudge')
         self.button3 = gtk.ToggleToolButton(gtk.STOCK_BOLD)
         self.button4 = gtk.ToggleToolButton(gtk.STOCK_ITALIC)
         self.button5 = gtk.ToggleToolButton(gtk.STOCK_UNDERLINE)</diff>
      <filename>amsn2/gui/front_ends/gtk/chat_window.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bc3ab31ead15ff44849595b2249b8386d77e8924</id>
    </parent>
  </parents>
  <author>
    <name>Satanas</name>
    <email>satanas@infierno.(none)</email>
  </author>
  <url>http://github.com/drf/amsn2/commit/dcedf154481a50cc153ba13643eb1122bbbcb1ac</url>
  <id>dcedf154481a50cc153ba13643eb1122bbbcb1ac</id>
  <committed-date>2008-11-18T05:23:48-08:00</committed-date>
  <authored-date>2008-11-18T05:23:48-08:00</authored-date>
  <message>[Core] First approach of Theme Manager (working with GTK). Added default smileys set</message>
  <tree>9b6eca5bba0f167a57e7b28ce4f106c89e6ebf20</tree>
  <committer>
    <name>Satanas</name>
    <email>satanas@infierno.(none)</email>
  </committer>
</commit>
