diff options
| author | Dan Winship <dwinship@redhat.com> | 2007-09-20 19:56:28 (GMT) |
|---|---|---|
| committer | Dan Winship <dwinship@redhat.com> | 2007-09-20 19:56:28 (GMT) |
| commit | 070d7a6dfc2fa4c953ab7c9b84fccd43ef1dcc53 (patch) | |
| tree | e1d1c27ccd380332114fa91af9a8c5c980704d74 | |
| parent | 741a424166b1ef4d6046ea543205d3992c21579f (diff) | |
| parent | c4ac2f47fd5014248b8eb9c8f994e42a7d49b9b8 (diff) | |
Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar
| -rw-r--r-- | shell/intro/intro.py | 1 | ||||
| -rw-r--r-- | sugar/graphics/Makefile.am | 1 | ||||
| -rw-r--r-- | sugar/graphics/button.py | 32 |
3 files changed, 0 insertions, 34 deletions
diff --git a/shell/intro/intro.py b/shell/intro/intro.py index e56babd..8b23302 100644 --- a/shell/intro/intro.py +++ b/shell/intro/intro.py @@ -26,7 +26,6 @@ import logging from sugar import env from sugar.graphics import style -from sugar.graphics.button import CanvasButton from sugar.graphics.entry import CanvasEntry from sugar.profile import get_profile diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am index 53e05aa..1e2d4c2 100644 --- a/sugar/graphics/Makefile.am +++ b/sugar/graphics/Makefile.am @@ -2,7 +2,6 @@ sugardir = $(pythondir)/sugar/graphics sugar_PYTHON = \ __init__.py \ animator.py \ - button.py \ combobox.py \ entry.py \ icon.py \ diff --git a/sugar/graphics/button.py b/sugar/graphics/button.py deleted file mode 100644 index 647f36d..0000000 --- a/sugar/graphics/button.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2007 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 hippo -import gtk - -from sugar.graphics.icon import Icon - -class CanvasButton(hippo.CanvasButton): - def __init__(self, label, icon_name=None): - hippo.CanvasButton.__init__(self, text=label) - - if icon_name: - icon = Icon(icon_name=icon_name, icon_size=gtk.ICON_SIZE_BUTTON) - self.props.widget.set_image(icon) - icon.show() - - |