From d1a5eef9dfe2ff358cda012c7c4d32a8084df358 Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Sun, 06 Dec 2009 19:43:06 +0000
Subject: Removed extraneous FrameOverlayer introduced with merge

---
diff --git a/tutorius/overlayer.py b/tutorius/overlayer.py
index fc0abd4..5454b39 100644
--- a/tutorius/overlayer.py
+++ b/tutorius/overlayer.py
@@ -160,7 +160,6 @@ class Overlayer(gtk.Layout):
         # some cases.
         self._overlayed.set_size_request(allocation.width, allocation.height)
 
-
 class FrameOverlayer(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
@@ -176,71 +175,14 @@ class FrameOverlayer(gtk.Window):
                                   gtk.DEST_DEFAULT_DROP,
                                   [ ( WIDGET_ID, 0, TARGET_TYPE_WIDGET ) ],
                                   gtk.gdk.ACTION_MOVE)
-
         self._widgets = []
-
-
-    def show(self):
         self.set_decorated(False) # Remove borders and title bar
         self.set_keep_above(True) # Always on top
         self.fullscreen() # Cover the entire screen
-
-        gtk.Window.show(self)
         self.expose = self.connect("expose-event", self.apply_mask)
 
-    def apply_mask(self,*args):
-        self.px = gtk.gdk.Pixmap(None, 1173, 800, 1) # source, size, colors
-        self.cr = self.px.cairo_create()
-        self.cr.set_operator(cairo.OPERATOR_CLEAR)
-        self.cr.paint()
-        self.cr.set_source_rgb(1,1,1)
-        self.cr.set_operator(cairo.OPERATOR_SOURCE)
- 
-        for widget in self._widgets:
-            widget.draw_with_context(self.cr)
-        self.shape_combine_mask(self.px, 0, 0) # pixmap, offset
-
-    def put(self,widget, offset_x, offset_y):
-        self._widgets.append(widget)
-        widget.show()
-        self._overlayer.put(widget, offset_x, offset_y)
-        self._overlayer.queue_draw()
-
-    def move(self, widget, x, y):
-        self._overlayer.move(widget,x,y)
-
-    def remove(self, widget):
-        self._widgets.remove(widget)
-        self._overlayer.remove(widget)
-
-    def queue_draw(self):
-        self._overlayer.queue_draw()
-
-class FrameOverlayer(gtk.Window):
-    def __init__(self):
-        gtk.Window.__init__(self)
-        self._vbox = gtk.VBox()
-        self._overlayer = Overlayer(self._vbox)
-        self.add(self._overlayer)
-        self._vbox.show()
-        self._overlayer.show()
-        self.show_all()
-
-        self._overlayer.drag_dest_set(gtk.DEST_DEFAULT_MOTION |
-                                  gtk.DEST_DEFAULT_HIGHLIGHT |
-                                  gtk.DEST_DEFAULT_DROP,
-                                  [ ( WIDGET_ID, 0, TARGET_TYPE_WIDGET ) ],
-                                  gtk.gdk.ACTION_MOVE)
-        self._widgets = []
-
-
     def show(self):
-        self.set_decorated(False) # Remove borders and title bar
-        self.set_keep_above(True) # Always on top
-        self.fullscreen() # Cover the entire screen
-
         gtk.Window.show(self)
-        self.expose = self.connect("expose-event", self.apply_mask)
 
     def apply_mask(self,*args):
         self.px = gtk.gdk.Pixmap(None, screen_width(), screen_height(), 1) # source, size, colors
--
cgit v0.9.1