preparing for new versionv14

11 files changed, 439 insertions, 137 deletions

diff --git a/CI.py b/CI.py
index cd09259..40522dd 100755
--- a/CI.py
+++ b/CI.py
@@ -13,6 +13,7 @@
 
 from constants import SWIDTH, SHEIGHT, OFFSET, SCALE, HTOP1, HTOP2, HTOP3
 from C import header, footer, mark, special_mark
+
 import math
 
 htop1 = HTOP1
diff --git a/MANIFEST b/MANIFEST
index acfa452..50b0b53 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -27,12 +27,48 @@ images/A.svg
 
 icons/Con.svg
 icons/Aon.svg
-icons/Coff.svg
-icons/Aoff.svg
+
+
 sliderule.py
 L.py
 L2.py
 images/L.svg
 images/L2.svg
 icons/Lon.svg
-icons/Loff.svg
+
+CI.py
+images/CI.svg
+
+icons/CIon.svg
+K.py
+T.py
+S.py
+images/T.svg
+images/S.svg
+images/K.svg
+images/label.svg
+icons/Son.svg
+icons/Ton.svg
+
+
+
+icons/Kon.svg
+
+icons/Don.svg
+icons/L2on.svg
+T2.py
+K2.py
+A2.py
+DI.py
+S2.py
+images/K2.svg
+images/T2.svg
+images/A2.svg
+images/S2.svg
+images/DI.svg
+icons/DIon.svg
+icons/S2on.svg
+icons/realign.svg
+icons/A2on.svg
+icons/K2on.svg
+icons/T2on.svg
diff --git a/NEWS b/NEWS
index 44223ed..bffe3ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
 14
 
