diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-10-15 15:03:18 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-10-15 15:03:18 (GMT) |
commit | 878ac4cbcfd096c0019e1a71594291a993cd22f6 (patch) | |
tree | ef2eb9f67d566aaeb0f35d12cf8aedb03b29633b | |
parent | 7d9376482d7bee08a0721379be246eb843e190a8 (diff) |
Name input screen should be deactivable #1497
-rw-r--r-- | data/sugar.schemas.in | 7 | ||||
-rw-r--r-- | src/jarabe/intro/window.py | 17 |
2 files changed, 24 insertions, 0 deletions
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in index 8c43930..42b4cbd 100644 --- a/data/sugar.schemas.in +++ b/data/sugar.schemas.in @@ -13,6 +13,13 @@ </locale> </schema> <schema> + <key>/schemas/desktop/sugar/user/default_nick</key> + <applyto>/desktop/sugar/user/default_nick</applyto> + <owner>sugar</owner> + <type>string</type> + <default>disabled</default> + </schema> + <schema> <key>/schemas/desktop/sugar/user/color</key> <applyto>/desktop/sugar/user/color</applyto> <owner>sugar</owner> diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py index 94c6782..17da465 100644 --- a/src/jarabe/intro/window.py +++ b/src/jarabe/intro/window.py @@ -18,6 +18,7 @@ import os import logging from gettext import gettext as _ import gconf +import pwd import gtk import gobject @@ -111,6 +112,9 @@ class _NamePage(_Page): def get_name(self): return self._entry.props.text + def set_name(self, new_name): + self._entry.props.text = new_name + def activate(self): self._entry.props.widget.grab_focus() @@ -156,6 +160,19 @@ class _IntroBox(hippo.CanvasBox): self._current_page = None self._next_button = None + client = gconf.client_get_default() + default_nick = client.get_string('/desktop/sugar/user/default_nick') + if default_nick: + self._page = self.PAGE_COLOR + if default_nick == 'disabled': + pw = pwd.getpwuid(os.getuid()) + if pw.pw_gecos: + self._name_page.set_name(pw.pw_gecos) + else: + self._name_page.set_name(pw.pw_name) + else: + self._name_page.set_name(default_nick) + self._setup_page() def _setup_page(self): |