sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-27 23:19:16 +01:00
commit e3bab8cd12
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shell/view/frame/ZoomBox.py
View File

@ -20,6 +20,7 @@ from gettext import gettext as _
import hippo import hippo
from sugar.graphics.menu import Menu, MenuItem from sugar.graphics.menu import Menu, MenuItem
from sugar.graphics import color
from sugar.graphics.iconbutton import IconButton from sugar.graphics.iconbutton import IconButton
import sugar import sugar
@ -79,19 +80,27 @@ class ZoomBox(hippo.CanvasBox):
self._popup_context = popup_context self._popup_context = popup_context
self._activity_icon = None self._activity_icon = None
icon = IconButton(icon_name='theme:stock-zoom-mesh') icon = IconButton(icon_name='theme:stock-zoom-mesh',
stroke_color=color.BLACK,
fill_color=color.WHITE)
icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_MESH) icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_MESH)
self.append(icon) self.append(icon)
icon = IconButton(icon_name='theme:stock-zoom-friends') icon = IconButton(icon_name='theme:stock-zoom-friends',
stroke_color=color.BLACK,
fill_color=color.WHITE)
icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_FRIENDS) icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_FRIENDS)
self.append(icon) self.append(icon)
icon = IconButton(icon_name='theme:stock-zoom-home') icon = IconButton(icon_name='theme:stock-zoom-home',
stroke_color=color.BLACK,
fill_color=color.WHITE)
icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_HOME) icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_HOME)
self.append(icon) self.append(icon)
icon = IconButton(icon_name='theme:stock-zoom-activity') icon = IconButton(icon_name='theme:stock-zoom-activity',
stroke_color=color.BLACK,
fill_color=color.WHITE)
icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_ACTIVITY) icon.connect('activated', self._level_clicked_cb, sugar.ZOOM_ACTIVITY)
self.append(icon) self.append(icon)

5
sugar/graphics/button.py
View File

@ -47,6 +47,7 @@ class Button(hippo.CanvasBox, hippo.CanvasItem):
self._round_box.props.background_color = color.BLACK.get_int() self._round_box.props.background_color = color.BLACK.get_int()
self._round_box.props.padding_top = units.points_to_pixels(1) self._round_box.props.padding_top = units.points_to_pixels(1)
self._round_box.props.padding_bottom = units.points_to_pixels(1) self._round_box.props.padding_bottom = units.points_to_pixels(1)
self._round_box.props.spacing = units.points_to_pixels(3)
self._text_box = hippo.CanvasText() self._text_box = hippo.CanvasText()
self._text_box.props.font_desc = font.DEFAULT.get_pango_desc() self._text_box.props.font_desc = font.DEFAULT.get_pango_desc()
@ -87,8 +88,8 @@ class Button(hippo.CanvasBox, hippo.CanvasItem):
else: else:
self._icon = CanvasIcon(icon_name=value, self._icon = CanvasIcon(icon_name=value,
scale=units.SMALL_ICON_SCALE, scale=units.SMALL_ICON_SCALE,
fill_color=color.WHITE, fill_color=color.BLACK,
stroke_color=color.BLACK) stroke_color=color.WHITE)
# Insert icon on the label's left # Insert icon on the label's left
self._round_box.remove_all() self._round_box.remove_all()
self._round_box.append(self._icon) self._round_box.append(self._icon)

2
sugar/graphics/iconbutton.py
View File

@ -102,9 +102,7 @@ class IconButton(CanvasIcon):
def prelight(self, enter): def prelight(self, enter):
if enter: if enter:
if self._active: if self._active:
self.props.fill_color = color.BLACK
self.props.background_color = color.BLACK.get_int() self.props.background_color = color.BLACK.get_int()
else: else:
if self._active: if self._active:
self.props.fill_color = self._normal_fill_color
self.props.background_color = self._normal_background_color self.props.background_color = self._normal_background_color