-* switched to combo boxes in order to enable user-definable combinations
+* switched to combo boxes in order to enable user-definable combinations (#2225)
 * added button to realign slides
+* added keyboard shortcuts (e.g., arrow keys to move slides)
 * code reorder in order to accomodate user-definable combinations
 
 13
diff --git a/icons/A2on.svg b/icons/A2on.svg
new file mode 100644
index 0000000..cc26f5f
--- /dev/null
+++ b/icons/A2on.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     width="50.94099"
+     height="50.940994"
+     rx="8.1506357"
+     ry="7.0263433"
+     x="2.0295048"
+     y="2.0295029"
+     id="rect2817"
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900621;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">A</tspan></text>
+</svg>
diff --git a/icons/K2on.svg b/icons/K2on.svg
new file mode 100644
index 0000000..cd799ab
--- /dev/null
+++ b/icons/K2on.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     width="50.94099"
+     height="50.940994"
+     rx="8.1506357"
+     ry="7.0263433"
+     x="2.0295048"
+     y="2.0295029"
+     id="rect2817"
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900621;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">K</tspan></text>
+</svg>
diff --git a/icons/S2on.svg b/icons/S2on.svg
new file mode 100644
index 0000000..ef8bb8e
--- /dev/null
+++ b/icons/S2on.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     width="50.94099"
+     height="50.940994"
+     rx="8.1506357"
+     ry="7.0263433"
+     x="2.0295048"
+     y="2.0295029"
+     id="rect2817"
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900621;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">S</tspan></text>
+</svg>
diff --git a/icons/T2on.svg b/icons/T2on.svg
new file mode 100644
index 0000000..6eaea9f
--- /dev/null
+++ b/icons/T2on.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     width="50.94099"
+     height="50.940994"
+     rx="8.1506357"
+     ry="7.0263433"
+     x="2.0295048"
+     y="2.0295029"
+     id="rect2817"
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900621;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">T</tspan></text>
+</svg>
diff --git a/po/Sliderule.pot b/po/Sliderule.pot
index 9f770bd..25837b0 100644
--- a/po/Sliderule.pot
+++ b/po/Sliderule.pot
@@ -8,78 +8,139 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-25 18:07-0400\n"
+"POT-Creation-Date: 2010-08-28 17:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: activity/activity.info:2
 msgid "Sliderule"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:300
-msgid "Project"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:52
+#: /home/walter/Desktop/sliderule/sliderule.py:24
+msgid "square/square root"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:53
+#: /home/walter/Desktop/sliderule/sliderule.py:25
+msgid "multiply/divide"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:54
+#: /home/walter/Desktop/sliderule/sliderule.py:26
+msgid "divide/multiply"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:55
+#: /home/walter/Desktop/sliderule/sliderule.py:27
+msgid "cube/cube root"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:56
+#: /home/walter/Desktop/sliderule/sliderule.py:28
+msgid "sin, asin"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:306
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:57
+#: /home/walter/Desktop/sliderule/sliderule.py:29
+msgid "tan, atan"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:58
+#: /home/walter/Desktop/sliderule/sliderule.py:30
 msgid "add/subtract"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:308
-msgid "multiply/divide"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:59
+msgid "user defined"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:310
-msgid "inverse"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:62
+msgid "log²"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:312
-msgid "square/square root"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:63
+msgid "log"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:314
-msgid "cube/cube root"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:64
+msgid "1/log"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:316
-msgid "sin, asin"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:65
+msgid "log³"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/SlideruleActivity.py:318
-msgid "tan, atan"
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:66
+msgid "sin"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:67
+msgid "tan"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:68
+msgid "linear"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:33
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:490
+msgid "Project"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:496
+msgid "function"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:499
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:501
+msgid "top scale"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:503
+msgid "bottom scale"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:505
+msgid "bot scale"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/SlideruleActivity.py:508
+#: /home/walter/Desktop/sliderule/sliderule.py:73
+msgid "realign slides"
+msgstr ""
+
+#: /home/walter/Desktop/sliderule/sliderule.py:41
 msgid "Slide Rule"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:37
+#: /home/walter/Desktop/sliderule/sliderule.py:45
 msgid "L"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:41
+#: /home/walter/Desktop/sliderule/sliderule.py:49
 msgid "C"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:45
+#: /home/walter/Desktop/sliderule/sliderule.py:53
 msgid "CI"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:49
+#: /home/walter/Desktop/sliderule/sliderule.py:57
 msgid "A"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:53
+#: /home/walter/Desktop/sliderule/sliderule.py:61
 msgid "K"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:57
+#: /home/walter/Desktop/sliderule/sliderule.py:65
 msgid "S"
 msgstr ""
 
-#: /home/walter/Desktop/sliderule/sliderule.py:61
+#: /home/walter/Desktop/sliderule/sliderule.py:69
 msgid "T"
 msgstr ""
diff --git a/sprite_factory.py b/sprite_factory.py
index 017d65d..07bbc90 100644
--- a/sprite_factory.py
+++ b/sprite_factory.py
@@ -27,6 +27,7 @@ class Slider:
         # create sprite from svg file
         self.spr = Sprite(sprites, x, y,
                           self.load_image(path,name,w,h))
+        self.name = name
 
     def draw_slider(self, layer=1000):
         self.spr.set_layer(layer)
@@ -59,3 +60,5 @@ def svg_str_to_pixbuf(svg_string):
     pl.close()
     pixbuf = pl.get_pixbuf()
     return pixbuf
+
+
diff --git a/sprites.py b/sprites.py
index a361ba0..bd115e2 100644
--- a/sprites.py
+++ b/sprites.py
@@ -36,6 +36,11 @@ Example usage:
         # Import the classes into your program.
         from sprites import Sprites Sprite
 
+        # In your expose callback event handler, call refresh
+        def _expose_cb(self, win, event):
+            self.sprite_list.refresh(event)
+            return True
+
         # Create a new sprite collection for a gtk Drawing Area.
         my_drawing_area = gtk.DrawingArea()
         self.sprite_list = Sprites(my_drawing_area)
@@ -75,15 +80,14 @@ def svg_str_to_pixbuf(svg_string):
 import pygtk
 pygtk.require('2.0')
 import gtk
-import gobject
 import pango
 
-#
-# A class for the list of sprites and everything they share in common
-#
 
 class Sprites:
+    """ A class for the list of sprites and everything they share in common """
+
     def __init__(self, canvas, area=None, gc=None):
+        """ Initialize an empty array of sprites """
         self.canvas = canvas
         if area == None:
             self.area = self.canvas.window
@@ -95,48 +99,65 @@ class Sprites:
         self.list = []
 
     def get_sprite(self, i):
+        """ Return a sprint from the array """
         if i < 0 or i > len(self.list)-1:
             return(None)
         else:
             return(self.list[i])
 
     def length_of_list(self):
+        """ How many sprites are there? """
         return(len(self.list))
 
     def append_to_list(self, spr):
+        """ Append a new sprite to the end of the list. """
         self.list.append(spr)
 
     def insert_in_list(self, spr, i):
+        """ Insert a sprite at position i. """
         if i < 0:
             self.list.insert(0, spr)
-        elif i > len(self.list)-1:
+        elif i > len(self.list) - 1:
             self.list.append(spr)
         else:
             self.list.insert(i, spr)
 
     def remove_from_list(self, spr):
+        """ Remove a sprite from the list. """
         if spr in self.list:
             self.list.remove(spr)
 
     def find_sprite(self, pos):
+        """ Search based on (x, y) position. Return the 'top/first' one. """
         list = self.list[:]
         list.reverse()
         for spr in list:
-            if spr.hit(pos): return spr
+            if spr.hit(pos):
+                return spr
         return None
 
-    def redraw_sprites(self):
+    def refresh(self, event):
+        """ Handle expose event refresh """
+        self.redraw_sprites(event.area)
+
+    def redraw_sprites(self, area=None):
+        """ Redraw the sprites that intersect area. """
         for spr in self.list:
-            spr.draw()
+            if area == None:
+                spr.draw()
+            else:
+                intersection = spr.rect.intersect(area)
+                if intersection.width > 0 or intersection.height > 0:
+                    spr.draw()
+
 
-#
-# A class for the individual sprites
-#
 class Sprite:
+    """ A class for the individual sprites """
+
     def __init__(self, sprites, x, y, image):
+        """ Initialize an individual sprite """
         self._sprites = sprites
-        self._x = int(x)
-        self._y = int(y)
+        self.rect = gtk.gdk.Rectangle(int(x), int(y), 0, 0)
         self._scale = [12]
         self._rescale = [True]
         self._horiz_align = ["center"]
@@ -145,65 +166,78 @@ class Sprite:
         self._bold = False
         self._italic = False
         self._color = None
-        self._width = 0
-        self._height = 0
-        self._margins = [0,0,0,0]
+        self._margins = [0, 0, 0, 0]
         self.layer = 100
         self.labels = []
         self.images = []
-        self._dx = [] # image offsets
+        self._dx = []  # image offsets
         self._dy = []
         self.set_image(image)
-        self._sprites.append_to_list(self)
+        if self._sprites is not None:
+            self._sprites.append_to_list(self)
 
     def set_image(self, image, i=0, dx=0, dy=0):
-        while len(self.images) < i+1:
-           self.images.append(None)
-           self._dx.append(0)
-           self._dy.append(0)
+        """ Add an image to the sprite. """
+        while len(self.images) < i + 1:
+            self.images.append(None)
+            self._dx.append(0)
+            self._dy.append(0)
         self.images[i] = image
         self._dx[i] = dx
         self._dy[i] = dy
         if isinstance(self.images[i], gtk.gdk.Pixbuf):
-            _w = self.images[i].get_width()
-            _h = self.images[i].get_height()
+            w = self.images[i].get_width()
+            h = self.images[i].get_height()
         else:
-            _w, _h = self.images[i].get_size()
-        if i == 0: # Always reset width and height when base image changes.
-            self._width = _w + dx
-            self._height = _h + dy
+            w, h = self.images[i].get_size()
+        if i == 0:  # Always reset width and height when base image changes.
+            self.rect.width = w + dx
+            self.rect.height = h + dy
         else:
-            if _w + dx > self._width:
-                self._width = _w + dx
-            if _h + dy > self._height:
-                self._height = _h + dy
-
-    def move(self, pos):
-        self.inval()
-        self._x,self._y = int(pos[0]),int(pos[1])
-        self.inval()
-
-    def move_relative(self, pos):
-        self.inval()
-        self._x += int(pos[0])
-        self._y += int(pos[1])
-        self.inval()
+            if w + dx > self.rect.width:
+                self.rect.width = w + dx
+            if h + dy > self.rect.height:
+                self.rect.height = h + dy
+
+    def move(self, pos, visible=True):
+        """ Move to new (x, y) position """
+        if visible:
+            self.inval()
+        self.rect.x, self.rect.y = int(pos[0]), int(pos[1])
+        if visible:
+            self.inval()
+
+    def move_relative(self, pos, visible=True):
+        """ Move to new (x+dx, y+dy) position """
+        if visible:
+            self.inval()
+        self.rect.x += int(pos[0])
+        self.rect.y += int(pos[1])
+        if visible:
+            self.inval()
 
     def get_xy(self):
-        return (self._x, self._y)
+        """ Return current (x, y) position """
+        return (self.rect.x, self.rect.y)
 
     def get_dimensions(self):
-        return (self._width, self._height)
+        """ Return current size """
+        return (self.rect.width, self.rect.height)
 
     def get_layer(self):
+        """ Return current layer """
         return self.layer
 
     def set_shape(self, image, i=0):
+        """ Set the current image associated with the sprite """
         self.inval()
         self.set_image(image, i)
         self.inval()
 
     def set_layer(self, layer):
+        """ Set the layer for a sprite """
+        if self._sprites is None:
+            return
         self._sprites.remove_from_list(self)
         self.layer = layer
         for i in range(self._sprites.length_of_list()):
@@ -215,37 +249,43 @@ class Sprite:
         self.inval()
 
     def set_label(self, new_label, i=0):
+        """ Set the label drawn on the sprite """
         self._extend_labels_array(i)
         if type(new_label) is str or type(new_label) is unicode:
             # pango doesn't like nulls
-            self.labels[i] = new_label.replace("\0"," ")
+            self.labels[i] = new_label.replace("\0", " ")
         else:
             self.labels[i] = str(new_label)
         self.inval()
 
     def set_margins(self, l=0, t=0, r=0, b=0):
-        self._margins = [l,t,r,b]
+        """ Set the margins for drawing the label """
+        self._margins = [l, t, r, b]
 
     def _extend_labels_array(self, i):
+        """ Append to the labels attribute list """
         if self._fd is None:
-           self.set_font('Sans')
+            self.set_font('Sans')
         if self._color is None:
-           self._color = self._sprites.cm.alloc_color('black')
-        while len(self.labels) < i+1:
-           self.labels.append(" ")
-           self._scale.append(self._scale[0])
-           self._rescale.append(self._rescale[0])
-           self._horiz_align.append(self._horiz_align[0])
-           self._vert_align.append(self._vert_align[0])
+            self._color = self._sprites.cm.alloc_color('black')
+        while len(self.labels) < i + 1:
+            self.labels.append(" ")
+            self._scale.append(self._scale[0])
+            self._rescale.append(self._rescale[0])
+            self._horiz_align.append(self._horiz_align[0])
+            self._vert_align.append(self._vert_align[0])
 
     def set_font(self, font):
+        """ Set the font for a label """
         self._fd = pango.FontDescription(font)
 
     def set_label_color(self, rgb):
+        """ Set the font color for a label """
         self._color = self._sprites.cm.alloc_color(rgb)
 
     def set_label_attributes(self, scale, rescale=True, horiz_align="center",
                              vert_align="middle", i=0):
+        """ Set the various label attributes """
         self._extend_labels_array(i)
         self._scale[i] = scale
         self._rescale[i] = rescale
@@ -253,114 +293,147 @@ class Sprite:
         self._vert_align[i] = vert_align
 
     def hide(self):
+        """ Hide a sprite """
+        if self._sprites is None:
+            return
         self.inval()
         self._sprites.remove_from_list(self)
 
     def inval(self):
-        self._sprites.area.invalidate_rect(
-            gtk.gdk.Rectangle(self._x,self._y,self._width,self._height), False)
+        """ Force a region redraw by gtk """
+        if self._sprites is None:
+            return
+        self._sprites.area.invalidate_rect(self.rect, False)
 
     def draw(self):
-        for i,img in enumerate(self.images):
+        """ Draw the sprite (and label) """
+        if self._sprites is None:
+            return
+        for i, img in enumerate(self.images):
             if isinstance(img, gtk.gdk.Pixbuf):
-                self._sprites.area.draw_pixbuf(
-                    self._sprites.gc, img, 0, 0, self._x+self._dx[i],
-                                                 self._y+self._dy[i])
+                self._sprites.area.draw_pixbuf(self._sprites.gc, img, 0, 0,
+                                               self.rect.x + self._dx[i],
+                                               self.rect.y + self._dy[i])
             elif img is not None:
-                self._sprites.area.draw_drawable(
-                    self._sprites.gc, img, 0, 0, self._x+self._dx[i],
-                                                 self._y+self._dy[i], -1, -1)
+                self._sprites.area.draw_drawable(self._sprites.gc, img, 0, 0,
+                                                 self.rect.x + self._dx[i],
+                                                 self.rect.y + self._dy[i],
+                                                 -1, -1)
         if len(self.labels) > 0:
             self.draw_label()
 
     def hit(self, pos):
+        """ Is (x, y) on top of the sprite? """
         x, y = pos
-        if x < self._x:
+        if x < self.rect.x:
             return False
-        if x > self._x+self._width:
+        if x > self.rect.x + self.rect.width:
             return False
-        if y < self._y:
+        if y < self.rect.y:
             return False
-        if y > self._y+self._height:
+        if y > self.rect.y + self.rect.height:
             return False
         return True
 
     def draw_label(self):
-        my_width = self._width-self._margins[0]-self._margins[2]
+        """ Draw the label based on its attributes """
+        if self._sprites is None:
+            return
+        my_width = self.rect.width - self._margins[0] - self._margins[2]
         if my_width < 0:
             my_width = 0
-        my_height = self._height-self._margins[1]-self._margins[3]
+        my_height = self.rect.height - self._margins[1] - self._margins[3]
         for i in range(len(self.labels)):
             pl = self._sprites.canvas.create_pango_layout(str(self.labels[i]))
-            self._fd.set_size(int(self._scale[i]*pango.SCALE))
+            self._fd.set_size(int(self._scale[i] * pango.SCALE))
             pl.set_font_description(self._fd)
-            w = pl.get_size()[0]/pango.SCALE
+            w = pl.get_size()[0] / pango.SCALE
             if w > my_width:
-                if self._rescale[i] is True:
+                if self._rescale[i]:
                     self._fd.set_size(
-                                    int(self._scale[i]*pango.SCALE*my_width/w))
+                            int(self._scale[i] * pango.SCALE * my_width / w))
                     pl.set_font_description(self._fd)
