diff options
| author | Simon Schampijer <simon@schampijer.de> | 2008-06-13 20:54:52 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2008-06-13 20:54:52 (GMT) |
| commit | 70873f1f512a2cb5fdb8e7e4283266ec45871adf (patch) | |
| tree | 79009ae71e6b31c4b2889aa7e8ab732bbf08475f /src | |
| parent | 4a04ea9e04b9d0b959abd2b0adb59f1b15ecf75d (diff) | |
ControlPanel: Use the sesionmanager for the sugar restart
Diffstat (limited to 'src')
| -rw-r--r-- | src/controlpanel/gui.py | 26 | ||||
| -rw-r--r-- | src/controlpanel/sectionview.py | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/controlpanel/gui.py b/src/controlpanel/gui.py index e51f9e3..b07687f 100644 --- a/src/controlpanel/gui.py +++ b/src/controlpanel/gui.py @@ -24,6 +24,7 @@ from sugar.graphics.icon import Icon from sugar.graphics import style from sugar.graphics.alert import Alert import config +from session import get_session_manager from controlpanel.toolbar import MainToolbar from controlpanel.toolbar import SectionToolbar @@ -246,19 +247,19 @@ class ControlPanel(gtk.Window): self._section_toolbar.accept_button.set_sensitive(False) alert = Alert() alert.props.title = _('Warning') - alert.props.msg = _('Changes require restart to take effect') + alert.props.msg = _('Changes require restart') - cancel_icon = Icon(icon_name='dialog-cancel') - alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel changes'), - cancel_icon) - cancel_icon.show() + icon = Icon(icon_name='dialog-cancel') + alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel changes'), icon) + icon.show() - later_icon = Icon(icon_name='dialog-ok') - alert.add_button(gtk.RESPONSE_ACCEPT, _('Later'), later_icon) - later_icon.show() + icon = Icon(icon_name='dialog-ok') + alert.add_button(gtk.RESPONSE_ACCEPT, _('Later'), icon) + icon.show() - # TODO - # Handle restart + icon = Icon(icon_name='system-restart') + alert.add_button(gtk.RESPONSE_APPLY, _('Restart now'), icon) + icon.show() self._vbox.pack_start(alert, False) self._vbox.reorder_child(alert, 2) @@ -278,8 +279,9 @@ class ControlPanel(gtk.Window): self._options[self._current_option]['alerts'] = \ self._section_view.restart_alerts self._show_main_view() - elif response_id is gtk.RESPONSE_APPLY: - _logger.debug('Restart...') + elif response_id is gtk.RESPONSE_APPLY: + session_manager = get_session_manager() + session_manager.logout() def __select_option_cb(self, button, event, option): self._show_section_view(option) diff --git a/src/controlpanel/sectionview.py b/src/controlpanel/sectionview.py index d9830bc..ceaeacd 100644 --- a/src/controlpanel/sectionview.py +++ b/src/controlpanel/sectionview.py @@ -31,7 +31,7 @@ class SectionView(gtk.VBox): self._is_valid = True self.needs_restart = False self.restart_alerts = [] - self.restart_msg = _('Changes require a sugar restart to take effect.') + self.restart_msg = _('Changes require restart') def do_set_property(self, pspec, value): if pspec.name == 'is-valid': |