From 6b2ead024ac1bf83ebfbe69f607ac35b0a6d63ac Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 31 Jul 2007 14:40:06 +0200 Subject: [PATCH] Adapt to sugar API changes. This makes the colors ugly, I need to talk with Eben and figure out the right colors. --- collapsedentry.py | 1 - detailview.py | 3 +-- expandedentry.py | 13 ++++++------- journalentry.py | 10 +++++----- journaltoolbox.py | 1 - keepicon.py | 6 +++--- listview.py | 4 ++-- tagbox.py | 1 - volumestoolbar.py | 1 - 9 files changed, 17 insertions(+), 23 deletions(-) diff --git a/collapsedentry.py b/collapsedentry.py index 4915dac..b439cd6 100644 --- a/collapsedentry.py +++ b/collapsedentry.py @@ -23,7 +23,6 @@ import pango from sugar.graphics.canvasicon import CanvasIcon from sugar.graphics.xocolor import XoColor from sugar.graphics import style -from sugar.graphics import color from sugar.graphics import units from sugar.date import Date from sugar.datastore import datastore diff --git a/detailview.py b/detailview.py index b18b9c2..20918ae 100644 --- a/detailview.py +++ b/detailview.py @@ -21,7 +21,6 @@ import gobject import gtk import hippo -from sugar.graphics import color from sugar.graphics import units from sugar.graphics import style from sugar.graphics.canvasicon import CanvasIcon @@ -47,7 +46,7 @@ class DetailView(gtk.VBox): canvas.show() root = hippo.CanvasBox() - root.props.background_color = color.DESKTOP_BACKGROUND.get_int() + root.props.background_color = style.COLOR_PANEL_GREY.get_int() canvas.set_root(root) back_bar = BackBar() diff --git a/expandedentry.py b/expandedentry.py index 99132eb..28ca9de 100644 --- a/expandedentry.py +++ b/expandedentry.py @@ -24,7 +24,6 @@ import gobject import gtk from sugar.graphics import style -from sugar.graphics import color from sugar.graphics import units from sugar.graphics.canvasicon import CanvasIcon from sugar.graphics.xocolor import XoColor @@ -39,7 +38,7 @@ from tagbox import TagBox class Separator(hippo.CanvasBox, hippo.CanvasItem): def __init__(self): hippo.CanvasBox.__init__(self, - background_color=color.DESKTOP_BACKGROUND.get_int(), + background_color=style.COLOR_PANEL_GREY.get_int(), box_height=units.points_to_pixels(2)) class BuddyList(hippo.CanvasBox): @@ -82,9 +81,9 @@ class ExpandedEntry(JournalEntry): JournalEntry._update_color(self) if self._title: if self.get_keep(): - self._title.set_background(color.WHITE.get_html()) + self._title.set_background(style.COLOR_WHITE.get_html()) else: - self._title.set_background(color.FRAME_BORDER.get_html()) + self._title.set_background(style.COLOR_BLACK.get_html()) def _build_title_box(self): hbox = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL) @@ -141,7 +140,7 @@ class ExpandedEntry(JournalEntry): surface = cairo.ImageSurface.create_from_png(png_file) image = hippo.CanvasImage(image=surface, border=units.points_to_pixels(1), - border_color=color.BLACK.get_int(), + border_color=style.COLOR_BLACK.get_int(), xalign=hippo.ALIGNMENT_CENTER, yalign=hippo.ALIGNMENT_CENTER) vbox.append(image) @@ -152,7 +151,7 @@ class ExpandedEntry(JournalEntry): xalign=hippo.ALIGNMENT_START, yalign=hippo.ALIGNMENT_START, border=units.points_to_pixels(1), - border_color=color.BLACK.get_int(), + border_color=style.COLOR_BLACK.get_int(), padding=units.points_to_pixels(3), size_mode=hippo.CANVAS_SIZE_WRAP_WORD, box_width=units.grid_to_pixels(4)) @@ -163,7 +162,7 @@ class ExpandedEntry(JournalEntry): xalign=hippo.ALIGNMENT_CENTER, yalign=hippo.ALIGNMENT_CENTER, border=units.points_to_pixels(1), - border_color=color.BLACK.get_int(), + border_color=style.COLOR_BLACK.get_int(), box_width=units.grid_to_pixels(4)) vbox.append(no_image_label, hippo.PACK_EXPAND) diff --git a/journalentry.py b/journalentry.py index bb75c50..d4c5a4d 100644 --- a/journalentry.py +++ b/journalentry.py @@ -23,7 +23,7 @@ import hippo from sugar.graphics.frame import Frame from sugar.date import Date -from sugar.graphics import color +from sugar.graphics import style from sugar.graphics import units from sugar.datastore import datastore from sugar import activity @@ -64,14 +64,14 @@ class JournalEntry(hippo.CanvasBox): def _update_color(self): if self.get_keep(): - self.frame.props.background_color = color.WHITE.get_int() + self.frame.props.background_color = style.COLOR_WHITE.get_int() else: - self.frame.props.background_color = color.FRAME_BORDER.get_int() + self.frame.props.background_color = style.COLOR_SELECTION_GREY.get_int() if self._is_selected: - self.frame.props.border_color = color.TOOLBAR_BACKGROUND.get_int() + self.frame.props.border_color = style.COLOR_BLACK.get_int() else: - self.frame.props.border_color = color.FRAME_BORDER.get_int() + self.frame.props.border_color = style.COLOR_WHITE.get_int() def get_icon_name(self): if self._icon_name: diff --git a/journaltoolbox.py b/journaltoolbox.py index 8aec9b4..f446a3a 100644 --- a/journaltoolbox.py +++ b/journaltoolbox.py @@ -25,7 +25,6 @@ import gtk import backup from sugar.graphics import units -from sugar.graphics import color from sugar.graphics.xocolor import XoColor from sugar.graphics.toolbox import Toolbox from sugar.graphics.toolcombobox import ToolComboBox diff --git a/keepicon.py b/keepicon.py index b55ce7d..9f57ade 100644 --- a/keepicon.py +++ b/keepicon.py @@ -17,7 +17,7 @@ import gobject from sugar.graphics.canvasicon import CanvasIcon -from sugar.graphics import color +from sugar.graphics import style class KeepIcon(CanvasIcon): __gproperties__ = { @@ -36,8 +36,8 @@ class KeepIcon(CanvasIcon): self.props.fill_color = None self.props.stroke_color = None else: - self.props.fill_color = color.DESKTOP_BACKGROUND - self.props.stroke_color = color.WHITE + self.props.fill_color = style.COLOR_PANEL_GREY + self.props.stroke_color = style.COLOR_WHITE def do_set_property(self, pspec, value): CanvasIcon.do_set_property(self, pspec, value) diff --git a/listview.py b/listview.py index 1ee8747..468fab6 100644 --- a/listview.py +++ b/listview.py @@ -22,7 +22,7 @@ import gtk from sugar.activity import activity from sugar.datastore import datastore -from sugar.graphics import color +from sugar.graphics import style from sugar.graphics import units from sugar.graphics.canvasicon import CanvasIcon @@ -60,7 +60,7 @@ class ListView(gtk.HBox): self._box = hippo.CanvasBox() self._box.props.orientation = hippo.ORIENTATION_VERTICAL - 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) diff --git a/tagbox.py b/tagbox.py index fb0890a..0d3f09f 100644 --- a/tagbox.py +++ b/tagbox.py @@ -17,7 +17,6 @@ from gettext import gettext as _ import hippo -from sugar.graphics import color from sugar.graphics import units from sugar.graphics import style diff --git a/volumestoolbar.py b/volumestoolbar.py index 0065ad3..4d34430 100644 --- a/volumestoolbar.py +++ b/volumestoolbar.py @@ -24,7 +24,6 @@ import dbus from sugar.activity import activity from sugar.datastore import datastore -from sugar.graphics import color from sugar.graphics import units from sugar.graphics.radiotoolbutton import RadioToolButton from sugar.graphics.palette import Palette -- 2.11.4.GIT