-                    w = pl.get_size()[0]/pango.SCALE
+                    w = pl.get_size()[0] / pango.SCALE
                 else:
-                    j = len(self.labels[i])-1
+                    j = len(self.labels[i]) - 1
                     while(w > my_width and j > 0):
                         pl = self._sprites.canvas.create_pango_layout(
-                                 "…"+self.labels[i][len(self.labels[i])-j:])
-                        self._fd.set_size(int(self._scale[i]*pango.SCALE))
+                              "…" + self.labels[i][len(self.labels[i]) - j:])
+                        self._fd.set_size(int(self._scale[i] * pango.SCALE))
                         pl.set_font_description(self._fd)
-                        w = pl.get_size()[0]/pango.SCALE        
+                        w = pl.get_size()[0] / pango.SCALE
                         j -= 1
             if self._horiz_align[i] == "center":
-                x = int(self._x+self._margins[0]+(my_width-w)/2)
+                x = int(self.rect.x + self._margins[0] + (my_width - w) / 2)
             elif self._horiz_align[i] == 'left':
-                x = int(self._x+self._margins[0])
+                x = int(self.rect.x + self._margins[0])
             else: # right
-                x = int(self._x+self._width-w-self._margins[2])
-            h = pl.get_size()[1]/pango.SCALE
+                x = int(self.rect.x + self.rect.width - w - self._margins[2])
+            h = pl.get_size()[1] / pango.SCALE
             if self._vert_align[i] == "middle":
