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

7 files changed, 23 insertions, 12 deletions

diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index ee1c578..375857f 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -9,7 +9,6 @@ sugar_PYTHON =			\
 	entry.py                \
 	font.py			\
 	frame.py		\
-	iconcolor.py		\
 	label.py		\
 	menu.py			\
 	menushell.py		\
@@ -21,4 +20,5 @@ sugar_PYTHON =			\
 	spreadbox.py		\
 	timeline.py         	\
 	toolbar.py		\
-	units.py
+	units.py		\
+	xocolor.py
diff --git a/sugar/graphics/canvasicon.py b/sugar/graphics/canvasicon.py
index 67c35aa..7cf1ed2 100644
--- a/sugar/graphics/canvasicon.py
+++ b/sugar/graphics/canvasicon.py
@@ -24,7 +24,6 @@ import rsvg
 import cairo
 import time
 
-from sugar.graphics.iconcolor import IconColor
 from sugar.graphics.timeline import Timeline
 from sugar.graphics.popup import Popup
 from sugar.graphics import color
diff --git a/sugar/graphics/color.py b/sugar/graphics/color.py
index 4e3d885..b18b2ce 100644
--- a/sugar/graphics/color.py
+++ b/sugar/graphics/color.py
@@ -14,7 +14,13 @@ _system_colors = {
     'desktop-background'            : '#E2E2E3',
     'menu-background'               : '#414141',
     'menu-separator'                : '#D1D1D2',
-    'menu-border'                   : '#D1D1D2'
+    'menu-border'                   : '#D1D1D2',
+    'button-normal'                 : '#FFFFFF',
+    'button-background-normal'      : '#424242',
+    'button-hover'                  : '#808080',
+    'button-background-hover'       : '#000000',
+    'button-inactive'               : '#808080',
+    'button-background-inactive'    : '#424242'
 }
 
 def _html_to_rgb(html_color):
@@ -79,3 +85,9 @@ DESKTOP_BACKGROUND          = SystemColor('desktop-background')
 MENU_BACKGROUND             = SystemColor('menu-background')
 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')
+BUTTON_INACTIVE             = SystemColor('button-inactive')
+BUTTON_BACKGROUND_INACTIVE  = SystemColor('button-background-inactive')
diff --git a/sugar/graphics/iconbutton.py b/sugar/graphics/iconbutton.py
index b1992a6..78196d0 100644
--- a/sugar/graphics/iconbutton.py
+++ b/sugar/graphics/iconbutton.py
@@ -21,7 +21,7 @@ import gobject
 import hippo
 
 from canvasicon import CanvasIcon
-from iconcolor import IconColor
+from xocolor import XoColor
 from sugar.graphics import units
 from sugar import profile
             
@@ -47,11 +47,11 @@ class IconButton(CanvasIcon):
         if self.props.color:
             self._normal_color = self.props.color
         else:
-            self._normal_color = IconColor('white')
+            self._normal_color = XoColor('white')
             self.props.color = self._normal_color
 
         self._prelight_color = profile.get_color()
-        self._inactive_color = IconColor('#808080,#424242')
+        self._inactive_color = XoColor('#808080,#424242')
         self._set_size(STANDARD_SIZE)
 
         self.connect('button-press-event', self._button_press_event_cb)
diff --git a/sugar/graphics/iconcolor.py b/sugar/graphics/xocolor.py
index ca1ca6a..07fe80e 100644
--- a/sugar/graphics/iconcolor.py
+++ b/sugar/graphics/xocolor.py
@@ -595,7 +595,7 @@ def _parse_string(color_string):
 def is_valid(color_string):
     return (_parse_string(color_string) != None)
 
-class IconColor:
+class XoColor:
     def __init__(self, color_string=None):
         if color_string == None or not is_valid(color_string):
             n = int(random.random() * (len(_colors) - 1))
diff --git a/sugar/profile.py b/sugar/profile.py
index 65f8582..cb1309b 100644
--- a/sugar/profile.py
+++ b/sugar/profile.py
@@ -18,7 +18,7 @@ import os
 from ConfigParser import ConfigParser
 
 from sugar import env
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 
 class _Profile(object):
     def __init__(self):
@@ -39,7 +39,7 @@ class _Profile(object):
             self.name = cp.get('Buddy', 'NickName')
 
         if cp.has_option('Buddy', 'Color'):
-            self.color = IconColor(cp.get('Buddy', 'Color'))
+            self.color = XoColor(cp.get('Buddy', 'Color'))
 
         if cp.has_option('Buddy', 'PublicKey'):
             self.pubkey = cp.get('Buddy', 'PublicKey')
diff --git a/sugar/simulator.py b/sugar/simulator.py
index c97f364..fd592ee 100644
--- a/sugar/simulator.py
+++ b/sugar/simulator.py
@@ -22,7 +22,7 @@ import gobject
 import dbus
 
 from sugar.presence import PresenceService
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 from sugar.p2p import Stream
 from sugar import util
 
@@ -135,7 +135,7 @@ class Bot(object):
 
     def __init__(self):
         self.name = Bot._name_collection.get_name()
-        self.color = IconColor()
+        self.color = XoColor()
         self.icon = None
 
         self._queue = []