From 4346a50e6f650850c41caa6ddfae9e00571a1588 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 27 Apr 2007 11:43:40 +0200
Subject: [PATCH] Remove all the bubbles from the public API, yay ;)

---
 .../view}/ClipboardBubble.py                  |  0
 shell/view/Makefile.am                        |  1 +
 shell/view/clipboardmenu.py                   |  3 +-
 sugar/graphics/Makefile.am                    |  2 -
 sugar/graphics/bubble.py                      | 77 -------------------
 5 files changed, 3 insertions(+), 80 deletions(-)
 rename {sugar/graphics => shell/view}/ClipboardBubble.py (100%)
 delete mode 100644 sugar/graphics/bubble.py

diff --git a/sugar/graphics/ClipboardBubble.py b/shell/view/ClipboardBubble.py
similarity index 100%
rename from sugar/graphics/ClipboardBubble.py
rename to shell/view/ClipboardBubble.py
diff --git a/shell/view/Makefile.am b/shell/view/Makefile.am
index abbb230e..bd4cf7a4 100644
--- a/shell/view/Makefile.am
+++ b/shell/view/Makefile.am
@@ -6,6 +6,7 @@ sugar_PYTHON =				\
 	ActivityHost.py			\
 	BuddyIcon.py			\
 	BuddyMenu.py			\
+	ClipboardBubble.py		\
 	clipboardicon.py		\
 	clipboardmenu.py		\
 	keyhandler.py			\
diff --git a/shell/view/clipboardmenu.py b/shell/view/clipboardmenu.py
index 9db69223..0d1549c9 100644
--- a/shell/view/clipboardmenu.py
+++ b/shell/view/clipboardmenu.py
@@ -4,10 +4,11 @@ import hippo
 
 from sugar.graphics.menu import Menu, MenuItem
 from sugar.graphics.canvasicon import CanvasIcon
-from sugar.graphics.ClipboardBubble import ClipboardBubble
 from sugar.graphics import color
 from sugar.graphics import font
 
+from view.ClipboardBubble import ClipboardBubble
+
 class ClipboardProgressBar(ClipboardBubble):
 
     def __init__(self, percent = 0):
diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index 4e74d08d..41c96f4a 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -2,12 +2,10 @@ sugardir = $(pythondir)/sugar/graphics
 sugar_PYTHON =			\
 	__init__.py		\
 	animator.py		\
-	bubble.py		\
 	button.py		\
 	iconbutton.py          	\
 	canvasicon.py		\
 	color.py		\
-	ClipboardBubble.py	\
 	entry.py                \
 	filechooser.py		\
 	font.py			\
diff --git a/sugar/graphics/bubble.py b/sugar/graphics/bubble.py
deleted file mode 100644
index 5bfe87a7..00000000
--- a/sugar/graphics/bubble.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-import math
-
-import gobject
-import gtk
-import hippo
-
-class Bubble(hippo.CanvasBox, hippo.CanvasItem):
-    __gtype_name__ = 'SugarBubble'
-
-    __gproperties__ = {
-        'color'    : (object, None, None,
-                      gobject.PARAM_READWRITE),
-    }
-
-    def __init__(self, **kwargs):
-        self._color = None
-        self._radius = 8
-
-        hippo.CanvasBox.__init__(self, **kwargs)
-
-    def do_set_property(self, pspec, value):
-        if pspec.name == 'color':
-            self._color = value
-            self.emit_paint_needed(0, 0, -1, -1)
-
-    def do_get_property(self, pspec):
-        if pspec.name == 'color':
-            return self._color
-
-    def _string_to_rgb(self, color_string):
-        col = gtk.gdk.color_parse(color_string)
-        return (col.red / 65535.0, col.green / 65535.0, col.blue / 65535.0)
-
-    def do_paint_below_children(self, cr, damaged_box):
-        [width, height] = self.get_allocation()
-
-        line_width = 3.0
-        x = line_width
-        y = line_width
-        width -= line_width * 2
-        height -= line_width * 2
-
-        cr.move_to(x + self._radius, y);
-        cr.arc(x + width - self._radius, y + self._radius,
-               self._radius, math.pi * 1.5, math.pi * 2);
-        cr.arc(x + width - self._radius, x + height - self._radius,
-               self._radius, 0, math.pi * 0.5);
-        cr.arc(x + self._radius, y + height - self._radius,
-               self._radius, math.pi * 0.5, math.pi);
-        cr.arc(x + self._radius, y + self._radius, self._radius,
-               math.pi, math.pi * 1.5);
-
-        color = self._string_to_rgb(self._color.get_fill_color())
-        cr.set_source_rgb(*color)
-        cr.fill_preserve();
-
-        color = self._string_to_rgb(self._color.get_stroke_color())
-        cr.set_source_rgb(*color)
-        cr.set_line_width(line_width)
-        cr.stroke();