-                y = int(self._y+self._margins[1]+(my_height-h)/2)
+                y = int(self.rect.y + self._margins[1] + (my_height - h) / 2)
             elif self._vert_align[i] == "top":
-                y = int(self._y+self._margins[1])
+                y = int(self.rect.y + self._margins[1])
             else: # bottom
-                y = int(self._y+self._height-h-self._margins[3])
+                y = int(self.rect.y + self.rect.height - h - self._margins[3])
             self._sprites.gc.set_foreground(self._color)
             self._sprites.area.draw_layout(self._sprites.gc, x, y, pl)
 
     def label_width(self):
+        """ Calculate the width of a label """
         max = 0
         for i in range(len(self.labels)):
             pl = self._sprites.canvas.create_pango_layout(self.labels[i])
-            self._fd.set_size(int(self._scale[i]*pango.SCALE))
+            self._fd.set_size(int(self._scale[i] * pango.SCALE))
             pl.set_font_description(self._fd)
-            w = pl.get_size()[0]/pango.SCALE
+            w = pl.get_size()[0] / pango.SCALE
             if w > max:
                 max = w
         return max
 
     def label_safe_width(self):
-        return self._width-self._margins[0]-self._margins[2]
-    
+        """ Return maximum width for a label """
+        return self.rect.width - self._margins[0] - self._margins[2]
+
     def label_safe_height(self):
