...

3 files changed, 46 insertions, 10 deletions

diff --git a/Main.py b/Main.py
index dec42e5..2f6daaf 100644
--- a/Main.py
+++ b/Main.py
@@ -32,7 +32,6 @@ import Ground
 import Sound
 import Document
 from Utils import *
-from Shared import *
 
 class FrameWidget(gtk.DrawingArea):
     def __init__(self):
@@ -342,10 +341,22 @@ class CartoonBuilder:
 
         for y in range(rows):
             for x in range(Theme.FRAME_COLS):
-                b = gtk.Button('foo')
-                b.set_size_request(Theme.THUMB_SIZE, Theme.THUMB_SIZE)
-                b.show()
-                self.table.attach(b, x, x+1, y, y+1)
+                image = gtk.Image()
+                #image.set_from_pixbuf(Document.thumb(i))
+                image.show()
+
+                image_box = gtk.EventBox()
+                image_box.show()
+                image_box.set_events(gtk.gdk.BUTTON_PRESS_MASK)
+                #image_box.connect('button_press_event', self._tape_cb, i)
+                image_box.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BLACK))
+                image_box.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse(BLACK))
+                image_box.props.border_width = 2
+                image_box.set_size_request(Theme.THUMB_SIZE, Theme.THUMB_SIZE)
+                image_box.add(image)
+
+                self.table.attach(image_box, x, x+1, y, y+1)
+
 
         self.table.show()
 
@@ -354,8 +365,21 @@ class CartoonBuilder:
         s.show()
         s.set_viewport(self.table)
 
-        s.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BUTTON_FOREGROUND))
-        s.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BACKGROUND))
+        s.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BACKGROUND))
+
+
+        s.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BACKGROUND))
+        s.modify_fg(gtk.STATE_ACTIVE, gtk.gdk.color_parse(BACKGROUND))
+        s.modify_fg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse(BACKGROUND))
+        s.modify_fg(gtk.STATE_SELECTED, gtk.gdk.color_parse(BACKGROUND))
+        s.modify_fg(gtk.STATE_INSENSITIVE, gtk.gdk.color_parse(BACKGROUND))
+
+
+        s.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BUTTON_BACKGROUND))
+        s.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse(BUTTON_BACKGROUND))
+        s.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse(BUTTON_BACKGROUND))
+        s.modify_bg(gtk.STATE_SELECTED, gtk.gdk.color_parse(BUTTON_BACKGROUND))
+        s.modify_bg(gtk.STATE_INSENSITIVE, gtk.gdk.color_parse(BUTTON_BACKGROUND))
 
 
         yellow_frames = gtk.EventBox()
diff --git a/Utils.py b/Utils.py
index a816bb9..c5844ca 100644
--- a/Utils.py
+++ b/Utils.py
@@ -210,10 +210,16 @@ class ScrolledBox(gtk.EventBox):
         gtk.EventBox.modify_fg(self, state, bg)
         self._viewport.get_parent().modify_fg(state, bg)
 
+        self._scrolled.modify_fg(state, bg)
+        self._scrolled.child.modify_fg(state, bg)
+
     def modify_bg(self, state, bg):
         gtk.EventBox.modify_bg(self, state, bg)
         self._viewport.get_parent().modify_bg(state, bg)
 
+        self._scrolled.modify_bg(state, bg)
+        self._scrolled.child.modify_bg(state, bg)
+
     def set_viewport(self, widget):
         if widget == self._viewport: return
         if self._viewport and self._aviewport_sig:
diff --git a/gtkrc b/gtkrc
index b4ae7cd..57110c6 100644
--- a/gtkrc
+++ b/gtkrc
@@ -1,8 +1,14 @@
-style "mamacombo"
+style "combobox"
 {
     color["focus_line"] = "#027F01"
     bg[NORMAL] = "#027F01"
     bg[ACTIVE] = "#026002"
+    bg[PRELIGHT] = "#027F01"
+}
+
+style "scrollbar"
+{
+    bg[NORMAL] = "#027F01"
 }
 
 style "fixframe"
@@ -10,7 +16,7 @@ style "fixframe"
     color["focus_line"] = "#FFFFFF"
     bg[NORMAL] = "#808080"
     bg[ACTIVE] = "#808080"
+    bg[PRELIGHT] = "#808080"
 }
 
-widget_class "*<GtkComboBox>*" style "mamacombo"
-widget       "*ComboBox*"      style "fixframe"
+widget "*ComboBox*" style "fixframe"