From 53044aa9cb2d0074a5fdcb590f88d0eb0a326230 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 17 Dec 2008 22:06:05 +0000
Subject: use ScrolledToolbar in Mini/InstrumentPanel

---
(limited to 'common/Util')

diff --git a/common/Util/ScrolledToolbar.py b/common/Util/ScrolledToolbar.py
index 9beaaec..c9512cc 100644
--- a/common/Util/ScrolledToolbar.py
+++ b/common/Util/ScrolledToolbar.py
@@ -1,42 +1,63 @@
-#import pygtk
 import gtk
-#import os
-#import sets
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.icon import Icon
 
-class ScrolledToolbar(gtk.HBox):
+class ScrollButton(gtk.ToolButton):
+    def __init__(self, icon_name):
+        gtk.ToolButton.__init__(self)
+
+        icon = Icon(icon_name = icon_name, icon_size=gtk.ICON_SIZE_SMALL_TOOLBAR)
+        # The alignment is a hack to work around gtk.ToolButton code
+        # that sets the icon_size when the icon_widget is a gtk.Image
+        alignment = gtk.Alignment(0.5, 0.5)
+        alignment.add(icon)
+        self.set_icon_widget(alignment)
+        
+class ScrolledToolbar(gtk.EventBox):
     def __init__(self):
-        gtk.HBox.__init__( self )
+        gtk.EventBox.__init__(self)
+
+        box = gtk.HBox()
+        self.add(box)
 
-        scrollLeftImg = gtk.Image()
-        scrollLeftImg.set_from_icon_name('go-left', gtk.ICON_SIZE_BUTTON)
-        self._scrollLeft = gtk.Button( label = None )
-        self._scrollLeft.set_relief(gtk.RELIEF_NONE)
-        self._scrollLeft.set_image(scrollLeftImg)
-        self._scrollLeft.connect( "clicked", self.doScroll, "left" )
-        self.pack_start( self._scrollLeft, False, False )
+        self._scrollLeft = ScrollButton('go-left')
+        self._scrollLeft.connect( "clicked", self._scroll_cb, "left" )
+        box.pack_start( self._scrollLeft, False, False )
 
         self._scrolledWindow = gtk.ScrolledWindow()
-        self._scrolledWindow.set_policy( gtk.POLICY_ALWAYS, gtk.POLICY_NEVER )
-        self.pack_start( self._scrolledWindow )
+        self._scrolledWindow.set_policy(gtk.POLICY_ALWAYS, gtk.POLICY_NEVER)
+        self._scrolledWindow.connect('scroll-event', self._scroll_event_cb)
+        box.pack_start( self._scrolledWindow )
         self._hadjustment = self._scrolledWindow.get_hadjustment()
-        self._hadjustment.connect( "changed", self.scrollChanged )
-        self._hadjustment.connect( "value-changed", self.scrollChanged )
+        self._hadjustment.connect( "changed", self._scroll_changed_cb )
+        self._hadjustment.connect( "value-changed", self._scroll_changed_cb )
 
-        scrollRightImg = gtk.Image()
-        scrollRightImg.set_from_icon_name('go-right', gtk.ICON_SIZE_BUTTON)
-        self._scrollRight = gtk.Button( label = None )
-        self._scrollRight.set_relief(gtk.RELIEF_NONE)
-        self._scrollRight.set_image(scrollRightImg)
-        self._scrollRight.connect( "clicked", self.doScroll, "right" )
-        self.pack_start( self._scrollRight, False, False )
+        self._scrollRight = ScrollButton('go-right')
+        self._scrollRight.connect( "clicked", self._scroll_cb, "right" )
+        box.pack_start(self._scrollRight, False, False)
+
+    def modify_bg(self, state, bg):
+        gtk.EventBox.modify_bg(self, state, bg)
+        self._viewport.get_parent().modify_bg(state, bg)
 
     def set_viewport(self, widget):
+        self._viewport = widget
         self._scrolledWindow.add_with_viewport(widget)
 
+    def get_viewport_allocation(self):
+        alloc = self._scrolledWindow.get_allocation()
+        alloc.x -= self._hadjustment.get_value()
+        return alloc
+
     def get_adjustment(self):
         return self._hadjustment
 
-    def doScroll( self, widget, data ):
+    def _scroll_event_cb(self, widget, event):
+        if event.direction == gtk.gdk.SCROLL_UP: event.direction = gtk.gdk.SCROLL_LEFT
+        if event.direction == gtk.gdk.SCROLL_DOWN: event.direction = gtk.gdk.SCROLL_RIGHT
+        return False
+
+    def _scroll_cb( self, widget, data ):
         if data == "left":
             val = max( self._hadjustment.get_property("lower"), self._hadjustment.get_value() - self._hadjustment.get_property("page_increment") )
         else:
@@ -44,7 +65,7 @@ class ScrolledToolbar(gtk.HBox):
 
         self._hadjustment.set_value( val )
 
-    def scrollChanged( self, widget ):
+    def _scroll_changed_cb( self, widget ):
         val = self._hadjustment.get_value()
         if val == 0:
             self._scrollLeft.set_sensitive( False )
@@ -55,8 +76,3 @@ class ScrolledToolbar(gtk.HBox):
             self._scrollRight.set_sensitive( False )
         else:
             self._scrollRight.set_sensitive( True )
-
-    def get_viewport_allocation(self):
-        alloc = self._scrolledWindow.get_allocation()
-        alloc.x -= self._hadjustment.get_value()
-        return alloc
--
cgit v0.9.1