-        return self._height-self._margins[1]-self._margins[3]
-    
+        """ Return maximum height for a label """
+        return self.rect.height - self._margins[1] - self._margins[3]
+
     def label_left_top(self):
-        return (self._margins[0], self._margins[1])
+        """ Return the upper-left corner of the label safe zone """
+        return(self._margins[0], self._margins[1])
 
-    def get_pixel(self, pos, i=0):
+    def get_pixel(self, pos, i=0, mode='888'):
+        """ Return the pixel at (x, y) """
         x, y = pos
-        x = x-self._x
-        y = y-self._y
-        if y > self.images[i].get_height()-1:
-            return (-1,-1,-1,-1)
-        try:
+        x = x - self.rect.x
+        y = y - self.rect.y
+        if isinstance(self.images[i], gtk.gdk.Pixbuf):
+            if y > self.images[i].get_height() - 1:
+                return(-1, -1, -1, -1)
             array = self.images[i].get_pixels()
             if array is not None:
-                offset = (y*self.images[i].get_width()+x)*4
-                r,g,b,a = ord(array[offset]), ord(array[offset+1]),\
-                          ord(array[offset+2]), ord(array[offset+3])
-                return (r,g,b,a)
-            else:
-                return (-1,-1,-1,-1)
-        except IndexError:
-            print "Index Error: %d %d" % (len(array), offset)
-            return (-1,-1,-1,-1)
+                offset = (y * self.images[i].get_width() + x) * 4
+                try:
+                    r, g, b, a = ord(array[offset]), ord(array[offset + 1]), \
+                        ord(array[offset + 2]), ord(array[offset + 3])
+                    return(r, g, b, a)
+                except IndexError:
+                    print "Index Error: %d %d" % (len(array), offset)
+            return(-1, -1, -1, -1)
+        else:
+            w, h = self.images[i].get_size()
+            if x < 0 or x > (w - 1) or y < 0 or y > (h - 1):
+                return(-1, -1, -1, -1)
+            image = self.images[i].get_image(x, y, 1, 1)
+            pixel = image.get_pixel(0, 0)
+            visual = self.images[i].get_visual()
+            r = int((pixel & visual.red_mask) >> visual.red_shift)
+            g = int((pixel & visual.green_mask) >> visual.green_shift)
+            b = int((pixel & visual.blue_mask) >> visual.blue_shift)
+            # Rescale to 8 bits
+            if mode == '565':
+                r = r << 3
+                g = g << 2
+                b = b << 3
+            return(r, g, b, 0)
diff --git a/window.py b/window.py
index 8b8eea1..8cdea5d 100644
--- a/window.py
+++ b/window.py
@@ -164,6 +164,9 @@ class SlideRule():
             self._move_slides(self.D.spr, -self.D.spr.get_xy()[0])
         elif k == 'Return' or k == 'BackSpace':
             self.parent.realign_cb()
+            self.R_tab_top.spr.move((150, self.R_tab_top.spr.get_xy()[1]))
+            self.R_tab_bottom.spr.move((150, self.R_tab_bottom.spr.get_xy()[1]))
+            self.R.spr.move((150, self.R.spr.get_xy()[1]))
         return True
 
     def _make_slider(self, name, y):