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

Remove obsolete sugar.graphics.color.

Browse Source
This commit is contained in:
Marco Pesenti Gritti
2007-07-31 14:05:14 +02:00
parent 1845435e8c
commit cca69e7012
16 changed files with 64 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sugar/graphics/Makefile.am
-1
View File
@@ -7,7 +7,6 @@ sugar_PYTHON = \
canvasbutton.py \
canvasicon.py \
canvasentry.py \
color.py \
combobox.py \
frame.py \
notebook.py \
sugar/graphics/canvasicon.py
+3 -3
View File
@@ -25,8 +25,8 @@ import rsvg
import cairo
import time
from sugar.graphics import color
from sugar.graphics.xocolor import XoColor
from sugar.graphics import style
from sugar.graphics import units
from sugar.graphics.palette import Palette, CanvasInvoker
@@ -193,8 +193,8 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
self._handle = None
self.emit_paint_needed(0, 0, -1, -1)
elif pspec.name == 'xo-color':
self.props.fill_color = color.HTMLColor(value.get_fill_color())
self.props.stroke_color = color.HTMLColor(value.get_stroke_color())
self.props.fill_color = style.Color(value.get_fill_color())
self.props.stroke_color = style.Color(value.get_stroke_color())
elif pspec.name == 'fill-color':
if self._fill_color != value:
if not self._cache:
sugar/graphics/color.py
-121
View File
@@ -1,121 +0,0 @@
# Copyright (C) 2006-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 gtk
_system_colors = {
'toolbar-background' : '#404040',
'frame-border' : '#D1D1D2',
'entry-background-focused' : '#FFFFFF',
'entry-background-unfocused' : '#414141',
'entry-selection-focused' : '#D1D1D2',
'entry-selection-unfocused' : '#00FF00',
'entry-text-focused' : '#000000',
'entry-text-unfocused' : '#FFFFFF',
'entry-border' : '#D1D1D2',
'label-text' : '#FFFFFF',
'desktop-background' : '#E2E2E3',
'menu-background' : '#000000',
'menu-background-hover' : '#404040',
'menu-separator' : '#D1D1D2',
'menu-border' : '#D1D1D2',
'button-normal' : '#FFFFFF',
'button-background-normal' : '#404040',
'button-hover' : '#808080',
'button-background-hover' : '#000000',
'icon-stroke-inactive' : '#757575',
'icon-fill-inactive' : '#9D9FA1',
'toggle-button-background' : '#A1A5A8'
}
def _html_to_rgb(html_color):
""" #RRGGBB -> (r, g, b) tuple (in float format) """
html_color = html_color.strip()
if html_color[0] == '#':
html_color = html_color[1:]
if len(html_color) != 6:
raise ValueError, "input #%s is not in #RRGGBB format" % html_color
r, g, b = html_color[:2], html_color[2:4], html_color[4:]
r, g, b = [int(n, 16) for n in (r, g, b)]
r, g, b = (r / 255.0, g / 255.0, b / 255.0)
return (r, g, b)
def _rgba_to_int(r, g, b, a):
color = int(a * 255) + (int(b * 255) << 8) + \
(int(g * 255) << 16) + (int(r * 255) << 24)
return color
class RGBColor(object):
def __init__(self, r, g, b, a=1.0):
self._r = r
self._g = g
self._b = b
self._a = a
def get_rgba(self):
return (self._r, self._g, self._b, self._a)
def get_int(self):
return _rgba_to_int(self._r, self._g, self._b, self._a)
def get_gdk_color(self):
return gtk.gdk.Color(int(self._r * 65535), int(self._g * 65535),
int(self._b * 65535))
def get_html(self):
return '#%02x%02x%02x' % (self._r * 255, self._g * 255, self._b * 255)
class HTMLColor(RGBColor):
def __init__(self, html_color):
rgb = _html_to_rgb(html_color)
RGBColor.__init__(self, *rgb)
class SystemColor(HTMLColor):
def __init__(self, color_id):
HTMLColor.__init__(self, _system_colors[color_id])
RED = RGBColor(1.0, 0.0, 0.0)
GREEN = RGBColor(0.0, 1.0, 0.0)
BLUE = RGBColor(0.0, 0.0, 1.0)
WHITE = RGBColor(1.0, 1.0, 1.0)
BLACK = RGBColor(0.0, 0.0, 0.0)
TOOLBAR_BACKGROUND = SystemColor('toolbar-background')
FRAME_BORDER = SystemColor('frame-border')
ENTRY_BACKGROUND_FOCUSED = SystemColor('entry-background-focused')
ENTRY_BACKGROUND_UNFOCUSED = SystemColor('entry-background-unfocused')
ENTRY_SELECTION_FOCUSED = SystemColor('entry-selection-focused')
ENTRY_SELECTION_UNFOCUSED = SystemColor('entry-selection-unfocused')
ENTRY_TEXT_FOCUSED = SystemColor('entry-text-focused')
ENTRY_TEXT_UNFOCUSED = SystemColor('entry-text-unfocused')
ENTRY_BORDER = SystemColor('entry-border')
LABEL_TEXT = SystemColor('label-text')
DESKTOP_BACKGROUND = SystemColor('desktop-background')
MENU_BACKGROUND = SystemColor('menu-background')
MENU_BACKGROUND_HOVER = SystemColor('menu-background-hover')
MENU_SEPARATOR = SystemColor('menu-separator')
MENU_BORDER = SystemColor('menu-border')
BUTTON_NORMAL = SystemColor('button-normal')
BUTTON_BACKGROUND_NORMAL = SystemColor('button-background-normal')
BUTTON_HOVER = SystemColor('button-hover')
BUTTON_BACKGROUND_HOVER = SystemColor('button-background-hover')
ICON_FILL_INACTIVE = SystemColor('icon-fill-inactive')
ICON_STROKE_INACTIVE = SystemColor('icon-stroke-inactive')
TOGGLE_BUTTON_BACKGROUND = SystemColor('toggle-button-background')
sugar/graphics/frame.py
+2 -2
View File
@@ -15,7 +15,7 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
from sugar.graphics import color
from sugar.graphics import style
from sugar.graphics.roundbox import RoundBox
class Frame(RoundBox):
@@ -23,4 +23,4 @@ class Frame(RoundBox):
def __init__(self, **kwargs):
RoundBox.__init__(self, **kwargs)
self.props.border_color = color.FRAME_BORDER.get_int()
self.props.border_color = style.COLOR_BLACK.get_int()
sugar/graphics/iconbutton.py
+5 -6
View File
@@ -26,7 +26,7 @@ import hippo
from sugar.graphics.canvasicon import CanvasIcon
from sugar.graphics import units
from sugar.graphics import color
from sugar.graphics import style
STANDARD_SIZE = 0
SMALL_SIZE = 1
@@ -44,8 +44,8 @@ class IconButton(CanvasIcon, hippo.CanvasItem):
CanvasIcon.__init__(self, cache=True, **kwargs)
if not self.props.fill_color and not self.props.stroke_color:
self.props.fill_color = color.BUTTON_BACKGROUND_NORMAL
self.props.stroke_color = color.BUTTON_NORMAL
self.props.fill_color = style.Color("#404040")
self.props.stroke_color = style.Color("#FFFFFF")
self._set_size(STANDARD_SIZE)
self.connect('activated', self._icon_clicked_cb)
@@ -82,10 +82,9 @@ class IconButton(CanvasIcon, hippo.CanvasItem):
def prelight(self, enter):
if enter:
if self.props.active:
self.props.background_color = color.BLACK.get_int()
self.props.background_color = 0x000000FF
else:
self.props.background_color = \
color.BUTTON_BACKGROUND_NORMAL.get_int()
self.props.background_color = 0x404040FF
def _icon_clicked_cb(self, button):
if self._palette:
sugar/graphics/objectchooser.py
+7 -8
View File
@@ -24,7 +24,6 @@ import hippo
from sugar.graphics.frame import Frame
from sugar.activity.bundle import Bundle
from sugar.date import Date
from sugar.graphics import color
from sugar.graphics import style
from sugar.graphics import units
from sugar.graphics.canvasicon import CanvasIcon
@@ -43,7 +42,7 @@ class ObjectChooser(gtk.Dialog):
self._selected_entry = False
self._box = hippo.CanvasBox()
self._box.props.background_color = color.DESKTOP_BACKGROUND.get_int()
self._box.props.background_color = style.COLOR_PANEL_GREY.get_int()
self._box.props.spacing = units.points_to_pixels(5)
self._box.props.padding = units.points_to_pixels(5)
@@ -105,8 +104,8 @@ class CollapsedEntry(Frame):
Frame.__init__(self)
self.props.box_height = units.grid_to_pixels(1)
self.props.spacing = units.points_to_pixels(5)
self.props.border_color = color.FRAME_BORDER.get_int()
self.props.background_color = color.DESKTOP_BACKGROUND.get_int()
self.props.border_color = style.COLOR_BLACK.get_int()
self.props.background_color = style.COLOR_PANEL_GREY.get_int()
self.jobject = jobject
self._icon_name = None
@@ -169,8 +168,8 @@ class CollapsedEntry(Frame):
def set_selected(self, selected):
if selected:
self.props.border_color = color.WHITE.get_int()
self.props.background_color = color.WHITE.get_int()
self.props.border_color = style.COLOR_WHITE.get_int()
self.props.background_color = style.COLOR_WHITE.get_int()
else:
self.props.border_color = color.FRAME_BORDER.get_int()
self.props.background_color = color.DESKTOP_BACKGROUND.get_int()
self.props.border_color = style.COLOR_BLACK.get_int()
self.props.background_color = style.COLOR_PANEL_GREY.get_int()
sugar/graphics/roundbox.py
+2 -2
View File
@@ -20,7 +20,7 @@ import math
import hippo
from sugar.graphics import units
from sugar.graphics import color
from sugar.graphics import style
class RoundBox(hippo.CanvasBox, hippo.CanvasItem):
__gtype_name__ = 'SugarRoundBox'
@@ -37,7 +37,7 @@ class RoundBox(hippo.CanvasBox, hippo.CanvasItem):
self.props.border = self._BORDER_DEFAULT
self.props.border_left = self._radius
self.props.border_right = self._radius
self.props.border_color = color.BLACK.get_int()
self.props.border_color = style.COLOR_BLACK.get_int()
def do_paint_background(self, cr, damaged_box):
[width, height] = self.get_allocation()
sugar/graphics/style.py
+3
View File
@@ -103,8 +103,11 @@ TOOLBOX_TAB_VBORDER = int((zoom(36) - FONT_NORMAL_H - _FOCUS_LINE_WIDTH) / 2)
TOOLBOX_TAB_HBORDER = zoom(15) - _FOCUS_LINE_WIDTH - _TAB_CURVATURE
TOOLBOX_TAB_LABEL_WIDTH = zoom(150 - 15 * 2)
COLOR_WHITE = Color('#000000')
COLOR_WHITE = Color('#FFFFFF')
COLOR_PANEL_GREY = Color('#C0C0C0')
COLOR_SELECTION_GREY = Color('#A6A6A6')
COLOR_INACTIVE_FILL = Color('#9D9FA1')
COLOR_INACTIVE_STROKE = Color('#757575')
PALETTE_CURSOR_DISTANCE = zoom(10)