From 14ffdc1d03f93e76ae0f7e483c006ce76f61dd23 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 31 Oct 2007 10:32:54 +0000
Subject: sugar-control: fixed some imports, cleaned some strings

---
diff --git a/bin/sugar-control-panel b/bin/sugar-control-panel
index 489cf72..367372d 100755
--- a/bin/sugar-control-panel
+++ b/bin/sugar-control-panel
@@ -24,7 +24,7 @@ from sugar import env
 
 sys.path.insert(0, env.get_shell_path())
  
-import control 
+from controlpanel import control
         
 def cmd_help():
     print 'Usage: sugar-control [ option ] key [ args ... ] \n\
diff --git a/shell/controlpanel/Makefile.am b/shell/controlpanel/Makefile.am
index 353aeec..b772170 100644
--- a/shell/controlpanel/Makefile.am
+++ b/shell/controlpanel/Makefile.am
@@ -1,2 +1,4 @@
 sugardir = $(pkgdatadir)/shell/controlpanel
-sugar_PYTHON = control.py
+sugar_PYTHON = 				\
+	__init__.py			\
+	control.py
diff --git a/shell/controlpanel/control.py b/shell/controlpanel/control.py
index 28922b8..02ddfe3 100644
--- a/shell/controlpanel/control.py
+++ b/shell/controlpanel/control.py
@@ -218,7 +218,7 @@ def print_jabber():
 
 def set_jabber(server):
     """Set the jabber server
-    server : 'olpc.collabora.co.uk'
+    server : e.g. 'olpc.collabora.co.uk'
     """
     pro = profile.get_profile()
     pro.jabber_server = server
@@ -239,11 +239,11 @@ def print_color():
                 print 'fill:   color=%s hue=%s'%(color, hue)
 
 def set_color(stroke, fill, modstroke='medium', modfill='medium'):
-    """Set the system color.
-    fill : 'red, orange, yellow, blue, purple'
-    stroke : 'red, orange, yellow, blue, purple'
-    modstroke : 'dark, medium, light'
-    modfill : ''dark, medium, light'
+    """Set the system color by setting a fill and stroke color.
+    fill : [red, orange, yellow, blue, purple]
+    stroke : [red, orange, yellow, blue, purple]
+    hue stroke : [dark, medium, light] (optional)
+    hue fill : [dark, medium, light] (optional)
     """
     
     if modstroke not in _MODIFIERS or modfill not in _MODIFIERS:
@@ -272,7 +272,7 @@ def print_nick():
     
 def set_nick(nick):
     """Set the nickname.
-    nick : 'erikos'
+    nick : e.g. 'walter'
     """
     pro = profile.get_profile()
     pro.nick_name = nick    
@@ -285,16 +285,16 @@ def get_radio():
     state = nm.state()
     if state:
         if state == NM_ASLEEP:
-            return _('Asleep')
+            return _('off')
         else:
-            return _('Awake')
+            return _('on')
     return _('State is unknown.')
 
 def print_radio():
     print get_radio()
     
 def set_radio(state):
-    """Turn Radio off
+    """Turn Radio 'on' or 'off'
     state : 'on/off'
     """
 
--
cgit v0.9.1